@straiffi/archon 1.10.12 → 1.11.0

package/dist/server/lib/lightweightPrompt.js

@@ -1,27 +1,267 @@
+import { requireExecutableAgent } from './agentCatalog.js';
+import { runOneShotAgentForTool } from './oneShotAgent.js';
+import { createExecutionRun, transitionExecutionRun } from './executionRuns.js';
+import { createExecutionProfileSelectionMetadata } from './executionRunAuthority.js';
+import { createExecutionTargetKey, resolveExecutionTarget } from './executionTargets.js';
+import { resolveWorkloadExecutionEnvironment, WorkloadExecutionEnvironmentFailure } from './workloadExecutionEnvironment.js';
 import { createWorkspaceProcessEnvironment } from './workspaceProcessEnvironment.js';
-import { runOneShotAgent } from './agentProvider.js';
-import { claudeAgentProvider } from './claudeAgentProvider.js';
-import { hostExecutionEnvironment } from './hostExecutionEnvironment.js';
-import { opencodeAgentProvider } from './opencodeAgentProvider.js';
-export const runLightweightPrompt = async ({ tool, model, variant }, prompt, cwd) => {
+const LIGHTWEIGHT_PROMPT_LEASE_WAIT_TIMEOUT_MS = 30 * 60 * 1000;
+const LIGHTWEIGHT_PROMPT_LEASE_RETRY_MS = 100;
+const lightweightPromptQueues = new Map();
+const runningLightweightPromptQueues = new Set();
+let lightweightPromptSequence = 0;
+const waitForLeaseRetry = () => new Promise(resolve => {
+    setTimeout(resolve, LIGHTWEIGHT_PROMPT_LEASE_RETRY_MS);
+});
+const getPromptPriority = (initiatedBy) => {
+    if (initiatedBy === 'user') {
+        return 0;
+    }
+    if (initiatedBy === 'automation') {
+        return 1;
+    }
+    return 2;
+};
+const drainLightweightPromptQueue = async (key) => {
+    if (runningLightweightPromptQueues.has(key)) {
+        return;
+    }
+    runningLightweightPromptQueues.add(key);
     try {
-        return await runOneShotAgent(tool === 'claude' ? claudeAgentProvider : opencodeAgentProvider, hostExecutionEnvironment, {
-            cwd,
-            env: createWorkspaceProcessEnvironment(cwd),
-            prompt,
-            model,
-            variant,
-            emptyOutputMessage: 'The helper model did not return a usable result.',
-            retryOpenCodeDatabaseLocks: tool === 'opencode',
+        const queue = lightweightPromptQueues.get(key);
+        while (queue?.length) {
+            queue.sort((left, right) => left.priority - right.priority || left.sequence - right.sequence);
+            const pending = queue.shift();
+            await pending?.run();
+        }
+    }
+    finally {
+        lightweightPromptQueues.delete(key);
+        runningLightweightPromptQueues.delete(key);
+    }
+};
+const enqueueLightweightPrompt = (key, priority, task) => new Promise((resolve, reject) => {
+    const queue = lightweightPromptQueues.get(key) ?? [];
+    queue.push({
+        priority,
+        sequence: lightweightPromptSequence++,
+        run: async () => {
+            try {
+                resolve(await task());
+            }
+            catch (error) {
+                reject(error);
+            }
+        },
+    });
+    lightweightPromptQueues.set(key, queue);
+    void drainLightweightPromptQueue(key);
+});
+const runExecutionContextCommand = (context, command, args) => new Promise((resolve, reject) => {
+    let settled = false;
+    const handle = context.provider.execute({
+        phase: 'setup',
+        target: context.target,
+        command,
+        args,
+        cwd: context.target?.workspacePath ?? '/',
+        stdio: ['ignore', 'ignore', 'pipe'],
+        launcherEnvironment: context.launcherEnvironment,
+        runtimeEnvironment: context.runtimeEnvironment,
+        detached: false,
+        placementExecutionRunId: context.placementExecutionRunId,
+    });
+    const stderr = [];
+    handle.child.stderr?.on('data', chunk => stderr.push(Buffer.from(chunk)));
+    void handle.placementFailure.then(failure => {
+        if (failure && !settled) {
+            settled = true;
+            reject(failure);
+        }
+    });
+    handle.child.on('error', error => {
+        if (!settled) {
+            settled = true;
+            reject(error);
+        }
+    });
+    handle.child.on('close', code => {
+        if (settled) {
+            return;
+        }
+        settled = true;
+        if (code === 0) {
+            resolve();
+            return;
+        }
+        reject(new Error(Buffer.concat(stderr).toString().trim() || `${command} exited with code ${code}`));
+    });
+});
+export const resolveLightweightPromptExecutionContext = async ({ project, executionRunId, execution, target: descriptor, }) => {
+    const target = await resolveExecutionTarget({ project, descriptor });
+    const lease = { release: null };
+    try {
+        const environment = await resolveWorkloadExecutionEnvironment({
+            project,
+            executionRunId,
+            agent: execution.tool,
+            model: execution.model ?? null,
+            target,
+            workload: 'plan',
+            onLeaseAcquired: release => {
+                lease.release = release;
+            },
         });
+        lease.release = null;
+        return {
+            context: {
+                provider: environment.provider,
+                target,
+                launcherEnvironment: environment.launcherEnvironment,
+                runtimeEnvironment: environment.runtimeEnvironment,
+                placementExecutionRunId: executionRunId,
+            },
+            release: environment.release,
+        };
     }
     catch (error) {
-        if (!model) {
-            throw error;
+        await lease.release?.();
+        throw error;
+    }
+};
+const resolveQueuedLightweightPromptExecutionContext = async (input) => {
+    const deadline = Date.now() + LIGHTWEIGHT_PROMPT_LEASE_WAIT_TIMEOUT_MS;
+    while (true) {
+        try {
+            return await resolveLightweightPromptExecutionContext(input);
+        }
+        catch (error) {
+            if (!(error instanceof WorkloadExecutionEnvironmentFailure) || error.code !== 'environment_leased') {
+                throw error;
+            }
+            if (Date.now() >= deadline) {
+                throw new Error('Timed out waiting for the Docker Sandbox to become available for the helper prompt.', { cause: error });
+            }
+            await waitForLeaseRetry();
         }
-        const agent = tool === 'claude' ? 'Claude' : 'OpenCode';
-        const selection = variant ? `${model} (${variant})` : model;
-        throw new Error(`Configured Helper model "${selection}" for ${agent} could not run. Verify that the model is available or select another Helper model. ${error instanceof Error ? error.message : String(error)}`, { cause: error });
     }
 };
+export const runLightweightPrompt = async ({ tool, model, variant }, prompt, context, workingDirectory = context.target?.workspacePath) => {
+    requireExecutableAgent(tool);
+    if (!workingDirectory) {
+        throw new Error('A lightweight prompt requires a working directory');
+    }
+    return runOneShotAgentForTool(tool, context.provider, {
+        cwd: workingDirectory,
+        env: createWorkspaceProcessEnvironment(workingDirectory),
+        prompt,
+        model,
+        variant,
+        planAgent: true,
+        emptyOutputMessage: 'The helper model did not return a usable result.',
+        retryOpenCodeDatabaseLocks: tool === 'opencode',
+    }, context);
+};
+export const runTrackedLightweightPrompt = async ({ project, execution, target, initiatedBy = 'user', workingDirectory, parentRunId = null, sourceReference, }, prompt) => {
+    const { tool, model, variant } = execution;
+    requireExecutableAgent(tool);
+    const run = createExecutionRun({
+        projectId: project.id,
+        kind: 'planning_agent',
+        domainStatus: 'queued',
+        sourceReference: sourceReference === undefined
+            ? { kind: 'project', id: project.id, label: project.name }
+            : sourceReference,
+        parentRunId,
+        initiatedBy,
+        metadata: {
+            helper_prompt: true,
+            helper_tool: tool,
+            helper_model: model ?? null,
+            helper_variant: variant ?? null,
+            target_kind: target.kind,
+            target_bundle_id: target.bundleId,
+            ...createExecutionProfileSelectionMetadata(project.id),
+        },
+        eventType: 'helper_prompt_created',
+    });
+    const queueKey = createExecutionTargetKey(project.id, target);
+    return enqueueLightweightPrompt(queueKey, getPromptPriority(initiatedBy), async () => {
+        let release = null;
+        let resolvedContext = null;
+        let removeProviderWorkingDirectory = false;
+        try {
+            const resolved = await resolveQueuedLightweightPromptExecutionContext({
+                project,
+                executionRunId: run.id,
+                execution,
+                target,
+            });
+            transitionExecutionRun({
+                projectId: project.id,
+                runId: run.id,
+                status: 'running',
+                domainStatus: 'running',
+                eventType: 'helper_prompt_started',
+            });
+            release = resolved.release;
+            resolvedContext = resolved.context;
+            if (workingDirectory && resolved.context.provider.kind === 'docker_sandbox') {
+                if (!/^\/tmp\/archon-context-scan-[^/]+$/.test(workingDirectory)) {
+                    throw new Error('Docker Sandbox isolated helper directories must use the project context scan namespace');
+                }
+                await runExecutionContextCommand(resolved.context, 'mkdir', ['-p', workingDirectory]);
+                removeProviderWorkingDirectory = true;
+                resolvedContext = { ...resolved.context, isolatedWorkingDirectory: workingDirectory };
+            }
+            const output = await runLightweightPrompt(execution, prompt, resolvedContext, workingDirectory);
+            if (removeProviderWorkingDirectory) {
+                await runExecutionContextCommand(resolved.context, 'rm', ['-rf', workingDirectory]);
+                removeProviderWorkingDirectory = false;
+            }
+            await release();
+            release = null;
+            transitionExecutionRun({
+                projectId: project.id,
+                runId: run.id,
+                status: 'completed',
+                domainStatus: 'completed',
+                eventType: 'helper_prompt_completed',
+            });
+            return output;
+        }
+        catch (error) {
+            if (removeProviderWorkingDirectory && resolvedContext) {
+                try {
+                    await runExecutionContextCommand(resolvedContext, 'rm', ['-rf', workingDirectory]);
+                }
+                catch {
+                    // The original failure remains authoritative; provider release below still runs.
+                }
+            }
+            if (release) {
+                try {
+                    await release();
+                }
+                catch (releaseError) {
+                    error = new Error('Helper execution environment could not be released', { cause: releaseError });
+                }
+            }
+            transitionExecutionRun({
+                projectId: project.id,
+                runId: run.id,
+                status: 'failed',
+                domainStatus: 'failed',
+                failure: { code: 'helper_prompt_failed', message: error instanceof Error ? error.message : String(error) },
+                eventType: 'helper_prompt_failed',
+            });
+            if (!model) {
+                throw error;
+            }
+            const agent = tool === 'claude' ? 'Claude' : tool === 'codex' ? 'Codex' : 'OpenCode';
+            const selection = variant ? `${model} (${variant})` : model;
+            throw new Error(`Configured Helper model "${selection}" for ${agent} could not run. Verify that the model is available or select another Helper model. ${error instanceof Error ? error.message : String(error)}`, { cause: error });
+        }
+    });
+};
 //# sourceMappingURL=lightweightPrompt.js.map

package/dist/server/lib/lightweightPrompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"lightweightPrompt.js","sourceRoot":"","sources":["../../../server/lib/lightweightPrompt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iCAAiC,EAAE,MAAM,kCAAkC,CAAA;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAC9D,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAQlE,MAAM,CAAC,MAAM,oBAAoB,GAAG,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAa,EAAE,MAAc,EAAE,GAAW,EAAmB,EAAE;IAC9H,IAAI,CAAC;QACH,OAAO,MAAM,eAAe,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,EAAE,wBAAwB,EAAE;YACxH,GAAG;YACH,GAAG,EAAE,iCAAiC,CAAC,GAAG,CAAC;YAC3C,MAAM;YACN,KAAK;YACL,OAAO;YACP,kBAAkB,EAAE,kDAAkD;YACtE,0BAA0B,EAAE,IAAI,KAAK,UAAU;SAC9C,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,KAAK,CAAA;QACb,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAA;QACvD,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,CAAA;QAC3D,MAAM,IAAI,KAAK,CAAC,4BAA4B,SAAS,SAAS,KAAK,sFAAsF,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;IACtO,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"lightweightPrompt.js","sourceRoot":"","sources":["../../../server/lib/lightweightPrompt.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/mobileAccess.js

@@ -18,8 +18,8 @@ import { listAgentRunsForParent } from './agentRuns.js';
 import { ApprovalRequestConflictError, ApprovalRequestCursorError, decideApprovalRequest, getApprovalRequest, listApprovalRequestEvents, listApprovalRequests } from './approvalRequests.js';
 import { finalizeProductionCheckApproval, resumeProductionCheckApproval } from './checkRunner.js';
 import { finalizeGitPushApproval, resumeGitPushApproval } from './gitPushApprovals.js';
-import { discoverAgentModels, getSupportedAgentCatalog, isSupportedAgent } from './agentCatalog.js';
-import config from './config.js';
+import { discoverAgentModelCatalog, getSupportedAgentCatalog, isSupportedAgent } from './agentCatalog.js';
+import { getActiveTool as getPersistedActiveTool, setActiveTool as setPersistedActiveTool } from './activeTool.js';
 const DEFAULT_MOBILE_PORT = 43111;
 const MOBILE_PORT_FALLBACK_COUNT = 20;
 const PAIRING_TTL_MS = 2 * 60 * 1000;
@@ -226,20 +226,23 @@ const listMobileChatSessions = async (projectId) => {
 };
 const listMobileModels = async (tool) => {
     if (!isSupportedAgent(tool)) {
-        return [];
+        return { status: 'unavailable', models: [] };
     }
-    return await discoverAgentModels(tool);
+    return await discoverAgentModelCatalog(tool);
 };
 const listMobileSkills = async (tool, projectId) => {
-    if (tool !== 'opencode') {
-        return [];
+    if (tool !== 'opencode' && tool !== 'codex') {
+        return { status: 'unavailable', skills: [] };
     }
-    const [{ getProjectById }, { getDiscoveredSkills }] = await Promise.all([
+    const [{ getProjectById }, { getSkillDiscoveryResult }] = await Promise.all([
         import('./projects.js'),
         import('./skills.js'),
     ]);
     const project = projectId ? getProjectById(projectId) : null;
-    return await getDiscoveredSkills(tool, { projectPath: project?.repo_path ?? null });
+    return await getSkillDiscoveryResult(tool, {
+        projectId: project?.id ?? null,
+        projectPath: project?.repo_path ?? null,
+    });
 };
 const listMobileTickets = async (projectId) => {
     const [{ getProjectById }, { listTickets }] = await Promise.all([
@@ -342,11 +345,15 @@ export const createMobileAccessController = (options = {}) => {
     const getProjectTicket = options.getTicket ?? getMobileTicket;
     let getProjectBundleDetails = options.getBundleDetails ?? (() => null);
     const getMobileTargetOptions = options.getProjectTargetOptions ?? getProjectTargetOptions;
-    const getActiveTool = options.getTool ?? (() => config.tool ?? 'opencode');
-    const setActiveTool = options.setTool ?? (tool => {
-        config.tool = tool;
+    const getActiveTool = options.getTool ?? getPersistedActiveTool;
+    const setActiveTool = options.setTool ?? setPersistedActiveTool;
+    const listSupportedAgents = options.listAgents ?? (async (projectId) => {
+        const projects = await listMobileProjects();
+        const project = projectId ? projects.find(candidate => candidate.id === projectId) : null;
+        return await getSupportedAgentCatalog({
+            probeHostAvailability: project?.build_execution_provider === 'host',
+        });
     });
-    const listSupportedAgents = options.listAgents ?? getSupportedAgentCatalog;
     const listAgentModels = options.listModels ?? listMobileModels;
     const listAgentSkills = options.listSkills ?? listMobileSkills;
     const createMobileChatSession = options.createChatSession ?? ((projectId, payload, broadcaster) => createProjectChatSession({ projectId, payload, broadcaster }));
@@ -909,7 +916,8 @@ export const createMobileAccessController = (options = {}) => {
                 return;
             }
             try {
-                res.json(await listSupportedAgents());
+                const projectId = typeof req.query.project_id === 'string' ? req.query.project_id : null;
+                res.json(await listSupportedAgents(projectId));
             }
             catch {
                 res.status(500).json({ error: 'Unable to list agents.' });