@loicngr/kobo 1.7.16 → 1.7.18

package/AGENTS.md

@@ -62,7 +62,11 @@ src/
 │   │   │   ├── orchestrator.ts     # per-workspace engine map, retry/quota handling, watchdog, public API
 │   │   │   ├── session-controller.ts # lifecycle wrapper around an AgentEngine instance
 │   │   │   ├── event-router.ts     # maps engine AgentEvent stream to WS emit + DB side-effects
-│   │   │   └── engines/claude-code/ # Claude Code engine (spawn + stream-parser + args-builder + mcp-config + capabilities)
+│   │   │   └── engines/{claude-code,codex}/ # per-engine adapters implementing the AgentEngine contract
+│   │   ├── forge/                  # ForgeProvider abstraction — github / gitlab / none, with registry + auto-resolve
+│   │   ├── change-source-branch-service.ts # re-target a workspace onto a new source branch (built-in cherry-pick or custom bash)
+│   │   ├── git-stats-service.ts    # pure compute of commit/ahead-behind/diff stats + forge availability for a workspace
+│   │   ├── settings-defaults.ts    # DEFAULT_* constants for opt-in settings (e.g. change-source-branch script)
 │   │   ├── content-migration-service.ts # runtime legacy ws_events → normalised AgentEvent migration
 │   │   ├── templates-service.ts    # prompt templates CRUD (JSON file persistence, seeding)
 │   │   ├── dev-server-service.ts   # per-workspace dev server lifecycle (docker or npm process)
@@ -82,8 +86,8 @@ src/
 ├── client/                         # Vue 3 + Quasar SPA
 │   └── src/
 │       ├── stores/                 # pinia: workspace, websocket, settings, dev-server, templates
-│       ├── components/             # WorkspaceList, NotionPanel, AcceptancePanel, ChatInput, GitPanel, PlansPanel…
-│       ├── utils/                  # expand-template (template variable substitution), formatters…
+│       ├── components/             # WorkspaceList, NotionPanel, AcceptancePanel, ChatInput, GitPanel, PlansPanel, WorkspaceAttentionLabels…
+│       ├── utils/                  # expand-template, formatters, workspace-attention (CI failure / changes-requested derivation)…
 │       ├── pages/                  # WorkspacePage, CreatePage, SettingsPage
 │       └── router/
 ├── mcp-server/                     # standalone MCP server spawned per workspace
@@ -101,6 +105,7 @@ src/
 | `agent_sessions` | Claude Code CLI invocations — pid, `claude_session_id`, status, started_at, ended_at, `name` |
 | `ws_events` | persisted WebSocket events for replay on reconnect — type, payload, session_id, created_at |
 | `pending_wakeups` | one-row-per-workspace scheduler for the `ScheduleWakeup` tool — target_at (ISO UTC), prompt, reason; CASCADE DELETE on workspace |
+| `workspace_chat_history` | chat-input history per workspace — message text + `created_at`, ordered by autoincrement id, capped at 200 entries by the service; CASCADE DELETE on workspace |
 
 `status` enum: `created | extracting | brainstorming | executing | completed | idle | error | quota`. Transitions are validated in `updateWorkspaceStatus` against `VALID_TRANSITIONS`.
 
@@ -157,6 +162,10 @@ Two emit flavors in `websocket-service.ts`:
 
 ## External integrations
 
+### Forge providers
+
+`src/server/services/forge/` implements a `ForgeProvider` interface with three concrete providers: `github` (wraps the `gh` CLI), `gitlab` (wraps the `glab` CLI), and `none` (no-op — disables PR/MR features cleanly). The public surface is two functions: `getForgeProvider(name)` in `registry.ts` (returns the provider for a named forge) and `resolveForge(projectPath)` in `resolve.ts` (reads the per-project `forge` setting, then falls back to auto-detection from the `origin` remote URL — host contains `github.com` → GitHub, host contains `gitlab` → GitLab, otherwise `none`). The per-project `forge` setting (`'auto' | 'github' | 'gitlab' | 'none'`, default `'auto'`) is stored in `settings.json` and seeded by settings migration v32. PR routes (`open-pr`, `change-pr-base`) and the pr-watcher go through the resolved provider. **Kōbō ships no forge credentials** — the user must install and authenticate `gh` or `glab` themselves; when the CLI is absent or unauthenticated, PR/MR actions are disabled with a tooltip rather than a raw error.
+
 ### Notion (opt-in, user-provided credentials)
 
 `notion-service.ts` spawns the official [`@notionhq/notion-mcp-server`](https://github.com/makenotion/notion-mcp-server) as a child process (`npx -y @notionhq/notion-mcp-server`) and talks to it over stdio using JSON-RPC / MCP. **Kōbō ships no Notion credentials** — the feature only works if the user has configured their own integration token. The token is resolved in this order:
@@ -175,7 +184,7 @@ See the "Notion integration" section of the README for the end-user setup guide.
 
 Two engines live under `src/server/services/agent/engines/`, both implementing the `AgentEngine` contract in `types.ts`:
 
-**Claude Code** (`claude-code/`) — uses `@anthropic-ai/claude-agent-sdk` (in-process async iterator). Spawns no subprocess. Auth via `~/.claude.json` or `ANTHROPIC_API_KEY` env var.
+**Claude Code** (`claude-code/`) — uses `@anthropic-ai/claude-agent-sdk` (in-process async iterator). Spawns no subprocess. Auth via `~/.claude.json` or `ANTHROPIC_API_KEY` env var. The engine arms a **15 s result-drain watchdog** when the SDK emits its `result` message: if the async iterator does not close cleanly within the window, `session:ended` is force-emitted so the orchestrator and auto-loop never hang on a stuck generator. The watchdog is idempotent via a `sessionEndedEmitted` guard and the timer is cleared in `finally`.
 
 **OpenAI Codex** (`codex/`) — uses the **`codex app-server` JSON-RPC protocol** (line-delimited JSON over stdio with a long-lived `codex` subprocess). The engine layers are:
 - `jsonrpc/transport.ts` + `jsonrpc/peer.ts` — generic JSON-RPC 2.0 stdio peer (request correlation, notifications, server-initiated requests)
@@ -200,6 +209,28 @@ Background: the engine was migrated from `@openai/codex-sdk` (one-shot `codex ex
 - **Streaming bursts trip auto-scroll.** Codex emits one `message:text` event per token-delta (50-200 per message), versus Claude which emits ~1 per content block. The naive `eventCount` watcher in `ActivityFeed.vue` triggered an animated `scrollToBottom(180)` per event, causing stacked animations and visible jank. The fix coalesces requests through `requestAnimationFrame` and only animates the *first* scroll after a quiet period — subsequent scrolls during a burst snap instantly.
 - **`MCP tools` need `default_tools_approval_mode: 'auto'` in `config.mcp_servers`.** Without it Codex flags every MCP tool call as needing user approval ("user cancelled MCP tool call"). Kōbō trusts every tool it spawns, so the options-builder pre-approves the namespace.
 
+## Workspace operations
+
+### Change source branch
+
+`change-source-branch-service.ts` re-targets a workspace onto a new source branch. The default path is a cherry-pick of the branch-proper commits (commits in the working branch but in **neither** the old nor the new base), inspired by the sekur `deploy-preprod-rebase.yml` workflow. The route is `POST /api/workspaces/:id/change-source-branch` and returns a discriminated status: `done | aligned | conflict | too-many | dirty`.
+
+- **Built-in cherry-pick** — `fetchAllBranches` → `listProperCommits` → `stashPush` (if dirty + aligned) → backup branch (`kobo-backup/<branch>-<unix-ts>`) → `reset --hard origin/<new>` → cherry-pick replay → optional force-push prompt → forge PR-base update via `provider.changePrBase`. Conflicts leave the worktree in a cherry-pick state for the user/agent to resolve via `POST /:id/git/resolve-with-agent`. `GitConflictError` carries an `operation: 'rebase' | 'merge' | 'cherry-pick'` discriminator.
+- **Custom bash override** — if `effective.changeSourceBranchScript` is non-empty (per-project override or global default), the script **replaces** the built-in flow. Spawned with `bash -c`, cwd = worktree, 5 min timeout, stderr captured (last 8 KB). Exit 0 → Kōbō updates the source-branch metadata; any non-zero exit → the stderr tail is propagated as a clean error. The user-facing menu item only shows when the resolved script is non-empty — empty = feature disabled (opt-in).
+- **Custom-script env vars** — `KOBO_NEW_BASE`, `KOBO_OLD_BASE`, `KOBO_WORKING_BRANCH`, `KOBO_WORKTREE_PATH`, `KOBO_PROJECT_PATH`, `KOBO_PROJECT_NAME`, `KOBO_WORKSPACE_ID`, `KOBO_WORKSPACE_NAME`, `KOBO_FORGE`, `KOBO_PR_NUMBER` (empty when no PR/MR is open). The default script lives in `settings-defaults.ts` and is seeded into `global.changeSourceBranchScript` by settings migration v33; the client reads it through `GET /api/settings/defaults` for the "Reset to Kōbō default" button. See [CONFIGURATION.md → Custom change-source-branch script](CONFIGURATION.md#custom-change-source-branch-script).
+
+### Workspace attention indicators
+
+`src/client/src/utils/workspace-attention.ts` derives a small set of badges (CI failure, changes-requested) from the PR snapshot + git stats stored on each workspace. `WorkspaceAttentionLabels.vue` renders them inline on the workspace cards in the left drawer. The derivation is a pure function — easy to unit-test, no IO. Drawer cards therefore stay reactive to whatever the pr-watcher / bulk-info refresh writes back into the store.
+
+### Bulk workspace info refresh
+
+`GET /api/workspaces/info` returns `{ workspaces, prSnapshots, gitStats }` in one shot. The client polls this endpoint every 30 s so every non-archived workspace stays ≤ 30 s fresh without a per-card stats request. The server-side pr-watcher feeds the same caches (`lastKnownGitStats` map, PR snapshots) so the work is shared between the polling client and the watchdog loop.
+
+### File editing in the diff viewer
+
+The right panel of `DiffViewer.vue` is editable when the workspace agent is stopped and the file is not in `deleted` status. `Ctrl/Cmd+S` or the explicit Save button persists the file via `POST /api/workspaces/:id/save-file`, sending `{ path, content, baseSha }` where `baseSha` is the sha256 captured at `GET /diff-file` time. The route refuses with **412 Precondition Failed** + `{ currentSha }` if the on-disk content has changed; the client shows a Reload / Keep mine dialog. Worktree-traversal guards (including parent-symlink escapes) and a 1 MB size cap live in `file-editor-service.ts`. Changing files in the tree while dirty pops an "Unsaved changes" prompt.
+
 ## Code conventions
 
 **Service layer** throws descriptive errors; the route layer catches and maps to HTTP status codes. Error messages follow the pattern `` `Workspace '${id}' not found` `` / `` `... is already archived` ``.

package/CHANGELOG.md

@@ -4,6 +4,18 @@ All notable changes to Kōbō are documented here. The format is based on
 [Keep a Changelog](https://keepachangelog.com/). Each release is an `## <version>`
 section — the in-app "What's new" dialog reads this file.
 
+## 1.7.18
+
+- chore(audit): fix npm audit
+- feat(client): collapsible ask-user-question panel
+- feat: per-workspace chat history + inline file editing in the diff viewer
+- feat: multi-forge, change source branch, workspace attention
+
+## 1.7.17
+
+- feat: per-workspace chat history + inline file editing in the diff viewer
+- feat: multi-forge, change source branch, pr-watcher
+
 ## 1.7.16
 
 - feat(engine): handle user interruptions as clean stops

package/README.md

@@ -17,7 +17,8 @@ Kōbō runs multiple coding agents in parallel, each isolated in its own git wor
 - **Two agent engines** — Claude Code (via `@anthropic-ai/claude-agent-sdk`) and OpenAI Codex (via `codex app-server`), chosen per workspace.
 - **Live chat** — streaming text, reasoning blocks, inline Edit/Write diffs, per-turn cards, infinite scrollback; `/` autocompletes skills & commands and `@` fuzzy-autocompletes worktree file paths; every workspace's session events are exportable to CSV.
 - **Task tracking** — per-workspace MCP server (`kobo-tasks`) lets the agent manage its own tasks, acceptance criteria, and live status.
-- **Git panel** — Monaco-based diff viewer, inline conflict resolution, `Sync` / `Push` / `Open PR` wired to the `gh` CLI.
+- **Git panel** — Monaco-based diff viewer with **inline file editing** (edit the right-hand panel directly, save with `Ctrl/Cmd+S`, conflict-guarded via sha precondition), inline conflict resolution, `Sync` / `Push` / `Open PR` / `Change PR base` / `Change source branch` (cherry-pick of the branch-proper commits, with an optional custom bash script). Multi-forge: GitHub (`gh`), GitLab (`glab`), or no forge — auto-detected from the remote, overridable per project.
+- **Attention indicators** — workspace cards in the drawer surface CI failures and review-requested-changes inline, so failing PRs/MRs stand out at a glance.
 - **Auto-loop** — opt-in mode that walks the task list, spawning a fresh session per task and stopping on completion, stall, or error.
 - **Quota-aware** — 5-hour / 7-day Claude usage and Codex rate-limit buckets in the footer; sessions auto-resume after a rate-limit reset.
 - **Scheduled wakeups** — the agent schedules a one-shot wake-up via the `ScheduleWakeup` tool; Kōbō persists it across restarts, shows a live countdown, and re-invokes the agent with the stored prompt at the chosen time.

package/dist/mcp-server/kobo-tasks-handlers.js

@@ -235,6 +235,44 @@ export function listWorkspaceImagesHandler(worktreePath) {
         };
     });
 }
+/**
+ * `## Source` block markers written by the workspace creation route — a
+ * `- Notion: <url>` line for Notion imports, `- Sentry: <url>` for Sentry.
+ * The marker is the discriminator: it is what tells a ticket file apart from
+ * an agent note, and Notion apart from Sentry.
+ */
+const SOURCE_MARKER = /^- (Notion|Sentry): (.+)$/m;
+/**
+ * Read the mission's source-of-truth ticket(s). Both the Notion and Sentry
+ * importers write their extracted brief into `.ai/thoughts/` at workspace
+ * creation; this returns one entry per ticket file, typed by origin.
+ *
+ * Only `.md` files at the *root* of `.ai/thoughts/` are considered — agent
+ * notes live under `.ai/thoughts/logs/` and are deliberately skipped. Files
+ * with no recognised `## Source` marker (stray notes) are skipped too.
+ * Sorted by `type` for a deterministic order. Empty array when nothing matches.
+ */
+export function getTicketSourcesHandler(worktreePath) {
+    const thoughtsDir = path.join(worktreePath, '.ai', 'thoughts');
+    if (!fs.existsSync(thoughtsDir))
+        return [];
+    const sources = [];
+    for (const entry of fs.readdirSync(thoughtsDir, { withFileTypes: true })) {
+        if (!entry.isFile() || !entry.name.endsWith('.md'))
+            continue;
+        const content = fs.readFileSync(path.join(thoughtsDir, entry.name), 'utf-8');
+        const match = content.match(SOURCE_MARKER);
+        if (!match)
+            continue;
+        sources.push({
+            type: match[1].toLowerCase(),
+            url: match[2].trim() || null,
+            content: content.trim(),
+        });
+    }
+    sources.sort((a, b) => a.type.localeCompare(b.type));
+    return sources;
+}
 // ── Documents ────────────────────────────────────────────────────────────────
 /** Directories (relative to the worktree root) scanned for AI-generated docs. */
 export const DOCUMENT_DIRS = ['docs/plans', 'docs/superpowers', '.ai/thoughts'];
@@ -308,9 +346,14 @@ export function readDocumentHandler(worktreePath, relPath) {
     return { path: normalized, content: fs.readFileSync(abs, 'utf-8') };
 }
 /**
- * Append a thought / decision / note to `.ai/thoughts/<YYYY-MM-DD>-<slug>.md`.
- * Creates the directory if missing. Returns the path (worktree-relative) of
- * the file actually written — useful for the agent to reference it in chat.
+ * Append a thought / decision / note to
+ * `.ai/thoughts/logs/<YYYY-MM-DD>-<slug>.md`. Creates the directory if missing.
+ * Returns the path (worktree-relative) of the file actually written — useful
+ * for the agent to reference it in chat.
+ *
+ * Notes live in the `logs/` sub-directory so they stay separate from the
+ * mission's source-of-truth ticket files at the root of `.ai/thoughts/` —
+ * `get_ticket` reads only the root and therefore never picks up agent notes.
  */
 export function logThoughtHandler(worktreePath, data) {
     const title = data.title?.trim();
@@ -319,7 +362,7 @@ export function logThoughtHandler(worktreePath, data) {
     const content = data.content?.trim();
     if (!content)
         throw new Error('content is required');
-    const thoughtsDir = path.join(worktreePath, '.ai', 'thoughts');
+    const thoughtsDir = path.join(worktreePath, '.ai', 'thoughts', 'logs');
     fs.mkdirSync(thoughtsDir, { recursive: true });
     const date = new Date().toISOString().slice(0, 10);
     const slug = title
@@ -332,7 +375,7 @@ export function logThoughtHandler(worktreePath, data) {
     const tagSuffix = data.tag ? `-${data.tag.replace(/[^a-z0-9]+/gi, '-').toLowerCase()}` : '';
     const filename = `${date}-${slug}${tagSuffix}.md`;
     const abs = path.join(thoughtsDir, filename);
-    const relPath = `.ai/thoughts/${filename}`;
+    const relPath = `.ai/thoughts/logs/${filename}`;
     const header = `# ${title}\n\n_${new Date().toISOString()}_${data.tag ? ` · tag: \`${data.tag}\`` : ''}\n\n`;
     fs.writeFileSync(abs, header + content + (content.endsWith('\n') ? '' : '\n'), 'utf-8');
     return { path: relPath };

package/dist/mcp-server/kobo-tasks-server.js

@@ -1,12 +1,10 @@
 #!/usr/bin/env node
-import fs from 'node:fs';
-import path from 'node:path';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 import { getDb } from '../server/db/index.js';
 import { runMigrations } from '../server/db/migrations.js';
-import { createTaskHandler, cronListHandler, deleteTaskHandler, getDevServerStatusHandler, getSessionUsageHandler, getSettingsHandler, getWorkspaceInfoHandler, listDocumentsHandler, listTasksHandler, listWorkspaceImagesHandler, logThoughtHandler, markAutoLoopReadyHandler, markTaskDoneHandler, readDocumentHandler, setWorkspaceAgentDescriptionHandler, updateTaskHandler, } from './kobo-tasks-handlers.js';
+import { createTaskHandler, cronListHandler, deleteTaskHandler, getDevServerStatusHandler, getSessionUsageHandler, getSettingsHandler, getTicketSourcesHandler, getWorkspaceInfoHandler, listDocumentsHandler, listTasksHandler, listWorkspaceImagesHandler, logThoughtHandler, markAutoLoopReadyHandler, markTaskDoneHandler, readDocumentHandler, setWorkspaceAgentDescriptionHandler, updateTaskHandler, } from './kobo-tasks-handlers.js';
 const workspaceId = process.env.KOBO_WORKSPACE_ID;
 const dbPath = process.env.KOBO_DB_PATH;
 const settingsPath = process.env.KOBO_SETTINGS_PATH;
@@ -283,8 +281,8 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
             annotations: { destructiveHint: false, openWorldHint: false },
         },
         {
-            name: 'get_notion_ticket',
-            description: 'CALL when the user references "the ticket", "the Notion page", or when you need the source-of-truth text for the mission. Returns the Notion URL + locally-extracted ticket content from .ai/thoughts/.',
+            name: 'get_ticket',
+            description: 'CALL when the user references "the ticket", "the issue", "the Notion page", or when you need the source-of-truth text for the mission. Works for any source — a Notion ticket or a Sentry issue. Returns `{ sources: [{ type, url, content }] }`, one entry per imported ticket (type is "notion" or "sentry"). Usually one source; empty when none was imported.',
             inputSchema: { type: 'object', properties: {}, required: [] },
             annotations: { readOnlyHint: true, openWorldHint: false },
         },
@@ -363,7 +361,7 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
         },
         {
             name: 'log_thought',
-            description: 'CALL WHEN you make a decision worth remembering — architecture choice, trade-off taken, dead-end avoided, pattern discovered. Appends a dated markdown file to .ai/thoughts/. Keep entries short and focused; one decision per call. Use create_task for actionable follow-ups instead.',
+            description: 'CALL WHEN you make a decision worth remembering — architecture choice, trade-off taken, dead-end avoided, pattern discovered. Appends a dated markdown file to .ai/thoughts/logs/. Keep entries short and focused; one decision per call. Use create_task for actionable follow-ups instead.',
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -589,21 +587,11 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             const info = getWorkspaceInfoHandler(db, workspaceId);
             return ok(listWorkspaceImagesHandler(info.worktreePath));
         }
-        if (name === 'get_notion_ticket') {
+        // `get_notion_ticket` is the pre-1.7 name, kept as a back-compat alias so
+        // sessions resumed against an older tool list still resolve.
+        if (name === 'get_ticket' || name === 'get_notion_ticket') {
             const info = getWorkspaceInfoHandler(db, workspaceId);
-            const thoughtsDir = path.join(info.worktreePath, '.ai', 'thoughts');
-            let ticketContent = '';
-            if (fs.existsSync(thoughtsDir)) {
-                const files = fs.readdirSync(thoughtsDir).filter((f) => f.endsWith('.md'));
-                for (const file of files) {
-                    ticketContent += `${fs.readFileSync(path.join(thoughtsDir, file), 'utf-8')}\n`;
-                }
-            }
-            return ok({
-                notionUrl: info.notionUrl,
-                notionPageId: info.notionPageId,
-                ticketContent: ticketContent.trim() || null,
-            });
+            return ok({ sources: getTicketSourcesHandler(info.worktreePath) });
         }
         if (name === 'get_git_info') {
             const result = await backendRequest('GET', `/api/workspaces/${workspaceId}/git-stats`);

package/dist/server/db/migrations.js

@@ -281,6 +281,25 @@ export const migrations = [
             }
         },
     },
+    {
+        version: 24,
+        name: 'add-workspace-chat-history-table',
+        migrate: (db) => {
+            // Per-workspace chat history (user-typed messages). CASCADE on workspace
+            // delete. Index supports the typical "latest N for a workspace" query via
+            // (workspace_id, id DESC).
+            db.exec(`
+        CREATE TABLE IF NOT EXISTS workspace_chat_history (
+          id            INTEGER PRIMARY KEY AUTOINCREMENT,
+          workspace_id  TEXT    NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
+          message       TEXT    NOT NULL,
+          created_at    TEXT    NOT NULL DEFAULT (datetime('now'))
+        );
+        CREATE INDEX IF NOT EXISTS idx_workspace_chat_history_workspace_id_id
+          ON workspace_chat_history(workspace_id, id DESC);
+      `);
+        },
+    },
 ];
 /** Current schema version — always equals the highest migration version. */
 export const SCHEMA_VERSION = migrations.length > 0 ? migrations[migrations.length - 1].version : 1;

package/dist/server/db/schema.js

@@ -106,8 +106,17 @@ export function initSchema(db) {
       fetched_at    TEXT NOT NULL
     );
 
+    CREATE TABLE IF NOT EXISTS workspace_chat_history (
+      id            INTEGER PRIMARY KEY AUTOINCREMENT,
+      workspace_id  TEXT    NOT NULL REFERENCES workspaces(id) ON DELETE CASCADE,
+      message       TEXT    NOT NULL,
+      created_at    TEXT    NOT NULL DEFAULT (datetime('now'))
+    );
+
     CREATE INDEX IF NOT EXISTS idx_tasks_workspace_id ON tasks(workspace_id);
     CREATE INDEX IF NOT EXISTS idx_agent_sessions_workspace_id ON agent_sessions(workspace_id);
     CREATE INDEX IF NOT EXISTS idx_ws_events_workspace_id ON ws_events(workspace_id);
+    CREATE INDEX IF NOT EXISTS idx_workspace_chat_history_workspace_id_id
+      ON workspace_chat_history(workspace_id, id DESC);
   `);
 }

package/dist/server/routes/settings.js

@@ -1,6 +1,7 @@
 import { Hono } from 'hono';
 import { DEFAULT_NOTION_INITIAL_PROMPT, DEFAULT_SENTRY_INITIAL_PROMPT, } from '../services/initial-prompt-template-service.js';
 import { DEFAULT_REVIEW_PROMPT_TEMPLATE } from '../services/review-template-service.js';
+import { DEFAULT_CHANGE_SOURCE_BRANCH_SCRIPT } from '../services/settings-defaults.js';
 import * as settingsService from '../services/settings-service.js';
 import { DEFAULT_GIT_CONVENTIONS, DEFAULT_PR_PROMPT_TEMPLATE, } from '../services/settings-service.js';
 import { listTemplates, replaceAllTemplates } from '../services/templates-service.js';
@@ -39,6 +40,7 @@ app.get('/defaults', (c) => {
         gitConventions: DEFAULT_GIT_CONVENTIONS,
         notionInitialPromptTemplate: DEFAULT_NOTION_INITIAL_PROMPT,
         sentryInitialPromptTemplate: DEFAULT_SENTRY_INITIAL_PROMPT,
+        changeSourceBranchScript: DEFAULT_CHANGE_SOURCE_BRANCH_SCRIPT,
     });
 });
 // GET /api/settings/mcp-servers — list active MCP servers from Claude config