elanous 0.2.36 → 0.2.37

package/src/autopilot/pr-manager.ts

@@ -127,7 +127,7 @@ export interface UpsertPrResult { url: string; reused: boolean }
  *  나머지 reason(add/commit/push/gh)은 진짜 실패로 detail(stderr)과 함께 관측·pr-failed. */
 export type UpsertPrOutcome =
   | { ok: true; url: string; reused: boolean; labelsApplied?: boolean; labelsOmitted?: boolean;
-      supersededPr?: number }
+      supersededPr?: number; boundCardHeadRefName?: string }
   | { ok: false; reason: 'add' | 'commit' | 'base' | 'noop' | 'push' | 'gh' | 'guard'; detail: string;
       incident?: PrCreateFailureIncident };
 
@@ -186,9 +186,9 @@ function readPrMergeState(run: CmdRunner, prNumber: number, cwd?: string): Merge
 
 /** 열린 PR 조회의 판별 가능한 결과. `SKIPPED`는 기본 브랜치 표식이라 gh를 호출하지 않았음을 뜻한다. */
 export type FindPrForBranchOutcome =
-  | { status: 'ok OUTPUT'; url: string }
-  | { status: 'ok EMPTY'; url: null }
-  | { status: 'FAILED'; url: null; rc?: number; stderrTail?: string }
+  | { status: 'ok OUTPUT'; url: string; rc?: number; stderrTail?: string }
+  | { status: 'ok EMPTY'; url: null; rc?: number; stderrTail?: string }
+  | { status: 'FAILED'; url: null; rc?: number; stderrTail?: string; stdoutTail?: string }
   | { status: 'SKIPPED'; url: null };
 
 export interface PrManager {
@@ -264,10 +264,10 @@ export function prBaseFromComparison(comparisonBase: string): string {
  * Feature-branch HEAD-only commits are excluded because the range is the base
  * ref itself, not `HEAD`. Network/`gh` are never used.
  */
-export function landingHistoryGitLogArgs(since: string, baseRef: string): string[] {
+export function landingHistoryGitLogArgs(since: string | null, baseRef: string): string[] {
   return [
     'log',
-    `--since=${since}`,
+    ...(since === null ? [] : [`--since=${since}`]),
     '--pretty=format:commit %H',
     '--name-only',
     '--no-merges',
@@ -338,8 +338,12 @@ export interface PrCreateStageObservation {
   ran: boolean;
   rc?: number;
   stderrTail?: string;
+  stdoutTail?: string;
   /** push 단계 전용 — force-push 최종 성공 여부. */
   ok?: boolean;
+  /** gh 단계 전용 — 재시도 전후의 목록 조회와 생성 명령을 각각 보존한다. */
+  lookup?: PrCreateStageObservation;
+  create?: PrCreateStageObservation;
 }
 /** PR 생성 실패 한 건 — push/gh 두 단계 관측을 하나의 기록에. */
 export interface PrCreateFailureIncident {
@@ -380,8 +384,26 @@ export function recordPrCreateFailureIncident(incident: PrCreateFailureIncident)
     ...(incident.runId ? { runId: sanitizeCredentialText(incident.runId) } : {}),
     branch: sanitizeCredentialText(incident.branch),
     remote: sanitizeCredentialText(incident.remote),
-    push: { ...incident.push, ...(incident.push.stderrTail ? { stderrTail: stderrTailOf(incident.push.stderrTail) } : {}) },
-    gh: { ...incident.gh, ...(incident.gh.stderrTail ? { stderrTail: stderrTailOf(incident.gh.stderrTail) } : {}) },
+    push: {
+      ...incident.push,
+      ...(incident.push.stderrTail ? { stderrTail: stderrTailOf(incident.push.stderrTail) } : {}),
+      ...(incident.push.stdoutTail ? { stdoutTail: stderrTailOf(incident.push.stdoutTail) } : {}),
+    },
+    gh: {
+      ...incident.gh,
+      ...(incident.gh.stderrTail ? { stderrTail: stderrTailOf(incident.gh.stderrTail) } : {}),
+      ...(incident.gh.stdoutTail ? { stdoutTail: stderrTailOf(incident.gh.stdoutTail) } : {}),
+      ...(incident.gh.lookup ? { lookup: {
+        ...incident.gh.lookup,
+        ...(incident.gh.lookup.stderrTail ? { stderrTail: stderrTailOf(incident.gh.lookup.stderrTail) } : {}),
+        ...(incident.gh.lookup.stdoutTail ? { stdoutTail: stderrTailOf(incident.gh.lookup.stdoutTail) } : {}),
+      } } : {}),
+      ...(incident.gh.create ? { create: {
+        ...incident.gh.create,
+        ...(incident.gh.create.stderrTail ? { stderrTail: stderrTailOf(incident.gh.create.stderrTail) } : {}),
+        ...(incident.gh.create.stdoutTail ? { stdoutTail: stderrTailOf(incident.gh.create.stdoutTail) } : {}),
+      } } : {}),
+    },
   };
   debug.log('autopilot.pr-manager', 'pr-create-failure-incident', safe);
   return safe;
@@ -615,7 +637,8 @@ function reuseSameCellPr(run: CmdRunner, input: UpsertPrInput, target: NonNullab
   if (!pushed.ok) return fail(`fast-forward push refused: ${(pushed.err || pushed.out).slice(0, 220)}`);
   debug.log('autopilot.pr-manager', 'same-cell-push-decision', { ...pushEvidence, outcome: 'allowed', reason: 'bound-card-pr-head-fast-forward' });
   debug.log('autopilot.pr-manager', 'same-cell-reused', { pr: target.number, cellId: target.cellId, cardId: target.cardId, branch: target.branch });
-  return editExistingPr(run, input, pr.url);
+  const edited = editExistingPr(run, input, pr.url);
+  return edited.ok ? { ...edited, boundCardHeadRefName: target.branch } : edited;
 }
 
 /** ★ PR 매니저 팩토리(대표 2026-07-12) — CmdRunner 주입(테스트 스텁). 실 배선은 기본 러너. */
@@ -642,13 +665,23 @@ export function makePrManager(
     }
     const r = run('gh', ['pr', 'list', '--head', branch, '--state', 'open', '--json', 'url', '--jq', '.[0].url // ""'], cwd ? { cwd } : undefined);
     const url = r.out.trim() || null;
+    const lookupEvidence = {
+      ...(typeof r.rc === 'number' ? { rc: r.rc } : {}),
+      ...(stderrTailOf(r.err) ? { stderrTail: stderrTailOf(r.err) } : {}),
+    };
+    const lookupFailureEvidence = {
+      ...lookupEvidence,
+      ...(stderrTailOf(r.out) ? { stdoutTail: stderrTailOf(r.out) } : {}),
+    };
     const outcome: FindPrForBranchOutcome = !r.ok
-      ? { status: 'FAILED', url: null,
-          ...(typeof r.rc === 'number' ? { rc: r.rc } : {}),
-          ...(stderrTailOf(r.err || r.out) ? { stderrTail: stderrTailOf(r.err || r.out) } : {}) }
+      ? { status: 'FAILED', url: null, ...lookupFailureEvidence }
       : url
         ? { status: 'ok OUTPUT', url }
         : { status: 'ok EMPTY', url: null };
+    if (r.ok) {
+      for (const [key, value] of Object.entries(lookupEvidence))
+        if (value !== undefined) Object.defineProperty(outcome, key, { value, enumerable: false });
+    }
     debug.log('autopilot.pr-manager', 'lookup', {
       branch,
       // ⚠️ 조회는 --jq '.[0].url' 이라 최대 한 줄이다 — "매칭된 PR 수"가 아니라 "돌아온 URL 줄 수"다.
@@ -845,11 +878,22 @@ export function makePrManager(
       const waitForPushRetry = input.waitForPushRetry ?? defaultWaitForPushRetry;
       // ★ 칸 PR-CREATE-FAIL-OBSERVE-FU — push/gh 단계 관측을 쌓아 실패 시 한 incident 로.
       const pushStage: PrCreateStageObservation = { stage: 'push', ran: false };
-      const ghStage: PrCreateStageObservation = { stage: 'gh', ran: false };
+      const ghStage: PrCreateStageObservation = {
+        stage: 'gh', ran: false,
+        lookup: { stage: 'gh', ran: false },
+        create: { stage: 'gh', ran: false },
+      };
+      const observeGhCommand = (r: CmdResult): PrCreateStageObservation => ({
+        stage: 'gh', ran: true, ...(typeof r.rc === 'number' ? { rc: r.rc } : {}),
+        ...(stderrTailOf(r.err) ? { stderrTail: stderrTailOf(r.err) } : {}),
+        ...(stderrTailOf(r.out) ? { stdoutTail: stderrTailOf(r.out) } : {}),
+      });
       const markGhRan = (r: CmdResult): CmdResult => {
         ghStage.ran = true;
         ghStage.rc = r.rc;
         ghStage.stderrTail = stderrTailOf(r.err);
+        ghStage.stdoutTail = stderrTailOf(r.out);
+        ghStage.create = observeGhCommand(r);
         return r;
       };
       const failedCreate = (reason: 'push' | 'gh', detail: string): UpsertPrOutcome =>
@@ -877,9 +921,16 @@ export function makePrManager(
       const existing = findPrForBranchOutcome(input.branch, cwd);
       if (existing.status !== 'SKIPPED') {
         ghStage.ran = true;
+        ghStage.lookup = {
+          stage: 'gh', ran: true,
+          ...(typeof existing.rc === 'number' ? { rc: existing.rc } : {}),
+          ...(existing.stderrTail ? { stderrTail: existing.stderrTail } : {}),
+          ...(existing.status === 'FAILED' && existing.stdoutTail ? { stdoutTail: existing.stdoutTail } : {}),
+        };
         if (existing.status === 'FAILED') {
           ghStage.rc = existing.rc;
           ghStage.stderrTail = existing.stderrTail;
+          ghStage.stdoutTail = existing.stdoutTail;
         }
       }
       if (existing.url) {

package/src/boot/daemon-runtime.ts

@@ -54,6 +54,7 @@ import type { CoreTurnDispatchTool } from '../core-turn/index.js';
 import { elanousSelfAccessPrompt } from '../agent/self-ambient.js';
 import { createToolCwdResolver, type ToolCwdResolver } from './tool-cwd.js';
 import { resolveSessionProjectContext } from '../project/session-context.js';
+import { buildUniversalPreamble, loadProjectAnchorWithMeta } from '../prompt-library/universal-preamble.js';
 import { debug } from '../debug/log.js';
 import { resolvePersonaAddress } from '../intake-plane/persona-answer.js';
 import { awaitGlobalPersonaLoad, getGlobalPersonaRegistry } from '../persona/global-registry.js';
@@ -601,13 +602,34 @@ export function createDaemonRunTurn(
   }
   const killNonDetachedPty = opts.killNonDetachedPty;
 
+  // TUI-CONTINUE-SESSION (0.2.35) — inject the daemon TUI preamble once per
+  // runtime, even when `--continue` reattaches persisted history. Never use
+  // the ACP client's cwd as an anchor path; project/session context is server-owned.
+  const preambleInjectedSessions = new Set<string>();
+
   const deps: CoreTurnBridgeDeps = {
     // Persists the user message AND builds the LLM-facing list. See
     // daemon-history-helper.ts for the per-turn shape. Cleanup C1
     // moved this out of an inline closure to fix the user-message
     // persistence bug uniformly across all daemon paths.
     getMessages: ({ sessionId, userText, promptBlocks, promptMeta }) => {
-      const projectInstructions = resolveSessionProjectContext(sessionId)?.instructions;
+      const isFirstTurn = history.get(sessionId).length === 0;
+      const projectContext = resolveSessionProjectContext(sessionId);
+      const inputSource = readInputSourceMeta(promptMeta as Record<string, unknown> | undefined);
+      // The daemon API is the local CLI/TUI prompt route. Other ACP surfaces
+      // keep their existing system prompt unchanged.
+      const isDaemonTuiTurn = inputSource?.kind === 'daemon-api';
+      const anchorCwd = isDaemonTuiTurn ? projectContext?.cwd : undefined;
+      const firstTurnPreamble = anchorCwd && !preambleInjectedSessions.has(sessionId)
+        ? buildUniversalPreamble({
+            cwd: anchorCwd,
+            ...(surface.specs.length > 0 ? { enabledTools: surface.specs.map((spec) => spec.name) } : {}),
+          })
+        : [];
+      if (firstTurnPreamble.length > 0) preambleInjectedSessions.add(sessionId);
+      // `buildUniversalPreamble` carries the project AGENTS.md on the TUI's
+      // first attached turn. Do not also append `projectInstructions` there.
+      const projectInstructions = firstTurnPreamble.length > 0 ? undefined : projectContext?.instructions;
       const baseSystemPrompt = [composeDaemonSystemPrompt(opts.systemPrompt, promptMeta, sessionId), projectInstructions]
         .filter(Boolean).join('\n\n');
       // Image-pipeline followup #4 (2026-05-05) — append daemon webterm
@@ -631,11 +653,21 @@ export function createDaemonRunTurn(
       const hasNonTextBlock = !!promptBlocks?.some(
         (b) => (b as { type?: string }).type !== 'text',
       );
-      const isFirstTurn = history.get(sessionId).length === 0;
       const messages = hasNonTextBlock
         ? appendUserPromptBlocksAndBuildMessages(history, sessionId, promptBlocks!, systemPrompt)
         : appendUserAndBuildMessages(history, sessionId, userText, systemPrompt);
-      return prependChatPersonaOnLaterTurn(messages, isFirstTurn);
+      const withPersona = prependChatPersonaOnLaterTurn(messages, isFirstTurn);
+      if (firstTurnPreamble.length === 0) return withPersona;
+      const anchor = loadProjectAnchorWithMeta(anchorCwd!);
+      debug.log('boot.daemon-runtime', 'first-turn-universal-preamble', {
+        sessionId,
+        cwd: anchorCwd,
+        source: projectContext ? 'project' : 'daemon',
+        systemMessages: firstTurnPreamble.length,
+        anchorFiles: anchor.files.map((file) => file.filename),
+        localAnchorFiles: anchor.files.filter((file) => file.local).map((file) => file.filename),
+      });
+      return [...firstTurnPreamble, ...withPersona];
     },
     getTools: () => surface.specs,
     dispatchTool: terminalCapableDispatch(surfaceHasPtyShell, async (name, args, ctx) => {

package/src/boot/daemon-tools/pty-shell.ts

@@ -106,9 +106,10 @@ export async function dispatchPtyShellTool(
   ctx?: DaemonToolDispatchCtx,
 ): Promise<unknown> {
   switch (name) {
-    case 'PtyShellStart':
+    case 'PtyShellStart': {
       // Autonomous surface — auto-approve the spawn (no HITL babysitting).
       return dispatchPtyShellStart(args, { requireApproval: false });
+    }
     case 'PtyShellPoll':
       return dispatchPtyShellPoll(args);
     case 'PtyShellSend':

package/src/budget/run-usage-rollup.ts

@@ -6,6 +6,7 @@ export interface RunUsageInput {
   site?: string | null;
   role?: string | null;
   phase?: string | null;
+  jobKind?: string | null;
   model?: string | null;
   billingProvider?: string | null;
   billing?: BillingRoute | null;
@@ -30,9 +31,11 @@ export interface RunUsageRow {
   runId: string;
   role?: string;
   site?: string;
-  model: string;
-  billingProvider: string;
-  billing: string;
+  jobKind?: string;
+  /** by:'job' 행은 종류별·호스트 합산 표이므로 실지 않는다(첫 행 대표값 오표출 방지). */
+  model?: string;
+  billingProvider?: string;
+  billing?: string;
   hostIds: string[];
   calls: number;
   inputTokens: number;
@@ -47,21 +50,23 @@ export interface RunUsageRow {
 }
 
 /** Aggregate llm-usage observations without turning unavailable prices into a known zero. */
-export function rollupRunUsage(...[rows, opts]: [rows: readonly RunUsageInput[], opts?: { by?: 'run' | 'role' }]): RunUsageRow[] {
+export function rollupRunUsage(...[rows, opts]: [rows: readonly RunUsageInput[], opts?: { by?: 'run' | 'role' | 'job' }]): RunUsageRow[] {
   const groups = new Map<string, RunUsageRow>();
   const byRole = opts?.by === 'role';
+  const byJob = opts?.by === 'job';
   for (const data of rows) {
-    const runId = byRole ? '(all)' : data.runId ?? '(none)';
+    const runId = byRole || byJob ? '(all)' : data.runId ?? '(none)';
     const role = data.role ?? '(none)';
     const site = data.site ?? '(none)';
+    const jobKind = data.jobKind ?? '(none)';
     const model = data.model ?? '(none)';
     const billingProvider = data.billingProvider ?? '(none)';
     const billing = data.billing ?? '(none)';
-    const key = JSON.stringify(byRole ? [role, site, model, billingProvider, billing] : [runId, model, billingProvider, billing]);
+    const key = JSON.stringify(byRole ? [role, site, model, billingProvider, billing] : byJob ? [jobKind] : [runId, model, billingProvider, billing]);
     let row = groups.get(key);
     if (!row) {
       row = {
-        runId, ...(byRole ? { role, site } : {}), model, billingProvider, billing, hostIds: [], calls: 0,
+        runId, ...(byRole ? { role, site } : {}), ...(byJob ? { jobKind } : { model, billingProvider, billing }), hostIds: [], calls: 0,
         inputTokens: 0, outputTokens: 0, cacheReadInputTokens: 0,
         cacheCreationInputTokens: 0, reasoningOutputTokens: 0,
         usdKnown: 0, unknownCostCalls: 0, includedCalls: 0, apiEquivalentUsd: 0,

package/src/budget/unified-usage.ts

@@ -458,6 +458,7 @@ function subscriptionFromCodexSnapshot(snap: UsageSnapshot): SubscriptionAxis {
  *  ⛔ 키가 없으면 행을 «안» 만든다(accounts=0 → 「없음」) — 키 없음은 «0달러»가 아니다.
  *  📏 응답 모양(실측 2026-09-23): `{data:{total_credits, total_usage}}` (USD). */
 export const OPENROUTER_CREDITS_ENDPOINT = 'https://openrouter.ai/api/v1/credits';
+export const OPENROUTER_KEY_ENDPOINT = 'https://openrouter.ai/api/v1/key';
 async function collectOpenRouterRows(deps: UnifiedUsageDeps): Promise<AccountUsageRow[]> {
   // ⛔ 시험 런타임은 seam 이 없으면 «키 없음»으로 본다 — 키 캐시는 «파일»이라 env 스크럽을 통과해
   //   기존 시험들이 실제 네트워크를 치게 된다(seam 을 모르는 옛 시험이 다수).
@@ -483,8 +484,27 @@ async function collectOpenRouterRows(deps: UnifiedUsageDeps): Promise<AccountUsa
     const used = typeof body.data?.total_usage === 'number' ? body.data.total_usage : null;
     if (total === null || used === null) return [{ ...base, credits: { status: 'error', detail: 'upstream-shape' } }];
     const balance = Math.round((total - used) * 100) / 100;
+    let note: string | undefined;
+    try {
+      const keyRes = await (deps.fetchOpenRouterImpl ?? fetch)(OPENROUTER_KEY_ENDPOINT, {
+        headers: { authorization: `Bearer ${key}` },
+        signal: AbortSignal.timeout(10_000),
+      });
+      if (keyRes.ok) {
+        const keyBody = (await keyRes.json()) as { data?: { limit?: unknown; limit_remaining?: unknown } };
+        const limit = keyBody.data?.limit;
+        const limitRemaining = keyBody.data?.limit_remaining;
+        if (typeof limit === 'number' && Number.isFinite(limit)
+          && typeof limitRemaining === 'number' && Number.isFinite(limitRemaining)) {
+          note = `키 한도 남은 금액 $${limitRemaining.toFixed(2)}`;
+        }
+      }
+    } catch {
+      // Key metadata is optional; preserve the successful credits row when unavailable.
+    }
     return [{
       ...base,
+      ...(note ? { note } : {}),
       credits: {
         status: 'ok',
         usedPercent: total > 0 ? Math.round((used / total) * 1000) / 10 : null,

package/src/capture/tui-self-report.ts

@@ -44,11 +44,30 @@ import {
 } from '../pty-shell/pty-manifest.js';
 import { writeHarnessScreen } from '../harness/harness-screen.js';
 import { runningBuild, startTuiRunStateRecorder } from '../pty-shell/tui-run-state.js';
+import type { TuiSelfRestartDeps } from '../pty-shell/tui-run-state.js';
+import { lastHumanKeyAt } from '../tui.js';
 import { debug } from '../debug/log.js';
 import { setTuiLogName, setTuiLogSession } from '../debug/tui-log-tag.js';
 import { getActiveSessionId } from '../session/index.js';
 import { routeExternalInput, type ExternalInputRoute } from '../input/external-input-queue.js';
 
+/**
+ * 사람 손이 «아직 떠난 것으로 안 본» 조용창 — 마지막 사람 키가 이 창 안이면 입력 중으로 친다.
+ * 유휴 임계(H9 기본 90초)보다 길게 잡아 «방금 만지던 사람» 을 절대 끊지 않는다.
+ */
+const SELF_RESTART_HUMAN_QUIET_MS = 10 * 60_000;
+
+/** 실제 TUI 가 쓰는 H9 신호: 낡음=기동 판⊕설치본⊕HEAD · 사람 입력=마지막 사람 키 · 세션=지금 대화. */
+export function productionTuiSelfRestart(readSessionId: () => string | null): TuiSelfRestartDeps {
+  return {
+    humanInputPending: () => {
+      const last = lastHumanKeyAt();
+      return last > 0 && Date.now() - last < SELF_RESTART_HUMAN_QUIET_MS;
+    },
+    readSessionId,
+  };
+}
+
 export interface TuiFrameObserverCfg {
   surfaceId: string;
   instance: string;
@@ -279,6 +298,9 @@ export interface TuiSelfReportDeps {
   reportControlCleanupFailure?: (stage: TuiControlCleanupStage, error: unknown) => void;
   /** 행 등록 직후 실행 판 ⊕ 턴(idle) 기록을 연다 — `elanous pty state` 가 읽는다. 반환 = 정리. */
   startRunState?: (surfaceId: string) => (() => void);
+  /** 자기 재기동 신호(TUI-H9)를 갈아 끼운다 — 기본 = 실 신호(`lastHumanKeyAt` ⊕ `getActiveSessionId`).
+   *  시험은 가짜 시계·가짜 restart 로 판정선을 증명한다. */
+  selfRestart?: TuiSelfRestartDeps | null;
   /** 미룬 우편 깨움 폴러(TUI-H4)를 연다 — 반환 = 정리. 기본은 실 행 등록과 짝일 때만 늦게 불러온 `startPendingWakePoller`. */
   startWakePoller?: (surfaceId: string) => (() => void);
   /** 박동마다 자기 행을 본다 — 없으면 null · ⛔ 조회 실패는 «던진다»(없다로 읽지 않는다). 기본 = `getPtyManifest(id, { strict })`. */
@@ -399,9 +421,18 @@ export function startTuiSelfReport(deps: TuiSelfReportDeps = {}): () => void {
     return () => {};
   }
   const activeControlTarget = controlTarget;
+  const readActiveSessionId: () => string | null = deps.readActiveSessionId
+    ?? (() => { try { return getActiveSessionId(); } catch { return null; } });
   let stopRunState: () => void = () => {};
   // 행 등록을 갈아 끼운 호출자(시험)는 실 manifest 를 안 건드린다 — 기본 녹음기는 기본 행 등록과 짝일 때만.
-  const startRunState = deps.startRunState ?? (deps.registerRow ? () => () => {} : startTuiRunStateRecorder);
+  // TUI-H9: 그 기본 녹음기에 «사람 입력 없음»(마지막 사람 키 입력) ⊕ «지금 대화» 를 실 신호로 주입한다 —
+  //   judged-stale ∧ idle ∧ 사람 없음 이면 스스로 재기동(새 세션 ⊕ 자리 맥락)한다(자세한 판정선은 startTuiRunStateRecorder).
+  const startRunState = deps.startRunState
+    ?? (deps.registerRow
+      ? () => () => {}
+      : (id: string) => startTuiRunStateRecorder(id, {
+        selfRestart: deps.selfRestart === null ? undefined : (deps.selfRestart ?? productionTuiSelfRestart(readActiveSessionId)),
+      }));
   try { stopRunState = startRunState(surfaceId); } catch { /* fail-soft — recorder logs its own write failures */ }
   // 미룬 우편 깨움(TUI-H4) — 이 TUI 가 턴 중·5분 창이라 못 받은 깨움을 idle 로 «기록»된 뒤 한 번 다시 두드린다.
   // 실 행 등록과 짝일 때만(시험이 행 등록을 갈아 끼우면 0) · 무거운 모듈은 늦게 불러온다.
@@ -491,8 +522,6 @@ export function startTuiSelfReport(deps: TuiSelfReportDeps = {}): () => void {
     ?? (deps.registerRow ? () => ({ alive: true }) : (id: string) => getPtyManifest(id, { strict: true }));
   const restoreBuild = deps.restoreBuild ?? (deps.registerRow ? () => {} : (id: string) => { updatePtyManifestBuild(id, runningBuild()); });
   const logRowMissing = deps.logRowMissing ?? ((data: TuiRowMissingEvent) => debug.log('tui.self-report', 'row-missing', data));
-  const readActiveSessionId: () => string | null = deps.readActiveSessionId
-    ?? (() => { try { return getActiveSessionId(); } catch { return null; } });
   const rowNickname = deps.nickname?.trim() || undefined;
   let lastSeenAt = now();
   let lastBeatAt = lastSeenAt;

package/src/cli/autopilot-cli.ts

@@ -9,6 +9,8 @@ import { writeStdoutJson } from './stdout-json.js';
 export interface AutopilotCliDeps {
   /** logs.db 싱크 등록(시험 주입). 기본 = `registerStandaloneLogSink`. `task-agent-action` 이 부른다. */
   registerSink?: (surface: string) => Promise<unknown>;
+  /** Deterministic action execution ports for isolated dispatcher tests. */
+  actionDeps?: Pick<import('../task-agent/actions.js').ActionDeps, 'mode' | 'command' | 'observe'>;
 }
 
 export function registerAutopilotCommands(program: Command, cliDeps: AutopilotCliDeps = {}): void {
@@ -22,7 +24,7 @@ export function registerAutopilotCommands(program: Command, cliDeps: AutopilotCl
       // 독립 프로세스 — 싱크를 붙이지 않으면 `task-agent`/`action` 관측이 logs.db 에 안 닿는다(fail-open).
       const { registerTaskAgentSink } = await import('./tasks-cli.js');
       await registerTaskAgentSink(cliDeps.registerSink);
-      const { executeNextAction } = await import('../task-agent/actions.js');
+      const { executeEntranceTick, executeNextAction } = await import('../task-agent/actions.js');
       const { getUserConfig } = await import('../user-config.js');
       const { spawnSync } = await import('node:child_process');
       const { writeFileSync, mkdirSync } = await import('node:fs');
@@ -41,15 +43,23 @@ export function registerAutopilotCommands(program: Command, cliDeps: AutopilotCl
         process.exitCode = 1;
         return;
       }
-      const action = JSON.parse(actionJson) as import('../task-agent/actions.js').NextAction;
+      const parsedInput = JSON.parse(actionJson) as import('../task-agent/actions.js').NextAction | import('../task-agent/actions.js').EntranceTickCandidate[];
+      const isEntranceTick = Array.isArray(parsedInput);
+      const action = isEntranceTick ? parsedInput[0]?.action : parsedInput;
+      if (!action) {
+        process.stderr.write('task-agent-action: action or non-empty entrance tick is required\n');
+        process.exitCode = 1;
+        return;
+      }
       const deps: import('../task-agent/actions.js').ActionDeps = {
         ...state,
+        ...cliDeps.actionDeps,
         failureCounts: state.failureCounts ?? {},
         saveState: () => {
           mkdirSync(dirname(statePath), { recursive: true });
           // 실패 횟수는 incrementFailure 가 잠금 안에서 키별로 더한다 — 여기선 덮어쓰지 않는다.
         },
-        mode: config.taskAgent?.mode,
+        mode: cliDeps.actionDeps?.mode ?? config.taskAgent?.mode,
         // 하루 착지 칸은 상태 파일 잠금 안에서 확보·반환한다 — 두 CLI 프로세스가 같은 잔여 칸을 쓰지 않게.
         reserveLanding: (day, limit) => withFileLockSync(`${statePath}.lock`, () => {
           const disk = readTaskAgentState<ActionState>(statePath);
@@ -74,18 +84,23 @@ export function registerAutopilotCommands(program: Command, cliDeps: AutopilotCl
           writeFileSync(statePath, JSON.stringify({ ...disk, landingsToday: disk.landingsToday - 1 }));
           deps.landingsToday = disk.landingsToday - 1;
         }),
-        observe: (_event, data) => debug.log('task-agent', 'action', data),
-        command: async args => {
+        observe: cliDeps.actionDeps?.observe ?? ((_event, data) => debug.log('task-agent', 'action', data)),
+        command: cliDeps.actionDeps?.command ?? (async (args, cwd) => {
           const p = args[0] === 'gh'
-            // PR 조회는 착지할 작업 트리에서 — 다른 저장소에서 불러도 엉뚱한 PR 을 읽지 않게.
-            ? spawnSync('gh', args.slice(1), { encoding: 'utf8', ...(action.cwd ? { cwd: action.cwd } : {}) })
+            // PR 조회는 해당 후보의 작업 트리에서 — 배열 후보 간 저장소가 섞이지 않게.
+            ? spawnSync('gh', args.slice(1), { encoding: 'utf8', ...(cwd ? { cwd } : {}) })
             // 지금 돌고 있는 진입점으로 부른다 — 저장소 밖(설치본)에서 불러도 같은 elanous 를 쓴다.
             : spawnSync(process.execPath, [process.argv[1]!, ...(process.argv.includes('--test') ? ['--test'] : []), ...args], { encoding: 'utf8' });
           return { status: p.status ?? 1, stdout: p.stdout ?? '', stderr: p.stderr ?? '' };
-        },
+        }),
       };
       let result: string;
-      try { result = await executeNextAction(action, deps); } catch (error) {
+      try {
+        if (isEntranceTick) {
+          const results = await executeEntranceTick(parsedInput, deps);
+          result = results.join('\n');
+        } else result = await executeNextAction(action, deps);
+      } catch (error) {
         // 잠금 안 읽기가 손상을 만나면 쓰지 않고 여기로 온다 — 실패로 끝낸다. 그 밖의 오류는 종전대로 올린다.
         if (!(error instanceof TaskAgentStateError)) throw error;
         process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);

package/src/cli/decisions-cli.ts

@@ -64,7 +64,7 @@ export function formatSeatDecisionRow(e: SeatDecisionRecord): string {
 }
 
 export function formatProposalRow(p: ProposalCard): string {
-  return `${p.id} · ${categoryLabel(p.category)} · ${p.title} · 사실 ${p.factId} · 비용 ${p.cost} · 되돌리기 ${p.undo}${p.thresholds.length ? ` · ${CROWN_MARK} 몫 ${p.thresholds.join('|')}` : ''} · 제안 ${representativeLabel(p.proposedBy)} · ${kst(p.proposedAt)} · 왕복 ${p.roundTrips}/${MAX_REVIEW_ROUND_TRIPS} · ${p.status === 'open' ? '검토 중' : p.status === 'agreed' ? '합의·실행·기록' : '불합의'}`;
+  return `${p.id} · ${categoryLabel(p.category)} · ${p.title} · 사실 ${p.factId} · 비용 ${p.cost} · 되돌리기 ${p.undo}${p.thresholds.length ? ` · ${CROWN_MARK} 몫 ${p.thresholds.join('|')}` : ''} · 제안 ${representativeLabel(p.proposedBy)} · ${kst(p.proposedAt)} · 왕복 ${p.roundTrips}/${MAX_REVIEW_ROUND_TRIPS} · ${p.status === 'open' ? '검토 중' : p.status === 'agreed' ? (p.thresholds.length ? '합의·승인 대기' : '합의·실행·기록') : '불합의'}`;
 }
 
 export function formatCrownCardRow(c: CrownCard): string {
@@ -235,14 +235,15 @@ export function registerDecisionsCommands(program: Command, config: DecisionLedg
     .requiredOption('--category <category>', `합의 범주 (${CONSENSUS_CATEGORIES.join('|')})`)
     .requiredOption('--title <text>').requiredOption('--fact-id <id>', '사실 id')
     .requiredOption('--cost <text>', '비용').requiredOption('--undo <text>', '되돌리기')
+    .option('--work-key <orch:card:cell>', 'splitter 교차 영향 작업 키')
     .option('--threshold <category>', `${CROWN_MARK} 몫 임계 범주 (반복: ${CROWN_THRESHOLD_CATEGORIES.join('|')})`, repeat, [])
     .option('--provider <name>', 'LLM 제공자 표식 — 가능하면 상대와 다른 제공자 (메아리 방지)')
     .option('--json').option('--hq-override')
-    .action((o: { by: string; category: string; title: string; factId: string; cost: string; undo: string; threshold: string[]; provider?: string; json?: boolean; hqOverride?: boolean }) => fail(() => {
+    .action((o: { by: string; category: string; title: string; factId: string; cost: string; undo: string; workKey?: string; threshold: string[]; provider?: string; json?: boolean; hqOverride?: boolean }) => fail(() => {
       if (!mayWrite('consensus propose', o.hqOverride)) return;
       const proposal = consensusEngine().propose({
         by: o.by as ConsensusRepresentative, category: o.category as ConsensusCategory, title: o.title, factId: o.factId, cost: o.cost, undo: o.undo,
-        thresholds: o.threshold.map(threshold => threshold as DecisionCategory), provider: o.provider,
+        workKey: o.workKey, thresholds: o.threshold.map(threshold => threshold as DecisionCategory), provider: o.provider,
       });
       return emit(proposal, o.json, `제안: ${formatProposalRow(proposal)}`);
     }));
@@ -263,7 +264,9 @@ export function registerDecisionsCommands(program: Command, config: DecisionLedg
     .option('--json').option('--hq-override')
     .action((id: string, o: { by: string; claim?: string; provider?: string; json?: boolean; hqOverride?: boolean }) => fail(() => {
       if (!mayWrite('consensus agree', o.hqOverride)) return;
-      const { proposal, crownCard } = consensusEngine().agree(id, { by: o.by as ConsensusRepresentative, claim: o.claim, provider: o.provider });
+      const consensus = consensusEngine();
+      const { proposal, crownCard } = consensus.agree(id, { by: o.by as ConsensusRepresentative, claim: o.claim, provider: o.provider });
+      if (!crownCard && !consensus.canExecute(proposal.id)) throw new Error(`합의 실행 관문 거부: ${proposal.id}`);
       return emit({ proposal, ...(crownCard ? { crownCard } : {}) }, o.json,
         `합의: ${formatProposalRow(proposal)}${crownCard ? `\n${CROWN_MARK} 카드: ${formatCrownCardRow(crownCard)}` : ''}`);
     }));