@straiffi/archon 1.11.8 → 1.11.10

package/dist/server/lib/diffExplanationRoutes.js

@@ -0,0 +1,236 @@
+import { defaultDiffExplanationJobs, DiffExplanationJobError, isDiffExplanationToken, } from './diffExplanationJobs.js';
+const MAX_REQUEST_BYTES = 16_384;
+const MAX_TOKEN_CHARS = 200;
+const MAX_GOAL_CHARS = 4_000;
+const SIGNATURE_PATTERN = /^sha256:[0-9a-f]{64}$/;
+const getParameter = (value) => Array.isArray(value) ? value[0] : value;
+const requestBytes = (req) => {
+    try {
+        return Buffer.byteLength(JSON.stringify(req.body), 'utf8');
+    }
+    catch {
+        return Number.POSITIVE_INFINITY;
+    }
+};
+const validKeys = (value, keys) => (Object.keys(value).every(key => keys.includes(key)));
+const parseToken = (value, label) => {
+    if (typeof value !== 'string' || value.length > MAX_TOKEN_CHARS || !isDiffExplanationToken(value)) {
+        return { ok: false, error: `${label} must be a random URL-safe token.` };
+    }
+    return { ok: true, value };
+};
+const parseTarget = (value) => {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return { ok: false, error: 'target is required.' };
+    }
+    const target = value;
+    if (target.kind === 'repo_root' && validKeys(target, ['kind'])) {
+        return { ok: true, value: { kind: 'repo_root' } };
+    }
+    if (target.kind === 'bundle' && validKeys(target, ['kind', 'bundle_id']) && typeof target.bundle_id === 'string' && target.bundle_id.trim()) {
+        return { ok: true, value: { kind: 'bundle', bundle_id: target.bundle_id.trim() } };
+    }
+    if (target.kind === 'ticket' && validKeys(target, ['kind', 'ticket_id']) && typeof target.ticket_id === 'string' && target.ticket_id.trim()) {
+        return { ok: true, value: { kind: 'ticket', ticket_id: target.ticket_id.trim() } };
+    }
+    if (target.kind === 'chat_session' && validKeys(target, ['kind', 'chat_session_id']) && typeof target.chat_session_id === 'string' && target.chat_session_id.trim()) {
+        return { ok: true, value: { kind: 'chat_session', chat_session_id: target.chat_session_id.trim() } };
+    }
+    return { ok: false, error: 'target must identify one workspace target.' };
+};
+const parseScope = (value) => (value === 'uncommitted' || value === 'review'
+    ? { ok: true, value }
+    : { ok: false, error: 'scope must be uncommitted or review.' });
+const parseOverride = (value) => {
+    if (value === undefined || value === null) {
+        return { ok: true, value: null };
+    }
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return { ok: false, error: 'execution_override must identify a helper model.' };
+    }
+    const override = value;
+    if (!validKeys(override, ['model', 'variant'])
+        || typeof override.model !== 'string'
+        || !override.model.trim()
+        || (override.variant !== null && override.variant !== undefined && (typeof override.variant !== 'string' || !override.variant.trim()))) {
+        return { ok: false, error: 'execution_override must identify a valid helper tool, model, and variant.' };
+    }
+    return {
+        ok: true,
+        value: {
+            model: override.model.trim(),
+            variant: typeof override.variant === 'string' ? override.variant.trim() : null,
+        },
+    };
+};
+const parseStart = (req) => {
+    if (!req.body || typeof req.body !== 'object' || Array.isArray(req.body)) {
+        return { ok: false, error: 'A change explanation request body is required.' };
+    }
+    const body = req.body;
+    if (!validKeys(body, [
+        'owner_token',
+        'request_generation',
+        'target',
+        'scope',
+        'file_path',
+        'displayed_diff_signature',
+        'goal_context',
+        'execution_override',
+    ])) {
+        return { ok: false, error: 'The change explanation request contains unknown fields.' };
+    }
+    const owner = parseToken(body.owner_token, 'owner_token');
+    const generation = parseToken(body.request_generation, 'request_generation');
+    const target = parseTarget(body.target);
+    const scope = parseScope(body.scope);
+    const override = parseOverride(body.execution_override);
+    if (!owner.ok || !generation.ok || !target.ok || !scope.ok || !override.ok) {
+        const failed = [owner, generation, target, scope, override].find(result => !result.ok);
+        return { ok: false, error: failed && !failed.ok ? failed.error : 'Invalid change explanation request.' };
+    }
+    if (typeof body.displayed_diff_signature !== 'string' || !SIGNATURE_PATTERN.test(body.displayed_diff_signature)) {
+        return { ok: false, error: 'displayed_diff_signature must be a workspace diff signature.' };
+    }
+    if (body.file_path !== undefined && body.file_path !== null && (typeof body.file_path !== 'string' || !body.file_path.trim())) {
+        return { ok: false, error: 'file_path must be a non-empty repository-relative path.' };
+    }
+    if (body.goal_context !== undefined && body.goal_context !== null && (typeof body.goal_context !== 'string' || body.goal_context.length > MAX_GOAL_CHARS)) {
+        return { ok: false, error: `goal_context must be at most ${MAX_GOAL_CHARS} characters.` };
+    }
+    return {
+        ok: true,
+        value: {
+            ownerToken: owner.value,
+            requestGeneration: generation.value,
+            target: target.value,
+            scope: scope.value,
+            filePath: typeof body.file_path === 'string' ? body.file_path.trim() : null,
+            displayedDiffSignature: body.displayed_diff_signature,
+            goalContext: typeof body.goal_context === 'string' ? body.goal_context : null,
+            executionOverride: override.value,
+        },
+    };
+};
+const ownerFromHeader = (req) => parseToken(req.headers['x-diff-explanation-owner'], 'X-Diff-Explanation-Owner');
+const sendJobError = (res, error) => {
+    if (error instanceof DiffExplanationJobError) {
+        return res.status(error.status).json({ error: error.message, reason: error.code });
+    }
+    return res.status(500).json({ error: 'The change explanation request failed.', reason: 'explanation_request_failed' });
+};
+export const registerDiffExplanationRoutes = (app, options = {}) => {
+    const jobs = options.jobs ?? defaultDiffExplanationJobs;
+    app.post('/projects/:id/diff-explanations', async (req, res) => {
+        if (requestBytes(req) > MAX_REQUEST_BYTES) {
+            return res.status(413).json({ error: 'The change explanation request is too large.', reason: 'payload_too_large' });
+        }
+        const parsed = parseStart(req);
+        if (!parsed.ok) {
+            return res.status(400).json({ error: parsed.error, reason: 'invalid_explanation_request' });
+        }
+        try {
+            const result = await jobs.start({
+                projectId: getParameter(req.params.id),
+                ...parsed.value,
+            });
+            res.setHeader('Cache-Control', 'no-store');
+            return res.status(result.reused ? 200 : 202).json(result);
+        }
+        catch (error) {
+            return sendJobError(res, error);
+        }
+    });
+    app.get('/projects/:id/diff-explanations/:jobId', (req, res) => {
+        const owner = ownerFromHeader(req);
+        if (!owner.ok) {
+            return res.status(400).json({ error: owner.error, reason: 'owner_required' });
+        }
+        const job = jobs.get(getParameter(req.params.id), getParameter(req.params.jobId), owner.value);
+        if (!job) {
+            return res.status(404).json({ error: 'Not found', reason: 'explanation_job_not_found' });
+        }
+        res.setHeader('Cache-Control', 'no-store');
+        return res.json({ job });
+    });
+    app.post('/projects/:id/diff-explanations/:jobId/cancel', (req, res) => {
+        const owner = ownerFromHeader(req);
+        if (!owner.ok) {
+            return res.status(400).json({ error: owner.error, reason: 'owner_required' });
+        }
+        const job = jobs.cancel(getParameter(req.params.id), getParameter(req.params.jobId), owner.value);
+        if (!job) {
+            return res.status(404).json({ error: 'Not found', reason: 'explanation_job_not_found' });
+        }
+        res.setHeader('Cache-Control', 'no-store');
+        return res.json({ job });
+    });
+    app.delete('/projects/:id/diff-explanations/:jobId', (req, res) => {
+        const owner = ownerFromHeader(req);
+        if (!owner.ok) {
+            return res.status(400).json({ error: owner.error, reason: 'owner_required' });
+        }
+        if (!jobs.release(getParameter(req.params.id), getParameter(req.params.jobId), owner.value)) {
+            return res.status(404).json({ error: 'Not found', reason: 'explanation_job_not_found' });
+        }
+        return res.status(204).send();
+    });
+};
+export const registerDiffExplanationSocketReplay = ({ ownerToken, projectId, jobId, replay, jobs = defaultDiffExplanationJobs, }) => jobs.subscribe({
+    ownerToken,
+    projectId,
+    jobId,
+    replay: true,
+    onEvent: event => replay(event.event, event.job),
+});
+export const registerDiffExplanationSocketHandlers = (socket, options = {}) => {
+    const jobs = options.jobs ?? defaultDiffExplanationJobs;
+    const subscriptions = new Map();
+    socket.on('diff-explanation:subscribe', (payload, acknowledge) => {
+        if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
+            acknowledge?.({ ok: false, reason: 'invalid_subscription' });
+            return;
+        }
+        const input = payload;
+        const owner = parseToken(input.owner_token, 'owner_token');
+        if (!owner.ok || typeof input.project_id !== 'string' || typeof input.job_id !== 'string') {
+            acknowledge?.({ ok: false, reason: 'invalid_subscription' });
+            return;
+        }
+        const key = `${input.project_id}\0${input.job_id}`;
+        subscriptions.get(key)?.();
+        const unsubscribe = registerDiffExplanationSocketReplay({
+            ownerToken: owner.value,
+            projectId: input.project_id,
+            jobId: input.job_id,
+            jobs,
+            replay: (event, job) => socket.emit(event, job),
+        });
+        if (!unsubscribe) {
+            subscriptions.delete(key);
+            acknowledge?.({ ok: false, reason: 'explanation_job_not_found' });
+            return;
+        }
+        subscriptions.set(key, unsubscribe);
+        acknowledge?.({ ok: true });
+    });
+    socket.on('diff-explanation:unsubscribe', payload => {
+        if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
+            return;
+        }
+        const input = payload;
+        if (typeof input.project_id !== 'string' || typeof input.job_id !== 'string') {
+            return;
+        }
+        const key = `${input.project_id}\0${input.job_id}`;
+        subscriptions.get(key)?.();
+        subscriptions.delete(key);
+    });
+    socket.on('disconnect', () => {
+        for (const unsubscribe of subscriptions.values()) {
+            unsubscribe();
+        }
+        subscriptions.clear();
+    });
+};
+//# sourceMappingURL=diffExplanationRoutes.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"diffExplanationRoutes.js","sourceRoot":"","sources":["../../../server/lib/diffExplanationRoutes.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/dockerSandboxCleanup.js

@@ -0,0 +1,68 @@
+import { DockerSandboxCollisionFailure, DockerSandboxStopVerificationFailure, SbxContractFailure, parseDockerSandboxInspection, parseJsonObject, requireSuccessfulCommand, } from './dockerSandboxExecutionEnvironment.js';
+import { findDockerSandboxReleaseProfile } from './dockerSandboxReleaseProfiles.js';
+// These profiles select response parsers only, never execution eligibility.
+// Dispatch by shape rather than trusting the installed CLI's version output.
+export const createDockerSandboxCleanup = (runner, dependencies) => {
+    const inspect = async (name, options = {}) => {
+        const result = await runner.run(['inspect', name, '--json'], options);
+        if (dependencies.isMissing(result)) {
+            return null;
+        }
+        requireSuccessfulCommand('inspect', result);
+        const record = parseJsonObject('inspect', result.stdout);
+        const profile = findDockerSandboxReleaseProfile(Object.hasOwn(record, 'runtime_mounts') ? '0.43.0' : '0.38.0');
+        const observed = parseDockerSandboxInspection(result.stdout, profile);
+        if (observed.name !== name) {
+            throw new DockerSandboxCollisionFailure(name, `Sandbox ${name} returned a different external name`);
+        }
+        return observed;
+    };
+    const inspectExpected = async (expected, options) => {
+        const observed = await inspect(expected.name, options);
+        if (observed && (observed.agent !== expected.agent
+            || observed.workspacePath !== expected.workspacePath
+            || observed.template !== expected.template)) {
+            throw new DockerSandboxCollisionFailure(expected.name, `Sandbox ${expected.name} does not match Archon's persisted external identity`);
+        }
+        return observed;
+    };
+    const mutate = async (command, expected, options) => {
+        try {
+            const args = command === 'stop' ? ['stop', expected.name] : ['rm', '--force', expected.name];
+            requireSuccessfulCommand(command, await runner.run(args, options));
+        }
+        catch (error) {
+            try {
+                if (!await inspectExpected(expected, options)) {
+                    return null;
+                }
+            }
+            catch {
+                // Preserve the command failure when absence cannot be verified.
+            }
+            throw error;
+        }
+        return inspectExpected(expected, options);
+    };
+    return {
+        inspect,
+        stop: async (expected, options = {}) => {
+            let observed = await inspectExpected(expected, options);
+            if (observed?.state === 'running') {
+                observed = await mutate('stop', expected, options);
+            }
+            if (observed && observed.state !== 'stopped') {
+                throw new DockerSandboxStopVerificationFailure(`Sandbox ${expected.name} did not reach the stopped state`);
+            }
+        },
+        remove: async (expected, options = {}) => {
+            if (!await inspectExpected(expected, options)) {
+                return;
+            }
+            if (await mutate('rm', expected, options)) {
+                throw new SbxContractFailure('rm', `Sandbox ${expected.name} still exists after removal`);
+            }
+        },
+    };
+};
+//# sourceMappingURL=dockerSandboxCleanup.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"dockerSandboxCleanup.js","sourceRoot":"","sources":["../../../server/lib/dockerSandboxCleanup.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/dockerSandboxEnvironmentOperations.js

@@ -3,6 +3,7 @@ import { resolveDockerSandboxReleaseForPersistedEnvironment } from './dockerSand
 import { getExecutionProfileRevision } from './executionProfileStore.js';
 import { createDockerSandboxRuntimeController, } from './dockerSandboxRuntimeController.js';
 import { appendExecutionEnvironmentEvent, listExecutionEnvironmentEvents, } from './executionEnvironments.js';
+import { resolveExpectedDockerSandbox } from './executionEnvironmentTargetCleanup.js';
 const runner = createSbxCommandRunner();
 export const dockerSandboxAdapter = createDockerSandboxAdapter(runner);
 export const dockerSandboxRuntimeController = createDockerSandboxRuntimeController({ runner });
@@ -46,7 +47,7 @@ export const reconnectAndInspectDockerSandbox = async (environment, dependencies
     return reconnected;
 };
 export const resolveArchonOwnedNetworkRuleIds = (environment) => {
-    const sandboxName = resolveExpectedDockerSandboxIdentity(environment).name;
+    const sandboxName = resolveExpectedDockerSandbox(environment).name;
     const events = listExecutionEnvironmentEvents(environment.project_id, environment.id);
     const ownedRuleIds = new Set();
     for (const event of events) {
@@ -69,7 +70,7 @@ export const resolveArchonOwnedNetworkRuleIds = (environment) => {
     return [...ownedRuleIds];
 };
 export const removeScopedRulesBestEffort = async (environment, dependencies = defaultDockerSandboxEnvironmentDependencies) => {
-    const sandboxName = resolveExpectedDockerSandboxIdentity(environment).name;
+    const sandboxName = resolveExpectedDockerSandbox(environment).name;
     let ownedRuleIds;
     try {
         ownedRuleIds = resolveArchonOwnedNetworkRuleIds(environment);
@@ -144,7 +145,7 @@ const recordNetworkRuleCleanupFailure = (environment, outcome) => {
     }
 };
 export const stopAndVerifyDockerSandbox = async (environment, dependencies = defaultDockerSandboxEnvironmentDependencies) => {
-    const expected = resolveExpectedDockerSandboxIdentity(environment);
+    const expected = resolveExpectedDockerSandbox(environment);
     const observed = await dependencies.adapter.inspect(expected.name);
     if (!observed) {
         return 'absent';

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

@@ -1 +1 @@
-{"version":3,"file":"dockerSandboxEnvironmentOperations.js","sourceRoot":"","sources":["../../../server/lib/dockerSandboxEnvironmentOperations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dockerSandboxEnvironmentOperations.js","sourceRoot":"","sources":["../../../server/lib/dockerSandboxEnvironmentOperations.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/dockerSandboxExecutionEnvironment.js

@@ -4,11 +4,12 @@ import { constants as fsConstants } from 'node:fs';
 import { access } from 'node:fs/promises';
 import { Transform } from 'node:stream';
 import { promisify } from 'node:util';
+import { createDockerSandboxCleanup } from './dockerSandboxCleanup.js';
 import { networkDestinationTarget } from './executionEnvironmentLifecycle.js';
 import { requireExecutionCapabilities } from './executionEnvironmentLifecycle.js';
 import { assertExactSandboxNetworkAllowlist, applyScopedNetworkRules as applyScopedSandboxNetworkRules, checkDestinationAccess as checkSandboxDestinationAccess, inspectGlobalNetworkPosture as inspectSandboxGlobalNetworkPosture, inspectSandboxNetworkRules as inspectScopedSandboxNetworkRules, removeScopedNetworkRules as removeScopedSandboxNetworkRules, } from './dockerSandboxNetworkPolicy.js';
 import { createDockerSandboxLauncherEnvironment } from './workspaceProcessEnvironment.js';
-import { RECOMMENDED_DOCKER_SANDBOX_RELEASE, inspectDockerSandboxRelease, isDockerSandboxReleaseHostQualified, resolveDockerSandboxReleaseProfile, } from './dockerSandboxReleaseProfiles.js';
+import { RECOMMENDED_DOCKER_SANDBOX_RELEASE, DOCKER_SANDBOX_RELEASE_PROFILES, inspectDockerSandboxRelease, isDockerSandboxReleaseHostQualified, resolveDockerSandboxReleaseProfile, } from './dockerSandboxReleaseProfiles.js';
 export const DOCKER_SANDBOX_PROVIDER = 'docker_sandbox';
 export const QUALIFIED_SBX_VERSION = RECOMMENDED_DOCKER_SANDBOX_RELEASE.version;
 export const QUALIFIED_SBX_BUILD = RECOMMENDED_DOCKER_SANDBOX_RELEASE.acceptedBuilds[0];
@@ -837,18 +838,44 @@ const requireReleaseCommandContract = (profile, contract) => {
     }
 };
 const isQualifiedMissingSandboxResult = (result, profile) => {
-    if (profile.parserContracts.missingSandbox !== 'v0.38.0'
+    if (profile.parserContracts.missingSandbox !== 'v0.38.0-cold-daemon'
         && profile.parserContracts.missingSandbox !== 'v0.43.0') {
         return false;
     }
-    return result.args[0] === 'inspect'
+    if (!(result.args[0] === 'inspect'
         && typeof result.args[1] === 'string'
         && result.args[1].length > 0
         && result.exitCode === 1
-        && result.stdout === ''
-        && result.stderr === `ERROR: sandbox '${result.args[1]}' not found\n`;
+        && result.stdout === '')) {
+        return false;
+    }
+    const missingMessage = `ERROR: sandbox '${result.args[1]}' not found\n`;
+    if (result.stderr === missingMessage) {
+        return true;
+    }
+    if (profile.parserContracts.missingSandbox !== 'v0.38.0-cold-daemon') {
+        return false;
+    }
+    const lines = result.stderr.split('\n');
+    if (lines.length !== 5
+        || lines[0] !== 'Starting sandboxd daemon...'
+        || lines[3] !== missingMessage.slice(0, -1)
+        || lines[4] !== '') {
+        return false;
+    }
+    const daemonStarted = /^Daemon started \(PID: [1-9]\d*, socket: ([^\r\n]+\/sandboxd\.sock)\)$/.exec(lines[1] ?? '');
+    const daemonLog = /^Logs: ([^\r\n]+\/daemon\.log)$/.exec(lines[2] ?? '');
+    if (!daemonStarted || !daemonLog || daemonStarted[1].length > 4096 || daemonLog[1].length > 4096) {
+        return false;
+    }
+    const socketDirectory = daemonStarted[1].slice(0, -'/sandboxd.sock'.length);
+    const logDirectory = daemonLog[1].slice(0, -'/daemon.log'.length);
+    return socketDirectory === logDirectory;
 };
 export const createDockerSandboxAdapter = (runner, qualificationOptions = {}) => {
+    const cleanup = createDockerSandboxCleanup(runner, {
+        isMissing: result => DOCKER_SANDBOX_RELEASE_PROFILES.some(profile => isQualifiedMissingSandboxResult(result, profile)),
+    });
     let qualification = null;
     const waitForQualification = (operation, signal) => {
         if (!signal) {
@@ -949,7 +976,7 @@ export const createDockerSandboxAdapter = (runner, qualificationOptions = {}) =>
             requireSuccessfulCommand('create', result);
             return requireExpected(expected, options);
         },
-        inspect,
+        inspect: cleanup.inspect,
         reconnect,
         exec: async (expected, command, args, options = {}) => {
             const profile = await ensureQualified(options);
@@ -973,59 +1000,8 @@ export const createDockerSandboxAdapter = (runner, qualificationOptions = {}) =>
                 ? filterDockerSandboxExecStartupNotice(child, expected.name)
                 : child;
         },
-        stop: async (expected, options = {}) => {
-            const profile = await ensureQualified(options);
-            requireReleaseCommandContract(profile, 'stop');
-            let observed = await inspectExpected(expected, options);
-            if (!observed) {
-                return;
-            }
-            if (observed.state === 'running') {
-                try {
-                    requireSuccessfulCommand('stop', await runner.run(['stop', expected.name], options));
-                }
-                catch (error) {
-                    try {
-                        if (!await inspectExpected(expected, options)) {
-                            return;
-                        }
-                    }
-                    catch {
-                        // Preserve the original stop failure when the follow-up inspection cannot be completed.
-                    }
-                    throw error;
-                }
-                observed = await inspectExpected(expected, options);
-                if (!observed) {
-                    return;
-                }
-            }
-            if (observed.state !== 'stopped') {
-                throw new DockerSandboxStopVerificationFailure(`Sandbox ${expected.name} did not reach the stopped state`);
-            }
-        },
-        remove: async (expected, options = {}) => {
-            const profile = await ensureQualified(options);
-            requireReleaseCommandContract(profile, 'remove');
-            const observed = await inspectExpected(expected, options);
-            if (!observed) {
-                return;
-            }
-            try {
-                requireSuccessfulCommand('rm', await runner.run(['rm', '--force', expected.name], options));
-            }
-            catch (error) {
-                try {
-                    if (!await inspectExpected(expected, options)) {
-                        return;
-                    }
-                }
-                catch {
-                    // Preserve the original removal failure when the follow-up inspection cannot be completed.
-                }
-                throw error;
-            }
-        },
+        stop: cleanup.stop,
+        remove: cleanup.remove,
         applyScopedNetworkRules: async (sandboxName, resources, options = {}) => {
             const profile = await ensureQualified(options);
             requireReleaseCommandContract(profile, 'policy-allow');