commandmate 0.19.0 → 0.21.0

package/dist/server/server.js

@@ -78,7 +78,11 @@ const resource_cleanup_1 = require("./src/lib/resource-cleanup");
 const db_migrations_1 = require("./src/lib/db/db-migrations");
 const env_1 = require("./src/lib/env");
 const db_repository_1 = require("./src/lib/db/db-repository");
-const db_1 = require("./src/lib/db");
+// Issue #1666: `resolveRepositoryPath`, `getWorktreeIdsByRepository`,
+// `deleteWorktreesByIds`, `cleanupMultipleWorktrees` and `killWorktreeSession`
+// went with the startup purge — they had no other caller here. `npm run lint`
+// only covers `src/`, and tsconfig sets no `noUnusedLocals`, so nothing in the
+// gates would have flagged them: they were removed by inspection, not by a tool.
 const session_cleanup_1 = require("./src/lib/session-cleanup");
 const dev = process.env.NODE_ENV !== 'production';
 const hostname = (0, env_1.getEnvByKey)('CM_BIND') || '127.0.0.1';
@@ -116,6 +120,32 @@ function validateCertPath(filePath, label) {
 // Create Next.js app
 const app = (0, next_1.default)({ dev, hostname, port });
 const handle = app.getRequestHandler();
+let worktreeRedirectModule = null;
+let worktreeRedirectLoad = null;
+async function resolveWorktreeAliasRedirect(url) {
+    if (!worktreeRedirectModule) {
+        if (!worktreeRedirectLoad) {
+            worktreeRedirectLoad = Promise.resolve().then(() => __importStar(require('./src/lib/git/worktree-redirect'))).then((mod) => {
+                worktreeRedirectModule = mod;
+            })
+                .catch((error) => {
+                // Fail open: without the resolver the layout's meta refresh still
+                // lands the user on the right worktree.
+                console.error('Failed to load worktree redirect resolver:', error);
+            });
+        }
+        await worktreeRedirectLoad;
+    }
+    if (!worktreeRedirectModule)
+        return null;
+    try {
+        return worktreeRedirectModule.resolveWorktreeRedirect(url);
+    }
+    catch (error) {
+        console.error('Worktree redirect resolution failed:', error);
+        return null;
+    }
+}
 // Issue #331: Prevent Next.js (NextCustomServer) from registering its own upgrade
 // event listener on the HTTP server.
 //
@@ -160,6 +190,21 @@ app.prepare().then(() => {
         }
         const method = req.method ?? 'UNKNOWN';
         const url = req.url ?? '/';
+        // Issue #1621/#1645: a URL naming a worktree by a retired ID gets a real
+        // 308 here, before Next renders anything. The cheap prefix test keeps every
+        // other route free of the dynamic import and the alias lookup.
+        if (url.startsWith('/worktrees/')) {
+            const redirect = await resolveWorktreeAliasRedirect(url);
+            if (redirect && !res.headersSent) {
+                res.statusCode = redirect.statusCode;
+                res.setHeader('Location', redirect.location);
+                // See WORKTREE_REDIRECT_CACHE_CONTROL: alias -> live is durable, not
+                // eternal, and a cached permanent redirect could never be corrected.
+                res.setHeader('Cache-Control', 'no-store');
+                res.end();
+                return;
+            }
+        }
         try {
             const parsedUrl = (0, url_1.parse)(url, true);
             await handle(req, res, parsedUrl);
@@ -226,6 +271,42 @@ app.prepare().then(() => {
             catch (error) {
                 console.error('Error reconciling Skill operations:', error);
             }
+            // Issue #1621 Phase 3/4: make live tmux sessions follow the worktree IDs
+            // that migration v54 has just renumbered. Session names are DERIVED from
+            // the ID (`mcbd-{cli}-{worktreeId}`), so a running agent would otherwise
+            // keep its process while disappearing from the UI — and the app would
+            // happily start a second agent in the same directory. `worktree_aliases`
+            // is the durable record of every ID that has moved, which makes this pass
+            // idempotent: when nothing is stale it costs one `tmux list-sessions`.
+            //
+            // Fail-open in its own try/catch — reconciling sessions must never be
+            // able to stop the server from serving. Dynamic import for the same
+            // reason as the reconcilers around it: a static import here perturbs
+            // Next's AsyncLocalStorage bootstrap under `tsx server.ts` and the first
+            // request that compiles middleware dies. Do not hoist this.
+            try {
+                const { reconcileWorktreeSessionsFromAliases } = await Promise.resolve().then(() => __importStar(require('./src/lib/session/worktree-session-reconcile')));
+                const sessionReport = await reconcileWorktreeSessionsFromAliases(db);
+                if (sessionReport.renamedSessions.length > 0) {
+                    console.log(`Reconciled ${sessionReport.renamedSessions.length} tmux session(s) to renamed worktree IDs ` +
+                        `(predicted=${sessionReport.planSources.predicted} ` +
+                        `discovered=${sessionReport.planSources.discovered})`);
+                }
+                // Issue #1661: a live `mcbd-*` session that no known worktree ID
+                // explains is exactly what the previous report could not express — the
+                // pass ran clean while two agents sat stranded under stale names. Say
+                // it out loud, with the names, so it is actionable from the log alone.
+                if (sessionReport.unaccountedSessions.length > 0) {
+                    console.warn(`${sessionReport.unaccountedSessions.length} tmux session(s) match no known worktree ID ` +
+                        `and were left untouched: ${sessionReport.unaccountedSessions.join(', ')}`);
+                }
+                if (sessionReport.errors.length > 0) {
+                    console.warn(`Session reconcile warnings: ${sessionReport.errors.join(', ')}`);
+                }
+            }
+            catch (error) {
+                console.error('Error reconciling worktree sessions:', error);
+            }
             // Issue #1543: close verification runs that a crash left in `running`.
             // Gate execution lives in process memory, so none of them survived the
             // restart; leaving the rows open would keep their worktrees permanently
@@ -269,19 +350,31 @@ app.prepare().then(() => {
                 excludedPaths.forEach(p => {
                     console.log(`  [excluded] ${p}`);
                 });
-                // Issue #202/#526: Remove worktrees of excluded repositories from DB
-                // SF-002: cleanup -> delete order for excluded repositories
-                // Sessions must be stopped before DB records are removed
-                for (const excludedPath of excludedPaths) {
-                    const resolvedPath = (0, db_repository_1.resolveRepositoryPath)(excludedPath);
-                    const worktreeIds = (0, db_1.getWorktreeIdsByRepository)(db, resolvedPath);
-                    if (worktreeIds.length > 0) {
-                        // Issue #526: Clean up tmux sessions before deleting from DB
-                        await (0, session_cleanup_1.cleanupMultipleWorktrees)(worktreeIds, session_cleanup_1.killWorktreeSession);
-                        const result = (0, db_1.deleteWorktreesByIds)(db, worktreeIds);
-                        console.log(`  Removed ${result.deletedCount} worktree(s) from excluded repository: ${resolvedPath}`);
-                    }
-                }
+                // Issue #1666: exclusion is where startup STOPS, not where it deletes.
+                //
+                // This branch used to purge every excluded repository — kill its tmux
+                // sessions, then `deleteWorktreesByIds`, taking chat history, memos,
+                // todos, timers, schedules, execution logs, tasks and verification runs
+                // with it by cascade. That was #202's "deleted repositories must not
+                // reappear after a restart", and it was harmless for exactly as long as
+                // `DELETE /api/repositories` was the only route to `enabled = 0`: that
+                // route already purged, so the loop re-deleted nothing.
+                //
+                // #1658 added a non-destructive disable (a single
+                // `UPDATE repositories SET enabled = 0`), which made this loop the
+                // thing that undid it — and only for `WORKTREE_REPOS` repositories,
+                // because a DB-only one leaves `allPaths` when disabled and never
+                // reaches `excludedPaths` at all. So the same toggle was destructive or
+                // not depending on where the repository had been configured, and the
+                // damage landed a restart later, far from the click that caused it.
+                //
+                // #202 survives without the deletion: an excluded repository is not
+                // scanned, so nothing re-creates its rows, and keeping rows is not the
+                // same as showing them. Hiding a repository's worktrees from the
+                // sidebar is `visible`'s job (#690) — a separate, reversible flag that
+                // the user sets deliberately — whereas `enabled` only decides what gets
+                // scanned. Deleting rows to achieve "not shown" destroys history to
+                // implement a view filter, and cannot be undone by re-enabling.
             }
             // Scan filtered repositories (excluded repos are skipped)
             const worktrees = await (0, worktrees_1.scanMultipleRepositories)(filteredPaths);

package/dist/server/src/lib/auto-yes-poller.js

@@ -62,8 +62,10 @@ const cli_session_1 = require("./session/cli-session");
 const prompt_detector_1 = require("./detection/prompt-detector");
 const auto_yes_resolver_1 = require("./polling/auto-yes-resolver");
 const auto_yes_policy_1 = require("./polling/auto-yes-policy");
+const auto_yes_suppression_state_1 = require("./polling/auto-yes-suppression-state");
 const task_transition_service_1 = require("./tasks/task-transition-service");
 const db_instance_1 = require("./db/db-instance");
+const chat_db_1 = require("./db/chat-db");
 const prompt_answer_sender_1 = require("./prompt-answer-sender");
 const manager_1 = require("./cli-tools/manager");
 const cli_patterns_1 = require("./detection/cli-patterns");
@@ -303,6 +305,15 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         const policy = (0, auto_yes_policy_1.getSessionAutoYesPolicy)(worktreeId, cliToolId, instanceId);
         const resolution = (0, auto_yes_resolver_1.resolveAutoAnswerWithPolicy)(promptDetection.promptData, policy);
         if (resolution.suppressedBy) {
+            // Issue #1684: the log line alone leaves a CLI-driven pipeline blind to
+            // why its worker stalled. Record the suppression so buildCurrentOutput
+            // can publish it (`autoYes.lastSuppression` in capture --json).
+            (0, auto_yes_suppression_state_1.recordPolicySuppression)(worktreeId, cliToolId, instanceId, {
+                reason: resolution.suppressedBy,
+                mode: policy?.mode ?? null,
+                promptType: promptDetection.promptData.type,
+                pattern: resolution.pattern,
+            });
             logger.warn('poller:auto-yes-suppressed-by-policy', {
                 worktreeId,
                 cliToolId,
@@ -346,6 +357,44 @@ async function detectAndRespondToPrompt(worktreeId, pollerState, cliToolId, clea
         // Undefined means the primary instance, which the task lookup identifies
         // by the tool id itself (see getActiveTaskForInstance).
         instanceId ?? cliToolId, 'prompt_answered_auto', { promptType: promptDetection.promptData.type });
+        // Issue #1685: persist question/options/answer to chat history so the audit
+        // trail survives even when the answer landed inside the response poller's
+        // interval and the prompt was never saved as a pending message. Must never
+        // fail the answer that already reached tmux.
+        let auditRecord = null;
+        try {
+            auditRecord = (0, chat_db_1.recordAnsweredPrompt)((0, db_instance_1.getDbInstance)(), {
+                worktreeId,
+                cliToolId,
+                instanceId: instanceId ?? cliToolId,
+                promptData: promptDetection.promptData,
+                answer,
+                answeredBy: 'auto',
+                content: promptDetection.rawContent || promptDetection.cleanContent,
+            });
+        }
+        catch (recordError) {
+            logger.warn('poller:prompt-audit-record-failed', {
+                worktreeId,
+                cliToolId,
+                instanceId,
+                error: (0, errors_1.getErrorMessage)(recordError),
+            });
+        }
+        if (auditRecord) {
+            const record = auditRecord;
+            // Fire-and-forget on purpose: the WS push is advisory, and awaiting a
+            // cold ws-server module load inside the poll path would make its
+            // completion timing nondeterministic for a side effect it doesn't
+            // depend on (the audit row is already committed above).
+            void Promise.resolve().then(() => __importStar(require('../lib/ws-server'))).then(({ broadcastMessage }) => {
+                broadcastMessage(record.created ? 'message' : 'message_updated', {
+                    worktreeId,
+                    message: record.message,
+                });
+            })
+                .catch(() => { });
+        }
         // Dynamic imports avoid a module cycle through terminal-broadcast ->
         // current-output-builder -> auto-yes-manager -> this poller.
         const [{ startPolling: startResponsePolling }, { broadcastTerminalSnapshotAfterInteraction }] = await Promise.all([

package/dist/server/src/lib/auto-yes-state.js

@@ -27,6 +27,7 @@ exports.getAutoYesStateCompositeKeys = getAutoYesStateCompositeKeys;
 exports.filterCompositeKeysByWorktree = filterCompositeKeysByWorktree;
 exports.getCompositeKeysByWorktree = getCompositeKeysByWorktree;
 exports.deleteAutoYesStateByWorktree = deleteAutoYesStateByWorktree;
+exports.migrateAutoYesStateWorktreeIds = migrateAutoYesStateWorktreeIds;
 exports.calculateBackoffInterval = calculateBackoffInterval;
 const auto_yes_config_1 = require("../config/auto-yes-config");
 const path_validator_1 = require("./security/path-validator");
@@ -358,6 +359,69 @@ function deleteAutoYesStateByWorktree(worktreeId) {
     keys.forEach(key => autoYesStates.delete(key));
     return keys.length;
 }
+/**
+ * Re-key every auto-yes state whose worktree ID is being renamed
+ * (Issue #1621 Phase 3).
+ *
+ * **Transfer, never invalidate.** Auto-Yes is what keeps an unattended worker
+ * answering prompts; dropping the state at rename time would leave the agent
+ * alive and silently stuck at the next confirmation, hours later, with nothing
+ * in the UI to explain it. The state object itself (enabledAt / expiresAt /
+ * stopPattern) is moved verbatim, so the countdown a user started keeps running
+ * against its original deadline.
+ *
+ * Takes the whole batch rather than one pair because IDs can **swap**: with
+ * A→B and B→A applied one at a time, the first move overwrites the destination's
+ * state before the destination has been read. Every source key is therefore read
+ * and removed first, and only then are the new keys written.
+ *
+ * The poller that consumes these states is a separate map with its own timers,
+ * and its timer callbacks capture the worktree ID — see
+ * `reconcileWorktreeSessions`, which restarts them. Moving the state without
+ * restarting the poller would stop Auto-Yes just as surely as deleting it.
+ *
+ * @param renames - Worktree ID pairs being applied
+ * @returns One entry per state that moved
+ */
+function migrateAutoYesStateWorktreeIds(renames) {
+    const targets = new Map();
+    for (const { oldId, newId } of renames) {
+        if (!oldId || !newId || oldId === newId)
+            continue;
+        targets.set(oldId, newId);
+    }
+    if (targets.size === 0)
+        return [];
+    const moves = [];
+    for (const [key, state] of autoYesStates) {
+        const oldWorktreeId = extractWorktreeId(key);
+        const newWorktreeId = targets.get(oldWorktreeId);
+        if (!newWorktreeId)
+            continue;
+        const cliToolId = extractCliToolId(key);
+        // A key whose second segment is not a known CLI tool cannot be rebuilt
+        // safely; leave it where it is rather than guess (it is unreachable through
+        // buildCompositeKey, so this only fires on hand-written state).
+        if (!cliToolId)
+            continue;
+        const instanceId = extractInstanceId(key) ?? cliToolId;
+        moves.push({
+            oldKey: key,
+            newKey: buildCompositeKey(newWorktreeId, cliToolId, instanceId),
+            oldWorktreeId,
+            newWorktreeId,
+            cliToolId,
+            instanceId,
+            state,
+        });
+    }
+    // Two passes so a swap (A→B, B→A) cannot have one half clobber the other.
+    for (const move of moves)
+        autoYesStates.delete(move.oldKey);
+    for (const move of moves)
+        autoYesStates.set(move.newKey, move.state);
+    return moves.map(({ state: _state, ...rest }) => rest);
+}
 /**
  * Calculate backoff interval based on consecutive errors.
  * Returns the normal polling interval when errors are below the threshold,

package/dist/server/src/lib/db/chat-db.js

@@ -24,6 +24,7 @@ exports.getMessagesByDateRange = getMessagesByDateRange;
 exports.getMessageById = getMessageById;
 exports.updatePromptData = updatePromptData;
 exports.markPendingPromptsAsAnswered = markPendingPromptsAsAnswered;
+exports.recordAnsweredPrompt = recordAnsweredPrompt;
 const crypto_1 = require("crypto");
 const logger_1 = require("../../lib/logger");
 const logger = (0, logger_1.createLogger)('chat-db');
@@ -123,7 +124,7 @@ function updateMessageContent(db, messageId, content, options) {
  * Get messages for a worktree, optionally filtered by CLI tool
  */
 function getMessages(db, worktreeId, options = {}) {
-    const { before, limit = 50, cliToolId, instanceId, includeArchived = false, limitUnit = 'messages' } = options;
+    const { before, limit = 50, cliToolId, instanceId, includeArchived = false, messageType, limitUnit = 'messages' } = options;
     // Build the shared scope clause (worktree + before cursor + archived + instance/cli
     // filter) and its bound params. Used for both the message-unit and pair-unit paths
     // so their filtering stays identical.
@@ -144,6 +145,11 @@ function getMessages(db, worktreeId, options = {}) {
             clause += ` AND cli_tool_id = ?`;
             params.push(cliToolId);
         }
+        // Issue #1685: message-type filter (prompt audit listing)
+        if (messageType) {
+            clause += ` AND message_type = ?`;
+            params.push(messageType);
+        }
         return { clause, params };
     };
     const SELECT_COLS = `SELECT id, worktree_id, role, content, summary, timestamp, log_file_name, request_id, message_type, prompt_data, cli_tool_id, instance_id, archived`;
@@ -425,6 +431,10 @@ function markPendingPromptsAsAnswered(db, worktreeId, cliToolId, instanceId) {
             promptData.status = 'answered';
             promptData.answer = '(answered via terminal)';
             promptData.answeredAt = new Date().toISOString();
+            // Issue #1685: attribution for the audit trail. This sweep only sees
+            // prompts nothing else claimed, so all that is known is that the agent
+            // moved on — i.e. someone acted in the terminal.
+            promptData.answeredBy = 'terminal';
             updateStmt.run(JSON.stringify(promptData), row.id);
             updatedCount++;
         }
@@ -434,3 +444,67 @@ function markPendingPromptsAsAnswered(db, worktreeId, cliToolId, instanceId) {
     }
     return updatedCount;
 }
+/**
+ * Persist "this prompt was just answered" to chat history (Issue #1685).
+ *
+ * The answer paths (Auto-Yes poller, /prompt-response) act on what is on
+ * screen, not on a stored message, so the prompt they resolve may or may not
+ * have been saved by the response poller yet:
+ *
+ * - If a pending prompt row exists for the instance, it is marked answered in
+ *   place — preferring the row whose question matches the screen, falling back
+ *   to the newest pending row (the two capture paths can clean text slightly
+ *   differently).
+ * - If none exists (the answer landed inside the response poller's interval —
+ *   the exact case Issue #1685 is about), a new already-answered prompt row is
+ *   created so the question/options/answer survive for the audit trail.
+ */
+function recordAnsweredPrompt(db, params) {
+    const { worktreeId, cliToolId, promptData, answer, answeredBy } = params;
+    const resolvedInstanceId = params.instanceId ?? cliToolId;
+    const rows = db
+        .prepare(`
+    SELECT id, prompt_data
+    FROM chat_messages
+    WHERE worktree_id = ?
+      AND instance_id = ?
+      AND message_type = 'prompt'
+      AND json_extract(prompt_data, '$.status') = 'pending'
+      ${exports.ACTIVE_FILTER}
+    ORDER BY timestamp DESC
+  `)
+        .all(worktreeId, resolvedInstanceId);
+    let target = null;
+    for (const row of rows) {
+        try {
+            const parsed = JSON.parse(row.prompt_data);
+            if (!target) {
+                target = { id: row.id, parsed };
+            }
+            if (parsed.question === promptData.question) {
+                target = { id: row.id, parsed };
+                break;
+            }
+        }
+        catch {
+            // Skip if prompt_data is invalid JSON
+        }
+    }
+    const answeredAt = new Date().toISOString();
+    if (target) {
+        const updated = { ...target.parsed, status: 'answered', answer, answeredAt, answeredBy };
+        updatePromptData(db, target.id, updated);
+        return { message: getMessageById(db, target.id), created: false };
+    }
+    const message = createMessage(db, {
+        worktreeId,
+        role: 'assistant',
+        content: params.content || promptData.question || '[prompt]',
+        messageType: 'prompt',
+        promptData: { ...promptData, status: 'answered', answer, answeredAt, answeredBy },
+        timestamp: new Date(),
+        cliToolId,
+        instanceId: resolvedInstanceId,
+    });
+    return { message, created: true };
+}

package/dist/server/src/lib/db/db-repository.js

@@ -28,6 +28,8 @@ exports.disableExistingRepository = disableExistingRepository;
 exports.getExcludedRepositoryPaths = getExcludedRepositoryPaths;
 exports.getExcludedRepositories = getExcludedRepositories;
 exports.restoreRepository = restoreRepository;
+exports.countDisabledRepositories = countDisabledRepositories;
+exports.setRepositoryEnabled = setRepositoryEnabled;
 exports.createCloneJob = createCloneJob;
 exports.getCloneJob = getCloneJob;
 exports.updateCloneJob = updateCloneJob;
@@ -449,8 +451,7 @@ function disableRepository(db, repositoryPath) {
     }
     const resolvedPath = resolveRepositoryPath(repositoryPath);
     // SEC-SF-004: Check disabled repository count limit before creating new record
-    const disabledCount = db.prepare('SELECT COUNT(*) as count FROM repositories WHERE enabled = 0').get();
-    if (disabledCount.count >= exports.MAX_DISABLED_REPOSITORIES) {
+    if (countDisabledRepositories(db) >= exports.MAX_DISABLED_REPOSITORIES) {
         throw new Error('Disabled repository limit exceeded');
     }
     createRepository(db, {
@@ -508,6 +509,69 @@ function restoreRepository(db, repoPath) {
     updateRepository(db, repo.id, { enabled: true });
     return { ...repo, enabled: true };
 }
+/**
+ * Number of repositories currently excluded from scans (`enabled = 0`).
+ *
+ * Extracted so the SEC-SF-004 ceiling is counted the same way by every caller
+ * that can create one more disabled row ({@link disableRepository}) or flip an
+ * enabled row to disabled ({@link setRepositoryEnabled}).
+ */
+function countDisabledRepositories(db) {
+    const row = db
+        .prepare('SELECT COUNT(*) as count FROM repositories WHERE enabled = 0')
+        .get();
+    return Number(row.count) || 0;
+}
+/**
+ * Flip a repository's scan-inclusion flag by id, and touch NOTHING else
+ * (Issue #1658).
+ *
+ * This is the non-destructive counterpart to `DELETE /api/repositories`, which
+ * is "exclude **and purge**": it disables the repository, kills every tmux
+ * session under it, and deletes its `worktrees` rows — taking chat history,
+ * memos, todos, timers, schedules, execution logs, tasks and verification runs
+ * with them (`deleteWorktreeChildRows`). A user who only wants a scan root to
+ * stop being scanned had no other route, so "stop scanning this" cost them
+ * their history and their running agents.
+ *
+ * What this function does, exhaustively: one `UPDATE repositories SET enabled`.
+ * It does not read, write or delete `worktrees` or any child table, and it
+ * never touches `visible` — `enabled` (scan inclusion, Issue #190) and
+ * `visible` (sidebar display, Issue #690) stay orthogonal columns, so
+ * re-enabling restores the user's own visibility choice rather than a guess.
+ *
+ * The scan side is the other half of the pair and already reads this flag:
+ * `POST /api/repositories/sync` and `server.ts` both drop `enabled = 0` paths
+ * via {@link registerAndFilterRepositories}, and neither
+ * `syncWorktreesToDB`'s per-repository prune nor `pruneStaleRepositoryWorktrees`
+ * can reach the rows of a repository that is merely absent from the scan while
+ * its directory still exists.
+ *
+ * SEC-SF-004: disabling one more repository is refused once
+ * {@link MAX_DISABLED_REPOSITORIES} rows are already disabled. Re-disabling an
+ * already-disabled repository adds no row and is therefore always allowed.
+ *
+ * @param db - Database instance
+ * @param id - Repository id (`repositories.id`), not a path
+ * @param enabled - `true` to include in scans, `false` to exclude
+ * @returns The repository as it now stands, or `null` when no row has that id
+ * @throws {RepositoryDbError} code `LIMIT_EXCEEDED` when the disabled ceiling
+ *   would be crossed
+ */
+function setRepositoryEnabled(db, id, enabled) {
+    const repo = getRepositoryById(db, id);
+    if (!repo)
+        return null;
+    // Already in the requested state: nothing to write, and no ceiling to test
+    // (the row is already counted).
+    if (repo.enabled === enabled)
+        return repo;
+    if (!enabled && countDisabledRepositories(db) >= exports.MAX_DISABLED_REPOSITORIES) {
+        throw new RepositoryDbError(`Cannot disable more than ${exports.MAX_DISABLED_REPOSITORIES} repositories`, 'LIMIT_EXCEEDED');
+    }
+    updateRepository(db, id, { enabled });
+    return getRepositoryById(db, id);
+}
 // ============================================================
 // Clone Job Operations
 // ============================================================

package/dist/server/src/lib/db/db.js

@@ -10,9 +10,9 @@
  * @internal functions from being unintentionally exposed.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeAgentInstance = exports.addAgentInstance = exports.setAgentInstances = exports.countAgentInstances = exports.getAgentInstance = exports.getAgentInstances = exports.deleteSessionState = exports.clearInProgressMessageId = exports.setInProgressMessageId = exports.updateSessionState = exports.getSessionState = exports.getMessagesByDateRange = exports.ACTIVE_FILTER = exports.markPendingPromptsAsAnswered = exports.updatePromptData = exports.getMessageById = exports.recomputeLastUserMessage = exports.clearLastUserMessage = exports.updateLastUserMessage = exports.deleteMessagesByInstance = exports.deleteMessagesByCliTool = exports.deleteMessageById = exports.deleteAllMessages = exports.getLastMessage = exports.getLastUserMessage = exports.getMessages = exports.updateMessageContent = exports.createMessage = exports.getLastAssistantMessageAt = exports.deleteWorktreesByIds = exports.deleteRepositoryWorktrees = exports.migrateWorktreeIdPreservingChildren = exports.getWorktreesByRepository = exports.getWorktreeIdsByRepository = exports.getInitialBranch = exports.saveInitialBranch = exports.updateVibeLocalContextWindow = exports.updateVibeLocalModel = exports.updateSelectedAgents = exports.updateCliToolId = exports.updateStatus = exports.updateFavorite = exports.updateLastViewedAt = exports.updateWorktreeLink = exports.updateWorktreeDescription = exports.upsertWorktree = exports.getWorktreeById = exports.getRepositories = exports.getWorktrees = exports.initDatabase = void 0;
-exports.getAssistantExecutionById = exports.updateAssistantExecution = exports.createAssistantExecution = exports.archiveAssistantMessagesFrom = exports.archiveAllAssistantMessages = exports.getAssistantMessageById = exports.getAssistantMessages = exports.updateAssistantMessageStatus = exports.createAssistantMessage = exports.updateAssistantConversation = exports.createAssistantConversation = exports.getAssistantConversationByRepositoryAndCliTool = exports.getAssistantConversationById = exports.updateDailyReportContent = exports.saveDailyReport = exports.getDailyReport = exports.recoverStuckSendingTimers = exports.clearTimerHistory = exports.cleanupOldTimers = exports.getPendingTimerCountByWorktree = exports.cancelTimersByWorktree = exports.cancelTimer = exports.updateTimerStatus = exports.getPendingTimers = exports.getTimerById = exports.getTimersByWorktree = exports.createTimer = exports.WORKTREE_TODO_STATUSES = exports.isWorktreeTodoStatus = exports.reorderWorktreeTodos = exports.deleteWorktreeTodo = exports.updateWorktreeTodo = exports.createWorktreeTodo = exports.getWorktreeTodoById = exports.getTodosByWorktreeId = exports.deleteTodo = exports.updateTodo = exports.createTodo = exports.getTodoById = exports.getAllTodos = exports.getTodosByRepositoryId = exports.MemoDbError = exports.reorderMemos = exports.deleteMemo = exports.updateMemo = exports.createMemo = exports.getMemoById = exports.getMemosByWorktreeId = exports.InvalidAgentInstanceError = exports.AgentInstanceLimitError = void 0;
-exports.listTaskEvents = exports.ACTIVE_TASK_STATUSES = exports.TERMINAL_TASK_STATUSES = exports.TASK_STATUSES = exports.isTerminalTaskStatus = exports.getActiveTaskForInstance = exports.getActiveTask = exports.listTasks = exports.getTask = exports.createTask = exports.VERIFICATION_TRIGGERS = exports.MAX_RUN_HISTORY_DAYS = exports.MAX_RUN_HISTORY_LIMIT = exports.DEFAULT_RUN_HISTORY_LIMIT = exports.listVerificationRunsForPeriod = exports.listRunningVerificationRuns = exports.getRunningVerificationRun = exports.listVerificationRuns = exports.getVerificationRun = exports.finishGateResult = exports.createGateResult = exports.finishVerificationRun = exports.createVerificationRun = exports.deletePushSubscriptionByEndpoint = exports.updatePushSubscriptionPreferences = exports.getPushSubscriptionsForKind = exports.getAllPushSubscriptions = exports.getPushSubscriptionByEndpoint = exports.upsertPushSubscription = exports.deleteAssistantSessionState = exports.updateAssistantSessionState = exports.getAssistantSessionState = exports.listRunningAssistantExecutions = exports.getRunningAssistantExecutionByConversation = exports.getLatestAssistantExecutionByConversation = void 0;
+exports.setInProgressMessageId = exports.updateSessionState = exports.getSessionState = exports.getMessagesByDateRange = exports.ACTIVE_FILTER = exports.recordAnsweredPrompt = exports.markPendingPromptsAsAnswered = exports.updatePromptData = exports.getMessageById = exports.recomputeLastUserMessage = exports.clearLastUserMessage = exports.updateLastUserMessage = exports.deleteMessagesByInstance = exports.deleteMessagesByCliTool = exports.deleteMessageById = exports.deleteAllMessages = exports.getLastMessage = exports.getLastUserMessage = exports.getMessages = exports.updateMessageContent = exports.createMessage = exports.getLastAssistantMessageAt = exports.getAliasedWorktreeIds = exports.getAllWorktreeAliases = exports.getWorktreeAliases = exports.resolveWorktreeIdWithAlias = exports.recordWorktreeAlias = exports.deleteWorktreesByIds = exports.deleteRepositoryWorktrees = exports.migrateWorktreeIdPreservingChildren = exports.getAllWorktreePathIds = exports.getAllWorktreeIds = exports.getWorktreesByRepository = exports.getWorktreeIdsByRepository = exports.getInitialBranch = exports.saveInitialBranch = exports.updateVibeLocalContextWindow = exports.updateVibeLocalModel = exports.updateSelectedAgents = exports.updateCliToolId = exports.updateStatus = exports.updateFavorite = exports.updateLastViewedAt = exports.updateWorktreeLink = exports.updateWorktreeDescription = exports.upsertWorktree = exports.getWorktreeById = exports.getRepositories = exports.getWorktrees = exports.initDatabase = void 0;
+exports.createAssistantMessage = exports.updateAssistantConversation = exports.createAssistantConversation = exports.getAssistantConversationByRepositoryAndCliTool = exports.getAssistantConversationById = exports.updateDailyReportContent = exports.saveDailyReport = exports.getDailyReport = exports.recoverStuckSendingTimers = exports.clearTimerHistory = exports.cleanupOldTimers = exports.getPendingTimerCountByWorktree = exports.cancelTimersByWorktree = exports.cancelTimer = exports.updateTimerStatus = exports.getPendingTimers = exports.getTimerById = exports.getTimersByWorktree = exports.createTimer = exports.WORKTREE_TODO_STATUSES = exports.isWorktreeTodoStatus = exports.reorderWorktreeTodos = exports.deleteWorktreeTodo = exports.updateWorktreeTodo = exports.createWorktreeTodo = exports.getWorktreeTodoById = exports.getTodosByWorktreeId = exports.deleteTodo = exports.updateTodo = exports.createTodo = exports.getTodoById = exports.getAllTodos = exports.getTodosByRepositoryId = exports.MemoDbError = exports.reorderMemos = exports.deleteMemo = exports.updateMemo = exports.createMemo = exports.getMemoById = exports.getMemosByWorktreeId = exports.InvalidAgentInstanceError = exports.AgentInstanceLimitError = exports.removeAgentInstance = exports.addAgentInstance = exports.setAgentInstances = exports.countAgentInstances = exports.getAgentInstance = exports.getAgentInstances = exports.deleteSessionState = exports.clearInProgressMessageId = void 0;
+exports.listTaskEvents = exports.ACTIVE_TASK_STATUSES = exports.TERMINAL_TASK_STATUSES = exports.TASK_STATUSES = exports.isTerminalTaskStatus = exports.getActiveTaskForInstance = exports.getActiveTask = exports.listTasks = exports.getTask = exports.createTask = exports.VERIFICATION_TRIGGERS = exports.MAX_RUN_HISTORY_DAYS = exports.MAX_RUN_HISTORY_LIMIT = exports.DEFAULT_RUN_HISTORY_LIMIT = exports.listVerificationRunsForPeriod = exports.listRunningVerificationRuns = exports.getRunningVerificationRun = exports.listVerificationRuns = exports.getVerificationRun = exports.finishGateResult = exports.createGateResult = exports.finishVerificationRun = exports.createVerificationRun = exports.deletePushSubscriptionByEndpoint = exports.updatePushSubscriptionPreferences = exports.getPushSubscriptionsForKind = exports.getAllPushSubscriptions = exports.getPushSubscriptionByEndpoint = exports.upsertPushSubscription = exports.deleteAssistantSessionState = exports.updateAssistantSessionState = exports.getAssistantSessionState = exports.listRunningAssistantExecutions = exports.getRunningAssistantExecutionByConversation = exports.getLatestAssistantExecutionByConversation = exports.getAssistantExecutionById = exports.updateAssistantExecution = exports.createAssistantExecution = exports.archiveAssistantMessagesFrom = exports.archiveAllAssistantMessages = exports.getAssistantMessageById = exports.getAssistantMessages = exports.updateAssistantMessageStatus = void 0;
 // init-db
 var init_db_1 = require("./init-db");
 Object.defineProperty(exports, "initDatabase", { enumerable: true, get: function () { return init_db_1.initDatabase; } });
@@ -35,9 +35,18 @@ Object.defineProperty(exports, "saveInitialBranch", { enumerable: true, get: fun
 Object.defineProperty(exports, "getInitialBranch", { enumerable: true, get: function () { return worktree_db_1.getInitialBranch; } });
 Object.defineProperty(exports, "getWorktreeIdsByRepository", { enumerable: true, get: function () { return worktree_db_1.getWorktreeIdsByRepository; } });
 Object.defineProperty(exports, "getWorktreesByRepository", { enumerable: true, get: function () { return worktree_db_1.getWorktreesByRepository; } });
+Object.defineProperty(exports, "getAllWorktreeIds", { enumerable: true, get: function () { return worktree_db_1.getAllWorktreeIds; } });
+Object.defineProperty(exports, "getAllWorktreePathIds", { enumerable: true, get: function () { return worktree_db_1.getAllWorktreePathIds; } });
 Object.defineProperty(exports, "migrateWorktreeIdPreservingChildren", { enumerable: true, get: function () { return worktree_db_1.migrateWorktreeIdPreservingChildren; } });
 Object.defineProperty(exports, "deleteRepositoryWorktrees", { enumerable: true, get: function () { return worktree_db_1.deleteRepositoryWorktrees; } });
 Object.defineProperty(exports, "deleteWorktreesByIds", { enumerable: true, get: function () { return worktree_db_1.deleteWorktreesByIds; } });
+// worktree-alias-db (Issue #1621: old IDs stay resolvable after a rename)
+var worktree_alias_db_1 = require("./worktree-alias-db");
+Object.defineProperty(exports, "recordWorktreeAlias", { enumerable: true, get: function () { return worktree_alias_db_1.recordWorktreeAlias; } });
+Object.defineProperty(exports, "resolveWorktreeIdWithAlias", { enumerable: true, get: function () { return worktree_alias_db_1.resolveWorktreeIdWithAlias; } });
+Object.defineProperty(exports, "getWorktreeAliases", { enumerable: true, get: function () { return worktree_alias_db_1.getWorktreeAliases; } });
+Object.defineProperty(exports, "getAllWorktreeAliases", { enumerable: true, get: function () { return worktree_alias_db_1.getAllWorktreeAliases; } });
+Object.defineProperty(exports, "getAliasedWorktreeIds", { enumerable: true, get: function () { return worktree_alias_db_1.getAliasedWorktreeIds; } });
 // chat-db
 var chat_db_1 = require("./chat-db");
 Object.defineProperty(exports, "getLastAssistantMessageAt", { enumerable: true, get: function () { return chat_db_1.getLastAssistantMessageAt; } });
@@ -56,6 +65,7 @@ Object.defineProperty(exports, "recomputeLastUserMessage", { enumerable: true, g
 Object.defineProperty(exports, "getMessageById", { enumerable: true, get: function () { return chat_db_1.getMessageById; } });
 Object.defineProperty(exports, "updatePromptData", { enumerable: true, get: function () { return chat_db_1.updatePromptData; } });
 Object.defineProperty(exports, "markPendingPromptsAsAnswered", { enumerable: true, get: function () { return chat_db_1.markPendingPromptsAsAnswered; } });
+Object.defineProperty(exports, "recordAnsweredPrompt", { enumerable: true, get: function () { return chat_db_1.recordAnsweredPrompt; } });
 Object.defineProperty(exports, "ACTIVE_FILTER", { enumerable: true, get: function () { return chat_db_1.ACTIVE_FILTER; } });
 Object.defineProperty(exports, "getMessagesByDateRange", { enumerable: true, get: function () { return chat_db_1.getMessagesByDateRange; } });
 // session-db

package/dist/server/src/lib/db/migrations/index.js

@@ -36,6 +36,9 @@ const v49_verification_runs_1 = require("./v49-verification-runs");
 const v50_tasks_1 = require("./v50-tasks");
 const v51_task_events_1 = require("./v51-task-events");
 const v52_orphaned_worktree_children_1 = require("./v52-orphaned-worktree-children");
+const v53_worktree_aliases_1 = require("./v53-worktree-aliases");
+const v54_worktree_id_path_derived_1 = require("./v54-worktree-id-path-derived");
+const v55_compact_churned_worktree_ids_1 = require("./v55-compact-churned-worktree-ids");
 /**
  * Complete ordered list of all migrations.
  * Used internally by the barrel file (db-migrations.ts); NOT exported from the barrel (DR2-004).
@@ -75,4 +78,7 @@ exports.migrations = [
     ...v50_tasks_1.v50_migrations,
     ...v51_task_events_1.v51_migrations,
     ...v52_orphaned_worktree_children_1.v52_migrations,
+    ...v53_worktree_aliases_1.v53_migrations,
+    ...v54_worktree_id_path_derived_1.v54_migrations,
+    ...v55_compact_churned_worktree_ids_1.v55_migrations,
 ];

package/dist/server/src/lib/db/migrations/runner.js

@@ -17,7 +17,7 @@ const path_1 = __importDefault(require("path"));
  * Current schema version
  * Increment this when adding new migrations
  */
-exports.CURRENT_SCHEMA_VERSION = 52;
+exports.CURRENT_SCHEMA_VERSION = 55;
 /**
  * Get current schema version from database
  */

package/dist/server/src/lib/db/migrations/v53-worktree-aliases.js

@@ -0,0 +1,53 @@
+"use strict";
+/**
+ * Migration v53: worktree_aliases (Issue #1621, Phase 2).
+ *
+ * Every ID a worktree has ever answered to, mapped to the ID it answers to now.
+ * #1644 froze the ID at first registration, but rows written before that carry
+ * a branch-derived ID, and #1645 will renumber them. The moment an ID moves,
+ * every URL a human kept — an open tab, a phone, a PWA shortcut, a bookmark, a
+ * script's `commandmate send <id>` — points at something that no longer
+ * resolves. An alias makes the old ID keep working instead of 404ing.
+ *
+ * `old_id` is the primary key: one historical ID resolves to exactly one
+ * worktree. `worktree_id` cascades, so a deleted worktree takes its aliases
+ * with it rather than leaving redirects to a dead row. (The column is also
+ * named `worktree_id`, so `getWorktreeChildTables` finds this table on both of
+ * its axes and a *rename* re-points the alias as well — an ID renamed twice
+ * still resolves in one hop, never a chain.)
+ *
+ * Resolution order is worktrees-first, aliases-second, and the ID minter is
+ * told about alias IDs too (`deriveWorktreeId`'s taken set), so a fresh
+ * worktree cannot be handed an ID that an alias would otherwise shadow. Both
+ * halves are needed: the index below exists for the second lookup, which runs
+ * on every API request whose worktree ID is not a live row.
+ *
+ * Timestamps are epoch milliseconds (INTEGER), matching v44 onward.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.v53_migrations = void 0;
+exports.v53_migrations = [
+    {
+        version: 53,
+        name: 'add-worktree-aliases',
+        up: (db) => {
+            db.exec(`
+        CREATE TABLE IF NOT EXISTS worktree_aliases (
+          old_id TEXT PRIMARY KEY,
+          worktree_id TEXT NOT NULL REFERENCES worktrees(id) ON DELETE CASCADE,
+          created_at INTEGER NOT NULL
+        );
+      `);
+            // Aliases are read by old_id (the PK covers that) and swept by
+            // worktree_id whenever a worktree is renamed or deleted.
+            db.exec(`
+        CREATE INDEX IF NOT EXISTS idx_worktree_aliases_worktree_id
+          ON worktree_aliases(worktree_id);
+      `);
+        },
+        down: (db) => {
+            db.exec('DROP INDEX IF EXISTS idx_worktree_aliases_worktree_id;');
+            db.exec('DROP TABLE IF EXISTS worktree_aliases;');
+        },
+    },
+];