@fitlab-ai/agent-infra 0.9.12 → 0.9.14

package/dist/lib/internal/platform-release-notes.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { publishReleaseNotes, releaseNoteContext, stageReleaseNotes } from '../platform/release-notes.js';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.js';
 function parseOptions(args, valueFlags, switchFlags = []) {
     const values = new Map();
     const switches = new Set();
@@ -28,15 +29,17 @@ function finish(result) {
     process.stdout.write(`${JSON.stringify(result)}\n`);
     process.exitCode = result.status === 'blocked' ? 2 : result.status === 'failed' ? 1 : 0;
 }
-function platformReleaseNotes(args = []) {
+async function platformReleaseNotes(args = []) {
+    if (!ensureInternalHandlerRoute('platform-release-notes', args))
+        return;
     const [action, ...rest] = args;
-    if (action === 'context') {
+    if (internalHandlerRoute('platform-release-notes', 'context', action ?? '')) {
         const parsed = parseOptions(rest, ['--cwd', '--history-limit', '--from-tag', '--to-tag', '--branch']);
         if (!parsed)
             return finish(invalidInput('invalid context options'));
         const cwd = path.resolve(parsed.values.get('--cwd') || process.cwd());
         const historyRaw = parsed.values.get('--history-limit') ?? null;
-        finish(releaseNoteContext({
+        finish(await releaseNoteContext({
             fromTag: parsed.values.get('--from-tag') || '',
             toTag: parsed.values.get('--to-tag') || '',
             branch: parsed.values.get('--branch') || '',
@@ -44,7 +47,7 @@ function platformReleaseNotes(args = []) {
         }, { cwd }));
         return;
     }
-    if (action === 'stage') {
+    if (internalHandlerRoute('platform-release-notes', 'stage', action ?? '')) {
         const parsed = parseOptions(rest, ['--cwd', '--notes-file']);
         if (!parsed)
             return finish(invalidInput('invalid stage options'));
@@ -54,7 +57,7 @@ function platformReleaseNotes(args = []) {
         finish(stageReleaseNotes({ notesFile }, { cwd: path.resolve(parsed.values.get('--cwd') || process.cwd()) }));
         return;
     }
-    if (action === 'publish') {
+    if (internalHandlerRoute('platform-release-notes', 'publish', action ?? '')) {
         const parsed = parseOptions(rest, ['--cwd', '--notes-file', '--tag', '--title', '--expected-sha256'], ['--dry-run']);
         if (!parsed)
             return finish(invalidInput('invalid publish options'));
@@ -69,7 +72,7 @@ function platformReleaseNotes(args = []) {
             fs.writeFileSync(resolvedNotesPath, fs.readFileSync(0));
         }
         try {
-            finish(publishReleaseNotes({
+            finish(await publishReleaseNotes({
                 tag: parsed.values.get('--tag') || '',
                 title: parsed.values.get('--title') || parsed.values.get('--tag') || '',
                 notesFile: resolvedNotesPath,

package/dist/lib/internal/platform-security.js

@@ -0,0 +1,93 @@
+import path from 'node:path';
+import { dismissSecurityAlert, readCommentFile, readSecurityAlert } from '../platform/security-alerts.js';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.js';
+const USAGE = `Usage: agent-infra-internal platform-security read --kind <dependabot|code-scanning> --number <number> [--cwd <path>]
+       agent-infra-internal platform-security dismiss --kind <dependabot|code-scanning> --number <number> --reason <reason> --comment-file <path> [--cwd <path>]
+`;
+function fail(message) {
+    process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, error: { code: 'SECURITY_INPUT_INVALID', message, retryable: false } })}\n`);
+    process.stderr.write(USAGE);
+    process.exitCode = 1;
+}
+function finish(result) {
+    process.stdout.write(`${JSON.stringify(result)}\n`);
+    process.exitCode = result.status === 'blocked' ? 2 : result.status === 'failed' ? 1 : 0;
+}
+function parseOptions(args) {
+    const values = new Map();
+    const switches = new Set();
+    const valueFlags = new Set(['--cwd', '--kind', '--number', '--reason', '--comment-file']);
+    for (let index = 0; index < args.length; index += 1) {
+        const flag = args[index];
+        if (flag === '--help' || flag === '-h')
+            return null;
+        if (!valueFlags.has(flag) || values.has(flag) || switches.has(flag))
+            return null;
+        const value = args[++index];
+        if (!value || value.startsWith('--'))
+            return null;
+        values.set(flag, value);
+    }
+    return { values, switches };
+}
+function required(values, flag) {
+    const value = values.get(flag);
+    return value && !value.startsWith('--') ? value : null;
+}
+async function platformSecurity(args = []) {
+    if (!ensureInternalHandlerRoute('platform-security', args))
+        return;
+    if (args[0] === '--help' || args[0] === '-h') {
+        process.stdout.write(USAGE);
+        return;
+    }
+    const action = args[0];
+    if (!internalHandlerRoute('platform-security', 'read', action ?? '')
+        && !internalHandlerRoute('platform-security', 'dismiss', action ?? '')) {
+        fail('a valid operation is required');
+        return;
+    }
+    if (action !== 'read' && action !== 'dismiss') {
+        fail('a valid operation is required');
+        return;
+    }
+    const parsed = parseOptions(args.slice(1));
+    if (!parsed) {
+        fail('invalid security alert options');
+        return;
+    }
+    const kind = required(parsed.values, '--kind');
+    const numberRaw = required(parsed.values, '--number');
+    const cwd = path.resolve(required(parsed.values, '--cwd') || process.cwd());
+    if (!kind || !numberRaw) {
+        fail(`${action} requires --kind and --number`);
+        return;
+    }
+    const number = Number(numberRaw);
+    if (!Number.isSafeInteger(number) || number <= 0) {
+        fail('--number must be a positive integer');
+        return;
+    }
+    if (action === 'read') {
+        if ([...parsed.values.keys()].some((flag) => !['--kind', '--number', '--cwd'].includes(flag))) {
+            fail('read does not accept dismissal options');
+            return;
+        }
+        finish(await readSecurityAlert({ kind: kind, number }, { cwd }));
+        return;
+    }
+    const reason = required(parsed.values, '--reason');
+    const commentFile = required(parsed.values, '--comment-file');
+    if (!reason || !commentFile) {
+        fail('dismiss requires --reason and --comment-file');
+        return;
+    }
+    const comment = readCommentFile(commentFile, cwd);
+    if (!comment.ok) {
+        finish({ status: 'failed', changed: false, error: comment.error });
+        return;
+    }
+    finish(await dismissSecurityAlert({ kind: kind, number, reason, comment: comment.value }, { cwd }));
+}
+export { platformSecurity };
+//# sourceMappingURL=platform-security.js.map

package/dist/lib/internal/pr-review-grade.js

@@ -3,8 +3,9 @@ import path from 'node:path';
 import { collectHostCandidates, decide, deriveTaskIssueMatches, extractClosingIssueNumbers, resolveHostFromCandidates } from '../pr-review/evidence-grading.js';
 import { inspectPlatformPullRequestByNumber } from '../platform/pull-requests.js';
 import { verifyInProcess } from '../task/verification-engine.js';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.js';
 const USAGE = `Usage: agent-infra-internal pr-review-grade decide --input-file <path|-> [--cwd <path>]
-       agent-infra-internal pr-review-grade resolve-host --pr <N> [--cwd <path>]
+       agent-infra-internal pr-review-grade resolve-host --pr <token> [--cwd <path>]
        agent-infra-internal pr-review-grade verify-artifact --artifact-file <path> [--cwd <path>]
 `;
 function fail(message) {
@@ -38,13 +39,19 @@ function parseFlags(args, start) {
 function readInput(value, cwd) {
     return value === '-' ? fs.readFileSync(0, 'utf8') : fs.readFileSync(path.resolve(cwd, value), 'utf8');
 }
-function prReviewGrade(args = []) {
+async function prReviewGrade(args = []) {
+    if (!ensureInternalHandlerRoute('pr-review-grade', args))
+        return;
     if (args[0] === '--help' || args[0] === '-h') {
         process.stdout.write(USAGE);
         return;
     }
     const operation = args[0];
-    if (!operation || !['decide', 'resolve-host', 'verify-artifact'].includes(operation)) {
+    if (!operation || ![
+        internalHandlerRoute('pr-review-grade', 'decide', operation),
+        internalHandlerRoute('pr-review-grade', 'resolve-host', operation),
+        internalHandlerRoute('pr-review-grade', 'verify-artifact', operation)
+    ].some(Boolean)) {
         fail('a valid operation is required');
         return;
     }
@@ -65,7 +72,7 @@ function prReviewGrade(args = []) {
         fail(`${operation} does not accept '--${unexpected}'`);
         return;
     }
-    if (operation === 'decide') {
+    if (internalHandlerRoute('pr-review-grade', 'decide', operation)) {
         if (typeof values.inputFile !== 'string') {
             fail('decide requires --input-file');
             return;
@@ -88,13 +95,13 @@ function prReviewGrade(args = []) {
         }
         return;
     }
-    if (operation === 'resolve-host') {
-        const pr = Number(values.pr);
-        if (!Number.isInteger(pr) || pr <= 0) {
-            fail('resolve-host requires a positive --pr');
+    if (internalHandlerRoute('pr-review-grade', 'resolve-host', operation)) {
+        const pr = typeof values.pr === 'string' ? values.pr : '';
+        if (!pr) {
+            fail('resolve-host requires --pr <token>');
             return;
         }
-        const inspected = inspectPlatformPullRequestByNumber(pr, { cwd });
+        const inspected = await inspectPlatformPullRequestByNumber(pr, { cwd });
         if (!inspected.pullRequest) {
             finish({
                 status: 'failed', changed: false, host: null, candidates: [], closingIssues: [],
@@ -102,17 +109,23 @@ function prReviewGrade(args = []) {
             }, inspected.status === 'blocked' ? 2 : 1);
             return;
         }
+        const prNumber = inspected.pullRequest.number;
+        const prIdentity = inspected.pullRequest.identity || { kind: 'number', value: prNumber };
         const closingIssues = extractClosingIssueNumbers(inspected.pullRequest.body);
-        const candidates = collectHostCandidates({ prNumber: pr, closingIssues, workspaceRoot: cwd });
+        const candidates = collectHostCandidates({ prNumber, prIdentity, closingIssues, workspaceRoot: cwd });
         const host = resolveHostFromCandidates(candidates);
         finish({
             status: 'ok', changed: false,
-            pr: { number: pr, baseSha: inspected.pullRequest.base.sha, headSha: inspected.pullRequest.head.sha, state: inspected.pullRequest.state },
+            pr: { number: prNumber, identity: prIdentity, baseSha: inspected.pullRequest.base.sha, headSha: inspected.pullRequest.head.sha, state: inspected.pullRequest.state },
             closingIssues, candidates, host,
             taskIssueMatches: deriveTaskIssueMatches(host, closingIssues), error: null
         });
         return;
     }
+    if (!internalHandlerRoute('pr-review-grade', 'verify-artifact', operation)) {
+        fail('operation is not registered');
+        return;
+    }
     if (typeof values.artifactFile !== 'string') {
         fail('verify-artifact requires --artifact-file');
         return;
@@ -120,7 +133,7 @@ function prReviewGrade(args = []) {
     const artifactPath = path.resolve(cwd, values.artifactFile);
     let result;
     try {
-        result = verifyInProcess({
+        result = await verifyInProcess({
             mode: 'checks',
             skillName: 'review-pr',
             taskDir: path.dirname(artifactPath),

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

@@ -7,6 +7,7 @@ import { commitExplicitPaths, inspectGitWorkflow, pushGitRefs } from '../git/wor
 import { inspectPlatformRelease, reconcileReleaseMilestones } from '../platform/releases.js';
 import { inspectHomebrewChannel, inspectNpmChannel } from '../release/channels.js';
 import { releaseSnapshot } from '../release/workflow.js';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.js';
 function command(cwd, executable, args) {
     return spawnSync(executable, args, { cwd, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] });
 }
@@ -236,7 +237,7 @@ async function inspectFacts(cwd, version) {
     const local = inspectLocalReleaseFacts(cwd, version);
     const remoteBranch = branch ? git(cwd, ['ls-remote', '--heads', 'origin', branch]) : null;
     const remoteTag = git(cwd, ['ls-remote', '--tags', 'origin', `refs/tags/${tag}`]);
-    const platform = inspectPlatformRelease(tag, { cwd });
+    const platform = await inspectPlatformRelease(tag, { cwd });
     const npm = await inspectNpmChannel(pkg.name, version);
     const formulaUrl = `https://raw.githubusercontent.com/${config.org}/homebrew-tap/main/Formula/${config.project}.rb`;
     const homebrew = await inspectHomebrewChannel(formulaUrl, version);
@@ -247,7 +248,7 @@ async function inspectFacts(cwd, version) {
         localTagAncestor: local.localTagAncestor,
         localTagConflict: local.localTagConflict,
         remoteBranch: Boolean(remoteBranch && remoteBranch.split(/\s+/)[0] === head), remoteTag: Boolean(remoteTag),
-        githubRelease: platform.platform.type !== 'github'
+        githubRelease: platform.error?.code === 'PLATFORM_CAPABILITY_UNSUPPORTED'
             ? true
             : platform.status === 'blocked' ? null : Boolean(platform.release?.published),
         npm: npm.published, homebrew: homebrew.published, smoke,
@@ -295,13 +296,21 @@ async function releaseWorkflow(args = []) {
     const version = String(rawVersion || '').replace(/^v/, '');
     const cwdIndex = rest.indexOf('--cwd');
     const cwd = path.resolve(cwdIndex >= 0 && rest[cwdIndex + 1] ? rest[cwdIndex + 1] : process.cwd());
-    if (!['inspect', 'prepare', 'publish', 'post-prepare', 'post-publish'].includes(action || '') || !semver.valid(version)) {
+    if (![
+        internalHandlerRoute('release-workflow', 'inspect', action || ''),
+        internalHandlerRoute('release-workflow', 'prepare', action || ''),
+        internalHandlerRoute('release-workflow', 'publish', action || ''),
+        internalHandlerRoute('release-workflow', 'post-prepare', action || ''),
+        internalHandlerRoute('release-workflow', 'post-publish', action || '')
+    ].some(Boolean) || !semver.valid(version)) {
         process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, error: { code: 'RELEASE_INPUT_INVALID', message: 'Usage: release-workflow inspect|prepare|publish|post-prepare|post-publish <version>' } })}\n`);
         process.exitCode = 1;
         return;
     }
+    if (!ensureInternalHandlerRoute('release-workflow', args))
+        return;
     const before = releaseSnapshot(version, await inspectFacts(cwd, version));
-    if (action === 'inspect') {
+    if (internalHandlerRoute('release-workflow', 'inspect', action || '')) {
         process.stdout.write(`${JSON.stringify({ status: 'no-op', changed: false, snapshot: before, error: null })}\n`);
         return;
     }
@@ -310,9 +319,9 @@ async function releaseWorkflow(args = []) {
         process.exitCode = 1;
         return;
     }
-    if (action === 'prepare') {
+    if (internalHandlerRoute('release-workflow', 'prepare', action || '')) {
         if (before.phase !== 'unprepared') {
-            const milestones = reconcileReleaseMilestones(version, { cwd });
+            const milestones = await reconcileReleaseMilestones(version, { cwd });
             process.stdout.write(`${JSON.stringify({ ...milestones, snapshot: before })}\n`);
             process.exitCode = milestones.status === 'failed' ? 1 : milestones.status === 'blocked' ? 2 : 0;
             return;
@@ -354,7 +363,7 @@ async function releaseWorkflow(args = []) {
             return;
         }
         const tagged = command(cwd, 'git', ['tag', '-a', `v${version}`, '-m', `Release v${version}`]);
-        const milestones = tagged.status === 0 ? reconcileReleaseMilestones(version, { cwd }) : null;
+        const milestones = tagged.status === 0 ? await reconcileReleaseMilestones(version, { cwd }) : null;
         const snapshot = releaseSnapshot(version, await inspectFacts(cwd, version));
         const failed = tagged.status !== 0 || milestones?.status === 'failed';
         const blocked = milestones?.status === 'blocked';
@@ -363,7 +372,7 @@ async function releaseWorkflow(args = []) {
         process.exitCode = failed ? 1 : blocked ? 2 : 0;
         return;
     }
-    if (action === 'publish') {
+    if (internalHandlerRoute('release-workflow', 'publish', action || '')) {
         if (!before.facts.localTag || !['prepared', 'partially-published'].includes(before.phase)) {
             process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, snapshot: before, error: { code: 'RELEASE_PHASE_INVALID', message: `Cannot publish from ${before.phase}` } })}\n`);
             process.exitCode = 1;
@@ -376,7 +385,7 @@ async function releaseWorkflow(args = []) {
         process.exitCode = result.status === 'failed' ? 1 : result.status === 'degraded' ? 2 : 0;
         return;
     }
-    if (action === 'post-publish') {
+    if (internalHandlerRoute('release-workflow', 'post-publish', action || '')) {
         const expectedValues = optionValues(rest, '--expected-sha256');
         if (expectedValues.length !== 1 || !/^sha256:[0-9a-f]{64}$/.test(expectedValues[0])) {
             process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, snapshot: before, error: { code: 'RELEASE_INPUT_INVALID', message: 'post-publish requires one --expected-sha256 sha256:<64 hex>' } })}\n`);
@@ -415,6 +424,11 @@ async function releaseWorkflow(args = []) {
         process.exitCode = blocked ? 2 : 1;
         return;
     }
+    if (!internalHandlerRoute('release-workflow', 'post-prepare', action || '')) {
+        process.stdout.write(`${JSON.stringify({ status: 'failed', changed: false, snapshot: before, error: { code: 'RELEASE_INPUT_INVALID', message: 'release-workflow action is not registered' } })}\n`);
+        process.exitCode = 1;
+        return;
+    }
     if (before.phase === 'complete') {
         process.stdout.write(`${JSON.stringify({ status: 'no-op', changed: false, snapshot: before, error: null })}\n`);
         return;

package/dist/lib/internal/sandbox-control.js

@@ -1,8 +1,10 @@
-import { requestSandboxControl, requestSandboxTaskFinalization, requestSandboxTaskControl, SandboxControlClientError } from '../sandbox/control/client.js';
+import { recoverSandboxControl, requestSandboxControl, requestSandboxTaskFinalization, requestSandboxTaskControl, SandboxControlClientError } from '../sandbox/control/client.js';
 import { normalizeAgentToken, AGENT_USAGE_HINT } from '../agent-clients/tokens.js';
 import { serveSandboxControl } from '../sandbox/control/server.js';
 import { runSandboxControlExecutor } from '../sandbox/control/executor.js';
 import { controllerProofFromContext, verifyCodexSandboxControllerContextWithWarnings } from '../agent-clients/adapters/codex-lifecycle/sandbox-controller.js';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.js';
+import { parseTaskCreateResult, taskCreateExitCode } from '../task/create-service.js';
 function isCanonicalCodexPrepare(args) {
     if (args[1] !== 'prepare')
         return false;
@@ -23,6 +25,24 @@ function finalizationErrorStatus(error) {
         return 'unknown';
     return error.retryable ? 'blocked' : 'failed';
 }
+function writeClientError(error) {
+    process.stderr.write(`${error.detail.message}\n`);
+    if (error.requestId)
+        process.stderr.write(`SANDBOX_CONTROL_REQUEST_ID: ${error.requestId}\n`);
+}
+function recoveredExitCode(response) {
+    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) {
     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 };
@@ -46,7 +66,7 @@ function sandboxFinalizationClient(args) {
         if (!(error instanceof SandboxControlClientError))
             throw error;
         writeFinalizationEnvelope(finalizationErrorStatus(error.detail), error.accepted, error.detail);
-        process.stderr.write(`${error.detail.message}\n`);
+        writeClientError(error);
         process.exitCode = error.detail.code === 'SANDBOX_CONTROL_RESULT_UNKNOWN' ? 1 : error.detail.retryable ? 2 : 1;
         return;
     }
@@ -66,8 +86,10 @@ function sandboxFinalizationClient(args) {
     process.exitCode = response.exitCode ?? 1;
 }
 async function sandboxControl(args) {
+    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)
@@ -85,7 +107,7 @@ async function sandboxControl(args) {
         }
         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;
@@ -95,7 +117,28 @@ async function sandboxControl(args) {
         await runSandboxControlExecutor(request, nonce);
         return;
     }
-    if (operation === 'client') {
+    if (internalHandlerRoute('sandbox-control', 'recover', operation ?? '')) {
+        if (rest.length !== 1 || !rest[0])
+            throw new Error('sandbox-control recover requires <request-id>');
+        let response;
+        try {
+            response = recoverSandboxControl(rest[0]);
+        }
+        catch (error) {
+            if (!(error instanceof SandboxControlClientError))
+                throw error;
+            writeClientError(error);
+            process.exitCode = error.detail.code === 'SANDBOX_CONTROL_RESULT_UNKNOWN' ? 1 : 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
+            : recoveredExitCode(response);
+        return;
+    }
+    if (internalHandlerRoute('sandbox-control', 'client', operation ?? '')) {
         const [family = '', ...commandArgs] = rest;
         if (family === 'task-finalization') {
             sandboxFinalizationClient(commandArgs);
@@ -117,7 +160,7 @@ async function sandboxControl(args) {
         catch (error) {
             if (!(error instanceof SandboxControlClientError))
                 throw error;
-            process.stderr.write(`${error.detail.message}\n`);
+            writeClientError(error);
             process.exitCode = error.detail.retryable ? 75 : 1;
             return;
         }
@@ -132,7 +175,7 @@ async function sandboxControl(args) {
         }
         return;
     }
-    throw new Error('Usage: agent-infra-internal sandbox-control serve --manifest <path> | execute --request <path> --nonce <nonce> | client <family> [args...]');
+    throw new Error('Usage: agent-infra-internal sandbox-control serve --manifest <path> | execute --request <path> --nonce <nonce> | client <family> [args...] | recover <request-id>');
 }
 export { sandboxControl };
 //# sourceMappingURL=sandbox-control.js.map

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

@@ -2,6 +2,7 @@ import { applyPrReviewActivityIntent, inspectPrReviewActivity } from '../task/ac
 import { consumeHumanOverride, failureId, overrideDryRunConflict } from '../task/human-override.js';
 import { resolveTaskRef } from '../task/resolve-ref.js';
 import { TaskExecutionLockError, withTaskExecutionLock } from '../task/task-execution-lock.js';
+import { ensureInternalHandlerRoute, internalHandlerRoute } from './cli-route-inventory.js';
 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]
        agent-infra-internal task-activity <task-ref> pr-review-complete --agent <agent> --artifact <canonical.md> --head <40hex> --verdict <approved|changes-requested|commented> --blockers <N> --major <N> --minor <N> [--dry-run]
@@ -32,13 +33,21 @@ function usageFailure(message) {
     process.stderr.write(USAGE);
     process.exitCode = 1;
 }
-function taskActivity(args = []) {
+async function taskActivity(args = []) {
+    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;
     }
@@ -78,7 +87,7 @@ function taskActivity(args = []) {
         usageFailure(`${kind} does not accept '${unexpected}'`);
         return;
     }
-    if (kind === 'pr-review-inspect') {
+    if (internalHandlerRoute('task-activity', 'pr-review-inspect', kind)) {
         const result = inspectPrReviewActivity(values);
         process.stdout.write(`${JSON.stringify(result)}\n`);
         if (result.status === 'failed')
@@ -91,9 +100,9 @@ function taskActivity(args = []) {
             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}'`);
@@ -113,7 +122,7 @@ function taskActivity(args = []) {
     let result;
     let humanOverride = null;
     try {
-        result = withTaskExecutionLock(resolved.repoRoot, resolved.taskId, `task-activity.${kind}`, () => {
+        result = await withTaskExecutionLock(resolved.repoRoot, resolved.taskId, `task-activity.${kind}`, async () => {
             let current = applyPrReviewActivityIntent(values, { lockAlreadyHeld: true });
             if (current.status !== 'failed' || !values.overrideTicket)
                 return current;
@@ -121,7 +130,7 @@ function taskActivity(args = []) {
                 usageFailure('override ticket requires target and scope');
                 return current;
             }
-            const consumed = consumeHumanOverride({
+            const consumed = await consumeHumanOverride({
                 taskRef, ticketId: String(values.overrideTicket),
                 failureId: failureId('activity-intent', current.error?.code ?? 'TASK_STATE_MISMATCH'),
                 target: String(values.overrideTarget), scope: String(values.overrideScope)