elanous 0.2.21 → 0.2.23

package/src/agent-env/profile.ts

@@ -1,8 +1,26 @@
+import { spawnSync } from 'node:child_process';
 import { existsSync, readFileSync, readdirSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 
-type Agent = 'claude' | 'codex' | 'grok';
+type Agent = 'claude' | 'codex' | 'grok' | 'gemini';
+
+function versionOf(binary: string): string | null {
+  const result = spawnSync(binary, ['--version'], { encoding: 'utf8', timeout: 3000 });
+  const line = `${result.stdout ?? ''}${result.stderr ?? ''}`.trim().split(/\r?\n/, 1)[0];
+  return result.status === 0 && line && /^[\w .+()-]{1,100}$/.test(line) ? line : null;
+}
+
+// Plugin and marketplace keys are `name@marketplace`; check each part instead of redacting every scoped name.
+function safePluginName(name: string): string {
+  const parts = name.split('@');
+  return parts.length <= 2 && parts.every(part => part !== '' && safeIdentifier(part) === part) ? name : '<redacted>';
+}
+
+function safeNames(path: string): string[] | '«없음»' {
+  return !existsSync(path) ? '«없음»' : readdirSync(path, { withFileTypes: true })
+    .filter(entry => entry.isDirectory()).map(entry => safeIdentifier(entry.name) ?? '<redacted>').sort();
+}
 type Presence = 'present' | '«없음»';
 
 function present(path: string): Presence {
@@ -54,7 +72,7 @@ function collectMcp(
   servers: unknown,
   source: McpSource,
 ): void {
-  for (const [name, server] of Object.entries(record(servers))) into[name] = mcpEntry(server, source);
+  for (const [name, server] of Object.entries(record(servers))) into[safeIdentifier(name) ?? '<redacted>'] = mcpEntry(server, source);
 }
 
 function hookGroups(hooks: Record<string, unknown>): Record<string, unknown[]> {
@@ -86,6 +104,7 @@ function claude(home: string): Record<string, unknown> {
   const skillsDir = join(dir, 'skills');
   const team = join(home, '.teamclaude');
   const teamManifest = json(join(team, 'package.json'));
+  const marketplaces = record(data.extraKnownMarketplaces);
   const teamVersion = typeof teamManifest?.version === 'string' && /^\d+\.\d+\.\d+(?:[-+.][a-zA-Z0-9.-]+)?$/.test(teamManifest.version)
     ? teamManifest.version : undefined;
   const mcp: Record<string, unknown> = {};
@@ -98,6 +117,7 @@ function claude(home: string): Record<string, unknown> {
   }
   const mcpFilesMissing = settings === null && user === null;
   return {
+    version: versionOf('claude'),
     settings: settings === null ? '«없음»' : 'present',
     userConfig: user === null ? '«없음»' : 'present',
     permissionMode: safeIdentifier(record(data.permissions).defaultMode),
@@ -106,10 +126,10 @@ function claude(home: string): Record<string, unknown> {
       command: safeCommand(statusLine.command) ?? null,
     },
     hooks: settings === null ? '«없음»' : hookGroups(hooks),
-    enabledPlugins: settings === null ? '«없음»' : Object.fromEntries(Object.entries(plugins).map(([name, enabled]) => [name, enabled === true])),
+    enabledPlugins: settings === null ? '«없음»' : Object.fromEntries(Object.entries(plugins).map(([name, enabled]) => [safePluginName(name), enabled === true])),
+    marketplaces: settings === null ? '«없음»' : Object.keys(marketplaces).map(name => safeIdentifier(name) ?? '<redacted>').sort(),
     mcpServers: mcpFilesMissing ? '«없음»' : mcp,
-    skills: !existsSync(skillsDir) ? '«없음»' : readdirSync(skillsDir, { withFileTypes: true })
-      .filter(entry => entry.isDirectory()).map(entry => entry.name).sort(),
+    skills: safeNames(skillsDir),
     teamclaude: { installed: present(team), version: teamVersion ?? null },
     auth: present(join(dir, 'auth.json')),
     credentials: present(join(dir, '.credentials.json')),

package/src/agent-mission/acp-judge.ts

@@ -17,7 +17,12 @@ type AcpAgentManagerPort = {
 };
 
 export type JudgeVerdict = 'merge' | 'rework' | 'reject' | 'ambiguous';
-export interface AcpJudgeResult { verdict: JudgeVerdict; asks: string[]; reason: string; raw: string; }
+export interface AcpJudgeResult {
+  verdict: JudgeVerdict; asks: string[]; reason: string; raw: string;
+  /** TA-LAND-MUSTFIX-ZERO — 심판 JSON 의 asks 가 없거나 배열이 아니거나 문자열 아닌 원소가 섞였다(`asks` 는 소비처 호환으로 `[]`·걸러진 값).
+   *  ⛔ 이때 `asks: []` 는 «남은 지적 0» 이 아니라 «모름» — 자동 병합 관문이 `review-must-fix-unknown` 으로 막는다. */
+  asksUnreadable?: true;
+}
 
 /** ACP 최종심판에 전달하는 PR diff의 기본 문자 상한. */
 export const DEFAULT_JUDGE_DIFF_CHAR_LIMIT = 24_000;
@@ -94,7 +99,8 @@ export function parseJudge(raw: string): AcpJudgeResult {
     const d = JSON.parse(json) as { verdict?: string; asks?: unknown; reason?: string };
     const verdict = (['merge', 'rework', 'reject', 'ambiguous'] as const).includes(d.verdict as JudgeVerdict) ? (d.verdict as JudgeVerdict) : 'ambiguous';
     const asks = Array.isArray(d.asks) ? d.asks.filter((x): x is string => typeof x === 'string') : [];
-    return { verdict, asks, reason: typeof d.reason === 'string' ? d.reason : '', raw };
+    const asksUnreadable = !Array.isArray(d.asks) || asks.length !== d.asks.length;
+    return { verdict, asks, reason: typeof d.reason === 'string' ? d.reason : '', raw, ...(asksUnreadable ? { asksUnreadable: true as const } : {}) };
   } catch { return { verdict: 'ambiguous', asks: [], reason: 'json-parse-fail', raw }; }
 }
 

package/src/agent-mission/capabilities-cli.ts

@@ -2,10 +2,12 @@ import type { Command } from 'commander';
 import { buildCapabilityMatrix, pickBackend } from './capability-matrix.js';
 import { createCapabilityReaders, type CapabilityRun } from './capability-readers.js';
 import { normalizeServiceName, type CapabilityEntry } from './capability-types.js';
+import { buildCapabilityIndex, type CapabilityIndexReaders } from '../smart-wizard/capability-index.js';
 
 export interface CapabilitiesCliDeps {
   run?: CapabilityRun;
   write?: (text: string) => void;
+  indexReaders?: CapabilityIndexReaders;
 }
 
 /** Register the read-only capability inventory under agent-mission (and its codex alias). */
@@ -14,7 +16,20 @@ export function registerCapabilitiesCommand(parent: Command, deps: CapabilitiesC
     .description('List codex, claude and grok service capabilities (read only)')
     .option('--service <name>', 'Show observations and selected backend for a service')
     .option('--json', 'Output JSON')
-    .action((opts: { service?: string; json?: boolean }) => {
+    .option('--index', 'Show provenance and authentication index (read only)')
+    .action(async (opts: { service?: string; json?: boolean; index?: boolean }) => {
+      if (opts.index) {
+        const index = await buildCapabilityIndex(deps.indexReaders);
+        const write = deps.write ?? (text => { process.stdout.write(text); });
+        if (opts.json) write(JSON.stringify(index) + '\n');
+        else {
+          write('SOURCE\tSTATUS\n');
+          for (const [source, status] of Object.entries(index.sources)) write(`${source}\t${status}\n`);
+          write('SOURCE\tID\tKIND\tSTATE\tAUTH\tPROVENANCE\n');
+          for (const entry of index.entries) write(`${entry.source}\t${entry.id}\t${entry.kind}\t${entry.state}\t${entry.auth}\t${entry.provenance}\n`);
+        }
+        return;
+      }
       const readers = createCapabilityReaders(deps.run);
       const matrix = buildCapabilityMatrix(readers);
       const entries: CapabilityEntry[] = opts.service

package/src/agent-mission/driver.ts

@@ -30,7 +30,7 @@ import { resolvePtyWebAddress } from '../cli/pty-web-address.js';
 import { verdictForFinalPtyScreen } from '../cli/pty-drive-verdict.js';
 import { reemitPtyUsage } from '../budget/pty-usage-reemit.js';
 import { classifyAuthError } from '../oauth/codex.js';
-import type { FallbackStep } from '../oauth/fallback-chain.js';
+import { normalizeFallbackChain, type FallbackStep } from '../oauth/fallback-chain.js';
 import { runPtyControlLoop, controlDepsForHandle, type ControlDecision, type ControlObservation, type RunSupervisor } from '../autopilot/pty-control-loop.js';
 import { probeControlStance, stanceBlocksWrite } from '../pty-shell/pty-control-stance.js';
 import { mapControlStance, supervisionObservationFields } from '../self-implement/supervision-vocabulary.js';
@@ -352,7 +352,7 @@ export function resolveBackendSpawn(
   //   ⚠️ 과금 스크럽 키만 — 중첩 표지는 정체성 allowlist 가 다시 싣는 키가 있어 이 PR 의 범위 밖이다.
   const unsetEnv = [...new Set(backend.scrubEnv ?? [])].filter((k) => !(k in env));
   // Codex drops parent env under shell_environment_policy inherit=core, so the nested-depth
-  // marker rides on argv (`-c shell_environment_policy.set.ELANOUS_NESTED_DEPTH=<child>`).
+  // marker rides on argv (`-c shell_environment_policy.set.ELANOUS_NESTED_DEPTH="<child>"` — TOML 문자열).
   // Backends that cannot carry it are refused only when a nested elanous launch was requested.
   const args = [...backend.args, ...nestedDepthCodexArgs(backend.name, getNestDepth() + 1)];
   return { cmd: backend.cmd, args, env, unsetEnv, nestedEnvRemovedCount, forcedEnv };
@@ -441,7 +441,7 @@ export function agentBackendNames(): string[] {
  *
  * ⛔ 불변식 셋(윗 모듈에서 그대로 이어받는다):
  *   ① **사람이 이름을 «명시»했으면 이 함수는 «안» 불린다** — 의도가 이긴다(호출자가 위에서 갈린다).
- *   ② **기본 체인은 `['codex-rotate']`** 이라 옵션을 안 켠 사용자는 «항상 codex» — 무변경.
+ *   ② **기본 체인은 `['codex-rotate', 'grok']`** 이며 claude-pty 는 명시 구성에서만 선택된다.
  *   ③ **조용히 바꾸지 않는다** — 바꿨으면 관측에 남긴다. 조용한 폴백은 이 파일이 이미
  *      거부한 형태다(위 `resolveBackend` 주석: *"조용한 codex 폴백은 애그노스틱 위반"*).
  *
@@ -460,9 +460,9 @@ export function resolveDefaultBackend(
         return resolveRunFallback();
       });
     const decision = decide();
-    if (decision.action === 'switch-backend' && decision.backend === 'grok') {
-      debug.log('agent-mission.backend', 'fallback-switch', { from: 'codex', to: 'grok', reason: 'codex-exhausted' });
-      return grokBackend;
+    if (decision.action === 'switch-backend' && (decision.backend === 'grok' || decision.backend === 'claude')) {
+      debug.log('agent-mission.backend', 'fallback-switch', { from: 'codex', to: decision.backend, reason: 'codex-exhausted' });
+      return decision.backend === 'claude' ? claudeBackend : grokBackend;
     }
   } catch (err) {
     debug.log('agent-mission.backend', 'fallback-failed', { message: (err as Error)?.message }, { level: 'warn' });
@@ -503,6 +503,20 @@ interface RuntimeFallbackContext extends RuntimeFallbackState {
   readonly fallbackEligible: boolean;
 }
 
+/** 초기 백엔드의 체인 위치부터 남은 칸만 재시도한다. 실제 전환은 각 칸의 판정이 허용해야 한다. */
+export function initialRuntimeFallback(backend: AgentBackend, chain: readonly FallbackStep[]): RuntimeFallbackContext {
+  const step: FallbackStep = backend.name === 'grok' ? 'grok' : backend.name === 'claude' ? 'claude-pty' : 'codex-rotate';
+  const position = chain.indexOf(step);
+  return {
+    fallbackEligible: true,
+    attemptedSteps: new Set<FallbackStep>([step]),
+    descents: 0,
+    // 초기 칸이 체인에 «없으면»(예: chain=['grok'] 인데 기본 codex 로 떴다) 체인 전체가 남은 칸이다 —
+    // 종전(codex 면 1칸)보다 줄이지 않는다.
+    maxDescents: position < 0 ? chain.filter((s) => s !== step).length : chain.length - position - 1,
+  };
+}
+
 /** 한도 실패에만 재판정한다. 새·미시도 체인 칸과 최초 남은 칸 상한을 모두 만족해야 이동한다. */
 export function decideRuntimeFallback(
   failure: unknown,
@@ -512,8 +526,10 @@ export function decideRuntimeFallback(
 ): AgentBackend | null {
   if (classifyAuthError(failure).errorKind !== 'rate-limited' || state.descents >= state.maxDescents) return null;
   const decision = decide({ currentStep, currentCredentialRateLimited: true });
-  if (decision.action !== 'switch-backend' || decision.backend !== 'grok' || state.attemptedSteps.has('grok')) return null;
-  return grokBackend;
+  if (decision.action !== 'switch-backend') return null;
+  const nextStep = decision.backend === 'grok' ? 'grok' : decision.backend === 'claude' ? 'claude-pty' : null;
+  if (!nextStep || state.attemptedSteps.has(nextStep)) return null;
+  return nextStep === 'claude-pty' ? claudeBackend : grokBackend;
 }
 
 export interface AgentMissionSpec {
@@ -1586,10 +1602,8 @@ async function runAgentMissionBody(spec: AgentMissionSpec, deps: AgentMissionDep
   if (spec.plugin && (spec.headless || (backend.name !== 'codex' && backend.name !== 'claude'))) throw new Error('--plugin 은 codex/claude PTY 전용입니다');
   if (spec.workdir && spec.chain) throw new Error('workdir 모드는 넘기기 사슬을 쓰지 않는다');
   const runtimeFallback = deps.runtimeFallback ?? {
+    ...initialRuntimeFallback(backend, normalizeFallbackChain(getUserConfig().llm?.fallbackChain).chain),
     fallbackEligible: spec.agent === undefined && !spec.chain,
-    attemptedSteps: new Set<FallbackStep>([backend.name === 'grok' ? 'grok' : 'codex-rotate']),
-    descents: 0,
-    maxDescents: backend.name === 'codex' ? 1 : 0,
   };
   const spawnPty = deps.startPty ?? startPty;
   const createMissionWorktree = deps.createWorktree ?? createWorktree;
@@ -2279,7 +2293,7 @@ async function runAgentMissionBody(spec: AgentMissionSpec, deps: AgentMissionDep
         const { resolveRunFallback: resolve } = require('../oauth/codex-account-store.js') as typeof import('../oauth/codex-account-store.js');
         return resolve(process.env, input);
       });
-    const currentStep: FallbackStep = backend.name === 'grok' ? 'grok' : 'codex-rotate';
+    const currentStep: FallbackStep = backend.name === 'grok' ? 'grok' : backend.name === 'claude' ? 'claude-pty' : 'codex-rotate';
     const nextBackend = runtimeFallback.fallbackEligible ? decideRuntimeFallback(
       failure,
       currentStep,
@@ -2296,7 +2310,7 @@ async function runAgentMissionBody(spec: AgentMissionSpec, deps: AgentMissionDep
     });
     if (nextBackend && !deps.isMissionAborted?.()) {
       decisionEvent({ step: 'recover', text: `Switching ${backend.name} to ${nextBackend.name}`, detail: { blocked: control.termination.message, action: `Retry with ${nextBackend.name}` } });
-      const nextStep: FallbackStep = nextBackend.name === 'grok' ? 'grok' : 'codex-rotate';
+      const nextStep: FallbackStep = nextBackend.name === 'grok' ? 'grok' : nextBackend.name === 'claude' ? 'claude-pty' : 'codex-rotate';
       stopLive();
       if (h.pid) await (deps.terminateProcessTree ?? terminateMissionProcessTree)(h.pid);
       try { h.kill(); } catch { /* noop */ }

package/src/agent-mission/pr-review-watch.ts

@@ -25,10 +25,14 @@ import { AUTO_REVIEW_LABEL } from '../self-implement/context-capsule.js';
 import { resolveReworkBackendChoice, runReviewLoop, type ReviewLoopOpts, type ReviewLoopResult, type ReviewVerdict } from './review-loop.js';
 import type { ReviewResult } from '../agent-substrate/pr-reviewer.js';
 
-/** 1차 리뷰 결과(ReviewResult) → review-loop injectedReview. fail→reinforce(mustFix)·pass/warn→ok(clean). 순수. */
+/** 1차 리뷰 결과(ReviewResult) → review-loop injectedReview. fail→reinforce(mustFix)·pass/warn→ok. 순수.
+ *  TA-LAND-MUSTFIX-ZERO — pass/warn 의 must-fix 를 «지우지 않고» asks 로 싣는다: 지우면 review-loop 의
+ *  자동 병합 관문이 «must-fix 0» 으로 읽는다. must-fix 0 이면 종전과 같은 `asks: []`. */
 export function mapReviewToInjected(r: ReviewResult): { verdict: ReviewVerdict; asks: string[] } {
   if (r.verdict === 'fail') return { verdict: 'reinforce', asks: r.mustFix };
-  return { verdict: 'ok', asks: [] };
+  // must-fix 목록을 못 읽으면 «0» 이 아니라 «모름» — ok 로 보내지 않는다(ambiguous = 명확화 요청 · 병합 없음).
+  if (!Array.isArray(r.mustFix)) return { verdict: 'ambiguous', asks: [] };
+  return { verdict: 'ok', asks: [...r.mustFix] };
 }
 
 /** [ISO] ELANOUS_STATE_DIR 존중(lazy) — 테스트격리 시 .elanous-test 로 스코프. */

package/src/agent-mission/review-loop.ts

@@ -31,6 +31,8 @@ export interface ReviewClassification {
   asks: string[];
   reason: string;
   classificationSource: ReviewClassificationSource;
+  /** TA-LAND-MUSTFIX-ZERO — 분류 JSON 의 asks 가 없거나 배열이 아니거나 문자열 아닌 원소가 섞였다. `asks: []` 는 그때 «0» 이 아니라 «모름». */
+  asksUnreadable?: true;
 }
 
 export interface ReviewLoopOpts {
@@ -115,6 +117,16 @@ function gh(args: string[]): string {
   return execFileSync('gh', args, { encoding: 'utf8', timeout: 60000, maxBuffer: 20 * 1024 * 1024, env: process.env });
 }
 
+/** TA-LAND-MUSTFIX-ZERO — 자동 병합 «직전» must-fix 관문(#25941 `canAuto` 와 같은 축).
+ *  남은 지적(asks)이 있으면 `review-warn-with-must-fix` · 목록 자체가 배열이 아니면 «0» 이 아니라
+ *  «모름» = `review-must-fix-unknown`(fail-closed). 막을 때 `review-loop` 범주에 `auto-merge-blocked` 를 남긴다. */
+function reviewMergeMustFixBlock(pr: string, stage: 'initial-ok' | 'final-judge', asks: unknown, unreadable: boolean, round?: number): 'review-warn-with-must-fix' | 'review-must-fix-unknown' | null {
+  const known = Array.isArray(asks) && !unreadable;
+  const reason = !known ? 'review-must-fix-unknown' : (asks as unknown[]).length > 0 ? 'review-warn-with-must-fix' : null;
+  if (reason) debug.log('review-loop', 'auto-merge-blocked', { pr, stage, reason, mustFixCount: known ? (asks as unknown[]).length : null, ...(round !== undefined ? { round } : {}) });
+  return reason;
+}
+
 /** Check every page of the PR file list immediately before an unattended review-loop merge. */
 function holdReleasePathBeforeReviewMerge(pr: string, runGh: (args: string[]) => string): boolean {
   let paths: string[];
@@ -254,10 +266,16 @@ export async function judgeAndFinalize(
   debug.log('review-loop', 'judge-start', { pr, round, diffChars: preparedDiff.totalChars, judgeBackend: judgeBackendResolution.backend, judgeBackendSource: judgeBackendResolution.source });
   const judge = opts.judge ?? judgeWithAcp;
   const j = await judge({ diff, context: `반영한 지적:\n${asks.join('\n')}${reviewerContext}`, gatePassed: true, cwd, backend: judgeBackendResolution.backend, ...(opts.judgeModel ? { model: opts.judgeModel } : {}) });
-  debug.log('review-loop', 'judge-verdict', { pr, round, verdict: j.verdict, asks: j.asks.length });
+  debug.log('review-loop', 'judge-verdict', { pr, round, verdict: j.verdict, asks: Array.isArray(j.asks) ? j.asks.length : null });
   const diffScope = `심판 diff 범위: 본 ${preparedDiff.judgeChars}자 / 전체 ${preparedDiff.totalChars}자`;
 
   if (j.verdict === 'merge') {
+    // TA-LAND-MUSTFIX-ZERO — 심판이 «merge» 라도 남긴 asks(미해결 지적)가 있으면 자동 병합하지 않는다 → HITL.
+    const mustFixBlock = opts.autoMerge ? reviewMergeMustFixBlock(pr, 'final-judge', j.asks, j.asksUnreadable === true, round) : null;
+    if (mustFixBlock) {
+      try { runGh(['pr', 'comment', pr, '--body', `🛑 ACP Claude Code 2차 최종심판: **MERGE** 이나 미해결 지적이 남아 자동 병합하지 않음(${mustFixBlock} · 라운드 ${round}) → 대표 결정 필요.\n${diffScope}\n사유: ${j.reason}`]); } catch { /* noop */ }
+      return { pr, branch, verdict: 'reinforce', asks: Array.isArray(j.asks) ? j.asks : asks, action: 'parked', reworkOk: true, pushed: lastPushed, rounds: round, detail: `2차 심판 MERGE ⊕ ${mustFixBlock} → HITL: ${j.reason}` };
+    }
     if (opts.autoMerge) {
       if (holdReleasePathBeforeReviewMerge(pr, runGh)) return { pr, branch, verdict: 'reinforce', asks, action: 'parked', reworkOk: true, pushed: lastPushed, rounds: round, detail: 'OP approval required: release-path hold or PR file inspection unavailable' };
       const approve = opts.approve ?? approvePr;
@@ -279,7 +297,7 @@ export async function judgeAndFinalize(
     try { runGh(['pr', 'comment', pr, '--body', `🛑 ACP Claude Code 2차 최종심판: **${j.verdict.toUpperCase()}** (라운드 ${round}) → 대표 결정 필요.\n${diffScope}\n사유: ${j.reason}`]); } catch { /* noop */ }
     return { pr, branch, verdict: 'reinforce', asks, action: 'parked', reworkOk: true, pushed: lastPushed, rounds: round, detail: `2차 심판 ${j.verdict} → HITL: ${j.reason}` };
   }
-  return { rework: j.asks.length > 0 ? j.asks : asks };
+  return { rework: Array.isArray(j.asks) && j.asks.length > 0 ? j.asks : asks };
 }
 
 export interface LatestReviewSource {
@@ -429,7 +447,8 @@ JSON 만: {"verdict":"...","asks":["..."],"reason":"..."}`;
     const d = JSON.parse(jm[0]) as { verdict?: string; asks?: unknown; reason?: string };
     const verdict = (['ok', 'reinforce', 'reject', 'ambiguous'] as const).includes(d.verdict as ReviewVerdict) ? (d.verdict as ReviewVerdict) : 'ambiguous';
     const asks = Array.isArray(d.asks) ? d.asks.filter((x): x is string => typeof x === 'string') : [];
-    return { verdict, asks, reason: typeof d.reason === 'string' ? d.reason : '', classificationSource: 'llm' };
+    const asksUnreadable = !Array.isArray(d.asks) || asks.length !== d.asks.length;
+    return { verdict, asks, reason: typeof d.reason === 'string' ? d.reason : '', classificationSource: 'llm', ...(asksUnreadable ? { asksUnreadable: true as const } : {}) };
   } catch { return { verdict: 'ambiguous', asks: [], reason: 'JSON 파싱 실패', classificationSource: 'llm' }; }
 }
 
@@ -497,15 +516,24 @@ export async function runReviewLoop(pr: string, opts: ReviewLoopOpts = {}): Prom
   debug.log('review-loop', 'classified', {
     pr,
     verdict: cls.verdict,
-    asks: cls.asks.length,
+    asks: Array.isArray(cls.asks) ? cls.asks.length : null, // 목록 없음 = null(«0» 아님) — 아래 must-fix 관문이 막는다
     source: opts.injectedReview ? 'injected' : 'gh',
     reason: cls.reason,
     classificationSource: cls.classificationSource,
   });
 
-  let asks = cls.asks;
+  let asks = Array.isArray(cls.asks) ? cls.asks : []; // 목록 없음·못 읽음은 아래 자동 병합 관문이 cls 로 막는다 · rework/명확화 소비처만 `[]` 로 읽는다
 
   if (cls.verdict === 'ok') {
+    // TA-LAND-MUSTFIX-ZERO — 1차 «ok» 에 지적(asks)이 남았거나 목록을 못 읽으면 자동 병합 경로로 가지 않는다(승인도 안 함) → HITL.
+    //   light·heavy 둘 다 — heavy 는 심판에 asks 를 안 넘기므로(`[]`) 여기서 막지 않으면 심판 merge 가 1차 must-fix 를 덮는다.
+    //   관문은 «이 경로가 실제로 자동 병합할 때»만 — light 는 autoMergeOnOk||autoMerge, heavy 는 심판 merge 의 autoMerge 뿐(autoMergeOnOk 만이면 종전대로 심판 → ready-to-merge).
+    const autoMergesHere = effectiveFinalJudge ? opts.autoMerge === true : (opts.autoMergeOnOk || opts.autoMerge);
+    const mustFixBlock = autoMergesHere ? reviewMergeMustFixBlock(pr, 'initial-ok', cls.asks, cls.asksUnreadable === true) : null;
+    if (mustFixBlock) {
+      try { runGh(['pr', 'comment', pr, '--body', `🛑 1차 리뷰 ok 이나 미해결 지적이 남아 자동 병합하지 않음(${mustFixBlock}) → 대표 결정 필요.`]); } catch { /* noop */ }
+      return { pr, branch, verdict: 'ok', asks: Array.isArray(cls.asks) ? cls.asks : [], action: 'parked', detail: `${depth}·1차 ok ⊕ ${mustFixBlock} → HITL(자동 병합 안 함)` };
+    }
     // light: 1차 clean 으로 충분 → approve + 머지. heavy: 1차 ok 여도 2차 심판 머스트.
     if (!effectiveFinalJudge) {
       if ((opts.autoMergeOnOk || opts.autoMerge) && holdReleasePathBeforeReviewMerge(pr, runGh)) {

package/src/agent-mission/supervisor-metrics.ts

@@ -69,8 +69,17 @@ function linkedRows(rows: readonly SupervisorLogRow[], missionIds: ReadonlySet<s
   const linked: SupervisorLogRow[] = [];
   let unlinked = false;
   for (const row of rows) {
-    const key = missionKey(row.data);
-    if (key && missionIds.has(key)) linked.push(row);
+    // The driver writes its runId into the ambient log payload and the PTY decision's
+    // sessionId; the decision emitter may replace missionId with a display alias.
+    // Without a runId, either retained identifier can identify an existing result.
+    const runId = row.data?.runId;
+    const sessionId = row.category === DECISION_CATEGORY ? row.data?.sessionId : undefined;
+    const key = typeof runId === 'string' && runId.trim() ? runId.trim() : null;
+    const sessionKey = typeof sessionId === 'string' && sessionId.trim() ? sessionId.trim() : null;
+    const missionId = typeof row.data?.missionId === 'string' && row.data.missionId.trim() ? row.data.missionId.trim() : null;
+    const matches = key ? missionIds.has(key)
+      : (missionId !== null && missionIds.has(missionId)) || (sessionKey !== null && missionIds.has(sessionKey));
+    if (matches) linked.push(row);
     else unlinked = true;
   }
   return { linked, unlinked };
@@ -123,6 +132,12 @@ export function aggregateSupervisorMetrics(
     ? unmeasured('questionsAnswered', '대화형 질문에 답해 넘긴 수', UNLINKED_REASON)
     : answers.linked.length === 0
     ? unmeasured('questionsAnswered', '대화형 질문에 답해 넘긴 수', '못 잼 · pty.decision answer 기록 없음')
+    : answers.linked.some((row) => {
+      const detail = row.data?.detail;
+      return !detail || typeof detail !== 'object' || !('answer' in detail)
+        || typeof detail.answer !== 'string' || !detail.answer.trim();
+    })
+    ? unmeasured('questionsAnswered', '대화형 질문에 답해 넘긴 수', '못 잼 · 답변 본문 기록 없음')
     : {
       id: 'questionsAnswered',
       label: '대화형 질문에 답해 넘긴 수',

package/src/agent-substrate/acp-reviewer.ts

@@ -25,10 +25,16 @@ export interface AcpReviewerOpts {
   cwd: string;
   /** ACP 백엔드 id (기본 claude = Claude Code via claude-code-acp). */
   backend?: string;
+  /** Per-review ACP spawn specification (subscription executor). */
+  backendSpec?: import('../acp/backend-registry.js').AcpBackendSpec;
+  /** Subscription child environment after billing credentials are removed. */
+  env?: Record<string, string>;
   /** 모델 tier 별칭 (opus|sonnet|haiku 등). 지정 시 session/set_model 로 고정(백엔드 CLI 기본 위임 아님). */
   model?: string;
   /** 리뷰 1턴 최대 대기(ms). 초과 시 cancel→throw(부분 리뷰로 오판 pass 방지). 기본 300000. */
   timeoutMs?: number;
+  /** One deadline for spawn → initialize → session/new → model select (ms). A child that never answers ACP must not hang the review. Default min(timeoutMs, 60000). */
+  handshakeTimeoutMs?: number;
 }
 
 /**
@@ -96,7 +102,7 @@ export function makeAcpReviewLLM(opts: AcpReviewerOpts): (prompt: string, images
     //   ⇒ 이 한 줄만 자기 catch 로 감싼다(전체 try 를 앞당기면 `start` 관측이 그 안으로 들어간다).
     let transport: string | null;
     try {
-      transport = injected ? null : getAcpBackend(backend).transport ?? 'acp';
+      transport = injected ? null : opts.backendSpec?.transport ?? getAcpBackend(backend).transport ?? 'acp';
     } catch (e) {
       debug.log('acp-review', 'error', {
         requestedBackend, backend, stage: 'resolve-backend', message: (e as Error).message,
@@ -116,6 +122,7 @@ export function makeAcpReviewLLM(opts: AcpReviewerOpts): (prompt: string, images
     let capabilitiesObserved = false;
     const agentOpts: Omit<AcpAgentOpts, 'backendId'> = {
       cwd: opts.cwd,
+      ...(opts.backendSpec ? { backendSpec: opts.backendSpec, env: opts.env } : {}),
       log: (message) => debug.log('acp-review', 'agent-log', { backend, message }),
       onCapabilities: (capabilities) => {
         capabilitiesObserved = true;
@@ -142,16 +149,25 @@ export function makeAcpReviewLLM(opts: AcpReviewerOpts): (prompt: string, images
     };
     // A review owns its manager and subprocess: the global manager caches
     // chat agents, whose callbacks and lifecycle must not be mutated here.
-    const reviewManager = injected ? undefined : new AcpAgentManager();
+    const reviewManager = injected || opts.backendSpec ? undefined : new AcpAgentManager();
     let agent: AcpAgent | undefined;
     let text = '';
     let timedOut = false;
     let timer: ReturnType<typeof setTimeout> | undefined;
+    const handshakeTimeoutMs = opts.handshakeTimeoutMs ?? Math.min(timeoutMs, 60_000);
+    const handshakeDeadline = Date.now() + handshakeTimeoutMs;
+    let handshakeTimer: ReturnType<typeof setTimeout> | undefined;
+    const withinHandshake = <T>(step: Promise<T>): Promise<T> => Promise.race([step, new Promise<never>((_, reject) => {
+      handshakeTimer = setTimeout(() => {
+        debug.log('acp-review', 'handshake-timeout', { backend, handshakeTimeoutMs }, { level: 'error' });
+        reject(new Error(`ACP handshake timeout (${handshakeTimeoutMs}ms)`));
+      }, Math.max(0, handshakeDeadline - Date.now()));
+    })]).finally(() => { if (handshakeTimer) clearTimeout(handshakeTimer); });
     try {
-      agent = opts.createAgent
-        ? opts.createAgent({ backendId: requestedBackend, ...agentOpts })
-        : await reviewManager!.getAgent(requestedBackend, agentOpts);
-      if (injected) await agent.start();
+      if (opts.createAgent) agent = opts.createAgent({ backendId: requestedBackend, ...agentOpts });
+      else if (opts.backendSpec) agent = new AcpAgent({ backendId: requestedBackend, ...agentOpts });
+      else agent = await withinHandshake(reviewManager!.getAgent(requestedBackend, agentOpts));
+      if (injected || opts.backendSpec) await withinHandshake(agent.start());
       if (!capabilitiesObserved) {
         try {
           debug.log('acp-review', 'capabilities', {
@@ -165,9 +181,9 @@ export function makeAcpReviewLLM(opts: AcpReviewerOpts): (prompt: string, images
           // Observability must not interrupt a review.
         }
       }
-      const sid = await agent.newSession();
+      const sid = await withinHandshake(agent.newSession());
       if (opts.model) {
-        const picked = await agent.selectSessionModel(sid, opts.model);
+        const picked = await withinHandshake(agent.selectSessionModel(sid, opts.model));
         debug.log('acp-review', 'model', { requested: opts.model, picked: picked?.name ?? null, backend });
       }
       timer = setTimeout(() => { timedOut = true; agent!.cancel(sid).catch(() => { /* noop */ }); }, timeoutMs);
@@ -211,7 +227,7 @@ export function makeAcpReviewLLM(opts: AcpReviewerOpts): (prompt: string, images
       // cleanup seam, while the per-review manager releases its agents and
       // process hooks. An injected agent is external to the manager.
       try {
-        if (injected) await agent?.stop();
+        if (injected || opts.backendSpec) await agent?.stop();
         else await reviewManager!.dispose();
       } catch (e) {
         debug.log('acp-review', 'stop-fail', { backend, message: (e as Error).message }, { level: 'error' });