@fitlab-ai/agent-infra 0.9.7 → 0.9.8

package/dist/lib/sandbox/control/state.js

@@ -3,7 +3,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { randomUUID } from 'node:crypto';
 import { buildProcessTreeStopCommand } from '../../server/process-control.js';
-import { processIdentityMatches } from '../../server/process-state.js';
+import { getProcessIdentityState } from '../../server/process-state.js';
 export const SANDBOX_CONTROL_AUDIT_MAX_BYTES = 1024 * 1024;
 export const SANDBOX_CONTROL_EXECUTION_STOP_MS = 2_000;
 function assertRegularFile(filePath) {
@@ -72,7 +72,7 @@ export function readActiveLease(manifest, now = Date.now()) {
         return null;
     return lease;
 }
-export function cleanupStaleSandboxControlLease(manifest, now = Date.now()) {
+export function cleanupStaleSandboxControlLease(manifest, now = Date.now(), options = {}) {
     const filePath = path.join(path.dirname(manifest.publicStatusDir), 'lease.json');
     if (!fs.existsSync(filePath))
         return false;
@@ -87,10 +87,13 @@ export function cleanupStaleSandboxControlLease(manifest, now = Date.now()) {
         || typeof lease.branch !== 'string' || typeof lease.reason !== 'string') {
         throw new Error('SANDBOX_CONTROL_LEASE_INVALID');
     }
-    const stale = lease.generation !== manifest.generation || lease.taskId !== manifest.taskId
-        || lease.branch !== manifest.branch || lease.expiresAt <= now || !processIdentityMatches({
+    const ownerState = (options.identityProbe ?? getProcessIdentityState)({
         pid: lease.owner.pid, startTime: lease.owner.startTime
     });
+    if (ownerState === 'unknown')
+        throw new Error('SANDBOX_CONTROL_LEASE_OWNER_UNAVAILABLE');
+    const stale = lease.generation !== manifest.generation || lease.taskId !== manifest.taskId
+        || lease.branch !== manifest.branch || lease.expiresAt <= now || ownerState === 'dead';
     if (!stale)
         return false;
     if (fs.readFileSync(filePath, 'utf8') !== raw)
@@ -125,29 +128,42 @@ export function readExecution(filePath) {
 export function terminateSandboxControlExecution(execution, options = {}) {
     const platform = options.platform ?? process.platform;
     const processGroupId = execution.child.processGroupId;
-    const processGroupAlive = (groupId) => {
+    const processGroupState = (groupId) => {
         try {
             const rows = execFileSync('ps', ['-axo', 'pgid=,stat='], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] });
             return rows.split('\n').some((row) => {
                 const match = row.trim().match(/^(\d+)\s+(\S+)/);
                 return Number(match?.[1]) === groupId && !match?.[2]?.startsWith('Z');
-            });
+            }) ? 'alive' : 'dead';
         }
         catch {
             try {
                 process.kill(-groupId, 0);
-                return true;
+                return 'alive';
             }
             catch (error) {
-                return error.code === 'EPERM';
+                const code = error.code;
+                if (code === 'ESRCH')
+                    return 'dead';
+                if (code === 'EPERM')
+                    return 'alive';
+                return 'unknown';
             }
         }
     };
-    const treeAlive = () => {
+    const treeState = () => {
         if (platform === 'win32' || !processGroupId) {
-            return processIdentityMatches({ pid: execution.child.pid, startTime: execution.child.startTime });
+            return (options.identityProbe ?? getProcessIdentityState)({
+                pid: execution.child.pid, startTime: execution.child.startTime
+            });
         }
-        return processGroupAlive(processGroupId);
+        return processGroupState(processGroupId);
+    };
+    const treeAlive = () => {
+        const state = treeState();
+        if (state === 'unknown')
+            throw new Error('SANDBOX_CONTROL_EXECUTION_OWNER_UNAVAILABLE');
+        return state === 'alive';
     };
     if (!treeAlive())
         return true;

package/dist/lib/sandbox/engine.js

@@ -14,6 +14,12 @@ const PLATFORM_DEFAULTS = Object.freeze({
     darwin: ENGINES.COLIMA,
     win32: ENGINES.WSL2
 });
+function isPerPlatformEngine(engine) {
+    return typeof engine === 'object' && engine !== null;
+}
+function resolveEngineForPlatform(engine, os) {
+    return isPerPlatformEngine(engine) ? engine[os] : engine;
+}
 function runFns({ runFn = run, runOkFn = runOk, runSafeFn = runSafe, runVerboseFn = runVerbose } = {}) {
     return {
         run: runFn,
@@ -56,23 +62,24 @@ function ensureBuildKit(engine, runOkEngineFn) {
     }
 }
 export function validateSandboxEngine(engine, { platformFn = platform } = {}) {
-    if (engine === null || engine === undefined) {
+    const os = platformFn();
+    const resolved = resolveEngineForPlatform(engine, os);
+    if (resolved === null || resolved === undefined) {
         return null;
     }
-    const os = platformFn();
-    if (!(engine in ADAPTERS)) {
+    if (!(resolved in ADAPTERS)) {
         const known = Object.keys(ADAPTERS).join(', ');
-        throw new Error(`sandbox: invalid "sandbox.engine" value "${engine}" (unknown sandbox engine). `
+        throw new Error(`sandbox: invalid "sandbox.engine" value "${resolved}" (unknown sandbox engine). `
             + `Valid engines: ${known}.`);
     }
-    const adapter = ADAPTERS[engine];
+    const adapter = ADAPTERS[resolved];
     if (!adapter.supportedPlatforms.includes(os)) {
         const supported = enginesForPlatform(os);
         const supportedList = supported.length > 0 ? supported.join(', ') : 'none';
-        throw new Error(`sandbox: "sandbox.engine" value "${engine}" is not supported on ${os}. `
+        throw new Error(`sandbox: "sandbox.engine" value "${resolved}" is not supported on ${os}. `
             + `Supported engines on ${os}: ${supportedList}.`);
     }
-    return engine;
+    return resolved;
 }
 export function detectEngine(config = {}, { platformFn = platform } = {}) {
     const configured = validateSandboxEngine(config.engine, { platformFn });

package/dist/lib/sandbox/mounts.js

@@ -1,7 +1,19 @@
 import path from 'node:path';
 import { shareBranchDir, shareCommonDir, shellConfigDirCandidates, worktreeDirCandidates } from './constants.js';
+import { sandboxWorkspaceViewStatePaths } from './workspace-view.js';
 export function sandboxCoreBindMounts(config, branch, overrides) {
     const taskBound = Boolean(overrides.taskSource && overrides.taskId);
+    const workspaceMounts = sandboxWorkspaceViewStatePaths(overrides.workspaceViewRoot).map(({ state, hostPath }) => taskBound && state === 'active'
+        ? {
+            hostPaths: [path.join(hostPath, '.short-ids.json')],
+            containerPath: '/workspace/.agents/workspace/active/.short-ids.json',
+            readOnly: true
+        }
+        : {
+            hostPaths: [hostPath],
+            containerPath: path.posix.join('/workspace/.agents/workspace', state),
+            readOnly: true
+        });
     const mounts = [
         {
             hostPaths: overrides.worktree
@@ -10,11 +22,7 @@ export function sandboxCoreBindMounts(config, branch, overrides) {
             containerPath: '/workspace',
             readOnly: false
         },
-        {
-            hostPaths: [overrides.workspaceViewRoot],
-            containerPath: '/workspace/.agents/workspace',
-            readOnly: true
-        },
+        ...workspaceMounts,
     ];
     if (taskBound) {
         mounts.push({
@@ -47,6 +55,13 @@ export function sandboxCoreBindMounts(config, branch, overrides) {
         containerPath: '/run/agent-infra/control',
         readOnly: false
     });
+    if (taskBound && overrides.runtimeDir) {
+        mounts.push({
+            hostPaths: [overrides.runtimeDir],
+            containerPath: '/run/agent-infra/runtime',
+            readOnly: false
+        });
+    }
     return mounts;
 }
 //# sourceMappingURL=mounts.js.map

package/dist/lib/sandbox/recovery.js

@@ -14,7 +14,7 @@ import { inspectWorktree } from './worktree-safety.js';
 import { commandForEngine, runEngine, runOkEngine, runProbe, runVerboseEngine } from './shell.js';
 import { declaredTmpfsSeedEntries, resolveTools, toolConfigDirCandidates } from './tools.js';
 import { fetchSandboxRows, selectSandboxContainer, startSandboxContainer } from './commands/list-running.js';
-import { getProcessStartTime, processIdentityMatches, removePidFileIfMatches } from '../server/process-state.js';
+import { getProcessIdentityState, getProcessStartTime, removePidFileIfMatches } from '../server/process-state.js';
 import { acquireSandboxControlBrokerStartup, garbageCollectSandboxControlRoot, isSandboxControlRootQuiescing, readSandboxControlManifest } from './control/lifecycle.js';
 import { appendSandboxControlAudit, readSandboxControlStatus } from './control/state.js';
 import { inspectSandboxControlContainer } from './control/container-identity.js';
@@ -89,7 +89,10 @@ export async function startSandboxControlBroker(repoRoot, manifestPath) {
         if (broker === null || broker.version !== 3 || owner === null) {
             throw new Error('SANDBOX_CONTROL_BROKER_VERSION_INVALID: rebuild the sandbox container before starting a new broker');
         }
-        const live = owner !== null && processIdentityMatches({ pid: owner.pid, startTime: owner.startTime });
+        const ownerState = getProcessIdentityState({ pid: owner.pid, startTime: owner.startTime });
+        if (ownerState === 'unknown')
+            throw new Error('SANDBOX_CONTROL_BROKER_OWNER_UNAVAILABLE');
+        const live = ownerState === 'alive';
         if (live
             && owner !== null
             && broker !== null
@@ -176,6 +179,15 @@ async function ensureSandboxControlBroker(params) {
     const brokerPath = path.join(control.root, 'broker.json');
     try {
         const broker = JSON.parse(fs.readFileSync(brokerPath, 'utf8'));
+        const validIdentity = typeof broker.pid === 'number'
+            && Number.isSafeInteger(broker.pid)
+            && typeof broker.startTime === 'number'
+            && Number.isSafeInteger(broker.startTime);
+        const ownerState = validIdentity
+            ? getProcessIdentityState({ pid: broker.pid, startTime: broker.startTime })
+            : 'dead';
+        if (ownerState === 'unknown')
+            throw new Error('SANDBOX_CONTROL_BROKER_OWNER_UNAVAILABLE');
         if (broker.version === 3
             && typeof broker.pid === 'number'
             && Number.isSafeInteger(broker.pid)
@@ -185,7 +197,7 @@ async function ensureSandboxControlBroker(params) {
             && broker.brokerId.length > 0
             && broker.token === validatedManifest.token
             && broker.generation === validatedManifest.generation
-            && processIdentityMatches({ pid: broker.pid, startTime: broker.startTime })) {
+            && ownerState === 'alive') {
             try {
                 const status = readSandboxControlStatus(control.statusDir);
                 if (status.generation === validatedManifest.generation && status.broker.pid === broker.pid
@@ -207,7 +219,9 @@ async function ensureSandboxControlBroker(params) {
             return;
         }
     }
-    catch {
+    catch (error) {
+        if (error instanceof Error && error.message === 'SANDBOX_CONTROL_BROKER_OWNER_UNAVAILABLE')
+            throw error;
         // A missing, stale, or malformed broker record is replaced below.
     }
     await startSandboxControlBroker(params.config.repoRoot, control.manifestPath);
@@ -242,6 +256,30 @@ export function classifySandboxRecovery(snapshot) {
             message: 'Container runtime capability signature does not match the current sandbox plan.'
         });
     }
+    if (snapshot.workspaceTopology === 'legacy-parent') {
+        findings.push({
+            repairKind: 'hard-failure',
+            code: 'SANDBOX_WORKSPACE_TOPOLOGY_MISMATCH',
+            message: 'Sandbox uses the legacy workspace parent-mount topology; recreate the container explicitly to migrate it.',
+            path: '/workspace/.agents/workspace'
+        });
+    }
+    if (snapshot.taskView && !snapshot.taskView.readable) {
+        findings.push({
+            repairKind: 'hard-failure',
+            code: 'SANDBOX_TASK_VIEW_UNREADABLE',
+            message: `Bound task view is not readable at ${snapshot.taskView.path}.`,
+            path: snapshot.taskView.path
+        });
+    }
+    if (snapshot.runtimeStoreOk === false) {
+        findings.push({
+            repairKind: 'hard-failure',
+            code: 'SANDBOX_RUNTIME_STORE_UNAVAILABLE',
+            message: 'Task-bound runtime store is not writable and readable by devuser.',
+            path: '/run/agent-infra/runtime'
+        });
+    }
     for (const mountPath of snapshot.unexpectedCapabilityMounts ?? []) {
         findings.push({
             repairKind: 'hard-failure',
@@ -250,6 +288,9 @@ export function classifySandboxRecovery(snapshot) {
         });
     }
     for (const mount of snapshot.mounts) {
+        if (snapshot.workspaceTopology === 'legacy-parent'
+            && mount.path.startsWith('/workspace/.agents/workspace'))
+            continue;
         if (mount.actualType !== mount.expectedType
             || !mount.sourceMatches
             || mount.actualRW !== mount.expectedRW
@@ -331,6 +372,20 @@ function inspectContainer(engine, container, runFn) {
     }
     return parsed[0];
 }
+function workspaceTopology(mountsByDestination) {
+    if (mountsByDestination.has('/workspace/.agents/workspace'))
+        return 'legacy-parent';
+    const perState = [
+        '/workspace/.agents/workspace/active',
+        '/workspace/.agents/workspace/active/.short-ids.json',
+        '/workspace/.agents/workspace/completed',
+        '/workspace/.agents/workspace/blocked',
+        '/workspace/.agents/workspace/archive'
+    ];
+    return perState.some((destination) => mountsByDestination.has(destination))
+        ? 'per-state'
+        : 'unknown';
+}
 function probe(engine, container, script, args, runOkFn, user = 'devuser') {
     return runOkFn(engine, 'docker', [
         'exec', '--user', user, container, 'sh', '-c', script, 'agent-infra-recovery', ...args
@@ -391,6 +446,7 @@ function expectedMounts(params) {
         controlStatusDir: control.statusDir,
         ...(params.workspace.mode === 'task-bound'
             ? {
+                runtimeDir: control.runtimeDir,
                 taskSource: assertSandboxTaskSource(config.repoRoot, params.workspace.taskId),
                 taskId: params.workspace.taskId
             }
@@ -489,6 +545,10 @@ export function collectSandboxRecoverySnapshot(params) {
     const capabilityPlan = createSandboxCapabilityPlan(params.config);
     const workspace = params.workspace ?? { mode: 'branch-only' };
     const tools = [...capabilityPlan.tools];
+    const topology = workspaceTopology(mountsByDestination);
+    const taskViewPath = workspace.mode === 'task-bound'
+        ? `/workspace/.agents/workspace/active/${workspace.taskId}/task.md`
+        : null;
     const seeds = declaredTmpfsSeedEntries(tools).map((seed) => {
         const mounted = mountsByDestination.get(seed.stagingPath)?.Type === 'bind';
         return {
@@ -507,6 +567,9 @@ export function collectSandboxRecoverySnapshot(params) {
         permissionsOk: probe(params.engine, params.container, 'test "$(stat -c %u:%g:%a -- "$1")" = "$(id -u devuser):$(id -g devuser):700"', [tool.containerMount], runOkFn),
         writable: probe(params.engine, params.container, 'probe="$1/.agent-infra-ready-$$"; trap \'rm -f -- "$probe"\' EXIT; : > "$probe"', [tool.containerMount], runOkFn)
     }));
+    const runtimeStoreOk = workspace.mode === 'task-bound'
+        ? probe(params.engine, params.container, 'probe="$1/.agent-infra-runtime-$$"; trap \'rm -f -- "$probe"\' EXIT; printf runtime-probe > "$probe" && test "$(cat -- "$probe")" = runtime-probe', ['/run/agent-infra/runtime'], runOkFn)
+        : undefined;
     const labels = inspection.Config?.Labels ?? {};
     const branchLabel = labels[sandboxBranchLabel(params.config)];
     const containerWorkspace = parseSandboxWorkspaceIdentity(labels, {
@@ -562,6 +625,14 @@ export function collectSandboxRecoverySnapshot(params) {
         actualBranch: typeof branchLabel === 'string' ? branchLabel : null,
         expectedWorkspace: workspace,
         actualWorkspace: containerWorkspace,
+        workspaceTopology: topology,
+        ...(taskViewPath === null ? {} : {
+            taskView: {
+                path: taskViewPath,
+                readable: probe(params.engine, params.container, 'test -r "$1"', [taskViewPath], runOkFn)
+            }
+        }),
+        ...(runtimeStoreOk === undefined ? {} : { runtimeStoreOk }),
         identityOk: typeof inspection.Id === 'string' && inspection.Id.length > 0
             && branchLabel === params.branch
             && sameSandboxWorkspaceIdentity(containerWorkspace, workspace),
@@ -677,10 +748,12 @@ function assess(params) {
 }
 function canRetryFreshReadiness(findings) {
     return findings.length > 0 && findings.every((finding) => finding.repairKind === 'hard-failure'
+        && finding.code !== 'SANDBOX_WORKSPACE_TOPOLOGY_MISMATCH'
         && finding.path !== undefined
         && (finding.path.startsWith('/workspace/.agents/workspace')
             || finding.path === '/home/devuser/.host-shell-config'
-            || finding.path === '/home/devuser/.bash_aliases'));
+            || finding.path === '/home/devuser/.bash_aliases'
+            || finding.path === '/run/agent-infra/runtime'));
 }
 export async function assertFreshSandboxReady(params) {
     validateTmpfsSeedEntries({
@@ -891,14 +964,9 @@ export async function ensureSandboxReady(params) {
         : `Sandbox recovery failed in place. Replacing only the container. ${dataBoundary}`;
     warnings.push(warning);
     (params.writeWarning ?? ((message) => process.stderr.write(`${message}\n`)))(warning);
-    const runVerboseFn = deps?.runVerbose ?? runVerboseEngine;
     let replacementResult = null;
     let replacementFailure = null;
     try {
-        if (params.row.running) {
-            runVerboseFn(params.engine, 'docker', ['stop', params.row.name]);
-        }
-        runVerboseFn(params.engine, 'docker', ['rm', params.row.name]);
         await params.recreate(params.branch);
         const rows = (deps?.fetchRows ?? fetchSandboxRows)(params.engine, sandboxLabel(params.config), sandboxBranchLabel(params.config));
         const replacement = selectSandboxContainer([...rows.running, ...rows.nonRunning], containerNameCandidates(params.config, params.branch));

package/dist/lib/sandbox/workspace-view.js

@@ -38,6 +38,7 @@ export function sandboxControlPaths(params) {
         channelDir: path.join(root, 'channel'),
         statusDir: path.join(root, 'public'),
         processingDir: path.join(root, 'processing'),
+        runtimeDir: path.join(root, 'runtime'),
         manifestPath: path.join(root, 'manifest.json')
     };
 }
@@ -50,6 +51,29 @@ function assertSafeDirectory(directory, expectedBase) {
         throw new Error(`Sandbox workspace view must not be a symbolic link: ${directory}`);
     }
 }
+function assertSafeMountTargetPath(target, worktreeRoot, canonicalWorktreeRoot) {
+    const relative = path.relative(worktreeRoot, target);
+    if (relative.startsWith('..') || path.isAbsolute(relative)) {
+        throw new Error(`Sandbox workspace mount target escapes its worktree: ${target}`);
+    }
+    let current = worktreeRoot;
+    for (const segment of ['', ...relative.split(path.sep).filter(Boolean)]) {
+        current = segment ? path.join(current, segment) : current;
+        try {
+            if (fs.lstatSync(current).isSymbolicLink()) {
+                throw new Error(`Sandbox workspace mount target must not contain a symbolic link: ${current}`);
+            }
+            const canonicalRelative = path.relative(canonicalWorktreeRoot, fs.realpathSync.native(current));
+            if (canonicalRelative.startsWith('..') || path.isAbsolute(canonicalRelative)) {
+                throw new Error(`Sandbox workspace mount target escapes its real worktree: ${current}`);
+            }
+        }
+        catch (error) {
+            if (error.code !== 'ENOENT')
+                throw error;
+        }
+    }
+}
 export function assertSandboxTaskSource(repoRoot, taskId) {
     if (!/^TASK-\d{8}-\d{6}$/.test(taskId))
         throw new Error('SANDBOX_TASK_SOURCE_INVALID');
@@ -65,42 +89,22 @@ export function assertSandboxTaskSource(repoRoot, taskId) {
     }
     return canonical;
 }
-export function prepareSandboxWorkspaceMountTarget(worktreeRoot) {
-    const worktree = path.resolve(worktreeRoot);
-    const canonicalWorktree = fs.realpathSync.native(worktree);
-    const agentsRoot = path.join(worktree, '.agents');
-    if (fs.existsSync(agentsRoot)) {
-        const agentsStat = fs.lstatSync(agentsRoot);
-        if (!agentsStat.isDirectory() || agentsStat.isSymbolicLink()) {
-            throw new Error(`Sandbox workspace mount ancestor must be a real directory: ${agentsRoot}`);
-        }
-    }
-    else {
-        fs.mkdirSync(agentsRoot, { mode: 0o700 });
-    }
-    const canonicalAgents = fs.realpathSync.native(agentsRoot);
-    if (path.dirname(canonicalAgents) !== canonicalWorktree) {
-        throw new Error(`Sandbox workspace mount ancestor escapes the worktree: ${agentsRoot}`);
+export function prepareSandboxWorkspaceMountTargets(worktreeRoot) {
+    const resolvedWorktreeRoot = path.resolve(worktreeRoot);
+    const canonicalWorktreeRoot = fs.realpathSync.native(resolvedWorktreeRoot);
+    const workspaceRoot = path.resolve(resolvedWorktreeRoot, '.agents', 'workspace');
+    const statePaths = sandboxWorkspaceViewStatePaths(workspaceRoot);
+    const registryTarget = path.join(workspaceRoot, 'active', '.short-ids.json');
+    for (const target of [workspaceRoot, ...statePaths.map(({ hostPath }) => hostPath), registryTarget]) {
+        assertSafeMountTargetPath(target, resolvedWorktreeRoot, canonicalWorktreeRoot);
     }
-    const target = path.join(agentsRoot, 'workspace');
-    if (fs.existsSync(target)) {
-        const stat = fs.lstatSync(target);
-        if (stat.isSymbolicLink()) {
-            throw new Error(`Sandbox workspace mount target must not be a symbolic link: ${target}`);
-        }
-        if (!stat.isDirectory()) {
-            throw new Error(`Sandbox workspace mount target must be a directory: ${target}`);
-        }
-        if (path.dirname(fs.realpathSync.native(target)) !== canonicalAgents) {
-            throw new Error(`Sandbox workspace mount target escapes the worktree: ${target}`);
-        }
-    }
-    else {
-        fs.mkdirSync(target, { mode: 0o700 });
+    fs.mkdirSync(workspaceRoot, { recursive: true, mode: 0o700 });
+    for (const { hostPath } of statePaths) {
+        fs.mkdirSync(hostPath, { recursive: true, mode: 0o700 });
+        fs.chmodSync(hostPath, 0o700);
     }
-    fs.chmodSync(target, 0o700);
-    fs.accessSync(target, fs.constants.W_OK);
-    return target;
+    fs.chmodSync(workspaceRoot, 0o700);
+    fs.closeSync(fs.openSync(registryTarget, 'a', 0o600));
 }
 export function materializeSandboxWorkspaceView(params) {
     const projectRoot = path.resolve(params.base, params.project);
@@ -131,15 +135,32 @@ export function materializeSandboxWorkspaceView(params) {
     return { root, taskMountPath };
 }
 export function materializeSandboxControl(params) {
-    const { root, channelDir, statusDir, processingDir, manifestPath } = sandboxControlPaths(params);
+    const { root, channelDir, statusDir, processingDir, runtimeDir, manifestPath } = sandboxControlPaths(params);
     assertSafeDirectory(root, path.resolve(params.base));
+    if (fs.existsSync(root)) {
+        if (!params.replacementLease || path.resolve(params.replacementLease.root) !== root) {
+            throw new Error('SANDBOX_CONTROL_REPLACEMENT_REQUIRED');
+        }
+        params.replacementLease.assertOwned();
+    }
     const consumedDir = path.join(root, 'consumed');
     assertSafeDirectory(consumedDir, root);
     fs.rmSync(consumedDir, { recursive: true, force: true });
     fs.mkdirSync(consumedDir, { recursive: true, mode: 0o700 });
-    for (const directory of [statusDir, processingDir]) {
+    for (const directory of [statusDir, processingDir, runtimeDir]) {
         assertSafeDirectory(directory, root);
+        if (directory === runtimeDir)
+            fs.rmSync(directory, { recursive: true, force: true });
+        fs.mkdirSync(directory, { recursive: true, mode: 0o700 });
+    }
+    for (const directory of [
+        path.join(runtimeDir, 'clients'),
+        path.join(runtimeDir, 'clients', 'codex', 'capabilities'),
+        path.join(runtimeDir, 'clients', 'codex', 'lifecycle')
+    ]) {
+        assertSafeDirectory(directory, runtimeDir);
         fs.mkdirSync(directory, { recursive: true, mode: 0o700 });
+        fs.chmodSync(directory, 0o700);
     }
     for (const queue of ['requests', 'responses']) {
         const directory = path.join(channelDir, queue);
@@ -151,7 +172,7 @@ export function materializeSandboxControl(params) {
     const generation = randomBytes(16).toString('hex');
     const repoRoot = fs.realpathSync.native(params.repoRoot);
     const manifest = {
-        version: 4,
+        version: 5,
         engine: params.engine ?? 'docker',
         repoRoot,
         worktreeRoot: fs.realpathSync.native(params.worktreeRoot),
@@ -165,16 +186,17 @@ export function materializeSandboxControl(params) {
         generation,
         channelDir,
         publicStatusDir: statusDir,
-        processingDir
+        processingDir,
+        runtimeDir
     };
     fs.writeFileSync(manifestPath, `${JSON.stringify(manifest)}\n`, { mode: 0o600 });
-    return { root, channelDir, statusDir, manifestPath, token, generation };
+    return { root, channelDir, statusDir, runtimeDir, manifestPath, token, generation };
 }
 export function finalizeSandboxControlManifest(setup, identity) {
     if (!identity.engine || !identity.id)
         throw new Error('SANDBOX_CONTROL_CONTAINER_ID_INVALID');
     const manifest = JSON.parse(fs.readFileSync(setup.manifestPath, 'utf8'));
-    manifest.version = 4;
+    manifest.version = 5;
     manifest.engine = identity.engine;
     manifest.containerIdentity = { id: identity.id, labels: { ...identity.labels } };
     const temporary = `${setup.manifestPath}.${process.pid}.${randomBytes(8).toString('hex')}.tmp`;

package/dist/lib/server/process-state.js

@@ -97,6 +97,56 @@ export function getProcessStartTime(pid, platform = process.platform) {
         return null;
     }
 }
+export function getProcessIdentityState(identity, platform = process.platform) {
+    if (!Number.isInteger(identity.pid) || identity.pid <= 0 || !Number.isSafeInteger(identity.startTime)) {
+        return 'dead';
+    }
+    if (platform === 'linux') {
+        try {
+            const stat = parseLinuxProcessStat(fs.readFileSync(`/proc/${identity.pid}/stat`, 'utf8'));
+            if (stat === null)
+                return 'unknown';
+            if (stat.state === 'Z')
+                return 'dead';
+            return stat.startTime === identity.startTime ? 'alive' : 'dead';
+        }
+        catch (error) {
+            return error.code === 'ENOENT' ? 'dead' : 'unknown';
+        }
+    }
+    try {
+        process.kill(identity.pid, 0);
+    }
+    catch (error) {
+        const code = error.code;
+        if (code === 'ESRCH')
+            return 'dead';
+        if (code !== 'EPERM')
+            return 'unknown';
+    }
+    const query = buildProcessStartTimeQuery(identity.pid, platform);
+    if (query === null)
+        return 'unknown';
+    try {
+        const output = execFileSync(query.command, query.args, {
+            encoding: 'utf8',
+            env: platform === 'darwin' ? { ...process.env, LC_ALL: 'C', LANG: 'C', TZ: 'UTC' } : process.env
+        }).trim();
+        if (output.length === 0)
+            return 'unknown';
+        const startTime = platform === 'win32'
+            ? new Date(output).getTime()
+            : platform === 'darwin'
+                ? parseDarwinStartTime(output)
+                : null;
+        if (startTime === null || Number.isNaN(startTime))
+            return 'unknown';
+        return startTime === identity.startTime ? 'alive' : 'dead';
+    }
+    catch {
+        return 'unknown';
+    }
+}
 function parsePidRecord(raw) {
     const trimmed = raw.trim();
     if (/^[1-9]\d*$/.test(trimmed)) {
@@ -200,6 +250,6 @@ export function removePidRecordIfMatches(pidFile, expected) {
     return removePidFileIfMatches(pidFile, state.snapshot);
 }
 export function processIdentityMatches(identity) {
-    return getProcessStartTime(identity.pid) === identity.startTime;
+    return getProcessIdentityState(identity) === 'alive';
 }
 //# sourceMappingURL=process-state.js.map

package/dist/lib/task/activity-intent.js

@@ -5,6 +5,7 @@ import { locateActivityLog, appendActivityEntry } from './activity-log.js';
 import { assertWritableInventory, buildArtifactLinkSection, inspectTaskArtifacts, parseArtifactName } from './artifact-lifecycle.js';
 import { TaskExecutionLockError, withTaskExecutionLock } from './task-execution-lock.js';
 import { captureTaskWriteMetadata, writeTask } from './write.js';
+import { allowsManualOverride } from './guard-override.js';
 const HEAD_RE = /^[0-9a-f]{40}$/;
 const REVIEW_ACTION_RE = /^Review PR \(Round ([1-9]\d*)\)( \[started\])?$/;
 const VERDICTS = new Set(['approved', 'changes-requested', 'commented']);
@@ -292,9 +293,11 @@ export function applyPrReviewActivityIntent(intent, options = {}) {
     const resolved = resolveTaskRef(intent.taskRef, { repoRoot: options.repoRoot });
     if (!resolved.ok)
         return failed(intent, resolved.code, resolved.message, resolved.taskId);
-    if (resolved.state !== 'active') {
+    if (resolved.state !== 'active' && !allowsManualOverride(options.manualOverride, 'activity-intent', 'TASK_STATE_MISMATCH')) {
         return failed(intent, 'TASK_STATE_MISMATCH', `task ${resolved.taskId} is ${resolved.state}, expected active`, resolved.taskId);
     }
+    if (options.lockAlreadyHeld)
+        return applyLocked(intent, validated.agent, { ...options, repoRoot: resolved.repoRoot });
     try {
         return withTaskExecutionLock(resolved.repoRoot, resolved.taskId, `task-activity:${intent.kind}`, () => applyLocked(intent, validated.agent, { ...options, repoRoot: resolved.repoRoot }), options.lockOptions);
     }

package/dist/lib/task/decision-intents.js

@@ -6,6 +6,7 @@ import { LEDGER_COLUMNS, LEDGER_HEADINGS, parseLedger } from './ledger.js';
 import { resolveTaskContext } from './resolve-ref.js';
 import { extractSection, extractSubSection, findSectionHeading } from './sections.js';
 import { captureTaskWriteMetadata, writeTask } from './write.js';
+import { allowsManualOverride } from './guard-override.js';
 const DECISION_ALIASES = ['人工裁决', 'Human Rulings', 'Human Decisions', 'Human Decision'];
 const ACTIVITY_ALIASES = ['活动日志', 'Activity Log'];
 function failed(code, message, taskId = null, ledgerId = null) {
@@ -56,7 +57,8 @@ function applyHumanDecision(request, options = {}) {
     const resolved = resolveTaskContext(request.taskRef, { repoRoot: options.repoRoot });
     if (!resolved.ok)
         return failed(resolved.code, resolved.message, resolved.taskId);
-    if (resolved.state !== 'active')
+    const stateOverride = allowsManualOverride(options.manualOverride, 'decision-intent', 'TASK_STATE_MISMATCH');
+    if (resolved.state !== 'active' && !stateOverride)
         return failed('TASK_STATE_MISMATCH', `task ${resolved.taskId} is ${resolved.state}, expected active`, resolved.taskId);
     let content;
     let rows;
@@ -155,7 +157,7 @@ function applyHumanDecision(request, options = {}) {
         kind: 'section', aliases: ACTIVITY_ALIASES, heading: activity.heading,
         body: appendActivityEntry(activity, { time: metadata.timestamp, step: 'Human Decision', agent: 'human', note: `${row.id} decided → ${recordId}` })
     });
-    const writeResult = writeTask({ taskRef: resolved.taskId, expectedState: 'active', mutations, dryRun: request.dryRun }, {
+    const writeResult = writeTask({ taskRef: resolved.taskId, expectedState: stateOverride ? resolved.state : 'active', mutations, dryRun: request.dryRun }, {
         ...options,
         taskLocation: { repoRoot: resolved.repoRoot, taskId: resolved.taskId, taskMdPath: resolved.taskMdPath, state: resolved.state },
         metadataProvider: () => metadata