@straiffi/archon 1.4.12 → 1.6.0

package/dist/server/index.js

@@ -18,7 +18,7 @@ import { resolveChatSessionTarget } from './lib/chatTargets.js';
 import { createChatMessage, getChatMessage, updateChatMessageContent } from './lib/chatMessages.js';
 import { attachChatTicketProposalsToMessageContent } from './lib/chatTicketProposals.js';
 import { createCorsOriginResolver, parseCorsOrigins } from './lib/cors.js';
-import { abortGitOperation, branchExistsLocally, commitGitChanges, createWorktreeAsync, deleteWorktree, getBundleReviewDiffForCwd, getGitDiffData, getGitDiffFiles, getGitStatus, getGitUnifiedDiff, getProjectBranch, getProjectBranchSuggestions, getSelectedGitUnifiedDiff, listUnpushedCommitsForCwd, pullGitBranch, pushCurrentBranch, rebaseGitBranchOntoBase, resolveExistingWorktreePath, resolveWorktreePath, summarizeTicketDiffFiles, switchProjectBranch, syncWorktreeFilesAsync, undoLatestUnpushedCommitForCwd } from './lib/git.js';
+import { abortGitOperation, branchExistsLocally, commitGitChanges, createWorktreeAsync, deleteWorktree, getBundleReviewDiffForCwd, getGitDiffData, getGitDiffFiles, getGitStatus, getGitUnifiedDiff, getProjectBranch, getProjectBranchSuggestions, getSelectedGitUnifiedDiff, hasKnownBranchRef, listUnpushedCommitsForCwd, pullGitBranch, pushCurrentBranch, rebaseGitBranchOntoBase, resolveExistingWorktreePath, resolveWorktreePath, summarizeTicketDiffFiles, switchProjectBranch, syncWorktreeFilesAsync, undoLatestUnpushedCommitForCwd } from './lib/git.js';
 import config from './lib/config.js';
 import { autoConfigProject, ProjectAutoConfigError } from './lib/projectAutoConfig.js';
 import { analyzeRepoPath, createInitialCommit, ensureInitialCommitForWorktrees, initializeGitRepo, isInitialCommitRequiredError, } from './lib/projectRepos.js';
@@ -34,9 +34,12 @@ import { prepareTicketForBuild } from './lib/buildFlow.js';
 import { getBundlePlanMutationBlockerById, shouldBlockPlanForBundleMutationById, } from './lib/bundleActivity.js';
 import { getDiscoveredModels, normalizeModelId, normalizeTicketModelId } from './lib/models.js';
 import { upgradeTool, UpgradeInProgressError } from './lib/toolUpgrade.js';
-import { acceptProjectMemorySuggestion, applyProjectMemorySuggestionToDecision, archiveProjectConvention, archiveProjectDecision, createProjectConvention, createProjectDecision, dismissProjectMemorySuggestion, getProjectMemoryById, getProjectMemorySuggestionById, isProjectMemoryEnabled, listProjectConventions, listLatestSuccessfulProjectContextArtifacts, listProjectDecisions, listProjectMemories, listProjectMemorySuggestions, restoreProjectConvention, restoreProjectDecision, serializeProjectMemoryFromConventionValue, serializeProjectMemoryFromDecisionValue, serializeProjectMemoryFromSuggestionValue, supersedeProjectDecision, updateProjectConvention, updateProjectDecision, validateProjectConventionPayload, validateProjectDecisionPayload, } from './lib/projectMemory.js';
+import { acceptProjectMemorySuggestion, applyProjectMemorySuggestionToDecision, applyProjectMemorySuggestionToConvention, archiveProjectConvention, archiveProjectDecision, createProjectConvention, createProjectDecision, dismissProjectMemorySuggestion, getProjectMemoryById, getProjectMemorySuggestionById, isProjectMemoryEnabled, listProjectConventions, listLatestSuccessfulProjectContextArtifacts, listProjectDecisions, listProjectMemories, listProjectMemorySuggestions, restoreProjectConvention, restoreProjectDecision, serializeProjectMemoryFromConventionValue, serializeProjectMemoryFromDecisionValue, serializeProjectMemoryFromSuggestionValue, supersedeProjectDecision, supersedeProjectDecisionFromSuggestion, updateProjectConvention, updateProjectDecision, validateProjectConventionPayload, validateProjectDecisionPayload, } from './lib/projectMemory.js';
 import { selectRelevantProjectMemory } from './lib/projectMemoryPrompt.js';
-import { getProjectContextResponse, startProjectContextScan } from './lib/projectMemoryScan.js';
+import { getProjectContextResponse, getProjectContextScanDetail, getProjectContextScanHistory, startProjectContextScan, } from './lib/projectMemoryScan.js';
+import { listProjectMemoryEvents } from './lib/projectMemoryEvents.js';
+import { getProjectMemorySelectionForAgentRun, listProjectMemoryUsage } from './lib/projectMemorySelections.js';
+import { decodeProjectMemoryCursor } from './lib/projectMemoryCursor.js';
 import { getProjectFileSuggestions } from './lib/projectFileSuggestions.js';
 import { updateProjectTargetSelection } from './lib/projectTargets.js';
 import { exportProjectMemoryArchive, importProjectMemoryArchive } from './lib/projectMemoryTransfer.js';
@@ -68,7 +71,7 @@ import { isTicketAgentSettingsPayload, updateTicketAgentSettings, } from './lib/
 import { resolveBundleReviewOwner, transitionBundleToReview } from './lib/bundleReviewOperations.js';
 import { getActiveBundleStageChangeHead, undoTicketStage } from './lib/ticketUndo.js';
 import { closeAllTerminalSessions, createProjectTerminalSession, createTerminalSessionForWorkspace, destroyTerminalSessionById, registerTerminalSocketHandlers, } from './lib/terminal.js';
-import { countBundleTickets, createTicketRecord, createBundle, deleteBundle, ensureProjectRootBundle, autoParkTicketIfStale, autoParkSettledBundleTicket, isBundleSettledForAutoPark, clearAutoParkDismissalIfNeeded, assignTicketDoneOrder, assignTicketLaneOrder, getBundle, getBundleByName, getBundleByBranch, getBundleRepresentativeTicketContext, isProjectRootBundle, getTicket, isBundledTicket, listTicketsInRunContext, listBundles, listBoardTicketEnrichment, listTickets, resolveTicketBranch, resolveTicketTool, updateBundleAutomationConfig, } from './lib/tickets.js';
+import { countBundleTickets, createTicketRecord, createBundle, deleteBundle, ensureProjectRootBundle, autoParkTicketIfStale, autoParkSettledBundleTicket, isBundleSettledForAutoPark, clearAutoParkDismissalIfNeeded, assignTicketDoneOrder, assignTicketLaneOrder, getBundle, getBundleByName, getBundleByBranch, getBundleRepresentativeTicketContext, isProjectRootBundle, getTicket, isBundledTicket, listTicketsInRunContext, listBundles, listBoardTicketEnrichment, listTickets, resolveTicketBranch, resolveTicketTool, updateBundleAutomationConfig, updateBundleIdentity, } from './lib/tickets.js';
 import { createTicketMessage, upsertTicketDescriptionMessage } from './lib/ticketMessages.js';
 import { listAgentRunsForParent } from './lib/agentRuns.js';
 import { HttpError } from './lib/httpError.js';
@@ -92,7 +95,7 @@ const sanitizeProjectMemoryExportFileName = (projectName) => {
         .toLowerCase()
         .replace(/[^a-z0-9]+/g, '-')
         .replace(/^-+|-+$/g, '');
-    return `${normalized || 'project'}-archon-memory-v3.json`;
+    return `${normalized || 'project'}-archon-memory-v5.json`;
 };
 const requireExistingProject = (projectId) => {
     const project = getProjectById(projectId);
@@ -424,19 +427,35 @@ const uniqueAutoBundleName = (projectId) => {
     }
     return candidate;
 };
-const hasBundleBranchCaseConflict = (branch, projectId) => {
+const hasBundleBranchCaseConflict = (branch, projectId, excludedBundleId) => {
     const normalizedBranch = branch.toLowerCase();
-    return listBundles(projectId).some(bundle => bundle.branch !== branch && bundle.branch.toLowerCase() === normalizedBranch);
+    return listBundles(projectId).some(bundle => bundle.id !== excludedBundleId
+        && bundle.branch !== branch
+        && bundle.branch.toLowerCase() === normalizedBranch);
 };
-const uniqueBundleBranchName = (name, projectId) => {
+const uniqueBundleBranchName = (name, projectId, options = {}) => {
+    if (options.currentBundle && name === options.currentBundle.name) {
+        return options.currentBundle.branch;
+    }
     const base = slugify(name);
     let branch = base;
     let suffix = 2;
-    while (getBundleByBranch(branch, projectId)) {
+    const conflictsWithBranch = (candidate) => {
+        const bundleConflict = getBundleByBranch(candidate, projectId);
+        if (bundleConflict && bundleConflict.id !== options.currentBundle?.id) {
+            return true;
+        }
+        if (!options.project) {
+            return false;
+        }
+        return hasKnownBranchRef(candidate, options.project)
+            || Boolean(resolveExistingWorktreePath(candidate, options.project));
+    };
+    while (conflictsWithBranch(branch)) {
         branch = `${base}-${suffix}`;
         suffix += 1;
     }
-    if (hasBundleBranchCaseConflict(branch, projectId)) {
+    if (hasBundleBranchCaseConflict(branch, projectId, options.currentBundle?.id)) {
         return null;
     }
     return branch;
@@ -509,6 +528,8 @@ db.prepare("UPDATE tickets SET agent_status = 'error' WHERE agent_status = 'runn
 // otherwise be permanently uninterruptible (the stop endpoint returns 409).
 db.prepare("UPDATE spec_sessions SET agent_status = 'error' WHERE agent_status = 'running'").run();
 db.prepare("UPDATE chat_sessions SET agent_status = 'error' WHERE agent_status = 'running'").run();
+// Live run rows belong to in-memory child processes and are never resumable after restart.
+db.prepare('DELETE FROM agent_runs').run();
 stopAllActiveBuildSequences();
 const getRequestedProjectId = (req) => {
     if (typeof req.query.project_id === 'string' && req.query.project_id !== '') {
@@ -1216,6 +1237,24 @@ const getBundleRecentCommitSubjects = (project, bundle) => {
         return [];
     }
 };
+const resolveBundleRenameEligibility = (project, bundle, tickets = listBundleTickets(project.id, bundle.id)) => {
+    if (isProjectRootBundle(bundle)) {
+        return { eligible: false, reason: 'project_root' };
+    }
+    if (tickets.some(ticket => ticket.state !== 'plan')) {
+        return { eligible: false, reason: 'tickets_not_plan' };
+    }
+    if (tickets.some(ticket => ticket.agent_status === 'running' || ticket.run_setup_status === 'preparing')) {
+        return { eligible: false, reason: 'agent_running' };
+    }
+    if (resolveExistingWorktreePath(bundle.branch, project)) {
+        return { eligible: false, reason: 'worktree_exists' };
+    }
+    if (hasKnownBranchRef(bundle.branch, project)) {
+        return { eligible: false, reason: 'branch_exists' };
+    }
+    return { eligible: true, reason: null };
+};
 const serializeBundleDetails = (project, bundle, extras = {}) => {
     const serializedBundle = serializeBundleRow(project.id, bundle);
     if (!serializedBundle) {
@@ -1232,6 +1271,7 @@ const serializeBundleDetails = (project, bundle, extras = {}) => {
     const bundleReviewState = getBundleReviewState(project.id, tickets);
     return {
         bundle: serializedBundle,
+        rename_eligibility: resolveBundleRenameEligibility(project, bundle, tickets),
         tickets,
         execution_order_ticket_ids: tickets.map(ticket => ticket.id),
         latest_session_ticket_id: latestSessionTicket?.id ?? null,
@@ -2006,6 +2046,13 @@ app.get('/projects/:id/chat-sessions/:sessionId', (req, res) => {
     }
     return res.json(refreshedChatSession);
 });
+app.get('/projects/:id/chat-sessions/:sessionId/agent-runs', (req, res) => {
+    const chatSession = getProjectChatSession(req.params.id, req.params.sessionId);
+    if (!chatSession) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    return res.json({ runs: listAgentRunsForParent('chat', chatSession.id) });
+});
 app.patch('/projects/:id/chat-sessions/:sessionId', (req, res) => {
     const project = getProjectById(req.params.id);
     if (!project) {
@@ -2295,6 +2342,13 @@ app.get('/projects/:id/spec-sessions/:sessionId', (req, res) => {
     }
     return res.json(refreshedSpecSession);
 });
+app.get('/projects/:id/spec-sessions/:sessionId/agent-runs', (req, res) => {
+    const specSession = getProjectSpecSession(req.params.id, req.params.sessionId);
+    if (!specSession) {
+        return res.status(404).json({ error: 'Not found' });
+    }
+    return res.json({ runs: listAgentRunsForParent('spec', specSession.id) });
+});
 app.patch('/projects/:id/spec-sessions/:sessionId', (req, res) => {
     const result = updateProjectSpecSessionMode({
         projectId: req.params.id,
@@ -3204,8 +3258,42 @@ app.patch('/bundles/:id', (req, res) => {
     if (!bundle) {
         return res.status(404).json({ error: 'Bundle not found' });
     }
+    const hasNameUpdate = hasOwn(req.body, 'name');
     if (isProjectRootBundle(bundle)) {
-        return res.status(409).json({ error: 'Project root bundle automation cannot be overridden' });
+        return res.status(409).json({
+            error: hasNameUpdate
+                ? 'Project root bundles cannot be renamed'
+                : 'Project root bundle automation cannot be overridden',
+        });
+    }
+    let nextName = bundle.name;
+    let nextBranch = bundle.branch;
+    if (hasNameUpdate) {
+        if (typeof req.body.name !== 'string' || !req.body.name.trim()) {
+            return res.status(400).json({ error: 'Bundle name must be a non-empty string' });
+        }
+        nextName = req.body.name.trim();
+        if (nextName !== bundle.name) {
+            const nameConflict = getBundleByName(nextName, result.project.id);
+            if (nameConflict && nameConflict.id !== bundle.id) {
+                return res.status(409).json({ error: 'Bundle name already exists in this project' });
+            }
+            const eligibility = resolveBundleRenameEligibility(result.project, bundle);
+            if (!eligibility.eligible) {
+                return res.status(409).json({
+                    error: 'Bundle cannot be renamed in its current state',
+                    reason: eligibility.reason,
+                });
+            }
+            const branch = uniqueBundleBranchName(nextName, result.project.id, {
+                currentBundle: bundle,
+                project: result.project,
+            });
+            if (!branch) {
+                return res.status(409).json({ error: 'Bundle branch already exists in this project with different casing' });
+            }
+            nextBranch = branch;
+        }
     }
     let automationDepth = bundle.automation_depth ?? null;
     if (hasOwn(req.body, 'automation_depth')) {
@@ -3235,12 +3323,31 @@ app.patch('/bundles/:id', (req, res) => {
             return res.status(400).json({ error: 'automation_review_fix_enabled must be a boolean' });
         }
     }
-    const updated = updateBundleAutomationConfig({
-        bundleId: bundle.id,
-        projectId: result.project.id,
-        automationDepth,
-        automationReviewFixEnabled,
-    });
+    let updated = null;
+    try {
+        updated = db.transaction(() => {
+            if (nextName !== bundle.name) {
+                updateBundleIdentity({
+                    bundleId: bundle.id,
+                    projectId: result.project.id,
+                    name: nextName,
+                    branch: nextBranch,
+                });
+            }
+            return updateBundleAutomationConfig({
+                bundleId: bundle.id,
+                projectId: result.project.id,
+                automationDepth,
+                automationReviewFixEnabled,
+            });
+        })();
+    }
+    catch (error) {
+        if (error instanceof Error && 'code' in error && String(error.code).startsWith('SQLITE_CONSTRAINT')) {
+            return res.status(409).json({ error: 'Bundle name or branch already exists in this project' });
+        }
+        throw error;
+    }
     listBundleTickets(result.project.id, bundle.id).forEach(ticket => {
         io.emit('ticket:updated', ticket);
     });
@@ -4399,7 +4506,7 @@ app.post('/projects', (req, res) => {
         return res.status(400).json({ error: validation.error });
     }
     const projectCount = Number(db.prepare('SELECT COUNT(*) AS count FROM projects').get()?.count ?? 0);
-    const { name, repo_path, linked_project_ids, run_setup, run_services, test_commands, run_ide, preview_service_name, preview_path, preview_capability_mode, helper_model, helper_variant, commit_message_rules, auto_park_stale_tickets, memory_enabled, worktree_sync, spec_aware_code_review_enabled, automation_depth, automation_review_fix_enabled, automation_review_severity, automation_review_max_iterations, } = validation.values;
+    const { name, repo_path, linked_project_ids, run_setup, run_services, test_commands, run_ide, preview_service_name, preview_path, preview_capability_mode, helper_model, helper_variant, commit_message_rules, auto_park_stale_tickets, memory_enabled, scan_include_globs_json, scan_exclude_globs_json, worktree_sync, spec_aware_code_review_enabled, automation_depth, automation_review_fix_enabled, automation_review_severity, automation_review_max_iterations, } = validation.values;
     if (!repo_path) {
         return res.status(400).json({ error: 'repo_path must be a non-empty string' });
     }
@@ -4429,6 +4536,8 @@ app.post('/projects', (req, res) => {
       commit_message_rules,
       auto_park_stale_tickets,
       memory_enabled,
+      scan_include_globs_json,
+      scan_exclude_globs_json,
       worktree_sync,
       spec_aware_code_review_enabled,
       automation_depth,
@@ -4436,8 +4545,8 @@ app.post('/projects', (req, res) => {
       automation_review_severity,
       automation_review_max_iterations
     )
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-  `).run(id, name, normalizedRepoPath, run_setup, run_services, test_commands, run_ide ?? null, preview_service_name ?? null, preview_path ?? null, preview_capability_mode ?? null, helper_model ?? null, helper_variant ?? null, commit_message_rules ?? null, auto_park_stale_tickets ?? 0, memory_enabled ?? 0, worktree_sync ?? null, spec_aware_code_review_enabled ?? 0, automation_depth ?? 'manual', automation_review_fix_enabled ?? 0, automation_review_severity ?? 'medium', automation_review_max_iterations ?? 3);
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(id, name, normalizedRepoPath, run_setup, run_services, test_commands, run_ide ?? null, preview_service_name ?? null, preview_path ?? null, preview_capability_mode ?? null, helper_model ?? null, helper_variant ?? null, commit_message_rules ?? null, auto_park_stale_tickets ?? 0, memory_enabled ?? 0, scan_include_globs_json ?? null, scan_exclude_globs_json ?? null, worktree_sync ?? null, spec_aware_code_review_enabled ?? 0, automation_depth ?? 'manual', automation_review_fix_enabled ?? 0, automation_review_severity ?? 'medium', automation_review_max_iterations ?? 3);
     replaceProjectLinks(id, linked_project_ids ?? []);
     ensureProjectRootBundle(id);
     if (projectCount === 0) {
@@ -4462,6 +4571,9 @@ app.get('/projects/:id/conventions', (req, res) => {
     const includeArchived = req.query.include_archived === 'true';
     return res.json({ conventions: listProjectConventions(result.project.id, { includeArchived }) });
 });
+const sendProjectMemoryValidationError = (res, validation) => {
+    return res.status(validation.code === 'field_too_large' ? 413 : 400).json(validation);
+};
 app.post('/projects/:id/conventions', (req, res) => {
     const result = requireProjectMemoryProject(req.params.id);
     if ('error' in result) {
@@ -4469,7 +4581,7 @@ app.post('/projects/:id/conventions', (req, res) => {
     }
     const validation = validateProjectConventionPayload(req.body);
     if ('error' in validation) {
-        return res.status(400).json({ error: validation.error });
+        return sendProjectMemoryValidationError(res, validation);
     }
     const created = createProjectConvention(result.project.id, {
         title: validation.values.title ?? '',
@@ -4477,6 +4589,8 @@ app.post('/projects/:id/conventions', (req, res) => {
         instruction: validation.values.instruction ?? '',
         rationale: validation.values.rationale ?? null,
         stages_json: validation.values.stages_json ?? null,
+        path_globs_json: validation.values.path_globs_json ?? null,
+        component_tags_json: validation.values.component_tags_json ?? null,
         priority: validation.values.priority ?? 'normal',
         injection_mode: validation.values.injection_mode ?? 'relevant',
     });
@@ -4489,7 +4603,7 @@ app.patch('/projects/:id/conventions/:conventionId', (req, res) => {
     }
     const validation = validateProjectConventionPayload(req.body, { partial: true });
     if ('error' in validation) {
-        return res.status(400).json({ error: validation.error });
+        return sendProjectMemoryValidationError(res, validation);
     }
     const updated = updateProjectConvention(result.project.id, req.params.conventionId, validation.values);
     if (!updated) {
@@ -4503,21 +4617,21 @@ app.post('/projects/:id/conventions/:conventionId/archive', (req, res) => {
         return res.status(result.status).json({ error: result.error });
     }
     const archived = archiveProjectConvention(result.project.id, req.params.conventionId);
-    if (!archived) {
-        return res.status(404).json({ error: 'Convention not found' });
+    if (archived.status !== 200 || !archived.memory) {
+        return res.status(archived.status).json({ error: archived.error ?? 'Convention lifecycle transition failed' });
     }
-    return res.json(archived);
+    return res.json(archived.memory);
 });
 app.post('/projects/:id/conventions/:conventionId/restore', (req, res) => {
     const result = requireProjectMemoryProject(req.params.id);
     if ('error' in result) {
         return res.status(result.status).json({ error: result.error });
     }
-    const restored = restoreProjectConvention(result.project.id, req.params.conventionId);
-    if (!restored) {
-        return res.status(404).json({ error: 'Convention not found' });
+    const restored = restoreProjectConvention(result.project.id, req.params.conventionId, req.body?.confirm_conflicts === true);
+    if (restored.status !== 200 || !restored.memory) {
+        return res.status(restored.status).json({ ...restored, error: restored.error ?? 'Convention lifecycle transition failed' });
     }
-    return res.json(restored);
+    return res.json(restored.memory);
 });
 app.get('/projects/:id/decisions', (req, res) => {
     const result = requireProjectMemoryProject(req.params.id);
@@ -4534,7 +4648,7 @@ app.post('/projects/:id/decisions', (req, res) => {
     }
     const validation = validateProjectDecisionPayload(req.body);
     if ('error' in validation) {
-        return res.status(400).json({ error: validation.error });
+        return sendProjectMemoryValidationError(res, validation);
     }
     const created = createProjectDecision(result.project.id, {
         title: validation.values.title ?? '',
@@ -4542,6 +4656,9 @@ app.post('/projects/:id/decisions', (req, res) => {
         decision: validation.values.decision ?? '',
         rationale: validation.values.rationale ?? null,
         implications_json: validation.values.implications_json ?? null,
+        stages_json: validation.values.stages_json ?? null,
+        path_globs_json: validation.values.path_globs_json ?? null,
+        component_tags_json: validation.values.component_tags_json ?? null,
     });
     return res.status(201).json(created);
 });
@@ -4552,7 +4669,7 @@ app.patch('/projects/:id/decisions/:decisionId', (req, res) => {
     }
     const validation = validateProjectDecisionPayload(req.body, { partial: true });
     if ('error' in validation) {
-        return res.status(400).json({ error: validation.error });
+        return sendProjectMemoryValidationError(res, validation);
     }
     const updated = updateProjectDecision(result.project.id, req.params.decisionId, validation.values);
     if (!updated) {
@@ -4566,32 +4683,39 @@ app.post('/projects/:id/decisions/:decisionId/archive', (req, res) => {
         return res.status(result.status).json({ error: result.error });
     }
     const archived = archiveProjectDecision(result.project.id, req.params.decisionId);
-    if (!archived) {
-        return res.status(404).json({ error: 'Decision not found' });
+    if (archived.status !== 200 || !archived.memory) {
+        return res.status(archived.status).json({ error: archived.error ?? 'Decision lifecycle transition failed' });
     }
-    return res.json(archived);
+    return res.json(archived.memory);
 });
 app.post('/projects/:id/decisions/:decisionId/supersede', (req, res) => {
     const result = requireProjectMemoryProject(req.params.id);
     if ('error' in result) {
         return res.status(result.status).json({ error: result.error });
     }
-    const superseded = supersedeProjectDecision(result.project.id, req.params.decisionId);
-    if (!superseded) {
-        return res.status(404).json({ error: 'Decision not found' });
+    const replacementDecisionId = typeof req.body?.replacement_decision_id === 'string' ? req.body.replacement_decision_id.trim() : '';
+    let superseded;
+    try {
+        superseded = supersedeProjectDecision(result.project.id, req.params.decisionId, replacementDecisionId);
     }
-    return res.json(superseded);
+    catch (error) {
+        return res.status(500).json({ error: getErrorMessage(error) });
+    }
+    if (superseded.status !== 200 || !superseded.memory) {
+        return res.status(superseded.status).json({ error: superseded.error ?? 'Decision lifecycle transition failed' });
+    }
+    return res.json(superseded.memory);
 });
 app.post('/projects/:id/decisions/:decisionId/restore', (req, res) => {
     const result = requireProjectMemoryProject(req.params.id);
     if ('error' in result) {
         return res.status(result.status).json({ error: result.error });
     }
-    const restored = restoreProjectDecision(result.project.id, req.params.decisionId);
-    if (!restored) {
-        return res.status(404).json({ error: 'Decision not found' });
+    const restored = restoreProjectDecision(result.project.id, req.params.decisionId, req.body?.confirm_conflicts === true);
+    if (restored.status !== 200 || !restored.memory) {
+        return res.status(restored.status).json({ ...restored, error: restored.error ?? 'Decision lifecycle transition failed' });
     }
-    return res.json(restored);
+    return res.json(restored.memory);
 });
 app.get('/projects/:id/memory/relevant', (req, res) => {
     const result = requireProjectMemoryProject(req.params.id);
@@ -4607,6 +4731,7 @@ app.get('/projects/:id/memory/relevant', (req, res) => {
         return res.status(404).json({ error: 'Ticket not found' });
     }
     return res.json(selectRelevantProjectMemory(result.project.id, {
+        flow: 'ticket_preview',
         stage: ticket.state,
         title: ticket.title,
         description: ticket.description,
@@ -4629,7 +4754,7 @@ app.post('/projects/:id/memory/import', (req, res) => {
     }
     const imported = importProjectMemoryArchive(result.project.id, req.body ?? null);
     if ('error' in imported) {
-        return res.status(400).json({ error: imported.error });
+        return res.status(imported.kind === 'limit' ? 413 : 400).json(imported);
     }
     return res.json(imported.value);
 });
@@ -4657,6 +4782,29 @@ app.get('/projects/:id/context', (req, res) => {
     }
     return res.json(getProjectContextResponse(result.project.id));
 });
+app.get('/projects/:id/context/scans', (req, res) => {
+    const result = requireProjectMemoryProject(req.params.id);
+    if ('error' in result) {
+        return res.status(result.status).json({ error: result.error });
+    }
+    const limit = req.query.limit == null ? 20 : Number(req.query.limit);
+    if (!Number.isInteger(limit) || limit < 1 || limit > 50) {
+        return res.status(400).json({ error: 'limit must be an integer between 1 and 50' });
+    }
+    const cursor = typeof req.query.cursor === 'string' ? decodeProjectMemoryCursor(req.query.cursor) : null;
+    if (req.query.cursor != null && !cursor) {
+        return res.status(400).json({ error: 'cursor must be a valid project memory cursor' });
+    }
+    return res.json(getProjectContextScanHistory(result.project.id, { limit, cursor }));
+});
+app.get('/projects/:id/context/scans/:scanId', (req, res) => {
+    const result = requireProjectMemoryProject(req.params.id);
+    if ('error' in result) {
+        return res.status(result.status).json({ error: result.error });
+    }
+    const detail = getProjectContextScanDetail(result.project.id, req.params.scanId);
+    return detail ? res.json(detail) : res.status(404).json({ error: 'Project context scan not found' });
+});
 app.get('/projects/:id/context/artifacts', (req, res) => {
     const result = requireProjectMemoryProject(req.params.id);
     if ('error' in result) {
@@ -4695,6 +4843,9 @@ app.get('/projects/:id/memories', (req, res) => {
     if (chatSessionId && !getProjectChatSession(result.project.id, chatSessionId)) {
         return res.status(404).json({ error: 'Chat session not found' });
     }
+    if (specSessionId && !getProjectSpecSession(result.project.id, specSessionId)) {
+        return res.status(404).json({ error: 'Spec session not found' });
+    }
     const includeGeneratedContext = req.query.include_generated_context !== 'false';
     return res.json({
         memories: listProjectMemories(result.project.id, {
@@ -4703,6 +4854,7 @@ app.get('/projects/:id/memories', (req, res) => {
             sources: sourceQuery.values,
             ticketId: ticketId || null,
             chatSessionId: chatSessionId || null,
+            specSessionId: specSessionId || null,
         }),
         generated_context: includeGeneratedContext
             ? {
@@ -4712,6 +4864,60 @@ app.get('/projects/:id/memories', (req, res) => {
             : null,
     });
 });
+app.get('/projects/:id/memory/agent-runs/:agentRunId/selection', (req, res) => {
+    const result = requireProjectMemoryProject(req.params.id);
+    if ('error' in result) {
+        return res.status(result.status).json({ error: result.error });
+    }
+    const selection = getProjectMemorySelectionForAgentRun(result.project.id, req.params.agentRunId);
+    return selection ? res.json({ selection }) : res.status(404).json({ error: 'Memory selection not found' });
+});
+app.get('/projects/:id/memory/items/:kind/:memoryId/usage', (req, res) => {
+    const result = requireProjectMemoryProject(req.params.id);
+    if ('error' in result) {
+        return res.status(result.status).json({ error: result.error });
+    }
+    if (req.params.kind !== 'decision' && req.params.kind !== 'convention') {
+        return res.status(400).json({ error: 'kind must be one of decision or convention' });
+    }
+    const memory = getProjectMemoryById(result.project.id, req.params.memoryId);
+    if (!memory || memory.kind !== req.params.kind || memory.state === 'suggested') {
+        return res.status(404).json({ error: 'Memory not found' });
+    }
+    const limit = req.query.limit == null ? 20 : Number(req.query.limit);
+    if (!Number.isInteger(limit) || limit < 1 || limit > 50) {
+        return res.status(400).json({ error: 'limit must be an integer between 1 and 50' });
+    }
+    const cursor = typeof req.query.cursor === 'string' ? decodeProjectMemoryCursor(req.query.cursor) : null;
+    if (req.query.cursor != null && !cursor) {
+        return res.status(400).json({ error: 'cursor must be a valid project memory cursor' });
+    }
+    const page = listProjectMemoryUsage(result.project.id, req.params.kind, memory.id, { limit, cursor });
+    return res.json({ usage: page.usage, next_cursor: page.nextCursor });
+});
+app.get('/projects/:id/memory/items/:kind/:memoryId/history', (req, res) => {
+    const result = requireProjectMemoryProject(req.params.id);
+    if ('error' in result) {
+        return res.status(result.status).json({ error: result.error });
+    }
+    if (req.params.kind !== 'decision' && req.params.kind !== 'convention') {
+        return res.status(400).json({ error: 'kind must be one of decision or convention' });
+    }
+    const memory = getProjectMemoryById(result.project.id, req.params.memoryId);
+    if (!memory || memory.kind !== req.params.kind || memory.state === 'suggested') {
+        return res.status(404).json({ error: 'Memory not found' });
+    }
+    const limit = req.query.limit == null ? 20 : Number(req.query.limit);
+    if (!Number.isInteger(limit) || limit < 1 || limit > 50) {
+        return res.status(400).json({ error: 'limit must be an integer between 1 and 50' });
+    }
+    const cursor = typeof req.query.cursor === 'string' ? decodeProjectMemoryCursor(req.query.cursor) : null;
+    if (req.query.cursor != null && !cursor) {
+        return res.status(400).json({ error: 'cursor must be a valid project memory cursor' });
+    }
+    const page = listProjectMemoryEvents(result.project.id, req.params.kind, memory.id, { limit, cursor });
+    return res.json({ events: page.events, next_cursor: page.nextCursor });
+});
 app.post('/projects/:id/memories', (req, res) => {
     const result = requireProjectMemoryProject(req.params.id);
     if ('error' in result) {
@@ -4724,7 +4930,7 @@ app.post('/projects/:id/memories', (req, res) => {
     if (kind === 'decision') {
         const validation = validateProjectDecisionPayload(req.body ?? {});
         if ('error' in validation) {
-            return res.status(400).json({ error: validation.error });
+            return sendProjectMemoryValidationError(res, validation);
         }
         const created = createProjectDecision(result.project.id, {
             title: validation.values.title ?? '',
@@ -4732,6 +4938,9 @@ app.post('/projects/:id/memories', (req, res) => {
             decision: validation.values.decision ?? '',
             rationale: validation.values.rationale ?? null,
             implications_json: validation.values.implications_json ?? null,
+            stages_json: validation.values.stages_json ?? null,
+            path_globs_json: validation.values.path_globs_json ?? null,
+            component_tags_json: validation.values.component_tags_json ?? null,
         });
         if (!created) {
             return res.status(500).json({ error: 'Unable to create the project decision' });
@@ -4740,7 +4949,7 @@ app.post('/projects/:id/memories', (req, res) => {
     }
     const validation = validateProjectConventionPayload(req.body ?? {});
     if ('error' in validation) {
-        return res.status(400).json({ error: validation.error });
+        return sendProjectMemoryValidationError(res, validation);
     }
     const created = createProjectConvention(result.project.id, {
         title: validation.values.title ?? '',
@@ -4748,6 +4957,8 @@ app.post('/projects/:id/memories', (req, res) => {
         instruction: validation.values.instruction ?? '',
         rationale: validation.values.rationale ?? null,
         stages_json: validation.values.stages_json ?? null,
+        path_globs_json: validation.values.path_globs_json ?? null,
+        component_tags_json: validation.values.component_tags_json ?? null,
         priority: validation.values.priority ?? 'normal',
         injection_mode: validation.values.injection_mode ?? 'relevant',
     });
@@ -4771,7 +4982,7 @@ app.patch('/projects/:id/memories/:memoryId', (req, res) => {
     if (memory.kind === 'decision') {
         const validation = validateProjectDecisionPayload(req.body ?? {}, { partial: true });
         if ('error' in validation) {
-            return res.status(400).json({ error: validation.error });
+            return sendProjectMemoryValidationError(res, validation);
         }
         const updated = updateProjectDecision(result.project.id, memory.id, validation.values);
         if (!updated) {
@@ -4781,7 +4992,7 @@ app.patch('/projects/:id/memories/:memoryId', (req, res) => {
     }
     const validation = validateProjectConventionPayload(req.body ?? {}, { partial: true });
     if ('error' in validation) {
-        return res.status(400).json({ error: validation.error });
+        return sendProjectMemoryValidationError(res, validation);
     }
     const updated = updateProjectConvention(result.project.id, memory.id, validation.values);
     if (!updated) {
@@ -4798,21 +5009,21 @@ app.post('/projects/:id/memories/:memoryId/archive', (req, res) => {
     if (!memory) {
         return res.status(404).json({ error: 'Memory not found' });
     }
-    if (memory.source !== 'manual') {
+    if (memory.state === 'suggested' || memory.state === 'dismissed' || memory.state === 'applied_to_existing') {
         return res.status(400).json({ error: 'Only saved memories can be archived' });
     }
     if (memory.kind === 'decision') {
         const updated = archiveProjectDecision(result.project.id, memory.id);
-        if (!updated) {
-            return res.status(404).json({ error: 'Memory not found' });
+        if (updated.status !== 200 || !updated.memory) {
+            return res.status(updated.status).json({ error: updated.error ?? 'Memory lifecycle transition failed' });
         }
-        return res.json({ memory: serializeProjectMemoryFromDecisionValue(updated) });
+        return res.json({ memory: serializeProjectMemoryFromDecisionValue(updated.memory) });
     }
     const updated = archiveProjectConvention(result.project.id, memory.id);
-    if (!updated) {
-        return res.status(404).json({ error: 'Memory not found' });
+    if (updated.status !== 200 || !updated.memory) {
+        return res.status(updated.status).json({ error: updated.error ?? 'Memory lifecycle transition failed' });
     }
-    return res.json({ memory: serializeProjectMemoryFromConventionValue(updated) });
+    return res.json({ memory: serializeProjectMemoryFromConventionValue(updated.memory) });
 });
 app.post('/projects/:id/memories/:memoryId/restore', (req, res) => {
     const result = requireProjectMemoryProject(req.params.id);
@@ -4823,21 +5034,21 @@ app.post('/projects/:id/memories/:memoryId/restore', (req, res) => {
     if (!memory) {
         return res.status(404).json({ error: 'Memory not found' });
     }
-    if (memory.source !== 'manual') {
+    if (memory.state === 'suggested' || memory.state === 'dismissed' || memory.state === 'applied_to_existing') {
         return res.status(400).json({ error: 'Only saved memories can be restored' });
     }
     if (memory.kind === 'decision') {
-        const updated = restoreProjectDecision(result.project.id, memory.id);
-        if (!updated) {
-            return res.status(404).json({ error: 'Memory not found' });
+        const updated = restoreProjectDecision(result.project.id, memory.id, req.body?.confirm_conflicts === true);
+        if (updated.status !== 200 || !updated.memory) {
+            return res.status(updated.status).json({ ...updated, error: updated.error ?? 'Memory lifecycle transition failed' });
         }
-        return res.json({ memory: serializeProjectMemoryFromDecisionValue(updated) });
+        return res.json({ memory: serializeProjectMemoryFromDecisionValue(updated.memory) });
     }
-    const updated = restoreProjectConvention(result.project.id, memory.id);
-    if (!updated) {
-        return res.status(404).json({ error: 'Memory not found' });
+    const updated = restoreProjectConvention(result.project.id, memory.id, req.body?.confirm_conflicts === true);
+    if (updated.status !== 200 || !updated.memory) {
+        return res.status(updated.status).json({ ...updated, error: updated.error ?? 'Memory lifecycle transition failed' });
     }
-    return res.json({ memory: serializeProjectMemoryFromConventionValue(updated) });
+    return res.json({ memory: serializeProjectMemoryFromConventionValue(updated.memory) });
 });
 app.post('/projects/:id/memories/:memoryId/supersede', (req, res) => {
     const result = requireProjectMemoryProject(req.params.id);
@@ -4848,14 +5059,21 @@ app.post('/projects/:id/memories/:memoryId/supersede', (req, res) => {
     if (!memory) {
         return res.status(404).json({ error: 'Memory not found' });
     }
-    if (memory.source !== 'manual' || memory.kind !== 'decision') {
+    if (memory.kind !== 'decision' || memory.state === 'suggested' || memory.state === 'dismissed' || memory.state === 'applied_to_existing') {
         return res.status(400).json({ error: 'Only saved decisions can be superseded' });
     }
-    const updated = supersedeProjectDecision(result.project.id, memory.id);
-    if (!updated) {
-        return res.status(404).json({ error: 'Memory not found' });
+    const replacementDecisionId = typeof req.body?.replacement_decision_id === 'string' ? req.body.replacement_decision_id.trim() : '';
+    let updated;
+    try {
+        updated = supersedeProjectDecision(result.project.id, memory.id, replacementDecisionId);
+    }
+    catch (error) {
+        return res.status(500).json({ error: getErrorMessage(error) });
+    }
+    if (updated.status !== 200 || !updated.memory) {
+        return res.status(updated.status).json({ error: updated.error ?? 'Memory lifecycle transition failed' });
     }
-    return res.json({ memory: serializeProjectMemoryFromDecisionValue(updated) });
+    return res.json({ memory: serializeProjectMemoryFromDecisionValue(updated.memory) });
 });
 app.post('/projects/:id/memories/:memoryId/accept', (req, res) => {
     const result = requireProjectMemoryProject(req.params.id);
@@ -4870,11 +5088,14 @@ app.post('/projects/:id/memories/:memoryId/accept', (req, res) => {
         ? validateProjectDecisionPayload(req.body ?? {}, { partial: true })
         : validateProjectConventionPayload(req.body ?? {}, { partial: true });
     if ('error' in validation) {
-        return res.status(400).json({ error: validation.error });
+        return sendProjectMemoryValidationError(res, validation);
     }
-    const accepted = acceptProjectMemorySuggestion(result.project.id, req.params.memoryId, validation.values);
+    const accepted = acceptProjectMemorySuggestion(result.project.id, req.params.memoryId, validation.values, req.body?.confirm_conflicts === true);
     if ('error' in accepted) {
-        return res.status(accepted.status).json({ error: accepted.error, suggestion: accepted.suggestion ?? null });
+        return res.status(accepted.status).json({ ...accepted, suggestion: accepted.suggestion ?? null });
+    }
+    if (!('decision' in accepted) && !('convention' in accepted)) {
+        return res.status(500).json({ error: 'Unable to accept the suggestion' });
     }
     const memory = 'decision' in accepted
         ? serializeProjectMemoryFromDecisionValue(accepted.decision)
@@ -4889,11 +5110,12 @@ app.post('/projects/:id/memories/:memoryId/dismiss', (req, res) => {
     if ('error' in result) {
         return res.status(result.status).json({ error: result.error });
     }
-    const dismissed = dismissProjectMemorySuggestion(result.project.id, req.params.memoryId);
-    if (!dismissed) {
-        return res.status(404).json({ error: 'Memory not found' });
+    const reason = typeof req.body?.reason === 'string' ? req.body.reason : null;
+    const dismissed = dismissProjectMemorySuggestion(result.project.id, req.params.memoryId, reason);
+    if ('error' in dismissed) {
+        return res.status(dismissed.status).json({ error: dismissed.error, suggestion: dismissed.suggestion ?? null });
     }
-    const memory = serializeProjectMemoryFromSuggestionValue(dismissed);
+    const memory = serializeProjectMemoryFromSuggestionValue(dismissed.suggestion);
     if (!memory) {
         return res.status(400).json({ error: 'Only suggested memories can be dismissed' });
     }
@@ -4908,18 +5130,17 @@ app.post('/projects/:id/memories/:memoryId/apply-to-existing', (req, res) => {
     if (!suggestion) {
         return res.status(404).json({ error: 'Memory not found' });
     }
-    if (suggestion.kind !== 'decision') {
-        return res.status(400).json({ error: 'Only decision suggestions can update an existing memory' });
-    }
     const decisionId = typeof req.body?.memory_id === 'string' ? req.body.memory_id.trim() : '';
     if (!decisionId) {
         return res.status(400).json({ error: 'memory_id is required' });
     }
-    const validation = validateProjectDecisionPayload(req.body ?? {}, { partial: true });
+    const validation = suggestion.kind === 'decision' ? validateProjectDecisionPayload(req.body ?? {}, { partial: true }) : validateProjectConventionPayload(req.body ?? {}, { partial: true });
     if ('error' in validation) {
-        return res.status(400).json({ error: validation.error });
+        return sendProjectMemoryValidationError(res, validation);
     }
-    const updated = applyProjectMemorySuggestionToDecision(result.project.id, req.params.memoryId, decisionId, validation.values);
+    const updated = suggestion.kind === 'decision'
+        ? applyProjectMemorySuggestionToDecision(result.project.id, req.params.memoryId, decisionId, validation.values)
+        : applyProjectMemorySuggestionToConvention(result.project.id, req.params.memoryId, decisionId, validation.values);
     if ('error' in updated) {
         return res.status(updated.status).json({ error: updated.error, suggestion: updated.suggestion ?? null });
     }
@@ -4973,11 +5194,11 @@ app.post('/projects/:id/memory/suggestions/:suggestionId/accept', (req, res) =>
         ? validateProjectDecisionPayload(req.body ?? {}, { partial: true })
         : validateProjectConventionPayload(req.body ?? {}, { partial: true });
     if ('error' in validation) {
-        return res.status(400).json({ error: validation.error });
+        return sendProjectMemoryValidationError(res, validation);
     }
-    const accepted = acceptProjectMemorySuggestion(result.project.id, req.params.suggestionId, validation.values);
+    const accepted = acceptProjectMemorySuggestion(result.project.id, req.params.suggestionId, validation.values, req.body?.confirm_conflicts === true);
     if ('error' in accepted) {
-        return res.status(accepted.status).json({ error: accepted.error, suggestion: accepted.suggestion ?? null });
+        return res.status(accepted.status).json({ ...accepted, suggestion: accepted.suggestion ?? null });
     }
     return res.json(accepted);
 });
@@ -4990,18 +5211,17 @@ app.post('/projects/:id/memory/suggestions/:suggestionId/update-existing', (req,
     if (!suggestion) {
         return res.status(404).json({ error: 'Suggestion not found' });
     }
-    if (suggestion.kind !== 'decision') {
-        return res.status(400).json({ error: 'Only decision suggestions can update an existing memory' });
-    }
-    const decisionId = typeof req.body?.decision_id === 'string' ? req.body.decision_id.trim() : '';
+    const decisionId = typeof req.body?.memory_id === 'string' ? req.body.memory_id.trim() : typeof req.body?.decision_id === 'string' ? req.body.decision_id.trim() : '';
     if (!decisionId) {
         return res.status(400).json({ error: 'decision_id is required' });
     }
-    const validation = validateProjectDecisionPayload(req.body ?? {}, { partial: true });
+    const validation = suggestion.kind === 'decision' ? validateProjectDecisionPayload(req.body ?? {}, { partial: true }) : validateProjectConventionPayload(req.body ?? {}, { partial: true });
     if ('error' in validation) {
-        return res.status(400).json({ error: validation.error });
+        return sendProjectMemoryValidationError(res, validation);
     }
-    const updated = applyProjectMemorySuggestionToDecision(result.project.id, req.params.suggestionId, decisionId, validation.values);
+    const updated = suggestion.kind === 'decision'
+        ? applyProjectMemorySuggestionToDecision(result.project.id, req.params.suggestionId, decisionId, validation.values)
+        : applyProjectMemorySuggestionToConvention(result.project.id, req.params.suggestionId, decisionId, validation.values);
     if ('error' in updated) {
         return res.status(updated.status).json({ error: updated.error, suggestion: updated.suggestion ?? null });
     }
@@ -5012,11 +5232,31 @@ app.post('/projects/:id/memory/suggestions/:suggestionId/dismiss', (req, res) =>
     if ('error' in result) {
         return res.status(result.status).json({ error: result.error });
     }
-    const dismissed = dismissProjectMemorySuggestion(result.project.id, req.params.suggestionId);
-    if (!dismissed) {
-        return res.status(404).json({ error: 'Suggestion not found' });
+    const reason = typeof req.body?.reason === 'string' ? req.body.reason : null;
+    const dismissed = dismissProjectMemorySuggestion(result.project.id, req.params.suggestionId, reason);
+    if ('error' in dismissed) {
+        return res.status(dismissed.status).json({ error: dismissed.error, suggestion: dismissed.suggestion ?? null });
     }
-    return res.json(dismissed);
+    return res.json(dismissed.suggestion);
+});
+app.post('/projects/:id/memory/suggestions/:suggestionId/supersede', (req, res) => {
+    const result = requireProjectMemoryProject(req.params.id);
+    if ('error' in result) {
+        return res.status(result.status).json({ error: result.error });
+    }
+    const targetDecisionId = typeof req.body?.decision_id === 'string' ? req.body.decision_id.trim() : '';
+    if (!targetDecisionId) {
+        return res.status(400).json({ error: 'decision_id is required' });
+    }
+    const validation = validateProjectDecisionPayload(req.body ?? {}, { partial: true });
+    if ('error' in validation) {
+        return sendProjectMemoryValidationError(res, validation);
+    }
+    const superseded = supersedeProjectDecisionFromSuggestion(result.project.id, req.params.suggestionId, targetDecisionId, validation.values);
+    if ('error' in superseded) {
+        return res.status(superseded.status).json({ error: superseded.error, suggestion: superseded.suggestion ?? null });
+    }
+    return res.json(superseded);
 });
 app.get('/projects/:id/branch', (req, res) => {
     const project = getProjectById(req.params.id);
@@ -5418,7 +5658,7 @@ app.patch('/projects/:id', (req, res) => {
             });
         }
     }
-    const { name, repo_path, linked_project_ids, run_setup, run_services, test_commands, run_ide, preview_service_name, preview_path, preview_capability_mode, helper_model, helper_variant, commit_message_rules, auto_park_stale_tickets, memory_enabled, worktree_sync, spec_aware_code_review_enabled, automation_depth, automation_review_fix_enabled, automation_review_severity, automation_review_max_iterations, } = validation.values;
+    const { name, repo_path, linked_project_ids, run_setup, run_services, test_commands, run_ide, preview_service_name, preview_path, preview_capability_mode, helper_model, helper_variant, commit_message_rules, auto_park_stale_tickets, memory_enabled, scan_include_globs_json, scan_exclude_globs_json, worktree_sync, spec_aware_code_review_enabled, automation_depth, automation_review_fix_enabled, automation_review_severity, automation_review_max_iterations, } = validation.values;
     db.prepare(`
     UPDATE projects SET
       name = ?,
@@ -5435,6 +5675,8 @@ app.patch('/projects/:id', (req, res) => {
       commit_message_rules = ?,
       auto_park_stale_tickets = ?,
       memory_enabled = ?,
+      scan_include_globs_json = ?,
+      scan_exclude_globs_json = ?,
       worktree_sync = ?,
       spec_aware_code_review_enabled = ?,
       automation_depth = ?,
@@ -5443,7 +5685,7 @@ app.patch('/projects/:id', (req, res) => {
       automation_review_max_iterations = ?,
       updated_at = CURRENT_TIMESTAMP
     WHERE id = ?
-  `).run(name ?? project.name, repo_path ?? project.repo_path, hasOwn(validation.values, 'run_setup') ? run_setup : project.run_setup, hasOwn(validation.values, 'run_services') ? run_services : project.run_services, hasOwn(validation.values, 'test_commands') ? test_commands : project.test_commands, hasOwn(validation.values, 'run_ide') ? run_ide : project.run_ide, hasOwn(validation.values, 'preview_service_name') ? preview_service_name : project.preview_service_name, hasOwn(validation.values, 'preview_path') ? preview_path : project.preview_path, hasOwn(validation.values, 'preview_capability_mode') ? preview_capability_mode : project.preview_capability_mode, hasOwn(validation.values, 'helper_model') ? helper_model : project.helper_model, hasOwn(validation.values, 'helper_variant') ? helper_variant : project.helper_variant, hasOwn(validation.values, 'commit_message_rules') ? commit_message_rules : project.commit_message_rules, hasOwn(validation.values, 'auto_park_stale_tickets') ? auto_park_stale_tickets : project.auto_park_stale_tickets, hasOwn(validation.values, 'memory_enabled') ? memory_enabled : project.memory_enabled, hasOwn(validation.values, 'worktree_sync') ? worktree_sync : project.worktree_sync, hasOwn(validation.values, 'spec_aware_code_review_enabled') ? spec_aware_code_review_enabled : project.spec_aware_code_review_enabled, hasOwn(validation.values, 'automation_depth') ? automation_depth : project.automation_depth, hasOwn(validation.values, 'automation_review_fix_enabled') ? automation_review_fix_enabled : project.automation_review_fix_enabled, hasOwn(validation.values, 'automation_review_severity') ? automation_review_severity : project.automation_review_severity, hasOwn(validation.values, 'automation_review_max_iterations') ? automation_review_max_iterations : project.automation_review_max_iterations, req.params.id);
+  `).run(name ?? project.name, repo_path ?? project.repo_path, hasOwn(validation.values, 'run_setup') ? run_setup : project.run_setup, hasOwn(validation.values, 'run_services') ? run_services : project.run_services, hasOwn(validation.values, 'test_commands') ? test_commands : project.test_commands, hasOwn(validation.values, 'run_ide') ? run_ide : project.run_ide, hasOwn(validation.values, 'preview_service_name') ? preview_service_name : project.preview_service_name, hasOwn(validation.values, 'preview_path') ? preview_path : project.preview_path, hasOwn(validation.values, 'preview_capability_mode') ? preview_capability_mode : project.preview_capability_mode, hasOwn(validation.values, 'helper_model') ? helper_model : project.helper_model, hasOwn(validation.values, 'helper_variant') ? helper_variant : project.helper_variant, hasOwn(validation.values, 'commit_message_rules') ? commit_message_rules : project.commit_message_rules, hasOwn(validation.values, 'auto_park_stale_tickets') ? auto_park_stale_tickets : project.auto_park_stale_tickets, hasOwn(validation.values, 'memory_enabled') ? memory_enabled : project.memory_enabled, hasOwn(validation.values, 'scan_include_globs_json') ? scan_include_globs_json : project.scan_include_globs_json, hasOwn(validation.values, 'scan_exclude_globs_json') ? scan_exclude_globs_json : project.scan_exclude_globs_json, hasOwn(validation.values, 'worktree_sync') ? worktree_sync : project.worktree_sync, hasOwn(validation.values, 'spec_aware_code_review_enabled') ? spec_aware_code_review_enabled : project.spec_aware_code_review_enabled, hasOwn(validation.values, 'automation_depth') ? automation_depth : project.automation_depth, hasOwn(validation.values, 'automation_review_fix_enabled') ? automation_review_fix_enabled : project.automation_review_fix_enabled, hasOwn(validation.values, 'automation_review_severity') ? automation_review_severity : project.automation_review_severity, hasOwn(validation.values, 'automation_review_max_iterations') ? automation_review_max_iterations : project.automation_review_max_iterations, req.params.id);
     if (hasOwn(validation.values, 'linked_project_ids')) {
         replaceProjectLinks(project.id, linked_project_ids ?? []);
     }