Home

mweinbach / agent-coworker

publicmweinbach/agent-coworker
Overview Code History Branches Pull requestsIssuesInsights
main
HomeOverview Code PRsIssues

chore: resolve merge conflicts with origin main

6 months ago

19bb0c1
Authored
Cursor Agent4/18/2026, 8:21:24 PM
Co-authored-by: Max Weinbach <mweinbach@users.noreply.github.com>

Parents541f6625f19ac9

12 files changed
  • apps/desktop/src/app/store.actions/thread.ts+1−30
  • apps/desktop/src/app/store.helpers.ts+0−7
  • apps/desktop/src/app/store.helpers/jsonRpcSocket.ts+0−24
  • apps/mobile/src/components/thread/thread-feed-item.tsx+0−5
  • apps/mobile/src/features/cowork/protocolTypes.ts+0−25
  • apps/mobile/src/features/cowork/snapshotReducer.ts+0−14
  • config/defaults.json+0−1
src/server/jsonrpc/eventProjector.ts
+0
−4
  • src/server/jsonrpc/routes/index.ts+0−2
  • src/server/jsonrpc/schema.ts+0−6
  • src/server/session/AgentSession.ts+0−30
  • src/tools/index.ts+1−4