.plans/branch-environment-picker-in-chatview-input.md | 74 +++++ .plans/git-flows-integration-tests.md | 99 +++++++ .plans/git-flows-test-plan.md | 103 +++++++ .plans/git-integration-branch-picker-worktrees.md | 115 ++++++++ AGENTS.md | 7 + README.md | 4 +- apps/desktop/package.json | 11 +- apps/desktop/scripts/dev-electron.mjs | 2 +- apps/desktop/scripts/smoke-test.mjs | 6 +- apps/desktop/src/main.ts | 3 +- apps/desktop/tsconfig.json | 4 +- apps/desktop/tsdown.config.ts | 21 ++ apps/desktop/tsup.config.ts | 10 - apps/desktop/turbo.jsonc | 24 ++ apps/server/package.json | 15 +- apps/server/src/codexAppServerManager.test.ts | 8 +- apps/server/src/codexAppServerManager.ts | 44 +-- apps/server/src/git.test.ts | 423 ++++++++++++++++++++++++++++ apps/server/src/git.ts | 229 +++++++++++++++ apps/server/src/providerManager.test.ts | 5 +- apps/server/src/providerManager.ts | 11 +- apps/server/src/wsServer.test.ts | 26 ++ apps/server/src/wsServer.ts | 31 +- apps/server/tsconfig.json | 4 +- apps/server/tsdown.config.ts | 14 + apps/server/tsup.config.ts | 13 - apps/server/turbo.jsonc | 11 + apps/web/index.html | 5 +- apps/web/package.json | 5 +- apps/web/src/App.tsx | 13 +- apps/web/src/components/BranchToolbar.tsx | 315 +++++++++++++++++++++ apps/web/src/components/ChatView.tsx | 244 ++++++++-------- apps/web/src/components/DiffPanel.tsx | 4 +- apps/web/src/components/Sidebar.tsx | 2 + apps/web/src/historyBootstrap.ts | 15 +- apps/web/src/index.css | 37 +-- apps/web/src/persistenceSchema.test.ts | 4 + apps/web/src/persistenceSchema.ts | 21 +- apps/web/src/session-logic.ts | 25 +- apps/web/src/store.test.ts | 2 + apps/web/src/store.ts | 28 +- apps/web/src/types.ts | 2 + apps/web/src/wsNativeApi.ts | 8 + apps/web/turbo.jsonc | 9 + apps/web/vite.config.ts | 15 +- bun.lock | 483 +++++++++++++++++++++----------- package.json | 18 +- packages/contracts/package.json | 10 +- packages/contracts/src/git.ts | 69 +++++ packages/contracts/src/index.ts | 1 + packages/contracts/src/ipc.ts | 18 ++ packages/contracts/src/provider.ts | 27 +- packages/contracts/src/ws.ts | 8 + vitest.config.ts | 12 +- 54 files changed, 2192 insertions(+), 525 deletions(-)