@fitlab-ai/agent-infra 0.9.8 → 0.9.10

package/dist/lib/agent-clients/adapters/codex-lifecycle/sandbox-controller.js

@@ -5,25 +5,11 @@ import os from 'node:os';
 import path from 'node:path';
 import semver from 'semver';
 import * as toml from 'smol-toml';
-import { requestSandboxControl } from '../../../sandbox/control/client.js';
+import { requestCodexControllerClose, requestCodexControllerOpen, requestCodexControllerVerify, requestSandboxControl } from '../../../sandbox/control/client.js';
 import { readSandboxControlStatus } from '../../../sandbox/control/state.js';
-import { getProcessStartTime, isProcessAlive } from '../../../server/process-state.js';
-import { computeLifecycleBuildIdentity } from './build-identity.js';
-const CONTEXT_TTL_MS = 4 * 60 * 60 * 1_000;
-function digestFiles(files) {
-    const hash = crypto.createHash('sha256');
-    for (const file of [...files].sort()) {
-        const stat = fs.lstatSync(file);
-        if (!stat.isFile() || stat.isSymbolicLink()) {
-            throw new Error('CODEX_SANDBOX_CONTROLLER_BUNDLE_MISMATCH');
-        }
-        hash.update(path.basename(file));
-        hash.update('\0');
-        hash.update(fs.readFileSync(file));
-        hash.update('\0');
-    }
-    return hash.digest('hex');
-}
+import { getProcessStartTime } from '../../../server/process-state.js';
+import { LIFECYCLE_PROTOCOL_VERSION } from './build-identity.js';
+import { contextFromControllerLease, controllerProofFromContext, verifyCodexSandboxControllerContextWithWarnings as verifyContextFileWithWarnings, writeCodexSandboxControllerContext } from './controller-context.js';
 function copyRegular(source, destination, mode) {
     const stat = fs.lstatSync(source);
     if (!stat.isFile() || stat.isSymbolicLink()) {
@@ -108,6 +94,30 @@ function verifyControl(taskId, control) {
     if (payload.taskId !== taskId)
         throw new Error('CODEX_SANDBOX_CONTROLLER_TASK_BINDING_INVALID');
 }
+function verifyCodexSandboxControllerContextWithWarnings(contextPath, options = {}) {
+    const control = options.control ?? controlFromEnvironment();
+    const fileVerification = verifyContextFileWithWarnings(contextPath, {
+        repoRoot: options.repoRoot,
+        now: options.now,
+        generation: control.generation,
+        probeProcess: options.probeProcess
+    });
+    const context = fileVerification.context;
+    const verified = (options.requestControllerVerify ?? requestCodexControllerVerify)({
+        controllerProof: controllerProofFromContext(context),
+        ...control,
+        timeoutMs: 30_000
+    });
+    if (verified.binding.taskId !== context.taskId
+        || verified.binding.controlGeneration !== context.controlGeneration
+        || verified.binding.controllerInstanceDigest !== context.controllerInstanceDigest) {
+        throw new Error('CODEX_SANDBOX_CONTROLLER_CONTEXT_INVALID');
+    }
+    return Object.freeze({
+        context,
+        warnings: fileVerification.warnings
+    });
+}
 function detectedCodexVersion() {
     const result = spawnSync('codex', ['--version'], { encoding: 'utf8' });
     const version = /codex-cli\s+(\d+\.\d+\.\d+)/u.exec(result.stdout ?? '')?.[1];
@@ -191,7 +201,6 @@ function prepareCodexSandboxController(input, options = {}) {
     const repoRoot = path.resolve(options.repoRoot ?? process.cwd());
     const sourceHome = path.resolve(options.codexHome ?? process.env.CODEX_HOME ?? path.join(os.homedir(), '.codex'));
     const control = options.control ?? controlFromEnvironment();
-    (options.verifyTaskBinding ?? verifyControl)(input.taskId, control);
     const version = (options.codexVersion ?? detectedCodexVersion)();
     if (!semver.gte(version, '0.147.0'))
         throw new Error('CODEX_SANDBOX_CONTROLLER_CODEX_UNSUPPORTED');
@@ -200,48 +209,36 @@ function prepareCodexSandboxController(input, options = {}) {
     fs.mkdirSync(runtimeRoot, { recursive: true, mode: 0o700 });
     fs.chmodSync(runtimeRoot, 0o700);
     const key = crypto.createHash('sha256')
-        .update(`${input.taskId}\0${control.generation}`)
+        .update(`${process.pid}\0${control.generation}`)
         .digest('hex');
-    const leasePath = path.join(runtimeRoot, `${key}.lease.json`);
-    if (fs.existsSync(leasePath)) {
-        const lease = JSON.parse(fs.readFileSync(leasePath, 'utf8'));
-        if (Number.isSafeInteger(lease.pid) && typeof lease.startTime === 'number'
-            && getProcessStartTime(lease.pid) === lease.startTime) {
-            throw new Error('CODEX_SANDBOX_CONTROLLER_BUSY');
-        }
-        fs.unlinkSync(leasePath);
-    }
     const parentStartTime = getProcessStartTime(process.pid);
     if (!parentStartTime)
         throw new Error('CODEX_SANDBOX_CONTROLLER_PROCESS_IDENTITY_INVALID');
-    const instanceDigest = crypto.randomBytes(32).toString('hex');
-    fs.writeFileSync(leasePath, `${JSON.stringify({
-        version: 1,
-        pid: process.pid,
-        startTime: parentStartTime,
-        taskId: input.taskId,
-        generation: control.generation,
-        instanceDigest
-    })}\n`, { mode: 0o600, flag: 'wx' });
     const home = fs.mkdtempSync(path.join(runtimeRoot, `${key}-`));
     fs.chmodSync(home, 0o700);
     let cleaned = false;
+    let context = null;
     const cleanup = () => {
         if (cleaned)
             return;
         cleaned = true;
+        if (context) {
+            try {
+                (options.closeController ?? requestCodexControllerClose)({
+                    controllerProcess: context.controllerProcess,
+                    controllerProof: controllerProofFromContext(context),
+                    ...control,
+                    timeoutMs: 30_000
+                });
+            }
+            catch {
+                // The wrapper is exiting; dead-process recovery safely handles an unknown close result.
+            }
+        }
         const relative = path.relative(runtimeRoot, home);
         if (!relative.startsWith('..') && !path.isAbsolute(relative)) {
             fs.rmSync(home, { recursive: true, force: true });
         }
-        try {
-            const lease = JSON.parse(fs.readFileSync(leasePath, 'utf8'));
-            if (lease.instanceDigest === instanceDigest)
-                fs.unlinkSync(leasePath);
-        }
-        catch {
-            // A missing or replaced lease is owned by another cleanup path.
-        }
     };
     try {
         const auth = path.join(sourceHome, 'auth.json');
@@ -254,31 +251,26 @@ function prepareCodexSandboxController(input, options = {}) {
         copyRegular(hooks, path.join(home, 'hooks.json'), 0o600);
         copyRegular(executor, path.join(home, 'agents', path.basename(executor)), 0o600);
         copyRegular(reviewer, path.join(home, 'agents', path.basename(reviewer)), 0o600);
-        if (crypto.createHash('sha256').update(fs.readFileSync(path.join(home, 'hooks.json'))).digest('hex')
-            !== crypto.createHash('sha256').update(fs.readFileSync(hooks)).digest('hex')
-            || digestFiles([
-                path.join(home, 'agents', path.basename(executor)),
-                path.join(home, 'agents', path.basename(reviewer))
-            ]) !== digestFiles([executor, reviewer])) {
-            throw new Error('CODEX_SANDBOX_CONTROLLER_BUNDLE_MISMATCH');
+        const opened = (options.openController ?? requestCodexControllerOpen)({
+            controllerProcess: { pid: process.pid, startTime: parentStartTime },
+            ...control,
+            timeoutMs: 30_000
+        });
+        const taskId = opened.lease.taskId;
+        if (opened.lease.buildIdentity.protocolVersion !== LIFECYCLE_PROTOCOL_VERSION) {
+            throw new Error('CODEX_LIFECYCLE_PROTOCOL_MISMATCH: Codex lifecycle protocol version does not match');
         }
-        const buildIdentity = computeLifecycleBuildIdentity(repoRoot);
-        const now = (options.now ?? Date.now)();
-        const context = Object.freeze({
-            version: 1,
-            taskId: input.taskId,
-            controlGeneration: control.generation,
-            controllerInstanceDigest: instanceDigest,
-            parentPid: process.pid,
-            parentStartTime,
-            issuedAt: now,
-            expiresAt: now + CONTEXT_TTL_MS,
-            buildIdentity,
-            hookDefinitionHash: crypto.createHash('sha256').update(fs.readFileSync(hooks)).digest('hex'),
-            lifecycleProfilesHash: digestFiles([executor, reviewer])
+        context = contextFromControllerLease(opened.lease, {
+            hookDefinitionHash: crypto.createHash('sha256').update(fs.readFileSync(hooks)).digest('hex')
         });
+        if (opened.lease.controlGeneration !== control.generation
+            || opened.lease.controllerProcess.pid !== process.pid
+            || opened.lease.controllerProcess.startTime !== parentStartTime) {
+            throw new Error('SANDBOX_CONTROL_RESULT_INVALID');
+        }
+        (options.verifyTaskBinding ?? verifyControl)(taskId, control);
         const contextPath = path.join(home, 'controller-context.json');
-        fs.writeFileSync(contextPath, `${JSON.stringify(context, null, 2)}\n`, { mode: 0o600 });
+        writeCodexSandboxControllerContext(contextPath, context);
         const shimDir = path.join(home, 'bin');
         fs.mkdirSync(shimDir, { mode: 0o700 });
         const internalCli = path.resolve(process.argv[1] ?? path.join(repoRoot, 'bin', 'internal-cli.ts'));
@@ -292,7 +284,7 @@ function prepareCodexSandboxController(input, options = {}) {
             input.reviewerModel ? `--reviewer-model ${input.reviewerModel}` : '',
             input.reviewerReasoningEffort ? `--reviewer-reasoning-effort ${input.reviewerReasoningEffort}` : ''
         ].filter(Boolean).join(' ');
-        const prompt = `$run-task ${input.taskRef}${policy ? ` ${policy}` : ''}`;
+        const prompt = `$run-task ${taskId}${policy ? ` ${policy}` : ''}`;
         const args = Object.freeze([
             'exec',
             '--enable', 'hooks',
@@ -303,7 +295,7 @@ function prepareCodexSandboxController(input, options = {}) {
             '-C', repoRoot,
             prompt
         ]);
-        const env = isolatedEnvironment(home, shimDir, contextPath, input.taskId, control, providerEnvironment, options.environment ?? process.env);
+        const env = isolatedEnvironment(home, shimDir, contextPath, taskId, control, providerEnvironment, options.environment ?? process.env);
         return Object.freeze({
             command: 'codex',
             args,
@@ -319,27 +311,6 @@ function prepareCodexSandboxController(input, options = {}) {
         throw error;
     }
 }
-function verifyCodexSandboxControllerContext(contextPath, taskId, options = {}) {
-    const stat = fs.lstatSync(contextPath);
-    if (!stat.isFile() || stat.isSymbolicLink() || (stat.mode & 0o077) !== 0) {
-        throw new Error('CODEX_SANDBOX_CONTROLLER_CONTEXT_INVALID');
-    }
-    const context = JSON.parse(fs.readFileSync(contextPath, 'utf8'));
-    const generation = options.generation ?? process.env.AGENT_INFRA_CONTROL_GENERATION;
-    if (context.version !== 1
-        || context.taskId !== taskId
-        || context.controlGeneration !== generation
-        || context.expiresAt < (options.now ?? Date.now())
-        || getProcessStartTime(context.parentPid) !== context.parentStartTime
-        || !isProcessAlive(context.parentPid)) {
-        throw new Error('CODEX_SANDBOX_CONTROLLER_CONTEXT_INVALID');
-    }
-    const current = computeLifecycleBuildIdentity(options.repoRoot ?? process.cwd());
-    if (JSON.stringify(current) !== JSON.stringify(context.buildIdentity)) {
-        throw new Error('CODEX_SANDBOX_CONTROLLER_BUNDLE_MISMATCH');
-    }
-    return Object.freeze(context);
-}
 async function runCodexSandboxController(input, options = {}) {
     const prepared = prepareCodexSandboxController(input, options);
     try {
@@ -394,5 +365,5 @@ async function runCodexSandboxController(input, options = {}) {
         prepared.cleanup();
     }
 }
-export { prepareCodexSandboxController, runCodexSandboxController, verifyCodexSandboxControllerContext };
+export { prepareCodexSandboxController, runCodexSandboxController, verifyCodexSandboxControllerContextWithWarnings, controllerProofFromContext };
 //# sourceMappingURL=sandbox-controller.js.map

package/dist/lib/agent-clients/adapters/codex-sandbox.js

@@ -30,6 +30,8 @@ function resolveHostCatalogPath(value, hostHomeDir) {
     }
 }
 const CODEX_DISABLED_FEATURE_FLAGS = ['apps', 'enable_mcp_apps'];
+const SANDBOX_CODEX_HOOKS_PATH = '/workspace/.codex/hooks.json';
+const CODEX_HOOK_TRUST_HASH = /^sha256:[a-f0-9]{64}$/;
 function removeCodexMcpServers(sandboxParsed) {
     if (!Object.hasOwn(sandboxParsed, 'mcp_servers')) {
         return false;
@@ -61,19 +63,58 @@ function inheritDisabledCodexFeatureFlags(sandboxParsed, hostParsed) {
     }
     return changed;
 }
-function ensureCodexModelInheritance(toolDir, hostHomeDir, containerCodexDir = '/home/devuser/.codex') {
-    if (!hostHomeDir) {
-        return;
+function inheritCodexHookTrustState(sandboxParsed, hostParsed, hostProjectDir) {
+    if (!hostProjectDir) {
+        return false;
     }
-    const hostConfigPath = path.join(hostHomeDir, '.codex', 'config.toml');
-    if (!fs.existsSync(hostConfigPath)) {
-        return;
+    if (Object.hasOwn(sandboxParsed, 'hooks') && !isJsonObjectRecord(sandboxParsed.hooks)) {
+        return false;
     }
-    let hostParsed;
-    try {
-        hostParsed = toml.parse(fs.readFileSync(hostConfigPath, 'utf8'));
+    const sandboxHooks = sandboxParsed.hooks ?? {};
+    if (Object.hasOwn(sandboxHooks, 'state') && !isJsonObjectRecord(sandboxHooks.state)) {
+        return false;
     }
-    catch {
+    const sandboxState = sandboxHooks.state ?? {};
+    const sandboxPrefix = `${SANDBOX_CODEX_HOOKS_PATH}:`;
+    const nextState = Object.fromEntries(Object.entries(sandboxState).filter(([key]) => !key.startsWith(sandboxPrefix)));
+    const hostState = isJsonObjectRecord(hostParsed.hooks)
+        && isJsonObjectRecord(hostParsed.hooks.state)
+        ? hostParsed.hooks.state
+        : {};
+    const hostPrefix = `${path.join(hostProjectDir, '.codex', 'hooks.json')}:`;
+    for (const [key, value] of Object.entries(hostState)) {
+        if (!key.startsWith(hostPrefix) || !isJsonObjectRecord(value)) {
+            continue;
+        }
+        const trustedHash = value.trusted_hash;
+        if (typeof trustedHash !== 'string' || !CODEX_HOOK_TRUST_HASH.test(trustedHash)) {
+            continue;
+        }
+        nextState[`${sandboxPrefix}${key.slice(hostPrefix.length)}`] = {
+            trusted_hash: trustedHash,
+            ...(typeof value.enabled === 'boolean' ? { enabled: value.enabled } : {})
+        };
+    }
+    if (JSON.stringify(sandboxState) === JSON.stringify(nextState)) {
+        return false;
+    }
+    if (Object.keys(nextState).length > 0) {
+        sandboxHooks.state = nextState;
+        sandboxParsed.hooks = sandboxHooks;
+    }
+    else {
+        delete sandboxHooks.state;
+        if (Object.keys(sandboxHooks).length > 0) {
+            sandboxParsed.hooks = sandboxHooks;
+        }
+        else {
+            delete sandboxParsed.hooks;
+        }
+    }
+    return true;
+}
+function ensureCodexModelInheritance(toolDir, hostHomeDir, containerCodexDir = '/home/devuser/.codex', hostProjectDir) {
+    if (!hostHomeDir) {
         return;
     }
     const sandboxConfigPath = path.join(toolDir, 'config.toml');
@@ -87,8 +128,25 @@ function ensureCodexModelInheritance(toolDir, hostHomeDir, containerCodexDir = '
             return;
         }
     }
+    const hostConfigPath = path.join(hostHomeDir, '.codex', 'config.toml');
+    let hostParsed = null;
+    if (fs.existsSync(hostConfigPath)) {
+        try {
+            hostParsed = toml.parse(fs.readFileSync(hostConfigPath, 'utf8'));
+        }
+        catch {
+            // An unavailable host trust source must not leave previously projected trust active.
+        }
+    }
+    if (!hostParsed) {
+        if (inheritCodexHookTrustState(sandboxParsed, {}, hostProjectDir)) {
+            fs.writeFileSync(sandboxConfigPath, `${toml.stringify(sandboxParsed)}\n`, 'utf8');
+        }
+        return;
+    }
     let changed = removeCodexMcpServers(sandboxParsed);
     changed = inheritDisabledCodexFeatureFlags(sandboxParsed, hostParsed) || changed;
+    changed = inheritCodexHookTrustState(sandboxParsed, hostParsed, hostProjectDir) || changed;
     const inheritSpecs = [
         ['model', 'string'],
         ['model_reasoning_effort', 'string'],
@@ -151,7 +209,10 @@ const codexBeforeContainerCreateHook = {
                 message: 'Codex sandbox hook requires its resolved tool state.'
             };
         }
-        ensureCodexModelInheritance(entry.dir, create.hostHome, entry.tool.containerMount);
+        const hostProjectDir = typeof context.config?.repoRoot === 'string'
+            ? context.config.repoRoot
+            : undefined;
+        ensureCodexModelInheritance(entry.dir, create.hostHome, entry.tool.containerMount, hostProjectDir);
         ensureCodexWorkspaceTrust(entry.dir);
         return { status: 'ready' };
     }

package/dist/lib/agent-clients/adapters/index.js

@@ -3,11 +3,13 @@ import { claudeCodeAdapter } from './claude-code.js';
 import { codexAdapter } from './codex.js';
 import { antigravityCliAdapter } from './antigravity-cli.js';
 import { opencodeAdapter } from './opencode.js';
+import { traecliAdapter } from './traecli.js';
 const adaptersById = new Map([
     claudeCodeAdapter,
     codexAdapter,
     antigravityCliAdapter,
-    opencodeAdapter
+    opencodeAdapter,
+    traecliAdapter
 ].map((adapter) => [adapter.id, adapter]));
 const BUILTIN_AGENT_CLIENT_ADAPTERS = Object.freeze(AGENT_CLIENT_IDS.map((id) => {
     const adapter = adaptersById.get(id);

package/dist/lib/agent-clients/adapters/traecli.js

@@ -0,0 +1,66 @@
+import { defineAgentClientAdapter } from '../adapter.js';
+import { hostJoin } from '../../sandbox/engines/wsl2-paths.js';
+const traecliAdapter = defineAgentClientAdapter({
+    id: 'traecli',
+    displayName: 'TraeCode CLI',
+    invocation: '/${skillName}',
+    capabilities: {
+        instructions: { level: 'compatible' },
+        skills: { level: 'compatible' },
+        commands: { level: 'integrated' },
+        hooks: { level: 'compatible' },
+        subagents: { level: 'experimental' },
+        orchestration: { level: 'experimental' },
+        sandbox: { level: 'integrated' },
+        verification: { level: 'compatible' }
+    },
+    modelSelection: {
+        kind: 'interactive-only',
+        command: '/model',
+        guidance: 'Use the host model picker for the complete model and reasoning-effort catalog.'
+    },
+    delegationEvidence: {
+        actualModel: 'unavailable',
+        actualReasoningEffort: 'unavailable'
+    },
+    project: {
+        ownedPathPrefixes: ['.trae/'],
+        managed: ['.trae/skills/'],
+        merged: [],
+        ejected: [],
+        seedCommands: [{
+                templates: {
+                    en: '.trae/skills/update-agent-infra.en.md',
+                    'zh-CN': '.trae/skills/update-agent-infra.zh-CN.md'
+                },
+                target: '.trae/skills/update-agent-infra.md'
+            }],
+        customCommand: {
+            target: '.trae/skills/${skillName}.md',
+            frontmatter: {},
+            includeUsage: true,
+            inheritDisableModelInvocation: true
+        }
+    },
+    sandbox: {
+        createTool: ({ home }) => ({
+            id: 'traecli',
+            name: 'TraeCode CLI',
+            install: {
+                type: 'shell',
+                cmd: 'curl -fsSL https://trae.cn/trae-cli/install_v2.sh | bash'
+            },
+            sandboxBase: hostJoin(home, '.agent-infra', 'sandboxes', 'traecli'),
+            containerMount: '/home/devuser/.trae',
+            versionCmd: 'traecli --version',
+            setupHint: 'Run traecli login inside the container to authenticate.'
+        }),
+        aliases: [
+            { name: 'traecli-yolo', command: 'traecli --dangerously-bypass-approvals-and-sandbox; tput ed' },
+            { name: 'ty', command: 'traecli --dangerously-bypass-approvals-and-sandbox; tput ed' }
+        ],
+        hooks: []
+    }
+});
+export { traecliAdapter };
+//# sourceMappingURL=traecli.js.map

package/dist/lib/agent-clients/tokens.js

@@ -2,7 +2,7 @@
 // activity log. Migrated from lib/task/commands/log.ts so that the write-side
 // internal commands and the rendering side share one definition. Historical
 // Gemini tokens remain read-only and are handled by classifyAgent below.
-export const KNOWN_AI_AGENTS = new Set(['claude', 'codex', 'antigravity', 'opencode', 'cursor']);
+export const KNOWN_AI_AGENTS = new Set(['claude', 'codex', 'antigravity', 'opencode', 'cursor', 'traecli']);
 // Long name -> short name mapping (HD-4, decision A): `claude-code` reuses the
 // existing orchestration precedent, and `antigravity-cli` is the active
 // client. `gemini-cli` is intentionally not writable.
@@ -10,7 +10,7 @@ export const AGENT_LONG_NAMES = {
     'claude-code': 'claude',
     'antigravity-cli': 'antigravity'
 };
-export const AGENT_USAGE_HINT = "agent must be a short token (claude/codex/antigravity/opencode/cursor), " +
+export const AGENT_USAGE_HINT = "agent must be a short token (claude/codex/antigravity/opencode/cursor/traecli), " +
     "a long name (claude-code -> claude, antigravity-cli -> antigravity), or 'human'";
 // Read-side historical compatibility for activity-log rendering: `gemini` and
 // `gemini-cli` stay recognizable when displaying old logs, but are never

package/dist/lib/agent-clients/types.js

@@ -2,7 +2,8 @@ const AGENT_CLIENT_IDS = [
     'claude-code',
     'codex',
     'antigravity-cli',
-    'opencode'
+    'opencode',
+    'traecli'
 ];
 const AGENT_CLIENT_CAPABILITY_IDS = [
     'instructions',

package/dist/lib/defaults.json

@@ -22,6 +22,11 @@
             "id": "opencode",
             "enabled": true,
             "installInSandbox": true
+        },
+        {
+            "id": "traecli",
+            "enabled": true,
+            "installInSandbox": true
         }
     ],
     "sandbox": {

package/dist/lib/git/workflow.js

@@ -124,7 +124,16 @@ function pushGitRefs(input, runner = defaultRunner) {
         }
         const canonical = ref.startsWith('refs/') ? ref : `refs/heads/${ref}`;
         const remoteFact = run(runner, input.cwd, ['ls-remote', '--exit-code', input.remote, canonical]);
-        operations.push({ name: 'push', ref, status: remoteFact.status === 0 ? 'applied' : 'failed', message: remoteFact.status === 0 ? undefined : 'Remote ref verification failed' });
+        const remoteSha = remoteFact.status === 0 ? remoteFact.stdout.trim().split(/\s+/)[0] ?? null : null;
+        const verified = remoteFact.status === 0 && (!input.expectedSha || remoteSha === input.expectedSha);
+        operations.push({
+            name: 'push',
+            ref,
+            status: verified ? 'applied' : 'failed',
+            message: verified ? undefined : input.expectedSha
+                ? `Remote ref verification failed: expected ${input.expectedSha}, received ${remoteSha ?? 'unavailable'}`
+                : 'Remote ref verification failed'
+        });
     }
     const failures = operations.filter((item) => item.status === 'failed').length;
     return { status: failures === 0 ? 'applied' : failures === operations.length ? 'failed' : 'degraded', changed: failures < operations.length, snapshot: inspectGitWorkflow(input.cwd, runner).snapshot, operations, error: failures ? { code: 'GIT_PUSH_PARTIAL', message: `${failures} ref push operation(s) failed` } : null };

package/dist/lib/internal/codex-lifecycle.js

@@ -6,8 +6,9 @@ import { preflightCodexLifecycleEvidence, resolveCodexTerminal, resolveCodexThre
 import { createCodexLifecycleStore } from '../agent-clients/adapters/codex-lifecycle/store.js';
 import { createCodexCapabilityStore } from '../agent-clients/adapters/codex-lifecycle/capability-store.js';
 import { computeLifecycleBuildIdentity } from '../agent-clients/adapters/codex-lifecycle/build-identity.js';
-import { verifyCodexSandboxControllerContext } from '../agent-clients/adapters/codex-lifecycle/sandbox-controller.js';
+import { verifyCodexSandboxControllerContextWithWarnings } from '../agent-clients/adapters/codex-lifecycle/sandbox-controller.js';
 import { resolveTaskRef } from '../task/resolve-ref.js';
+import { hasSealableOrchestrationDelegation } from '../task/orchestration.js';
 import { activateCodexOrchestrationDelegation, activateCodexSpawnDelegation, reconcileCodexOrchestrationDelegation, sealCodexOrchestrationDelegation, sealCodexParentDelegation } from '../task/codex-orchestration.js';
 const USAGE = 'Usage: agent-infra-internal codex-lifecycle <capability-arm|hook-event|resolve-start|resolve-stop|preflight|consume> [options]\n';
 const MANAGED_AGENT = /^agent-infra-lifecycle-(executor|reviewer)$/;
@@ -80,7 +81,7 @@ function controllerBinding(taskId) {
     const contextPath = process.env.AGENT_INFRA_CODEX_CONTROLLER_CONTEXT;
     if (!contextPath)
         return undefined;
-    const context = verifyCodexSandboxControllerContext(contextPath, taskId, { repoRoot: process.cwd() });
+    const context = verifyCodexSandboxControllerContextWithWarnings(contextPath, { repoRoot: process.cwd() }).context;
     return {
         instanceDigest: context.controllerInstanceDigest,
         controlGeneration: context.controlGeneration
@@ -121,7 +122,8 @@ function recordFromPayload(phase, payload) {
             sessionId: text('sessionId'),
             turnId: text('turnId'),
             childThreadId: text('childThreadId'),
-            nativeAgent: text('nativeAgent')
+            nativeAgent: text('nativeAgent'),
+            source: 'hook'
         };
     if (phase === 'subagent-stop')
         return {
@@ -314,8 +316,17 @@ async function codexLifecycle(args = []) {
             }
             const result = store.apply(event);
             if (parsed.values['--bridge'] === 'true' && event.type === 'hook-stop') {
-                const bridged = await sealCodexOrchestrationDelegation(event.childThreadId, { store });
-                outputBridgeResult(bridged);
+                if (!hasSealableOrchestrationDelegation('codex', event.childThreadId, { repoRoot: process.cwd() })) {
+                    output({ status: 'ignored', changed: false, evidence: null, diagnostics: [], error: null });
+                    return;
+                }
+                output({
+                    status: result.state.status,
+                    changed: true,
+                    evidence: result.state,
+                    diagnostics: [],
+                    error: result.state.error
+                });
                 return;
             }
             output({ status: result.state.status, changed: true, evidence: result.state, diagnostics: [], error: result.state.error });
@@ -341,7 +352,10 @@ async function codexLifecycle(args = []) {
             return;
         }
         if (parsed.operation === 'resolve-stop') {
-            const terminal = await resolveCodexTerminal(childThreadId);
+            const stopTurnId = store.read(childThreadId).state.stop?.turnId;
+            if (!stopTurnId)
+                throw new Error('Codex lifecycle stop hook is not available');
+            const terminal = await resolveCodexTerminal(childThreadId, stopTurnId);
             const latest = store.apply(terminal);
             if (latest.state.status !== 'stop-ready') {
                 throw new Error(`Codex lifecycle stop evidence is not ready (status=${latest.state.status})`);

package/dist/lib/internal/codex-sandbox-controller.js

@@ -1,4 +1,4 @@
-import { runCodexSandboxController, verifyCodexSandboxControllerContext } from '../agent-clients/adapters/codex-lifecycle/sandbox-controller.js';
+import { runCodexSandboxController, verifyCodexSandboxControllerContextWithWarnings } from '../agent-clients/adapters/codex-lifecycle/sandbox-controller.js';
 const USAGE = 'Usage: agent-infra-internal codex-sandbox-controller <run|verify-context> [options]\n';
 function fail(code, message, exitCode = 1) {
     process.stdout.write(`${JSON.stringify({
@@ -20,8 +20,6 @@ function parse(args) {
         return null;
     }
     const allowed = new Set([
-        '--task-id',
-        '--task-ref',
         '--context',
         '--executor-model',
         '--executor-reasoning-effort',
@@ -31,6 +29,11 @@ function parse(args) {
     const values = {};
     for (let index = 1; index < args.length; index += 1) {
         const flag = args[index];
+        if (flag === '--task-id' || flag.startsWith('--task-id=')
+            || flag === '--task-ref' || flag.startsWith('--task-ref=')) {
+            fail('CODEX_SANDBOX_CONTROLLER_IDENTITY_OPTION_UNSUPPORTED', 'controller task identity options are not supported', 2);
+            return null;
+        }
         const value = args[++index];
         if (!allowed.has(flag) || Object.hasOwn(values, flag) || !value || value.startsWith('--')) {
             fail('CODEX_SANDBOX_CONTROLLER_PAYLOAD_INVALID', `invalid option '${flag}'`, 2);
@@ -44,18 +47,14 @@ async function codexSandboxController(args = []) {
     const parsed = parse(args);
     if (!parsed || process.exitCode)
         return;
-    const taskId = parsed.values['--task-id'];
-    if (!taskId) {
-        fail('CODEX_SANDBOX_CONTROLLER_PAYLOAD_INVALID', '--task-id is required', 2);
-        return;
-    }
     try {
         if (parsed.operation === 'verify-context') {
             const contextPath = parsed.values['--context']
                 ?? process.env.AGENT_INFRA_CODEX_CONTROLLER_CONTEXT;
             if (!contextPath)
                 throw new Error('CODEX_SANDBOX_CONTROLLER_CONTEXT_MISSING');
-            const context = verifyCodexSandboxControllerContext(contextPath, taskId);
+            const verified = verifyCodexSandboxControllerContextWithWarnings(contextPath);
+            const context = verified.context;
             process.stdout.write(`${JSON.stringify({
                 status: 'ready',
                 changed: false,
@@ -66,15 +65,12 @@ async function codexSandboxController(args = []) {
                     expiresAt: context.expiresAt,
                     buildIdentity: context.buildIdentity,
                     hookDefinitionHash: context.hookDefinitionHash,
-                    lifecycleProfilesHash: context.lifecycleProfilesHash
                 },
+                ...(verified.warnings.length > 0 ? { warnings: verified.warnings } : {}),
                 error: null
             })}\n`);
             return;
         }
-        const taskRef = parsed.values['--task-ref'];
-        if (!taskRef)
-            throw new Error('CODEX_SANDBOX_CONTROLLER_TASK_REF_REQUIRED');
         const policy = [
             '--executor-model',
             '--executor-reasoning-effort',
@@ -86,8 +82,6 @@ async function codexSandboxController(args = []) {
             throw new Error('CODEX_SANDBOX_CONTROLLER_MODEL_POLICY_INVALID');
         }
         const exitCode = await runCodexSandboxController({
-            taskId,
-            taskRef,
             executorModel: parsed.values['--executor-model'],
             executorReasoningEffort: parsed.values['--executor-reasoning-effort'],
             reviewerModel: parsed.values['--reviewer-model'],

package/dist/lib/internal/git-workflow.js

@@ -1,7 +1,8 @@
 import fs from 'node:fs';
-import { commitExplicitPaths, inspectGitWorkflow, pushGitRefs, pushRebasedBranch } from '../git/workflow.js';
+import { inspectGitWorkflow, pushRebasedBranch } from '../git/workflow.js';
 import { compareReviewTrees, snapshotReview } from '../git/review-snapshot.js';
 import { resolvePostReviewGlobs } from '../task/review-fingerprint.js';
+import { executeCommitOperation } from '../task/commit-operation.js';
 function output(value) { process.stdout.write(`${JSON.stringify(value)}\n`); }
 function gitWorkflow(args = []) {
     const [action, ...rest] = args;
@@ -16,12 +17,9 @@ function gitWorkflow(args = []) {
     else if (action === 'commit') {
         const inputIndex = rest.indexOf('--input');
         const input = inputIndex >= 0 && rest[inputIndex + 1] ? JSON.parse(fs.readFileSync(rest[inputIndex + 1], 'utf8')) : null;
-        result = input ? commitExplicitPaths({ cwd: cwd ?? process.cwd(), ...input }) : { status: 'failed', changed: false, error: { code: 'GIT_INPUT_REQUIRED', message: '--input JSON file is required' } };
-    }
-    else if (action === 'push') {
-        const inputIndex = rest.indexOf('--input');
-        const input = inputIndex >= 0 && rest[inputIndex + 1] ? JSON.parse(fs.readFileSync(rest[inputIndex + 1], 'utf8')) : null;
-        result = input ? pushGitRefs({ cwd: cwd ?? process.cwd(), ...input }) : { status: 'failed', changed: false, error: { code: 'GIT_INPUT_REQUIRED', message: '--input JSON file is required' } };
+        result = input
+            ? executeCommitOperation({ cwd: cwd ?? process.cwd(), ...input })
+            : { status: 'failed', changed: false, error: { code: 'GIT_INPUT_REQUIRED', message: '--input JSON file is required' } };
     }
     else if (action === 'push-rebased') {
         const inputIndex = rest.indexOf('--input');