@straiffi/archon 1.8.6 → 1.8.7

package/dist/server/lib/workspaceIdentity.js

@@ -0,0 +1,433 @@
+import { spawn } from 'child_process';
+import { createHash } from 'crypto';
+import { createReadStream } from 'fs';
+import { lstat, readlink } from 'fs/promises';
+const DEFAULT_MAX_FILES = 20_000;
+const DEFAULT_MAX_BYTES = 512 * 1024 * 1024;
+const DEFAULT_MAX_PROCESS_OUTPUT_BYTES = 128 * 1024 * 1024;
+const DEFAULT_MAX_ATTEMPTS = 3;
+export const DEFAULT_WORKSPACE_IDENTITY_TIMEOUT_MS = 60_000;
+export class WorkspaceIdentityError extends Error {
+    reason;
+    constructor(reason, message) {
+        super(message);
+        this.reason = reason;
+    }
+}
+export const updateIdentityComponent = (hash, name, value) => {
+    const nameBuffer = Buffer.from(name, 'utf8');
+    const lengths = Buffer.alloc(16);
+    lengths.writeBigUInt64BE(BigInt(nameBuffer.length), 0);
+    lengths.writeBigUInt64BE(BigInt(value.byteLength), 8);
+    hash.update(lengths.subarray(0, 8)).update(nameBuffer).update(lengths.subarray(8)).update(value);
+};
+export const splitNull = (value) => {
+    const parts = [];
+    let start = 0;
+    for (let index = 0; index < value.length; index += 1) {
+        if (value[index] === 0) {
+            parts.push(value.subarray(start, index));
+            start = index + 1;
+        }
+    }
+    if (start < value.length) {
+        parts.push(value.subarray(start));
+    }
+    return parts;
+};
+const validatePositiveInteger = (name, value, maximum) => {
+    if (!Number.isSafeInteger(value) || value < 1 || value > maximum) {
+        throw new Error(`${name} must be between 1 and ${maximum}`);
+    }
+};
+const resolveLimits = (options) => {
+    const limits = {
+        signal: options.signal,
+        maxFiles: options.maxFiles ?? DEFAULT_MAX_FILES,
+        maxBytes: options.maxBytes ?? DEFAULT_MAX_BYTES,
+        maxProcessOutputBytes: options.maxProcessOutputBytes ?? DEFAULT_MAX_PROCESS_OUTPUT_BYTES,
+        maxAttempts: options.maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
+        timeoutMs: options.timeoutMs ?? DEFAULT_WORKSPACE_IDENTITY_TIMEOUT_MS,
+    };
+    validatePositiveInteger('Workspace identity maxFiles', limits.maxFiles, 1_000_000);
+    validatePositiveInteger('Workspace identity maxBytes', limits.maxBytes, Number.MAX_SAFE_INTEGER);
+    validatePositiveInteger('Workspace identity maxProcessOutputBytes', limits.maxProcessOutputBytes, Number.MAX_SAFE_INTEGER);
+    validatePositiveInteger('Workspace identity maxAttempts', limits.maxAttempts, 10);
+    validatePositiveInteger('Workspace identity timeoutMs', limits.timeoutMs, 3_600_000);
+    return limits;
+};
+const assertCaptureActive = (context) => {
+    if (context.limits.signal?.aborted) {
+        throw new WorkspaceIdentityError('cancelled', 'Workspace identity capture was cancelled');
+    }
+    if (Date.now() >= context.deadline) {
+        throw new WorkspaceIdentityError('time_limit_exceeded', 'Workspace identity capture exceeded its time limit');
+    }
+};
+const runGit = (repoPath, args, context, output = 'buffer', maxDigestOutputBytes) => new Promise((resolve, reject) => {
+    assertCaptureActive(context);
+    const child = spawn('git', args, { cwd: repoPath, stdio: ['ignore', 'pipe', 'pipe'] });
+    const stdout = [];
+    const stderr = [];
+    const hash = createHash('sha256');
+    let digestOutputBytes = 0;
+    let settled = false;
+    const finishWithError = (error) => {
+        if (settled) {
+            return;
+        }
+        settled = true;
+        clearTimeout(timer);
+        context.limits.signal?.removeEventListener('abort', onAbort);
+        child.kill('SIGKILL');
+        reject(error);
+    };
+    const accountOutput = (chunk) => {
+        context.processOutputBytes += chunk.length;
+        if (context.processOutputBytes > context.limits.maxProcessOutputBytes) {
+            finishWithError(new WorkspaceIdentityError('process_output_limit_exceeded', `Git output exceeded ${context.limits.maxProcessOutputBytes} bytes`));
+            return false;
+        }
+        return true;
+    };
+    const onAbort = () => finishWithError(new WorkspaceIdentityError('cancelled', 'Workspace identity capture was cancelled'));
+    const timer = setTimeout(() => finishWithError(new WorkspaceIdentityError('time_limit_exceeded', 'Workspace identity capture exceeded its time limit')), Math.max(1, context.deadline - Date.now()));
+    context.limits.signal?.addEventListener('abort', onAbort, { once: true });
+    child.stdout.on('data', rawChunk => {
+        const chunk = Buffer.from(rawChunk);
+        if (!accountOutput(chunk)) {
+            return;
+        }
+        if (output === 'digest') {
+            digestOutputBytes += chunk.length;
+            if (maxDigestOutputBytes !== undefined && digestOutputBytes > maxDigestOutputBytes) {
+                finishWithError(new WorkspaceIdentityError('byte_limit_exceeded', `Dirty workspace content exceeded ${context.limits.maxBytes} bytes`));
+                return;
+            }
+            hash.update(chunk);
+        }
+        else {
+            stdout.push(chunk);
+        }
+    });
+    child.stderr.on('data', rawChunk => {
+        const chunk = Buffer.from(rawChunk);
+        if (accountOutput(chunk)) {
+            stderr.push(chunk);
+        }
+    });
+    child.on('error', error => finishWithError(new WorkspaceIdentityError(error.message.includes('ENOENT') ? 'git_unavailable' : 'worktree_unavailable', error.message)));
+    child.on('close', code => {
+        if (settled) {
+            return;
+        }
+        settled = true;
+        clearTimeout(timer);
+        context.limits.signal?.removeEventListener('abort', onAbort);
+        const stderrBuffer = Buffer.concat(stderr);
+        if (code !== 0) {
+            reject(new WorkspaceIdentityError('git_unavailable', stderrBuffer.toString('utf8').trim() || `Git exited with code ${code}`));
+            return;
+        }
+        resolve(output === 'digest'
+            ? { digest: hash.digest(), outputBytes: digestOutputBytes }
+            : { stdout: Buffer.concat(stdout), stderr: stderrBuffer });
+    });
+});
+const runGitBuffered = async (repoPath, args, context) => await runGit(repoPath, args, context, 'buffer');
+const runGitDigest = async (repoPath, args, context, maxOutputBytes) => await runGit(repoPath, args, context, 'digest', maxOutputBytes);
+const parseWorkspaceSnapshotStatus = (status) => {
+    const records = splitNull(status);
+    const untracked = [];
+    let dirtyFileCount = 0;
+    for (let index = 0; index < records.length; index += 1) {
+        const record = records[index];
+        if (record.length === 0 || record[0] === 35) {
+            continue;
+        }
+        if (record[0] === 49 || record[0] === 50) {
+            dirtyFileCount += 1;
+            const xyStart = record.indexOf(32) + 1;
+            const submoduleStart = record.indexOf(32, xyStart) + 1;
+            const submoduleEnd = record.indexOf(32, submoduleStart);
+            const submoduleState = record.subarray(submoduleStart, submoduleEnd).toString('ascii');
+            if (submoduleState !== 'N...') {
+                throw new WorkspaceIdentityError('unsupported_dirty_submodule', 'Dirty submodules cannot produce workspace identity');
+            }
+            if (record[0] === 50) {
+                index += 1;
+            }
+            continue;
+        }
+        if (record[0] === 63 && record[1] === 32) {
+            dirtyFileCount += 1;
+            untracked.push(record.subarray(2));
+            continue;
+        }
+        if (record[0] === 117 && record[1] === 32) {
+            dirtyFileCount += 1;
+        }
+    }
+    return { dirtyFileCount, untracked: untracked.sort(Buffer.compare) };
+};
+export const parseWorkspaceStatus = (status) => parseWorkspaceSnapshotStatus(status).untracked;
+const readFileDigest = (absolutePath, context) => new Promise((resolve, reject) => {
+    assertCaptureActive(context);
+    const hash = createHash('sha256');
+    const stream = createReadStream(absolutePath);
+    let settled = false;
+    const finishWithError = (error) => {
+        if (settled) {
+            return;
+        }
+        settled = true;
+        clearTimeout(timer);
+        context.limits.signal?.removeEventListener('abort', onAbort);
+        stream.destroy();
+        reject(error);
+    };
+    const onAbort = () => finishWithError(new WorkspaceIdentityError('cancelled', 'Workspace identity capture was cancelled'));
+    const timer = setTimeout(() => finishWithError(new WorkspaceIdentityError('time_limit_exceeded', 'Workspace identity capture exceeded its time limit')), Math.max(1, context.deadline - Date.now()));
+    context.limits.signal?.addEventListener('abort', onAbort, { once: true });
+    stream.on('data', chunk => hash.update(chunk));
+    stream.on('error', error => finishWithError(new WorkspaceIdentityError('unstable_snapshot', error.message)));
+    stream.on('end', () => {
+        if (settled) {
+            return;
+        }
+        settled = true;
+        clearTimeout(timer);
+        context.limits.signal?.removeEventListener('abort', onAbort);
+        resolve(hash.digest());
+    });
+});
+const digestUntrackedManifest = async (repoPath, paths, context, maxContentBytes) => {
+    const hash = createHash('sha256');
+    let totalBytes = 0;
+    for (const relativePath of paths) {
+        assertCaptureActive(context);
+        const absolutePath = Buffer.concat([Buffer.from(repoPath), Buffer.from('/'), relativePath]);
+        let stats;
+        try {
+            stats = await lstat(absolutePath);
+        }
+        catch (error) {
+            throw new WorkspaceIdentityError('unstable_snapshot', error instanceof Error ? error.message : 'Untracked entry disappeared');
+        }
+        let type;
+        let mode;
+        let digest;
+        if (stats.isSymbolicLink()) {
+            const target = await readlink(absolutePath, { encoding: 'buffer' });
+            totalBytes += target.length;
+            type = 'symlink';
+            mode = '120000';
+            digest = createHash('sha256').update(target).digest();
+        }
+        else if (stats.isFile()) {
+            totalBytes += stats.size;
+            type = 'file';
+            mode = stats.mode & 0o111 ? '100755' : '100644';
+            if (totalBytes > maxContentBytes) {
+                throw new WorkspaceIdentityError('byte_limit_exceeded', `Untracked content exceeded ${context.limits.maxBytes} bytes`);
+            }
+            digest = await readFileDigest(absolutePath, context);
+        }
+        else {
+            throw new WorkspaceIdentityError('unsupported_untracked_entry', 'Untracked workspace entries must be files or symbolic links');
+        }
+        if (totalBytes > maxContentBytes) {
+            throw new WorkspaceIdentityError('byte_limit_exceeded', `Untracked content exceeded ${context.limits.maxBytes} bytes`);
+        }
+        updateIdentityComponent(hash, 'path', relativePath);
+        updateIdentityComponent(hash, 'type', Buffer.from(type));
+        updateIdentityComponent(hash, 'mode', Buffer.from(mode));
+        updateIdentityComponent(hash, 'content-sha256', digest);
+    }
+    return { digest: hash.digest(), contentBytes: totalBytes };
+};
+const readHead = async (repoPath, context, allowUnborn) => {
+    try {
+        return Buffer.from((await runGitBuffered(repoPath, ['rev-parse', '--verify', 'HEAD'], context)).stdout.toString('ascii').trim(), 'ascii');
+    }
+    catch (error) {
+        if (error instanceof WorkspaceIdentityError && /needed a single revision|unknown revision|ambiguous argument/i.test(error.message)) {
+            if (allowUnborn) {
+                return null;
+            }
+            throw new WorkspaceIdentityError('git_unavailable', error.message);
+        }
+        throw error;
+    }
+};
+const readSnapshot = async (repoPath, context, allowUnborn) => {
+    const head = await readHead(repoPath, context, allowUnborn);
+    const status = (await runGitBuffered(repoPath, ['status', '--porcelain=v2', '--untracked-files=all', '-z'], context)).stdout;
+    const parsedStatus = parseWorkspaceSnapshotStatus(status);
+    if (parsedStatus.dirtyFileCount > context.limits.maxFiles) {
+        throw new WorkspaceIdentityError('file_limit_exceeded', `Workspace contains more than ${context.limits.maxFiles} dirty files`);
+    }
+    return { head, status, ...parsedStatus };
+};
+const snapshotMatches = (left, right) => ((left.head === null ? right.head === null : right.head !== null && left.head.equals(right.head))
+    && left.status.equals(right.status));
+const unavailable = (error) => {
+    if (error instanceof WorkspaceIdentityError) {
+        return { state: 'unavailable', reason: error.reason, message: error.message };
+    }
+    return {
+        state: 'unavailable',
+        reason: 'worktree_unavailable',
+        message: error instanceof Error ? error.message : 'Workspace identity capture failed',
+    };
+};
+const assertWorkspaceDirectory = async (repoPath) => {
+    const workspaceStats = await lstat(repoPath);
+    if (!workspaceStats.isDirectory()) {
+        throw new Error('Workspace path is not a directory');
+    }
+};
+const captureDirtyDigests = async (repoPath, snapshot, context) => {
+    const tracked = snapshot.head
+        ? await runGitDigest(repoPath, ['diff', '--binary', '--no-ext-diff', '--full-index', 'HEAD', '--'], context, context.limits.maxBytes)
+        : await runGitDigest(repoPath, ['diff', '--binary', '--no-ext-diff', '--full-index', '--cached', '--'], context, context.limits.maxBytes);
+    const afterTrackedBytes = context.limits.maxBytes - tracked.outputBytes;
+    const unstaged = snapshot.head
+        ? null
+        : await runGitDigest(repoPath, ['diff', '--binary', '--no-ext-diff', '--full-index', '--'], context, afterTrackedBytes);
+    const remainingBytes = afterTrackedBytes - (unstaged?.outputBytes ?? 0);
+    const untracked = await digestUntrackedManifest(repoPath, snapshot.untracked, context, remainingBytes);
+    const totalBytes = tracked.outputBytes + (unstaged?.outputBytes ?? 0) + untracked.contentBytes;
+    if (totalBytes > context.limits.maxBytes) {
+        throw new WorkspaceIdentityError('byte_limit_exceeded', `Dirty workspace content exceeded ${context.limits.maxBytes} bytes`);
+    }
+    return {
+        tracked: tracked.digest,
+        unstaged: unstaged?.digest ?? null,
+        untracked: untracked.digest,
+    };
+};
+export const captureWorkspaceIdentity = async (repoPath, options = {}) => {
+    const limits = resolveLimits(options);
+    const context = { limits, deadline: Date.now() + limits.timeoutMs, processOutputBytes: 0 };
+    try {
+        assertCaptureActive(context);
+        await assertWorkspaceDirectory(repoPath);
+    }
+    catch (error) {
+        return unavailable(error);
+    }
+    for (let attempt = 0; attempt < limits.maxAttempts; attempt += 1) {
+        try {
+            const before = await readSnapshot(repoPath, context, true);
+            const beforeDigests = await captureDirtyDigests(repoPath, before, context);
+            const after = await readSnapshot(repoPath, context, true);
+            const afterDigests = await captureDirtyDigests(repoPath, after, context);
+            if (!snapshotMatches(before, after)
+                || !beforeDigests.tracked.equals(afterDigests.tracked)
+                || (beforeDigests.unstaged !== null
+                    && (afterDigests.unstaged === null || !beforeDigests.unstaged.equals(afterDigests.unstaged)))
+                || !beforeDigests.untracked.equals(afterDigests.untracked)) {
+                continue;
+            }
+            const dirtyHash = createHash('sha256');
+            updateIdentityComponent(dirtyHash, 'format', Buffer.from('archon-workspace-dirty-v1'));
+            updateIdentityComponent(dirtyHash, 'status', before.status);
+            updateIdentityComponent(dirtyHash, before.head ? 'tracked-diff-sha256' : 'index-diff-sha256', beforeDigests.tracked);
+            if (beforeDigests.unstaged) {
+                updateIdentityComponent(dirtyHash, 'unstaged-diff-sha256', beforeDigests.unstaged);
+            }
+            updateIdentityComponent(dirtyHash, 'untracked-manifest-sha256', beforeDigests.untracked);
+            const dirtyFingerprint = dirtyHash.digest('hex');
+            const head = before.head?.toString('ascii') ?? 'unborn';
+            const hash = createHash('sha256');
+            updateIdentityComponent(hash, 'format', Buffer.from('archon-workspace-v1'));
+            updateIdentityComponent(hash, 'head', Buffer.from(head));
+            updateIdentityComponent(hash, 'dirty-fingerprint', Buffer.from(dirtyFingerprint));
+            return {
+                state: 'available',
+                algorithm: 'sha256',
+                fingerprint: hash.digest('hex'),
+                components: { format: 'archon-workspace-v1', head, dirtyFingerprint },
+            };
+        }
+        catch (error) {
+            if (error instanceof WorkspaceIdentityError && error.reason === 'unstable_snapshot') {
+                continue;
+            }
+            return unavailable(error);
+        }
+    }
+    return {
+        state: 'unavailable',
+        reason: 'unstable_snapshot',
+        message: `Workspace changed during ${limits.maxAttempts} identity capture attempts`,
+    };
+};
+export const captureCheckCompatibleWorkspaceIdentity = async (repoPath, options = {}) => {
+    const limits = resolveLimits({
+        maxFiles: 1_000_000,
+        maxBytes: Number.MAX_SAFE_INTEGER,
+        maxProcessOutputBytes: Number.MAX_SAFE_INTEGER,
+        timeoutMs: 3_600_000,
+        ...options,
+    });
+    const context = { limits, deadline: Date.now() + limits.timeoutMs, processOutputBytes: 0 };
+    try {
+        assertCaptureActive(context);
+        await assertWorkspaceDirectory(repoPath);
+    }
+    catch (error) {
+        return unavailable(error);
+    }
+    for (let attempt = 0; attempt < limits.maxAttempts; attempt += 1) {
+        try {
+            let before;
+            try {
+                before = await readSnapshot(repoPath, context, false);
+            }
+            catch (error) {
+                if (error instanceof WorkspaceIdentityError && error.reason === 'git_unavailable'
+                    && /needed a single revision|unknown revision|ambiguous argument/i.test(error.message)) {
+                    return { state: 'unavailable', reason: 'unborn_repository', message: 'Repository does not have an initial commit' };
+                }
+                throw error;
+            }
+            const beforeDigests = await captureDirtyDigests(repoPath, before, context);
+            const hash = createHash('sha256');
+            updateIdentityComponent(hash, 'format', Buffer.from('archon-check-workspace-v1'));
+            updateIdentityComponent(hash, 'head', before.head);
+            updateIdentityComponent(hash, 'status', before.status);
+            updateIdentityComponent(hash, 'tracked-diff-sha256', beforeDigests.tracked);
+            const after = await readSnapshot(repoPath, context, false);
+            const afterDigests = await captureDirtyDigests(repoPath, after, context);
+            if (!snapshotMatches(before, after)
+                || !beforeDigests.tracked.equals(afterDigests.tracked)
+                || !beforeDigests.untracked.equals(afterDigests.untracked)) {
+                continue;
+            }
+            updateIdentityComponent(hash, 'untracked-manifest-sha256', beforeDigests.untracked);
+            return {
+                state: 'available',
+                algorithm: 'sha256',
+                fingerprint: hash.digest('hex'),
+                head: before.head.toString('ascii'),
+            };
+        }
+        catch (error) {
+            if (error instanceof WorkspaceIdentityError && error.reason === 'unstable_snapshot') {
+                continue;
+            }
+            const result = unavailable(error);
+            return result.reason === 'unsupported_dirty_submodule'
+                ? { ...result, message: 'Dirty submodules cannot produce check workspace evidence' }
+                : result;
+        }
+    }
+    return {
+        state: 'unavailable',
+        reason: 'unstable_snapshot',
+        message: `Workspace changed during ${limits.maxAttempts} identity capture attempts`,
+    };
+};
+//# sourceMappingURL=workspaceIdentity.js.map

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

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

package/dist/server/workers/plan.js

@@ -1095,8 +1095,8 @@ export const runPlannerPrompt = (tool, model, variant, prompt, cwd, options = {}
                 watchdogTimer = null;
             }
         };
-        const bindResolvedOpencodeSession = (sessionId) => {
-            const normalized = sessionId?.trim();
+        const bindResolvedOpencodeSession = (resolvedId) => {
+            const normalized = resolvedId?.trim();
             if (!normalized) {
                 return;
             }
@@ -1188,11 +1188,12 @@ export const runPlannerPrompt = (tool, model, variant, prompt, cwd, options = {}
         const startTime = Date.now();
         let firstFinalAnswerTime = null;
         const emitProgress = () => {
-            options.onProgress?.({
+            const progress = {
                 log: logLines.length > 0 ? logLines.join('\n\n') : null,
                 response: responseLines.length > 0 ? responseLines.join('\n\n') : null,
-            });
-            subagentTracker?.updateMain(logLines.length > 0 ? logLines.join('\n\n') : null, responseLines.length > 0 ? responseLines.join('\n\n') : null);
+            };
+            subagentTracker?.updateMain(progress.log, progress.response);
+            options.onProgress?.(progress);
         };
         const isHiddenOpenTag = /^\s*<archon-[a-z0-9-]+>\s*$/i;
         const isHiddenCloseTag = /^\s*<\/archon-[a-z0-9-]+>\s*$/i;
@@ -1219,7 +1220,7 @@ export const runPlannerPrompt = (tool, model, variant, prompt, cwd, options = {}
                 }
                 subagentTracker?.handle(subagentEvents);
                 if (providerSessionId) {
-                    opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                    bindResolvedOpencodeSession(providerSessionId);
                 }
                 if (isHiddenOpenTag.test(line)) {
                     insideHiddenBlock = true;
@@ -1267,7 +1268,7 @@ export const runPlannerPrompt = (tool, model, variant, prompt, cwd, options = {}
                 }
                 subagentTracker?.handle(subagentEvents);
                 if (providerSessionId) {
-                    opencodeSubagentMonitor?.setParentSessionId(providerSessionId);
+                    bindResolvedOpencodeSession(providerSessionId);
                 }
                 if (logFragment !== null) {
                     logLines.push(logFragment);
@@ -1277,6 +1278,7 @@ export const runPlannerPrompt = (tool, model, variant, prompt, cwd, options = {}
                     responseLines.push(responseFragment);
                 }
             }
+            opencodeSubagentMonitor?.refresh();
             const rawOutput = Buffer.concat(stdoutChunks).toString().trim();
             const errorOutput = Buffer.concat(stderrChunks).toString().trim();
             const recoveredResponse = recoveryTracker.getRecoveredResponse();