@straiffi/archon 1.10.12 → 1.11.0

package/dist/server/index.js

@@ -34,6 +34,7 @@ import { attachChatTicketProposalsToMessageContent } from './lib/chatTicketPropo
 import { createCorsOriginResolver, parseCorsOrigins } from './lib/cors.js';
 import { abortGitOperation, branchExistsLocally, commitGitChanges, createWorktreeAsync, deleteLocalBranch, deleteWorktree, getBundleReviewDiffForCwd, getGitDiffDataAsync, getGitDiffFiles, getGitDiffFilesAsync, getGitStatus, getGitStatusAsync, getGitUnifiedDiff, getGitUnifiedDiffAsync, getLocalProjectBranch, getProjectBranch, getProjectBranchAsync, getProjectBranchSuggestions, getReviewDiffDataAsync, getSelectedGitUnifiedDiff, getUnpushedCommitDiffForCwd, getUnpushedCommitSummaryForCwd, getUnpushedCommitSummaryForCwdAsync, hasKnownBranchRef, listUnpushedCommitsForCwd, pullGitBranch, pushCurrentBranch, rebaseGitBranchOntoBase, resolveExistingWorktreePath, resolveWorktreePath, squashUnpushedCommitsForCwd, summarizeTicketDiffFiles, switchProjectBranch, syncWorktreeFilesAsync, undoLatestUnpushedCommitForCwd, UnpushedCommitDiffSelectionError } from './lib/git.js';
 import config from './lib/config.js';
+import { getActiveTool, initializeActiveTool, setActiveTool } from './lib/activeTool.js';
 import { autoConfigProject, ProjectAutoConfigError } from './lib/projectAutoConfig.js';
 import { analyzeRepoPath, createInitialCommit, ensureInitialCommitForWorktrees, initializeGitRepo, isInitialCommitRequiredError, } from './lib/projectRepos.js';
 import { browseRepoPath } from './lib/directoryPicker.js';
@@ -41,14 +42,14 @@ import { resolveDesktopServerHost } from './lib/desktopServerHost.js';
 import { emitMobileRealtime, getMobileAccessStatus, regenerateMobilePairingChallenge, revokeMobileSession, setMobileAccessStatusChangeListener, startMobileAccess, stopMobileAccess, } from './lib/mobileAccess.js';
 import { validateDesktopMobileAccessRequest } from './lib/mobileAccessSecurity.js';
 import { refreshChatSessionUsageSnapshot, refreshSpecSessionUsageSnapshot, stopAllBuildAgents, stopAllReviewAgents, stopBuildAgent, stopReviewAgent } from './lib/agent.js';
-import { runLightweightPrompt } from './lib/lightweightPrompt.js';
+import { runTrackedLightweightPrompt } from './lib/lightweightPrompt.js';
 import { advanceBuildChain, startBuildChain, stopBuildChain } from './lib/buildChains.js';
 import { activateQueuedBuildSequenceTicket, bindBuildSequenceTicketExecutionRun, compensateBuildSequenceAcceptance, enqueueBundledBuild, getDependencyOrderedBundleTicketIds, getBuildSequenceIdForTicket, getBuildSequenceTicketExecutionProfileSelection, hasActiveSequenceForBundle, releaseQueuedBuildSequenceTicketExecutionRunForRetry, removeTicketFromBuildSequence, stopBuildSequence, } from './lib/buildSequences.js';
 import { createExecutionProfileSelection, createServiceExecutionProfileSelection, executionProfileSelectionMetadata, validateExecutionProfileSelection } from './lib/executionRunAuthority.js';
 import { prepareTicketForBuild } from './lib/buildFlow.js';
 import { getActiveBundleRepairBlocker, getBundlePlanMutationBlockerById, shouldBlockPlanForBundleMutationById, } from './lib/bundleActivity.js';
-import { getDiscoveredModels, normalizeModelId, normalizeTicketModelId } from './lib/models.js';
-import { getSupportedAgentCatalog, normalizeAgentModelId } from './lib/agentCatalog.js';
+import { getModelDiscoveryResult, normalizeModelId, normalizeTicketModelId } from './lib/models.js';
+import { agentSupportsVariants, getSupportedAgentCatalog, isAgentExecutable, isSupportedAgent, normalizeAgentModelId } from './lib/agentCatalog.js';
 import { parseStoredAgentModelConfig, resolveHelperModelConfig, serializeAgentModelConfig, validateAgentModelConfigUpdate, validateDiscoveredAgentModelConfig, } from './lib/agentModelConfig.js';
 import { upgradeTool, UpgradeInProgressError } from './lib/toolUpgrade.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';
@@ -77,7 +78,7 @@ import { buildAutomationFixInstruction, clearAutomationPause, countBlockingFindi
 import { resolveAutomationCheckGateResume, runAutomationCommitChain, runAutomationCommitOperation } from './lib/ticketAutomationCommit.js';
 import { resolveBuildTicketCommitCheckpointLineage, canMutateBuildTicketCommitCheckpoint } from './lib/buildTicketCommit.js';
 import { continueAfterBuildCheckpoint } from './lib/automationBuildContinuation.js';
-import { getDiscoveredSkills, normalizeSkillNames } from './lib/skills.js';
+import { getSkillDiscoveryResult, normalizeSkillNames } from './lib/skills.js';
 import { clearAllPreviewProxies } from './lib/previewProxy.js';
 import { createExecutionRun, addExecutionRunLink, addExecutionRunLinks, getExecutionRun, getLifecycleEvent, hasActiveBuildExecutionRunForTicket, getGitHubActionsExecutionDetails, getTestExecutionDetails, GitHubActionsDispatchConflictError, listExecutionRunLinks, listExecutionRuns, listLifecycleEvents, listProjectLifecycleEvents, toCanonicalLifecycleEvent, transitionExecutionRun, withExecutionRunTransaction, } from './lib/executionRuns.js';
 import { appendReviewRepairIterationDecisionInTransaction, attachReviewRepairActionEnvelopeInTransaction, attachReviewRepairActionInTransaction, claimReviewRepairIterationInTransaction, assertReviewRepairIterationDeletionEligible, deleteTerminalReviewRepairIterationsForTicketInTransaction, getActiveReviewRepairIteration, getReviewRepairIteration, pauseReviewRepairIteration, rewindStaleReviewRepairVerification, replaceReviewRepairActionEnvelopeRetryInTransaction, replaceReviewRepairActionRetryInTransaction, replaceReviewRepairVerificationRetryInTransaction, resetReviewRepairGateForRetry, resumePausedReviewRepairIteration, terminalizeReviewRepairIteration, terminalizeReviewRepairIterationInTransaction, } from './lib/reviewRepairIterations.js';
@@ -769,6 +770,7 @@ const scheduleBuildAfterTicketDeletion = (result) => {
 };
 const CORS_ORIGINS = parseCorsOrigins(process.env.CORS_ORIGIN);
 const CORS_ORIGIN_RESOLVER = createCorsOriginResolver(CORS_ORIGINS);
+initializeActiveTool();
 const app = express();
 const API_TIMING_ENABLED = process.env.ARCHON_API_TIMING === '1';
 const createApiTiming = (route, details = {}) => {
@@ -1993,6 +1995,7 @@ const serializeBundleDetails = (project, bundle, extras = {}) => {
         execution_order_ticket_ids: tickets.map(ticket => ticket.id),
         latest_session_ticket_id: latestSessionTicket?.id ?? null,
         latest_session_id: latestSessionTicket?.session_id ?? null,
+        latest_session_tool: latestSessionTicket?.tool ?? null,
         review_owner_ticket_id: extras.review_owner_ticket_id ?? null,
         target_ticket_id: resolvedTargetTicket?.id ?? null,
         has_completed_review: bundleReviewState.has_completed_review,
@@ -2027,6 +2030,7 @@ const serializeBundleConversationDetails = (project, bundle, extras = {}) => {
         execution_order_ticket_ids: tickets.map(ticket => ticket.id),
         latest_session_ticket_id: latestSessionTicket?.id ?? null,
         latest_session_id: latestSessionTicket?.session_id ?? null,
+        latest_session_tool: latestSessionTicket?.tool ?? null,
         review_owner_ticket_id: reviewOwnerTicketId,
         target_ticket_id: resolvedTargetTicket?.id ?? null,
     };
@@ -3877,6 +3881,9 @@ app.post('/bundles/:id/pull-request-description', async (req, res) => {
         return res.status(409).json({ error: 'Pull request descriptions are not available for the project root bundle.' });
     }
     const helperTool = config.tool ?? 'opencode';
+    if (!isAgentExecutable(helperTool)) {
+        return res.status(409).json({ error: `${helperTool} execution is not available` });
+    }
     const helperConfig = resolveHelperModelConfig({
         helperModelsJson: result.project.helper_models_json,
         agent: helperTool,
@@ -3896,16 +3903,15 @@ app.post('/bundles/:id/pull-request-description', async (req, res) => {
         .map(ticket => ticket.title.trim())
         .filter(Boolean);
     try {
-        const worktreePath = resolveWorktreePath(bundle.branch, result.project);
-        const rawDescription = await runLightweightPrompt({
-            tool: helperTool,
-            model: helperConfig.model,
-            variant: helperConfig.variant,
+        const rawDescription = await runTrackedLightweightPrompt({
+            project: result.project,
+            execution: { tool: helperTool, model: helperConfig.model, variant: helperConfig.variant },
+            target: { kind: 'bundle-worktree', bundleId: bundle.id, branch: bundle.branch },
         }, buildPullRequestDescriptionPrompt({
             title,
             ticketTitles,
             commitSubjects,
-        }), worktreePath);
+        }));
         const description = normalizeGeneratedPullRequestDescription(rawDescription);
         if (!description) {
             return res.status(500).json({ error: 'Unable to generate a pull request description right now.' });
@@ -5688,22 +5694,25 @@ app.post('/bundles/:id/dismiss-automation-pause', async (req, res) => {
     return res.json(serializeBundleDetails(result.project, bundle));
 });
 app.get('/tool', (_req, res) => {
-    res.json({ tool: config.tool ?? 'opencode' });
+    res.json({ tool: getActiveTool() });
 });
 app.post('/tool', (req, res) => {
     const { tool } = req.body;
-    if (tool !== 'claude' && tool !== 'opencode') {
+    if (!isSupportedAgent(tool)) {
         return res.status(400).json({ error: 'Invalid tool' });
     }
-    config.tool = tool;
+    setActiveTool(tool);
     io.emit('tool:updated', { tool });
     res.json({ tool });
 });
 app.post('/tools/upgrade', async (req, res) => {
     const { tool } = req.body ?? {};
-    if (tool !== 'claude' && tool !== 'opencode') {
+    if (!isSupportedAgent(tool)) {
         return res.status(400).json({ error: 'Invalid tool' });
     }
+    if (!isAgentExecutable(tool)) {
+        return res.status(409).json({ error: `${tool} execution is not available` });
+    }
     try {
         const result = await upgradeTool(tool);
         return res.json(result);
@@ -5725,13 +5734,16 @@ app.post('/projects/auto-config', async (req, res) => {
     }
     try {
         const requestedTool = req.body?.tool;
-        if (requestedTool !== undefined && requestedTool !== 'claude' && requestedTool !== 'opencode') {
+        if (requestedTool !== undefined && !isSupportedAgent(requestedTool)) {
             return res.status(400).json({ error: 'tool must be a supported agent' });
         }
         const tool = requestedTool
             ?? (hasOwn(req.body ?? {}, 'helper_model') && validation.values.helper_model ? 'opencode' : null)
             ?? config.tool
             ?? 'opencode';
+        if (!isAgentExecutable(tool)) {
+            return res.status(409).json({ error: `${tool} execution is not available` });
+        }
         const helperConfig = resolveHelperModelConfig({
             helperModelsJson: validation.values.helper_models_json,
             agent: tool,
@@ -5808,30 +5820,37 @@ app.post('/projects/browse-repo-path', (_req, res) => {
 });
 app.get('/models', async (req, res) => {
     const tool = typeof req.query.tool === 'string' ? req.query.tool : '';
-    if (tool !== 'opencode' && tool !== 'claude') {
-        return res.status(400).json({ error: 'Model discovery is only available for opencode or claude' });
+    if (!isSupportedAgent(tool)) {
+        return res.status(400).json({ error: 'Model discovery is only available for supported agents' });
     }
     const timing = createApiTiming('/models', { tool });
     res.set('Cache-Control', 'no-store');
-    const models = await getDiscoveredModels(tool);
+    const result = await getModelDiscoveryResult(tool);
     timing.mark('get_discovered_models');
-    timing.end({ count: models.length });
-    return res.json(models);
+    timing.end({ count: result.models.length, status: result.status });
+    return res.json(result);
 });
 app.get('/agents', async (_req, res) => {
     res.set('Cache-Control', 'no-store');
-    return res.json(await getSupportedAgentCatalog());
+    const projectId = typeof _req.query.project_id === 'string' ? _req.query.project_id : null;
+    const project = projectId ? getProjectById(projectId) : null;
+    return res.json(await getSupportedAgentCatalog({
+        probeHostAvailability: project?.build_execution_provider === 'host',
+    }));
 });
 app.get('/skills', async (req, res) => {
     const tool = typeof req.query.tool === 'string' ? req.query.tool : '';
     const projectId = typeof req.query.project_id === 'string' ? req.query.project_id : null;
-    if (tool !== 'opencode') {
-        return res.status(400).json({ error: 'Skill discovery is only available for opencode' });
+    if (tool !== 'opencode' && tool !== 'codex') {
+        return res.status(400).json({ error: 'Skill discovery is only available for agents with skill support' });
     }
     res.set('Cache-Control', 'no-store');
     const project = projectId ? getProjectById(projectId) : null;
-    const skills = await getDiscoveredSkills(tool, { projectPath: project?.repo_path ?? null });
-    return res.json(skills);
+    const result = await getSkillDiscoveryResult(tool, {
+        projectId: project?.id ?? null,
+        projectPath: project?.repo_path ?? null,
+    });
+    return res.json(result);
 });
 app.get('/integrations', (req, res) => {
     const result = getRequiredProject(req);
@@ -6607,6 +6626,12 @@ app.post('/plan', async (req, res) => {
 app.post('/planning-agent', async (req, res) => {
     const { description, model, variant, project_id } = req.body;
     const tool = resolveChatTool(req.body.tool);
+    if (!tool) {
+        return res.status(400).json({ error: 'tool must be a supported agent' });
+    }
+    if (!isAgentExecutable(tool)) {
+        return res.status(409).json({ error: `${tool} execution is not available` });
+    }
     if (typeof description !== 'string' || !description.trim()) {
         return res.status(400).json({ error: 'Description is required' });
     }
@@ -6694,8 +6719,8 @@ app.post('/planning-agent', async (req, res) => {
             draft,
             initiativePrompt: resolvedDescription,
             projectId: project.id,
-            model: tool === 'opencode' && typeof model === 'string' ? normalizeModelId(model) || null : null,
-            variant: tool === 'opencode' && typeof variant === 'string' && variant.trim() ? variant.trim() : null,
+            model: typeof model === 'string' ? normalizeAgentModelId(tool, model) || null : null,
+            variant: (tool === 'opencode' || tool === 'codex') && typeof variant === 'string' && variant.trim() ? variant.trim() : null,
             skills: resolveRequestedSkills(req.body?.skills),
             worktreeBundleId: bundleSelection.bundleId,
         });
@@ -7841,11 +7866,20 @@ app.post('/projects/:id/git-commit-message', async (req, res) => {
     });
     try {
         const helperTool = config.tool ?? 'opencode';
+        if (!isAgentExecutable(helperTool)) {
+            return res.status(409).json({ error: `${helperTool} execution is not available` });
+        }
         const helperConfig = resolveHelperModelConfig({
             helperModelsJson: workspace.project.helper_models_json,
             agent: helperTool,
         });
-        const rawMessage = await runLightweightPrompt({ tool: helperTool, ...helperConfig }, prompt, workspace.cwd);
+        const rawMessage = await runTrackedLightweightPrompt({
+            project: workspace.project,
+            execution: { tool: helperTool, ...helperConfig },
+            target: workspace.target_kind === 'bundle'
+                ? { kind: 'bundle-worktree', bundleId: workspace.target_bundle_id, branch: workspace.branch }
+                : { kind: 'project-root', bundleId: null, branch: workspace.branch },
+        }, prompt);
         const message = normalizeGeneratedCommitMessage(rawMessage);
         if (!message) {
             return res.status(500).json({ error: 'Unable to generate a commit message right now.' });
@@ -7869,6 +7903,9 @@ app.post('/projects/:id/pull-request-description', async (req, res) => {
         return res.status(409).json({ error: 'Pull request descriptions for bundle targets should use the bundle route.' });
     }
     const helperTool = config.tool ?? 'opencode';
+    if (!isAgentExecutable(helperTool)) {
+        return res.status(409).json({ error: `${helperTool} execution is not available` });
+    }
     const helperConfig = resolveHelperModelConfig({
         helperModelsJson: project.helper_models_json,
         agent: helperTool,
@@ -7884,15 +7921,15 @@ app.post('/projects/:id/pull-request-description', async (req, res) => {
             .filter(Boolean)
         : [];
     try {
-        const rawDescription = await runLightweightPrompt({
-            tool: helperTool,
-            model: helperConfig.model,
-            variant: helperConfig.variant,
+        const rawDescription = await runTrackedLightweightPrompt({
+            project,
+            execution: { tool: helperTool, model: helperConfig.model, variant: helperConfig.variant },
+            target: { kind: 'project-root', bundleId: null, branch: workspace.branch },
         }, buildPullRequestDescriptionPrompt({
             title,
             ticketTitles: [],
             commitSubjects,
-        }), workspace.cwd);
+        }));
         const description = normalizeGeneratedPullRequestDescription(rawDescription);
         if (!description) {
             return res.status(500).json({ error: 'Unable to generate a pull request description right now.' });
@@ -8386,8 +8423,11 @@ app.post('/tickets', (req, res) => {
         return res.status(400).json({ error: 'project_id must reference an existing project' });
     }
     const requestTool = resolveChatTool(req.body.tool ?? config.tool);
+    if (!requestTool) {
+        return res.status(400).json({ error: 'tool must be a supported agent' });
+    }
     const model = req.body.model != null ? normalizeAgentModelId(requestTool, req.body.model) || null : null;
-    const variant = requestTool === 'opencode' && typeof req.body.variant === 'string' && req.body.variant.trim()
+    const variant = agentSupportsVariants(requestTool) && typeof req.body.variant === 'string' && req.body.variant.trim()
         ? req.body.variant.trim()
         : null;
     const skills = resolveRequestedSkills(req.body.skills);
@@ -8504,7 +8544,9 @@ app.patch('/tickets/:id', async (req, res) => {
             resolvedModel = null;
         }
         else {
-            const normalizedModel = normalizeTicketModelId(req.body.model);
+            const normalizedModel = ticket.tool
+                ? normalizeAgentModelId(ticket.tool, req.body.model)
+                : normalizeTicketModelId(req.body.model);
             if (normalizedModel) {
                 resolvedModel = normalizedModel;
             }
@@ -9151,11 +9193,22 @@ app.post('/tickets/:id/git-commit-message', async (req, res) => {
     });
     try {
         const helperTool = resolveTicketTool(ticket, config.tool ?? 'opencode');
+        if (!isAgentExecutable(helperTool)) {
+            return res.status(409).json({ error: `${helperTool} execution is not available` });
+        }
         const helperConfig = resolveHelperModelConfig({
             helperModelsJson: workspace.project.helper_models_json,
             agent: helperTool,
         });
-        const rawMessage = await runLightweightPrompt({ tool: helperTool, ...helperConfig }, prompt, workspace.cwd);
+        const rawMessage = await runTrackedLightweightPrompt({
+            project: workspace.project,
+            execution: { tool: helperTool, ...helperConfig },
+            target: workspace.kind === 'project_root'
+                ? { kind: 'project-root', bundleId: null, branch: workspace.branch }
+                : ticket.worktree_bundle_id
+                    ? { kind: 'bundle-worktree', bundleId: ticket.worktree_bundle_id, branch: workspace.branch }
+                    : { kind: 'branch-worktree', bundleId: null, branch: workspace.branch },
+        }, prompt);
         const message = normalizeGeneratedCommitMessage(rawMessage);
         if (!message) {
             return res.status(500).json({ error: 'Unable to generate a commit message right now.' });
@@ -10195,6 +10248,10 @@ app.post('/tickets/:id/plan', (req, res) => {
             });
         }
     }
+    const planTool = resolveTicketTool(ticket, config.tool ?? 'opencode');
+    if (!isAgentExecutable(planTool)) {
+        return res.status(409).json({ error: `${planTool} execution is not available` });
+    }
     const scheduling = startPlan(ticket, io, {
         branch,
         targetBundleId,