@fitlab-ai/agent-infra 0.9.13 → 0.9.15

package/lib/internal/sandbox-control.ts

@@ -1,8 +1,13 @@
+import { createHash, randomUUID } from 'node:crypto';
+import { readFileSync } from 'node:fs';
+import path from 'node:path';
 import {
   recoverSandboxControl,
   requestSandboxControl,
   requestSandboxTaskFinalization,
   requestSandboxTaskControl,
+  requestSandboxTaskWorkflow,
+  resolveVisibleActiveShortId,
   SandboxControlClientError
 } from '../sandbox/control/client.ts';
 import { normalizeAgentToken, AGENT_USAGE_HINT } from '../agent-clients/tokens.ts';
@@ -12,6 +17,115 @@ import {
   controllerProofFromContext,
   verifyCodexSandboxControllerContextWithWarnings
 } from '../agent-clients/adapters/codex-lifecycle/sandbox-controller.ts';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.ts';
+import { parseTaskCreateResult, taskCreateExitCode } from '../task/create-service.ts';
+import { createTaskWorkflowRequest } from '../sandbox/control/task-workflow.ts';
+import { computeLifecycleBuildIdentity } from '../agent-clients/adapters/codex-lifecycle/build-identity.ts';
+import { routeOrchestration } from '../task/orchestration.ts';
+import { parseArtifactName } from '../task/artifact-name.ts';
+import type { LifecycleAuthorityRequestV1 } from '../task/control-authority.ts';
+
+function valueAfter(args: readonly string[], flag: string): string | undefined {
+  for (let index = 0; index < args.length; index += 1) {
+    if (args[index] === flag) return args[index + 1];
+    if (args[index]?.startsWith(`${flag}=`)) return args[index]!.slice(flag.length + 1);
+  }
+  return undefined;
+}
+
+function withoutValue(args: readonly string[], flag: string): string[] {
+  const result: string[] = [];
+  for (let index = 0; index < args.length; index += 1) {
+    if (args[index] === flag) { index += 1; continue; }
+    if (args[index]?.startsWith(`${flag}=`)) continue;
+    result.push(args[index]!);
+  }
+  return result;
+}
+
+function lifecycleIds(authorityRef: string, taskId: string): Readonly<{ operationId: string; lifecycleRequestId: string }> {
+  const digest = (label: string) => createHash('sha256')
+    .update(`${label}\0${taskId}\0${authorityRef}`, 'utf8')
+    .digest('hex');
+  return { operationId: digest('operation'), lifecycleRequestId: digest('lifecycle-request') };
+}
+
+function lifecycleAuthorityIdentity(
+  authorityRef: string,
+  taskId: string,
+  requestId: string,
+  phase: LifecycleAuthorityRequestV1['phase'],
+  family: LifecycleAuthorityRequestV1['family'],
+  artifact: string,
+  round: number
+): LifecycleAuthorityRequestV1 | undefined {
+  const contextPath = process.env.AGENT_INFRA_CODEX_CONTROLLER_CONTEXT;
+  if (!authorityRef || !contextPath) return undefined;
+  const routed = verifyCodexSandboxControllerContextWithWarnings(contextPath, { repoRoot: process.cwd() });
+  const buildIdentity = computeLifecycleBuildIdentity(process.cwd());
+  const hookDefinitionHash = createHash('sha256')
+    .update(readFileSync(path.join(process.cwd(), '.codex', 'hooks.json')))
+    .digest('hex');
+  const ids = lifecycleIds(authorityRef, taskId);
+  return {
+    version: 1,
+    requestId,
+    operationId: ids.operationId,
+    phase,
+    taskId,
+    family,
+    artifact,
+    round,
+    lifecycleRequestId: ids.lifecycleRequestId,
+    authorityRef,
+    expectedControlGeneration: routed.context.controlGeneration,
+    expectedControllerInstanceDigest: routed.context.controllerInstanceDigest,
+    expectedBuildIdentityDigest: createHash('sha256').update(JSON.stringify(buildIdentity)).digest('hex'),
+    expectedHookDefinitionHash: hookDefinitionHash
+  };
+}
+
+function lifecycleAuthoritySelector(args: readonly string[]): LifecycleAuthorityRequestV1 | undefined {
+  if (!isCanonicalCodexPrepare(args)) return undefined;
+  const authorityRef = valueAfter(args, '--capability-ref');
+  const taskId = args[0];
+  if (!authorityRef || !taskId) return undefined;
+  const routed = routeOrchestration(taskId);
+  if (!routed.next || !['analysis', 'plan', 'code'].includes(routed.next.stage)) return undefined;
+  return lifecycleAuthorityIdentity(
+    authorityRef,
+    taskId,
+    randomUUID(),
+    'orchestration.prepare',
+    routed.next.stage === 'analysis' ? 'analysis' : routed.next.stage === 'plan' ? 'plan' : 'code',
+    routed.next.artifact,
+    routed.next.round
+  );
+}
+
+function lifecycleWorkflowAuthoritySelector(
+  originalArgs: readonly string[],
+  workflow: ReturnType<typeof createTaskWorkflowRequest>
+): LifecycleAuthorityRequestV1 | undefined {
+  const authorityRef = valueAfter(originalArgs, '--capability-ref');
+  if (!authorityRef) return undefined;
+  if (workflow.operation === 'artifact-finalize-local') {
+    const family = valueAfter(workflow.args, '--family');
+    const artifact = valueAfter(workflow.args, '--artifact');
+    const parsed = artifact ? parseArtifactName(artifact) : null;
+    if ((family !== 'analysis' && family !== 'plan' && family !== 'code')
+      || !parsed || parsed.family !== family) return undefined;
+    return lifecycleAuthorityIdentity(authorityRef, workflow.taskId, workflow.id,
+      'artifact.finalize-local', family, artifact!, parsed.round);
+  }
+  if (workflow.operation !== 'event') return undefined;
+  const completed = /^(analysis|plan|code)\.completed$/u.exec(workflow.args[1] ?? '');
+  const artifact = valueAfter(workflow.args, '--artifact');
+  const parsed = artifact ? parseArtifactName(artifact) : null;
+  if (!completed || !parsed || parsed.family !== completed[1]) return undefined;
+  return lifecycleAuthorityIdentity(authorityRef, workflow.taskId, workflow.id,
+    'task-event.completed', completed[1] as LifecycleAuthorityRequestV1['family'], artifact!, parsed.round);
+}
 
 function isCanonicalCodexPrepare(args: readonly string[]): boolean {
   if (args[1] !== 'prepare') return false;
@@ -45,6 +159,17 @@ function writeClientError(error: SandboxControlClientError): void {
   if (error.requestId) process.stderr.write(`SANDBOX_CONTROL_REQUEST_ID: ${error.requestId}\n`);
 }
 
+function recoveredExitCode(response: Awaited<ReturnType<typeof recoverSandboxControl>>): number {
+  if (response.phase !== 'completed') return response.exitCode ?? 1;
+  try {
+    const result = parseTaskCreateResult(JSON.parse(response.stdout));
+    if (result.control?.requestId === response.id) return taskCreateExitCode(result);
+  } catch {
+    // Other control families use their own result envelopes.
+  }
+  return response.exitCode ?? 1;
+}
+
 function sandboxFinalizationClient(args: string[]): void {
   if (args.length !== 4 || !args[0] || args[1] !== 'complete' || args[2] !== '--agent' || !args[3]) {
     const error = { code: 'TASK_FINALIZATION_PAYLOAD_INVALID', message: 'task ref, complete intent, and --agent are required', retryable: false };
@@ -87,8 +212,9 @@ function sandboxFinalizationClient(args: string[]): void {
 }
 
 async function sandboxControl(args: string[]): Promise<void> {
+  if (!ensureInternalHandlerRoute('sandbox-control', args)) return;
   const [operation, ...rest] = args;
-  if (operation === 'serve') {
+  if (internalHandlerRoute('sandbox-control', 'serve', operation ?? '')) {
     const manifestIndex = rest.indexOf('--manifest');
     const manifest = manifestIndex >= 0 ? rest[manifestIndex + 1] : undefined;
     if (!manifest) throw new Error('sandbox-control serve requires --manifest');
@@ -104,7 +230,7 @@ async function sandboxControl(args: string[]): Promise<void> {
     }
     return;
   }
-  if (operation === 'execute') {
+  if (internalHandlerRoute('sandbox-control', 'execute', operation ?? '')) {
     const requestIndex = rest.indexOf('--request');
     const nonceIndex = rest.indexOf('--nonce');
     const request = requestIndex >= 0 ? rest[requestIndex + 1] : undefined;
@@ -113,7 +239,7 @@ async function sandboxControl(args: string[]): Promise<void> {
     await runSandboxControlExecutor(request, nonce);
     return;
   }
-  if (operation === 'recover') {
+  if (internalHandlerRoute('sandbox-control', 'recover', operation ?? '')) {
     if (rest.length !== 1 || !rest[0]) throw new Error('sandbox-control recover requires <request-id>');
     let response;
     try {
@@ -128,15 +254,58 @@ async function sandboxControl(args: string[]): Promise<void> {
     process.stderr.write(response.stderr);
     process.exitCode = response.phase === 'rejected'
       ? response.error?.retryable ? 75 : 1
-      : response.exitCode ?? 1;
+      : recoveredExitCode(response);
     return;
   }
-  if (operation === 'client') {
+  if (internalHandlerRoute('sandbox-control', 'client', operation ?? '')) {
     const [family = '', ...commandArgs] = rest;
     if (family === 'task-finalization') {
       sandboxFinalizationClient(commandArgs);
       return;
     }
+    if (family === 'task-workflow') {
+      const command = commandArgs[0] as Parameters<typeof createTaskWorkflowRequest>[0] | undefined;
+      const taskId = process.env.AGENT_INFRA_TASK_ID;
+      const generation = process.env.AGENT_INFRA_CONTROL_GENERATION;
+      if (!command || !taskId || !generation) {
+        process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, error: { code: 'SANDBOX_CONTROL_REQUEST_INVALID', message: 'task-workflow requires a bound task and generation' } })}\n`);
+        process.exitCode = 1;
+        return;
+      }
+      let workflow;
+      try {
+        const args = withoutValue(commandArgs.slice(1), '--capability-ref');
+        if (/^\d+$/.test(args[0] ?? '')) {
+          const resolved = resolveVisibleActiveShortId(args[0]!);
+          if (resolved !== taskId) throw new Error('SANDBOX_TASK_REF_MISMATCH');
+          args[0] = resolved;
+        }
+        workflow = createTaskWorkflowRequest(command, args, taskId, generation);
+      }
+      catch (error) {
+        process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, error: { code: 'SANDBOX_CONTROL_REQUEST_INVALID', message: error instanceof Error ? error.message : String(error) } })}\n`);
+        process.exitCode = 1;
+        return;
+      }
+      let response;
+      try {
+        const authority = lifecycleWorkflowAuthoritySelector(commandArgs, workflow);
+        response = requestSandboxTaskWorkflow({
+          workflow,
+          ...(authority ? { authority } : {})
+        });
+      }
+      catch (error) {
+        if (!(error instanceof SandboxControlClientError)) throw error;
+        writeClientError(error);
+        process.exitCode = error.detail.retryable ? 75 : 1;
+        return;
+      }
+      process.stdout.write(response.stdout);
+      process.stderr.write(response.stderr);
+      process.exitCode = response.phase === 'rejected' ? response.error?.retryable ? 75 : 1 : response.exitCode ?? 1;
+      return;
+    }
     let response;
     try {
       if (family === 'task-orchestration' && isCanonicalCodexPrepare(commandArgs)) {
@@ -144,7 +313,13 @@ async function sandboxControl(args: string[]): Promise<void> {
         const proof = contextPath
           ? controllerProofFromContext(verifyCodexSandboxControllerContextWithWarnings(contextPath).context)
           : null;
-        response = requestSandboxTaskControl({ family, args: commandArgs, controllerProof: proof });
+        const authority = lifecycleAuthoritySelector(commandArgs);
+        response = requestSandboxTaskControl({
+          family,
+          args: commandArgs,
+          controllerProof: authority ? null : proof,
+          ...(authority ? { authority } : {})
+        });
       } else {
         response = requestSandboxControl({ family, args: commandArgs });
       }

package/lib/internal/task-activity.ts

@@ -9,6 +9,7 @@ import type {
 import { consumeHumanOverride, failureId, overrideDryRunConflict } from '../task/human-override.ts';
 import { resolveTaskRef } from '../task/resolve-ref.ts';
 import { TaskExecutionLockError, withTaskExecutionLock } from '../task/task-execution-lock.ts';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.ts';
 
 const USAGE = `Usage: agent-infra-internal task-activity <task-ref> pr-review-inspect
        agent-infra-internal task-activity <task-ref> pr-review-start --agent <agent> --artifact <canonical.md> --head <40hex> [--dry-run]
@@ -44,9 +45,16 @@ function usageFailure(message: string): void {
 }
 
 async function taskActivity(args: string[] = []): Promise<void> {
+  if (!ensureInternalHandlerRoute('task-activity', args)) return;
   if (args[0] === '--help' || args[0] === '-h') { process.stdout.write(USAGE); return; }
   const [taskRef, kind] = args;
-  if (!taskRef || taskRef.startsWith('--') || !kind || !OPERATIONS.has(kind)) {
+  if (!taskRef || taskRef.startsWith('--') || !kind || !OPERATIONS.has(kind)
+    || ![
+      internalHandlerRoute('task-activity', 'pr-review-inspect', kind),
+      internalHandlerRoute('task-activity', 'pr-review-start', kind),
+      internalHandlerRoute('task-activity', 'pr-review-complete', kind),
+      internalHandlerRoute('task-activity', 'pr-review-terminate', kind)
+    ].some(Boolean)) {
     usageFailure('task ref and a supported PR review intent are required');
     return;
   }
@@ -72,7 +80,7 @@ async function taskActivity(args: string[] = []): Promise<void> {
   const allowed = ALLOWED[kind]!;
   const unexpected = Object.keys(values).find((key) => !allowed.has(key));
   if (unexpected) { usageFailure(`${kind} does not accept '${unexpected}'`); return; }
-  if (kind === 'pr-review-inspect') {
+  if (internalHandlerRoute('task-activity', 'pr-review-inspect', kind)) {
     const result = inspectPrReviewActivity(values as PrReviewInspectIntent);
     process.stdout.write(`${JSON.stringify(result)}\n`);
     if (result.status === 'failed') process.exitCode = 1;
@@ -81,9 +89,9 @@ async function taskActivity(args: string[] = []): Promise<void> {
   for (const key of COMMON) {
     if (values[key] === undefined) { usageFailure(`${kind} requires '${key}'`); return; }
   }
-  const operationRequired = kind === 'pr-review-complete'
+  const operationRequired = internalHandlerRoute('task-activity', 'pr-review-complete', kind)
     ? ['verdict', 'blockers', 'major', 'minor']
-    : kind === 'pr-review-terminate' ? ['outcome', 'reason'] : [];
+    : internalHandlerRoute('task-activity', 'pr-review-terminate', kind) ? ['outcome', 'reason'] : [];
   for (const key of operationRequired) {
     if (values[key] === undefined) { usageFailure(`${kind} requires '${key}'`); return; }
   }

package/lib/internal/task-artifact.ts

@@ -1,90 +1,26 @@
-import { resolveArtifactContext } from '../task/artifact-lifecycle.ts';
-import { finalizeLocalArtifact } from '../task/local-artifact-finalization.ts';
-import type { LocalArtifactFamily } from '../task/local-artifact-finalization.ts';
-import { resolveTaskRef } from '../task/resolve-ref.ts';
-import { loadVerificationConfig } from '../task/verification-config.ts';
+import { parseArtifactCommand, executeArtifactCommand } from '../task/artifact-command.ts';
+import { ensureInternalHandlerRoute } from './cli-route-inventory.ts';
 
-const USAGE = `Usage: agent-infra-internal task-artifact <N | TASK-id> inspect --family <family>\n       agent-infra-internal task-artifact <N | TASK-id> finalize-local --family <analysis|plan|code> --artifact <artifact>\n\nInspect workflow artifact context or finalize a local analysis/plan/code artifact without changing task state.\n`;
+const USAGE = `Usage: agent-infra-internal task-artifact <N | TASK-id> inspect --family <family>\n       agent-infra-internal task-artifact <N | TASK-id> init --family <family> --artifact <artifact> [--locale <zh-CN|en>]\n       agent-infra-internal task-artifact <N | TASK-id> repair --family <family> --artifact <artifact> --expected-sha256 <sha256> --expected-semantic-digest <digest>\n       agent-infra-internal task-artifact <N | TASK-id> finalize-local --family <analysis|plan|code> --artifact <artifact>\n\nInspect, initialize, repair, or finalize a workflow artifact without changing task state.\n`;
 
-function failUsage(message: string): void {
-  process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, error: { code: 'ARTIFACT_PAYLOAD_INVALID', message } })}\n`);
-  process.stderr.write(USAGE);
-  process.exitCode = 2;
-}
 
 function taskArtifact(args: string[] = []): void {
+  if (!ensureInternalHandlerRoute('task-artifact', args)) return;
   if (args[0] === '--help' || args[0] === '-h') { process.stdout.write(USAGE); return; }
-  if (args.length < 2) { failUsage('task ref and operation are required'); return; }
-  const operation = args[1];
-  if (operation !== 'inspect' && operation !== 'finalize-local') { failUsage(`unknown operation '${operation}'`); return; }
-  let family = '';
-  let artifact = '';
-  const seen = new Set<string>();
-  for (let index = 2; index < args.length; index += 1) {
-    const flag = args[index]!;
-    if (flag !== '--family' && flag !== '--artifact') { failUsage(`unknown option '${flag}'`); return; }
-    if (seen.has(flag)) { failUsage(`duplicate option '${flag}'`); return; }
-    const value = args[++index];
-    if (!value || value.startsWith('--')) { failUsage(`option '${flag}' requires a value`); return; }
-    seen.add(flag);
-    if (flag === '--family') family = value;
-    else artifact = value;
-  }
-  if (!family) { failUsage("option '--family' is required"); return; }
-  if (operation === 'inspect') {
-    if (artifact) { failUsage("option '--artifact' is only valid for finalize-local"); return; }
-    const result = resolveArtifactContext(args[0]!, family);
-    const output = family === 'code' && result.codeMode ? {
-      ...result,
-      mode: result.codeMode.mode,
-      code_max: result.codeMode.codeMax,
-      rev_max: result.codeMode.reviewMax,
-      verdict: result.codeMode.verdict,
-      next_round: result.next?.round ?? null,
-      next_artifact: result.next?.name ?? null,
-      review_artifact: result.codeMode.reviewArtifact,
-      implementation_input: result.codeMode.implementationInput,
-      decision_id: result.codeMode.decisionId,
-      decision_evidence: result.codeMode.decisionEvidence,
-      message: result.codeMode.message
-    } : result;
-    process.stdout.write(`${JSON.stringify(output)}\n`);
-    if (result.status === 'refused') process.exitCode = 1;
-    else if (result.status === 'failed') process.exitCode = 2;
+  let command;
+  try { command = parseArtifactCommand(args); }
+  catch (error) {
+    process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, error: {
+      code: 'ARTIFACT_PAYLOAD_INVALID', message: error instanceof Error ? error.message : String(error)
+    } })}\n`);
+    process.stderr.write(USAGE);
+    process.exitCode = 2;
     return;
   }
-  const resolved = resolveTaskRef(args[0]!);
-  const repositoryRoot = resolved.ok ? resolved.repoRoot : process.cwd();
-  if (!artifact) { failUsage("option '--artifact' is required"); return; }
-  if (family !== 'analysis' && family !== 'plan' && family !== 'code') {
-    failUsage("finalize-local only supports 'analysis', 'plan', and 'code'");
-    return;
-  }
-  const skillName = family === 'analysis' ? 'analyze-task' : family === 'plan' ? 'plan-task' : 'code-task';
-  let config: { requiredSections?: readonly string[]; requiredPatterns?: readonly string[] } = {};
-  try {
-    const loaded = loadVerificationConfig(repositoryRoot, skillName);
-    const artifactConfig = loaded.checks.artifact;
-    if (artifactConfig && typeof artifactConfig === 'object' && !Array.isArray(artifactConfig)) {
-      const sections = artifactConfig.required_sections;
-      const patterns = artifactConfig.required_patterns;
-      config = {
-        requiredSections: Array.isArray(sections) ? sections.filter((value): value is string => typeof value === 'string') : undefined,
-        requiredPatterns: Array.isArray(patterns) ? patterns.filter((value): value is string => typeof value === 'string') : undefined
-      };
-    }
-  } catch {
-    // Isolated fixture repositories may not contain the project's verification config.
-  }
-  const result = finalizeLocalArtifact({
-    taskRef: args[0]!,
-    family: family as LocalArtifactFamily,
-    artifact,
-    repoRoot: repositoryRoot,
-    ...config
-  });
+  const result = executeArtifactCommand(command);
   process.stdout.write(`${JSON.stringify(result)}\n`);
-  if (result.status === 'failed') process.exitCode = 1;
+  if (result.status === 'refused') process.exitCode = 1;
+  else if (result.status === 'failed') process.exitCode = command.operation === 'inspect' ? 2 : 1;
 }
 
 export { taskArtifact };

package/lib/internal/task-context.ts

@@ -1,5 +1,6 @@
 import { parseTaskScope } from '../task/command-options.ts';
 import { resolveTaskContext } from '../task/resolve-ref.ts';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.ts';
 
 const USAGE = `Usage: agent-infra-internal task-context resolve [<task-ref> | --task <task-ref> | -t <task-ref>]\n`;
 
@@ -10,8 +11,9 @@ function fail(code: string, message: string, usage = false): void {
 }
 
 function taskContext(args: string[] = []): void {
+  if (!ensureInternalHandlerRoute('task-context', args)) return;
   if (args[0] === '--help' || args[0] === '-h') { process.stdout.write(USAGE); return; }
-  if (args[0] !== 'resolve') { fail('TASK_CONTEXT_PAYLOAD_INVALID', "operation 'resolve' is required", true); return; }
+  if (!internalHandlerRoute('task-context', 'resolve', args[0] ?? '')) { fail('TASK_CONTEXT_PAYLOAD_INVALID', "operation 'resolve' is required", true); return; }
   let scope;
   try {
     scope = parseTaskScope(args.slice(1));

package/lib/internal/task-create.ts

@@ -1,25 +1,77 @@
 import fs from 'node:fs';
+import { resolveSandboxControlTransport } from './task-operation-registry.ts';
 import path from 'node:path';
 
-import { requestSandboxTaskCreate, SandboxControlClientError } from '../sandbox/control/client.ts';
+import {
+  requestSandboxTaskCreate,
+  SandboxControlClientError
+} from '../sandbox/control/client.ts';
 import { SANDBOX_CONTROL_MAX_BYTES } from '../sandbox/control/protocol.ts';
 import { validateTaskCreateCandidate } from '../task/create.ts';
-import { createTask, type TaskCreateResult } from '../task/create-service.ts';
+import {
+  createTask,
+  parseTaskCreateResult,
+  projectTaskCreateResult,
+  taskCreateExitCode,
+  taskCreateFailure,
+  type TaskCreateControl,
+  type TaskCreateResult
+} from '../task/create-service.ts';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.ts';
 
-function failed(code: string, message: string, retryable = false): TaskCreateResult {
-  return {
-    status: retryable ? 'blocked' : 'failed', changed: false, task: { id: null, shortId: null }, issue: null,
-    operations: [], warnings: [], error: { code, message, retryable }
-  };
+function failed(code: string, message: string, retryable = false, control?: TaskCreateControl): TaskCreateResult {
+  return taskCreateFailure({ code, message, retryable }, control);
 }
 
 function output(result: TaskCreateResult): void {
   process.stdout.write(`${JSON.stringify(result)}\n`);
-  process.exitCode = result.status === 'blocked' ? 2 : result.status === 'failed' ? 1 : 0;
+  process.exitCode = taskCreateExitCode(result);
+}
+
+function clientErrorControl(error: SandboxControlClientError): TaskCreateControl {
+  return {
+    requestId: error.requestId,
+    accepted: error.accepted,
+    recovery: error.accepted ? 'same-request-id' : error.detail.retryable ? 'new-request-id' : 'none'
+  };
+}
+
+function parseControlledResult(response: ReturnType<typeof requestSandboxTaskCreate>): TaskCreateResult {
+  if (response.phase !== 'completed' || response.error !== null) {
+    return failed(
+      'SANDBOX_CONTROL_RESPONSE_INVALID',
+      'SANDBOX_CONTROL_RESPONSE_INVALID: completed task-create response is invalid',
+      false,
+      { requestId: response.id, accepted: true, recovery: 'same-request-id' }
+    );
+  }
+  let result: TaskCreateResult;
+  try {
+    result = parseTaskCreateResult(JSON.parse(response.stdout));
+  } catch {
+    return failed(
+      'TASK_CREATE_RESULT_INVALID',
+      'TASK_CREATE_RESULT_INVALID: task-create result payload is invalid',
+      false,
+      { requestId: response.id, accepted: true, recovery: 'same-request-id' }
+    );
+  }
+  if (!result.control || result.control.requestId !== response.id || result.control.accepted !== true) {
+    return failed(
+      'TASK_CREATE_RESULT_INVALID',
+      'TASK_CREATE_RESULT_INVALID: controlled task-create result is missing request evidence',
+      false,
+      { requestId: response.id, accepted: true, recovery: 'same-request-id' }
+    );
+  }
+  process.stderr.write(response.stderr);
+  return result;
 }
 
 async function taskCreate(args: string[]): Promise<void> {
-  const inputIndex = args.indexOf('--input');
+  if (!ensureInternalHandlerRoute('task-create', args)) return;
+  const inputSelector = args.includes('--input') ? 'input' : '';
+  const inputIndex = internalHandlerRoute('task-create', 'input', inputSelector) ? args.indexOf('--input') : -1;
   const input = inputIndex >= 0 ? args[inputIndex + 1] : undefined;
   if (!input || args.length !== 2 || inputIndex !== 0) {
     output(failed('TASK_CREATE_PAYLOAD_INVALID', 'Usage: agent-infra-internal task-create --input <candidate.json>'));
@@ -31,25 +83,34 @@ async function taskCreate(args: string[]): Promise<void> {
     if (!stat.isFile() || stat.isSymbolicLink()) throw new Error('TASK_CREATE_INPUT_INVALID: input must be a regular file');
     if (stat.size > SANDBOX_CONTROL_MAX_BYTES) throw new Error('TASK_CREATE_INPUT_TOO_LARGE: input exceeds the control limit');
     const candidate = validateTaskCreateCandidate(JSON.parse(fs.readFileSync(inputPath, 'utf8')));
-    if (process.env.AGENT_INFRA_CONTROL_TOKEN) {
+    const environment = resolveSandboxControlTransport();
+    if (environment.kind === 'fail-closed') {
+      output(failed(environment.reasonCode ?? 'TASK_CONTROL_TRANSPORT_INVALID', 'sandbox client control configuration is invalid'));
+      return;
+    }
+    if (environment.kind === 'broker-client') {
       const response = requestSandboxTaskCreate({ candidate });
       if (response.phase === 'rejected') {
+        const accepted = response.error?.code === 'SANDBOX_CONTROL_RESULT_UNKNOWN';
         output(failed(
           response.error?.code ?? 'SANDBOX_CONTROL_REJECTED',
           response.error?.message ?? response.stderr,
-          response.error?.retryable ?? false
+          response.error?.retryable ?? false,
+          {
+            requestId: response.id,
+            accepted,
+            recovery: accepted ? 'same-request-id' : response.error?.retryable ? 'new-request-id' : 'none'
+          }
         ));
         return;
       }
-      process.stdout.write(response.stdout);
-      process.stderr.write(response.stderr);
-      process.exitCode = response.exitCode;
+      output(parseControlledResult(response));
       return;
     }
     output(await createTask(candidate, { repoRoot: process.cwd() }));
   } catch (error) {
     if (error instanceof SandboxControlClientError) {
-      output(failed(error.detail.code, error.detail.message, error.detail.retryable));
+      output(failed(error.detail.code, error.detail.message, error.detail.retryable, clientErrorControl(error)));
       return;
     }
     const message = error instanceof Error ? error.message : String(error);

package/lib/internal/task-delivery.ts

@@ -2,13 +2,15 @@ import path from 'node:path';
 
 import { normalizeAgentToken, AGENT_USAGE_HINT } from '../agent-clients/tokens.ts';
 import { deliverTaskBranch } from '../task/delivery.ts';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.ts';
 
 const USAGE = `Usage: agent-infra-internal task-delivery <task-ref> deliver --agent <agent> [--remote <name>] [--base <branch>] [--dry-run] [--cwd <path>]\n`;
 
 function taskDelivery(args: string[] = []): void {
+  if (!ensureInternalHandlerRoute('task-delivery', args)) return;
   const taskRef = args[0];
   const operation = args[1];
-  if (!taskRef || operation !== 'deliver') {
+  if (!taskRef || !internalHandlerRoute('task-delivery', 'deliver', operation ?? '')) {
     process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, error: { code: 'DELIVERY_PAYLOAD_INVALID', message: 'task ref and deliver operation are required' } })}\n`);
     process.stderr.write(USAGE);
     process.exitCode = 1;

package/lib/internal/task-event.ts

@@ -4,6 +4,7 @@ import type { TaskEventRequest, Verdict } from '../task/events.ts';
 import { consumeHumanOverride, failureId, overrideDryRunConflict } from '../task/human-override.ts';
 import { resolveTaskRef } from '../task/resolve-ref.ts';
 import { TaskExecutionLockError, withTaskExecutionLock } from '../task/task-execution-lock.ts';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.ts';
 
 const USAGE = `Usage: agent-infra-internal task-event <N | TASK-id> <event> --agent <agent> [event options] [--orchestrated] [--dry-run]
 
@@ -20,6 +21,7 @@ const FLAGS: Record<string, keyof TaskEventRequest> = {
   '--verdict': 'verdict', '--blockers': 'blockers', '--major': 'major',
   '--minor': 'minor', '--manual-validation': 'manualValidation', '--files-modified': 'filesModified',
   '--tests-passed': 'testsPassed', '--summary-result': 'summaryResult',
+  '--transaction-id': 'transactionId', '--receipt-digest': 'receiptDigest', '--pr-head-sha': 'prHeadSha',
   '--override-ticket': 'overrideTicket', '--override-target': 'overrideTarget', '--override-scope': 'overrideScope'
 };
 const NUMERIC = new Set(['round', 'question', 'blockers', 'major', 'minor', 'manualValidation', 'filesModified', 'testsPassed']);
@@ -30,36 +32,45 @@ function usageFailure(message: string): void {
   process.exitCode = 1;
 }
 
-async function taskEvent(args: string[] = []): Promise<void> {
-  if (args[0] === '--help' || args[0] === '-h') { process.stdout.write(USAGE); return; }
-  if (args.length < 2) { usageFailure('task ref and event are required'); return; }
+export function parseTaskEventRequest(args: readonly string[]): TaskEventRequest {
+  if (args.length < 2) throw new Error('task ref and event are required');
   const request: TaskEventRequest = { taskRef: args[0]!, event: args[1]!, agent: '' };
   const seen = new Set<string>();
   for (let index = 2; index < args.length; index += 1) {
     const flag = args[index]!;
     if (flag === '--orchestrated') {
-      if (seen.has(flag)) { usageFailure(`duplicate option '${flag}'`); return; }
+      if (seen.has(flag)) throw new Error(`duplicate option '${flag}'`);
       seen.add(flag); request.orchestrated = true; continue;
     }
     if (flag === '--dry-run') {
-      if (seen.has(flag)) { usageFailure(`duplicate option '${flag}'`); return; }
+      if (seen.has(flag)) throw new Error(`duplicate option '${flag}'`);
       seen.add(flag); request.dryRun = true; continue;
     }
     const key = FLAGS[flag];
-    if (!key) { usageFailure(`unknown option '${flag}'`); return; }
-    if (seen.has(flag)) { usageFailure(`duplicate option '${flag}'`); return; }
+    if (!key) throw new Error(`unknown option '${flag}'`);
+    if (seen.has(flag)) throw new Error(`duplicate option '${flag}'`);
     const value = args[++index];
-    if (value === undefined || value.startsWith('--')) { usageFailure(`option '${flag}' requires a value`); return; }
+    if (value === undefined || value.startsWith('--')) throw new Error(`option '${flag}' requires a value`);
     seen.add(flag);
     if (NUMERIC.has(key)) (request as Record<string, unknown>)[key] = Number(value);
     else if (key === 'verdict') request.verdict = value as Verdict;
     else (request as Record<string, unknown>)[key] = value;
   }
   const agent = normalizeAgentToken(String(request.agent ?? ''));
-  if (!agent) { usageFailure(`invalid --agent '${request.agent}': ${AGENT_USAGE_HINT}`); return; }
+  if (!agent) throw new Error(`invalid --agent '${request.agent}': ${AGENT_USAGE_HINT}`);
   request.agent = agent;
   const dryRunConflict = overrideDryRunConflict(request as unknown as Record<string, unknown>);
-  if (dryRunConflict) { usageFailure(dryRunConflict.message); return; }
+  if (dryRunConflict) throw new Error(dryRunConflict.message);
+  return request;
+}
+
+async function taskEvent(args: string[] = []): Promise<void> {
+  if (!ensureInternalHandlerRoute('task-event', args)) return;
+  if (args[0] === '--help' || args[0] === '-h') { process.stdout.write(USAGE); return; }
+  if (!internalHandlerRoute('task-event', 'event', args[1] ? 'event' : '')) { usageFailure('task ref and event are required'); return; }
+  let request: TaskEventRequest;
+  try { request = parseTaskEventRequest(args); }
+  catch (error) { usageFailure(error instanceof Error ? error.message : String(error)); return; }
   const resolved = resolveTaskRef(request.taskRef);
   if (!resolved.ok) {
     process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, error: { code: resolved.code, message: resolved.message } })}\n`);