Merge pull request #84 from mweinbach/cursor/merge-conflict-fix-f7d3
6 months ago
16 files changed
- apps/desktop/electron/services/persistence.ts+1−1
- apps/desktop/src/components/ConnectPage.tsx+21−21
- apps/desktop/src/lib/webAdapter.ts+39−27
- apps/desktop/src/main.web.tsx+1−1
- apps/desktop/src/ui/chat/a2ui/A2uiRenderer.tsx+1−1
- apps/desktop/src/ui/settings/pages/FeatureFlagsPage.tsx+1−1
- apps/desktop/test/settings-nav.test.ts+12−0
apps/desktop/test/sidebar-ui.test.tsx
+5
−0
apps/desktop/test/token-compliance.test.ts+2−0apps/mobile/src/components/thread/thread-feed-item.tsx+0−5config/defaults.json+0−1src/server/jsonrpc/eventProjector.ts+0−4src/server/jsonrpc/routes/a2ui.ts+5−1src/server/session/AgentSession.ts+0−10src/server/startServer.ts+1−1src/tools/index.ts+5−4
