chore: resolve merge conflicts with origin main
6 months ago
Authored
Cursor AgentCo-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−2src/server/jsonrpc/schema.ts+0−6src/server/session/AgentSession.ts+0−30src/tools/index.ts+1−4