Merge branch 'main' into feat/history-git-graph
5 days ago
Authored
asta-nguyen# Conflicts:
# apps/desktop/src/features/editor/queries.test.tsx
# apps/desktop/src/features/editor/queries.ts
# docs/llm/architecture/editor.md
Parents4c11d2af646f37
44 files changed
- apps/desktop/src-tauri/Cargo.toml+2−1
- apps/desktop/src-tauri/src/acp.rs+2751−0
- apps/desktop/src-tauri/src/agents.rs+1−1
- apps/desktop/src-tauri/src/commands.rs+139−0
- apps/desktop/src-tauri/src/git_view.rs+72−17
- apps/desktop/src-tauri/src/git_write.rs+646−0
- apps/desktop/src-tauri/src/lib.rs+18−1
- apps/desktop/src-tauri/src/wiring_tests.rs
+155
−1
apps/desktop/src-tauri/src/worktrees.rs+62−27apps/desktop/src-tauri/tests/fixtures/fake_acp_agent.py+206−0apps/desktop/src/App.test.tsx+1−1apps/desktop/src/App.tsx+10−7apps/desktop/src/features/editor/CommitBox.test.tsx+291−0apps/desktop/src/features/editor/CommitBox.tsx+242−0apps/desktop/src/features/editor/EditorChanges.tsx+175−25apps/desktop/src/features/editor/EditorFiles.tsx+5−1apps/desktop/src/features/editor/EditorWorkspace.test.tsx+152−11apps/desktop/src/features/editor/queries.test.tsx+233−2apps/desktop/src/features/editor/queries.ts+129−0apps/desktop/src/features/projects/ProjectTree.tsx+14−2apps/desktop/src/features/sessions/AgentIcon.tsx+25−0apps/desktop/src/features/sessions/SessionItems.tsx+14−1apps/desktop/src/features/sessions/SessionLaunch.tsx+5−1apps/desktop/src/features/sessions/StateBadge.tsx+11−2apps/desktop/src/features/sessions/agent-logos.ts+18−0apps/desktop/src/features/settings/AcpAgentsSection.tsx+188−0apps/desktop/src/features/settings/SettingsPage.test.tsx+235−2apps/desktop/src/features/settings/SettingsPage.tsx+3−0apps/desktop/src/features/terminal/TerminalController.test.ts+31−0apps/desktop/src/features/terminal/TerminalController.ts+16−3apps/desktop/src/features/worktrees/WorktreeRows.tsx+5−3apps/desktop/src/queryClient.ts+3−0apps/desktop/src/services/acp.test.ts+40−0apps/desktop/src/services/acp.ts+17−0apps/desktop/src/services/git-write.test.ts+41−0apps/desktop/src/services/git-write.ts+21−0apps/desktop/src/services/types.ts+50−0docs/agent-devkit/INDEX.md+1−0docs/agent-devkit/changes/2026-11-06-editor-commit-acp/delta.md+146−0docs/agent-devkit/changes/2026-11-06-editor-commit-acp/design.md+175−0docs/agent-devkit/changes/2026-11-06-editor-commit-acp/tasks.md+127−0docs/llm/INDEX.md+2−2docs/llm/architecture/editor.md+99−3docs/llm/domains/desktop-settings.md+33−5