elanous 0.2.20 → 0.2.22

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/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';
@@ -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/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,6 +25,10 @@ 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. */
@@ -96,7 +100,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 +120,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,7 +147,7 @@ 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;
@@ -150,8 +155,10 @@ export function makeAcpReviewLLM(opts: AcpReviewerOpts): (prompt: string, images
     try {
       agent = opts.createAgent
         ? opts.createAgent({ backendId: requestedBackend, ...agentOpts })
-        : await reviewManager!.getAgent(requestedBackend, agentOpts);
-      if (injected) await agent.start();
+        : opts.backendSpec
+          ? new AcpAgent({ backendId: requestedBackend, ...agentOpts })
+          : await reviewManager!.getAgent(requestedBackend, agentOpts);
+      if (injected || opts.backendSpec) await agent.start();
       if (!capabilitiesObserved) {
         try {
           debug.log('acp-review', 'capabilities', {
@@ -211,7 +218,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' });

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

@@ -59,6 +59,8 @@ export interface ReviewResult {
    * ⚠️ 미주입(`llmReview` 없음)은 «실패가 아니라 미검토»라 이 칸을 안 채운다 — 둘을 구분한다.
    */
   failureReason?: string;
+  /** Subscription reviewer unavailable: the default reviewer produced this verdict. */
+  reviewerFallback?: string;
 }
 
 /** 모든 리뷰 관측 생산자가 공유하는 diff 예산 필드 계약. 예산 부재는 빈 객체로 보존한다.
@@ -300,7 +302,7 @@ export function planReviewChunks(
  */
 export function foldReviewResults(
   results: readonly ReviewResult[],
-): Pick<ReviewResult, 'verdict' | 'mustFix' | 'shouldFix' | 'requirements' | 'reviewed' | 'failureReason'> {
+): Pick<ReviewResult, 'verdict' | 'mustFix' | 'shouldFix' | 'requirements' | 'reviewed' | 'failureReason' | 'reviewerFallback'> {
   const dedupe = (values: readonly string[]): string[] => [...new Set(values)];
   const collect = (pick: (r: ReviewResult) => readonly string[] | undefined): string[] =>
     dedupe(results.flatMap((r) => [...(pick(r) ?? [])]));
@@ -311,6 +313,7 @@ export function foldReviewResults(
   const shouldFix = collect((r) => r.shouldFix).slice(0, 6);
   const requirements = collect((r) => r.requirements);
   const failed = results.find((r) => r.reviewed !== true);
+  const reviewerFallback = results.find((r) => r.reviewerFallback)?.reviewerFallback;
   return {
     verdict,
     mustFix,
@@ -318,6 +321,7 @@ export function foldReviewResults(
     ...(requirements.length ? { requirements } : {}),
     reviewed: results.length > 0 && failed === undefined,
     ...(failed?.failureReason ? { failureReason: failed.failureReason } : {}),
+    ...(reviewerFallback ? { reviewerFallback } : {}),
   };
 }
 
@@ -560,6 +564,9 @@ export function buildReviewPrompt(
 
   return [
     'You are a strict staff-engineer reviewing an ALREADY-OPENED pull request from an autonomous coding agent.',
+    // ⚠️ 무표식 절단 금지(리뷰 must-fix) — 잘렸으면 **어느 절부터**인지 리뷰어가 알아야 한다.
+    phaseIntentHeading, phaseIntent,
+    ...(input.acceptance ? ['## Acceptance criteria', input.acceptance.slice(0, 1000)] : []),
     'This is a POST-PR review of the produced artifact. Judge whether the PR actually',
     'delivers the phase intent CORRECTLY and soundly: (1) correctness/latent bugs, (2) does it meet the stated',
     'acceptance criteria, (3) design/regression risk, (4) missing wiring (new code never called), (5) tests present',
@@ -584,9 +591,6 @@ export function buildReviewPrompt(
     '    and check that the error names that site; use values the real caller produces instead of synthetic input.',
     'Do NOT rubber-stamp; an empty review is a failed review — always surface at least a watch item.',
     '',
-    // ⚠️ 무표식 절단 금지(리뷰 must-fix) — 잘렸으면 **어느 절부터**인지 리뷰어가 알아야 한다.
-    phaseIntentHeading, phaseIntent,
-    ...(input.acceptance ? ['## Acceptance criteria', input.acceptance.slice(0, 1000)] : []),
     ...(input.workingMemory ? ['## Prior decisions / reuse boundaries (working memory)', input.workingMemory.slice(0, 1200)] : []),
     // ⭐ 증거가 무엇인지 먼저 말한다 — 규칙 (7) 이 "의도를 넘어선 변경" 을 판정하려면
     //   diff 에 담긴 것이 **이 PR 이 저작한 것인지**를 알아야 한다.
@@ -634,10 +638,12 @@ export function parseReviewResult(text: string): ReviewResult {
     const first = shouldFix.shift() ?? fallbackFinding;
     mustFix.push(first ?? 'PR 리뷰 FAIL — 재작업 필요(구체 지적 미파싱).');
   }
+  const fallback = text.match(/\n\[reviewer fallback: ([^\r\n]+)\]$/);
   return {
     verdict,
     mustFix: mustFix.slice(0, 6),
     shouldFix: shouldFix.slice(0, 6),
+    ...(fallback ? { reviewerFallback: fallback[1] } : {}),
     ...(requirements.length ? { requirements } : {}),
   };
 }
@@ -830,6 +836,7 @@ export function renderReview(r: ReviewResult): string {
   const icon = r.verdict === 'pass' ? '✅' : r.verdict === 'warn' ? '⚠️' : '⛔';
   const head = `${icon} 자율 PR 리뷰: ${r.verdict.toUpperCase()}`;
   const parts = [head];
+  if (r.reviewerFallback) parts.push(`[reviewer fallback: ${r.reviewerFallback}]`);
   if (r.mustFix.length) parts.push('**Must-fix (blockers)**', ...r.mustFix.map((f) => `- ${f}`));
   if (r.shouldFix.length) parts.push('**Should-fix**', ...r.shouldFix.map((f) => `- ${f}`));
   if (r.mustFix.length === 0 && r.shouldFix.length === 0) parts.push('— 리뷰 통과(블로커·비블로커 지적 없음).');

package/src/agent-substrate/review-intent.ts

@@ -525,6 +525,73 @@ function goalFileBlock(goalFile: string | undefined): Block | undefined {
     : undefined;
 }
 
+function isLightweightGoal(goal: string): boolean {
+  try {
+    const tree = unified().use(remarkParse).use(remarkGfm).parse(goal) as MarkdownNode;
+    const nodes = tree.children ?? [];
+    const headings = new Set<string>();
+    const declarations = new Set<string>();
+    for (let index = 0; index < nodes.length; index += 1) {
+      const node = nodes[index]!;
+      if (node.type !== 'heading' || node.depth !== 2) continue;
+      const start = node.position?.start.offset;
+      const end = node.position?.end.offset;
+      if (start === undefined || end === undefined) return false;
+      const heading = goal.slice(start, end).trim();
+      headings.add(heading);
+      if (heading !== '## 답하지 못하는 것' && heading !== '## 불변식') continue;
+      const next = nodes[index + 1];
+      if (next?.type !== 'list' || next.children?.length !== 1) continue;
+      const item = next.children[0];
+      const itemStart = item?.position?.start.offset;
+      const itemEnd = item?.position?.end.offset;
+      if (itemStart === undefined || itemEnd === undefined) continue;
+      if (goal.slice(itemStart, itemEnd).trim() === '- No persistent grounding was performed in lite authoring.') {
+        declarations.add(heading);
+      }
+    }
+    return headings.has('## WHAT TO BUILD') && headings.has('## ACCEPTANCE CRITERIA')
+      && declarations.has('## 답하지 못하는 것') && declarations.has('## 불변식');
+  } catch {
+    return false;
+  }
+}
+
+function lightweightGoalContext(goal: string, goalFile: string): Block {
+  const nodes = (unified().use(remarkParse).use(remarkGfm).parse(goal) as MarkdownNode).children ?? [];
+  const firstLine = (title: string): string | undefined => {
+    const headingIndex = nodes.findIndex((node) => {
+      if (node.type !== 'heading' || node.depth !== 2) return false;
+      const start = node.position?.start.offset;
+      const end = node.position?.end.offset;
+      return start !== undefined && end !== undefined && goal.slice(start, end).trim() === `## ${title}`;
+    });
+    if (headingIndex < 0) return undefined;
+    for (const node of nodes.slice(headingIndex + 1)) {
+      if (node.type === 'heading' && (node.depth ?? 0) <= 2) break;
+      if (node.type === 'code') continue;
+      const start = node.position?.start.offset;
+      const end = node.position?.end.offset;
+      if (start === undefined || end === undefined) continue;
+      const line = goal.slice(start, end).split('\n').find((item) => item.trim());
+      if (line) return line.replace(/^[-*]\s*/, '').replace(/^(?:무엇|왜):\s*/, '').trim();
+    }
+    return undefined;
+  };
+  const brief = (text: string): string => text.length > 350 ? `${text.slice(0, 350)}…[골 원문 참조]` : text;
+  const what = firstLine('WHAT TO BUILD');
+  const why = firstLine('PROBLEM');
+  return {
+    title: '무엇을 왜',
+    text: [
+      '무엇을 왜',
+      ...(what ? [`무엇: ${brief(what)}`] : []),
+      ...(why ? [`왜: ${brief(why)}`] : []),
+      `골 원문·긴 참조: ${goalFile}`,
+    ].join('\n'),
+  };
+}
+
 export function buildReviewIntent(i: Readonly<ReviewIntentInput>): string {
   // ① 조망 — 명시값이 없으면 **골 텍스트에서 추출**한다(생산자는 골 자체다·LLM 없음).
   const mined = extractIntentBlocks(i.goal);
@@ -537,7 +604,9 @@ export function buildReviewIntent(i: Readonly<ReviewIntentInput>): string {
   //   후순위 블록(스코프 경계)이 불필요하게 잘린다.
   const identity = parseShardIdentity(i.goal);
   const shardBoundary = identity ? { title: '조각 경계', text: `조각 경계\n${shardBoundaryBlock(identity)}` } : undefined;
-  const goalBody = stripExtractedSections(identity ? withoutShardIdentity(i.goal) : i.goal).trim();
+  const authoredLiteGoal = isLightweightGoal(i.goal);
+  const liteGoal = authoredLiteGoal && Boolean(i.goalFile?.trim());
+  const goalBody = liteGoal ? '' : stripExtractedSections(identity ? withoutShardIdentity(i.goal) : i.goal).trim();
   const goal = goalBody ? { title: '목표', text: `목표\n${goalBody}` } : undefined;
   // ⭐ **자식이 낸 증거**(diff 밖 이행 · base 적색 · 직전 반영분)를 한 묶음으로 잡아 둔다 — 아래 예산
   //   배분에서 **목표 본문보다 먼저** 채우기 위해서다. 제목 문자열이 아니라 **동일성**으로 가른다.
@@ -553,6 +622,20 @@ export function buildReviewIntent(i: Readonly<ReviewIntentInput>): string {
   const coverage = evidenceCoverageBlock(i.evidenceCoverage);
   const goalFile = goalFileBlock(i.goalFile);
   const runFacts = runFactsBlock(i);
+  // Lite authoring keeps its original ask in a fenced block under WHAT TO BUILD.
+  // Review the authored criteria and short context; the goal document is the pointer to the long source.
+  if (liteGoal) {
+    const acceptanceBlock = listBlock('수용기준', acceptance);
+    const context = lightweightGoalContext(i.goal, i.goalFile!.trim());
+    const boundaryBlock = listBlock('의도적 스코프 경계', boundaries);
+    const liteBlocks = [
+      acceptanceBlock, context, boundaryBlock, priorFindings, applied,
+      runFacts, goalType, shardBoundary, preexisting, importerTestsNotRun,
+      gateEvidence, designCheck, designGate, shardSiblings, coverage, claims,
+      listBlock('검증 못 한 경계 후보 (결정 아님 — 이것만으로 must-fix 를 면제하지도, 만들지도 말 것)', unverifiedBoundaryCandidates),
+    ].filter((block): block is Block => Boolean(block));
+    return fitReviewIntentBlocks(liteBlocks, liteBlocks, liteBlocks);
+  }
   // ⛔⭐⭐⭐ **런 사실이 «맨 앞»이다 — 라이브 실측으로 옮겼다**(2026-08-07).
   //   📏 `#7556`(실물 하니스 PR · 본문 37,354자)을 프로덕션 `intentFromPr` 에 태우니
   //     ***`runId` 도 커밋도 변경 파일도 «하나도» 안 남았다***(4,000자 상한 · 살아남은 것은 `목표`·`수용기준`).
@@ -645,7 +728,7 @@ function sectionPriority(title: string): 0 | 1 | 2 {
 const PREAMBLE_TITLE = '(머리말)';
 
 type MarkdownPosition = { readonly start: { readonly offset?: number }; readonly end: { readonly offset?: number } };
-type MarkdownNode = { readonly type: string; readonly position?: MarkdownPosition; readonly children?: readonly MarkdownNode[] };
+type MarkdownNode = { readonly type: string; readonly depth?: number; readonly position?: MarkdownPosition; readonly children?: readonly MarkdownNode[] };
 type MarkdownUnit = { readonly text: string; readonly start: number; readonly end: number };
 
 /** 비교 가능한 CommonMark 단위와 그 원문 범위. 코드 펜스는 원문에 남기되 비교 후보에서는 제외한다. */
@@ -829,6 +912,18 @@ function isTableHeader(line: string, next: string | undefined): boolean {
   return /^\s*\|(\s*:?-{2,}:?\s*\|)+\s*$/.test(next ?? '');
 }
 
+function topLevelCodeLines(goal: string): ReadonlySet<number> {
+  const lines = new Set<number>();
+  try {
+    const tree = unified().use(remarkParse).use(remarkGfm).parse(goal);
+    for (const node of tree.children) {
+      if (node.type !== 'code' || !node.position) continue;
+      for (let index = node.position.start.line - 1; index < node.position.end.line; index += 1) lines.add(index);
+    }
+  } catch { /* unknown syntax: keep existing extraction behavior */ }
+  return lines;
+}
+
 /** 골에서 **추출된 것만** 걷어낸 나머지(목표 서술). 추출 내용이 목표 블록에 중복되지 않게 한다.
  *
  *  ⚠️ **산문은 남긴다**(리뷰 must-fix) — 초판은 인식된 절을 만나면 다음 헤더까지 **통째로** 버려,
@@ -839,7 +934,9 @@ export function stripExtractedSections(goal: string): string {
   const mined = extractIntentBlocks(goal);
   const out: string[] = [];
   let extractedSection: 'acceptance' | 'boundary' | null = null;
-  for (const line of goal.split('\n')) {
+  const fencedLines = topLevelCodeLines(goal);
+  for (const [index, line] of goal.split('\n').entries()) {
+    if (fencedLines.has(index)) { out.push(line); continue; }
     const kind = headKind(line);
     if (kind === 'acceptance' || kind === 'boundary') { extractedSection = kind; continue; }   // 헤더만 제거
     if (kind === 'other') extractedSection = null;
@@ -921,6 +1018,7 @@ function isUnverifiedBoundaryCandidate(item: string): boolean {
 }
 
 export function extractIntentBlocks(goal: string, includeSections = false): ExtractedIntentBlocks {
+  const fencedLines = topLevelCodeLines(goal);
   const acceptanceItems: string[] = [];
   const scopeBoundaryItems: string[] = [];
   const unverifiedBoundaryCandidateItems: string[] = [];
@@ -945,6 +1043,7 @@ export function extractIntentBlocks(goal: string, includeSections = false): Extr
     push();
   }
   for (const [idx, line] of lines.entries()) {
+    if (fencedLines.has(idx)) continue;
     const kind = headKind(line);
     if (kind === 'acceptance') { cur = 'acceptance'; continue; }
     if (kind === 'boundary') { cur = 'boundary'; continue; }

package/src/autopilot/build/llm-conflict-merge.ts

@@ -16,8 +16,9 @@ import { collectMergeIntent, collectSiblingPrIntents, defaultIntentGit, type Int
 
 function deterministicNextMd(git: MergeGitSeam, worktreePath: string, file: string): string | null {
   try {
+    // stage 1 = base, stage 2 = ours (the checked-out run), stage 3 = theirs (the merged-in main) —
+    // the resolver's contract is (base, ours appends only, theirs may drop released lines on dev-bump).
     const resolved = resolveNextMdConflict(git.readIndexStage(worktreePath, 1, file), git.readIndexStage(worktreePath, 2, file), git.readIndexStage(worktreePath, 3, file));
-    void import('../../debug/log.js').then(({ debug }) => debug.log('self-dev.merge', 'next-md-deterministic', { resolved: resolved !== null })).catch(() => {});
     return resolved;
   } catch {
     return null; // a stage is missing (added/deleted on one side) — the usual resolver decides
@@ -58,9 +59,9 @@ export type LlmMergeErrorStep = 'fetch' | 'merge' | 'conflicted-files' | 'commit
 /** git stderr 첫 줄을 관측에 실을 때 쓰는 길이 상한. 구현이 정한다. */
 export const GIT_ERROR_DETAIL_MAX_CHARS = 240;
 
-/** merge 결과. llm-resolved=충돌을 LLM 이 종합 해결·커밋. conflict-unresolved=LLM 도 못 풀어 abort(base 유지). */
+/** merge 결과. llm-resolved=충돌을 LLM 이 종합 해결·커밋. deterministic-resolved=release/next.md 만 결정적 해결기로 커밋(LLM 0). conflict-unresolved=LLM 도 못 풀어 abort(base 유지). */
 export interface LlmMergeOutcome {
-  status: 'merged' | 'up-to-date' | 'llm-resolved' | 'conflict-unresolved' | 'error';
+  status: 'merged' | 'up-to-date' | 'llm-resolved' | 'deterministic-resolved' | 'conflict-unresolved' | 'error';
   resolvedFiles?: string[];
   sizeChange?: LlmMergeSizeChange;
   testDeclarationLoss?: Array<{ file: string; ours: number; theirs: number; merged: number }>;
@@ -118,7 +119,9 @@ function addSizeChange(size: LlmMergeSizeChange, file: string, before: string, a
 }
 
 export function formatLlmMergeOutcome(outcome: LlmMergeOutcome): string {
-  const files = outcome.resolvedFiles?.length ? ` (LLM 종합 ${outcome.resolvedFiles.length}파일: ${outcome.resolvedFiles.join(', ')})` : '';
+  const files = outcome.resolvedFiles?.length
+    ? ` (${outcome.status === 'deterministic-resolved' ? '결정적 해결' : 'LLM 종합'} ${outcome.resolvedFiles.length}파일: ${outcome.resolvedFiles.join(', ')})`
+    : '';
   if (outcome.status === 'conflict-unresolved') {
     // ⛔ reason·failedFile 은 «선택» 칸이다 — 공급자 오류·시험 선언 유실·크기 붕괴 출구는 계약상 reason 이 없다.
     //   있는 칸만 싣고, 그 출구들은 자기 실제 결과(어느 판정이 멈췄나)를 싣는다 — 「사유 undefined」 금지.
@@ -133,7 +136,7 @@ export function formatLlmMergeOutcome(outcome: LlmMergeOutcome): string {
     ];
     return `${outcome.status}${files}${parts.length ? `; ${parts.join(' · ')}` : ''}`;
   }
-  if (outcome.status !== 'llm-resolved') return `${outcome.status}${files}`;
+  if (outcome.status !== 'llm-resolved' && outcome.status !== 'deterministic-resolved') return `${outcome.status}${files}`;
   const size = outcome.sizeChange;
   if (size === undefined) return `${outcome.status}${files}; 규모 변화: 못 쟀다`;
   const delta = size.totalDeltaLines >= 0 ? `+${size.totalDeltaLines}` : `${size.totalDeltaLines}`;
@@ -233,6 +236,8 @@ export async function mergeMainWithLlmResolve(
   const resolvedFiles: string[] = [];
   const sizeChange: LlmMergeSizeChange = { files: [], totalBeforeLines: 0, totalAfterLines: 0, totalDeltaLines: 0 };
   const testDeclarationUnmeasured: string[] = [];
+  let deterministicResolved = 0;
+  let llmResolved = 0;
   const measuredOutcome = <T extends object>(outcome: T): T & Pick<LlmMergeOutcome, 'testDeclarationUnmeasured'> => ({
     ...outcome,
     ...(testDeclarationUnmeasured.length ? { testDeclarationUnmeasured } : {}),
@@ -245,6 +250,7 @@ export async function mergeMainWithLlmResolve(
     const abs = join(worktreePath, f);
     let conflicted: string;
     let merged: string;
+    let resolvedDeterministically = false;
     try {
       conflicted = git.readFile(abs);
     } catch {
@@ -252,9 +258,15 @@ export async function mergeMainWithLlmResolve(
       return unresolved({ status: 'conflict-unresolved', reason: 'conflict-file-unreadable', failedFile: f, resolvedFiles });
     }
     try {
-      // release/next.md: concurrent landings each append a line — keep both without asking the LLM (REL7c).
+      // release/next.md: concurrent landings each append a line — keep both before the LLM sees the file.
       const deterministic = f === NEXT_MD_PATH ? deterministicNextMd(git, worktreePath, f) : null;
-      merged = deterministic ?? await resolve(f, conflicted);
+      if (deterministic !== null) {
+        merged = deterministic;
+        resolvedDeterministically = true;
+        debug.log('self-implement.main-sync', 'next-md-resolved', { deterministic: true });
+      } else {
+        merged = await resolve(f, conflicted);
+      }
     } catch (error) {
       git.abort(worktreePath); // LLM 예외 → base 유지
       return unresolved({ status: 'conflict-unresolved', resolvedFiles, failedFile: f,
@@ -299,11 +311,13 @@ export async function mergeMainWithLlmResolve(
     git.writeFile(abs, merged);
     git.add(worktreePath, f);
     resolvedFiles.push(f);
+    if (resolvedDeterministically) deterministicResolved += 1;
+    else llmResolved += 1;
   }
   const committed = seamOk(git.commit(worktreePath));
   if (!committed.ok) { git.abort(worktreePath); return measuredOutcome(errorOutcome('commit', committed.errorDetail, resolvedFiles)); }
   return measuredOutcome({
-    status: 'llm-resolved',
+    status: llmResolved === 0 && deterministicResolved > 0 ? 'deterministic-resolved' : 'llm-resolved',
     resolvedFiles,
     sizeChange,
   });