elanous 0.2.28 → 0.2.31

package/src/cli/tasks-cli.ts

@@ -14,7 +14,8 @@ import { assignedVersions, releasedVersion, validateVersion } from '../release-l
 import { compareVersions } from '../directives/version-at.js';
 import { cardsBoard, countBoardTasks, INTERNAL_PACK_PROJECT, mergeBoards, releasePackBoard, type BoardNode } from '../task-agent/board.js';
 import type { Task } from '../task-orchestrator/types.js';
-import { cardPrNumber, CLOSED_BY_HAND_EVENT, closeTaskCard, COMPLETION_KINDS, handTask, updateTaskCard, LIVE_MOVE_HISTORY_EVENT, LIVE_MOVE_RESULT_EVENT, nextMoveFor, resolveHandText, readTaskAgentState, readTaskCard, taskAgentStatePath as taskStatePathDefault, shellQuote, TASK_CARD_PREFIX, TASK_SEATS, type CompletionKind, type TaskCard, type TaskLaunchContext, type TaskLaunchReceipt, type TaskLauncher, type TaskSeat } from '../task-agent/task-hand.js';
+import { cardPrNumber, CLOSED_BY_HAND_EVENT, closeTaskCard, COMPLETION_KINDS, handTask, updateTaskCard, LIVE_MOVE_HISTORY_EVENT, LIVE_MOVE_RESULT_EVENT, nextMoveFor, resolveHandText, readTaskAgentState, readTaskCard, runTagChange, taskAgentStatePath as taskStatePathDefault, taskCardLabelContext, shellQuote, TASK_CARD_PREFIX, TASK_SEATS, type CompletionKind, type TaskCard, type TaskLaunchContext, type TaskLaunchReceipt, type TaskLauncher, type TaskSeat } from '../task-agent/task-hand.js';
+import { RUN_TAG_KEYS, runIdentityFieldText, runPriorityClass } from '../task-agent/run-identity.js';
 import { readCardSalvageBranch, recordWiringLiveVerified, refreshCardRunBinding, type CardRunEvidenceDeps } from '../task-agent/card-evidence.js';
 import { captureReviewResults } from '../task-agent/review-result-capture.js';
 import { replayRemoteCardMoves } from '../task-agent/shadow.js';
@@ -33,6 +34,9 @@ export interface TasksCliDeps {
   bearerToken?: string;
   fetch?: typeof fetch;
   output?: (line: string) => void;
+  /** green-sweep entrypoint test seam: keep the actual CLI decision chain, replace only process reads. */
+  greenSweepChecklist?: typeof listChecklist;
+  greenSweepRun?: (command: string, args: string[]) => { status: number | null; stdout: string };
   /** `task hand --live` 의 발사기(시험 주입). 기본은 운영 config-dir 로 `harness say` 를 떼어 띄운다. */
   taskLauncher?: TaskLauncher;
   /** TA-REVIEW-RESULT-CAPTURE — `tasks show` 의 리뷰 결과 회수 시각(시험 주입 · 기본 지금). */
@@ -185,6 +189,12 @@ async function tryRemoteParent(args: string[], cwd: string | undefined, context:
     failed(targets[0]!, ['project-target-is-local']);
     return null;
   }
+  // ⛔ R7(2026-10-16): 시험 안에서 실 ssh 원격 발사는 명시 허용 없이 거부한다(가짜 ssh 주입은 통과).
+  //   ⚠️ 이 가드는 hold(launchHoldActive) 판정보다 «앞»이어야 한다 — hold 는 preflightParentHost 의 입력일 뿐이고,
+  //   preflightParentHost(parent-host.ts `preflightParentHost` 첫 줄)는 hold 와 무관하게 먼저 실 ssh 를 부른다(다중 대상이면
+  //   그 앞의 readParentHostCapacity 도 ssh). 가드를 아래로 내리면 hold 경로에서 시험이 실 ssh 를 쏜다(R7 사고 모양).
+  //   hold 경로를 재는 시험은 deps.ssh 가짜 또는 parentHost:null 을 주입한다(real-launch-guard.test 가 이 순서를 문다).
+  if (!deps.ssh) (await import('../task-agent/real-launch-guard.js')).refuseRealLaunchUnderTest('remote-parent-ssh', targets.map((target) => target.host).join(','));
   let launchHoldActive = false;
   try {
     if (deps.launchHoldActive) launchHoldActive = deps.launchHoldActive();
@@ -236,6 +246,8 @@ export async function defaultTaskLauncher(args: string[], cwd?: string, context?
     const remote = await tryRemoteParent(args, cwd, context, deps);
     if (remote) return remote;
   }
+  // ⛔ R7(2026-10-16): 시험 안에서 실 `elanous harness say` 를 띄우는 것은 명시 허용 없이 거부한다(가짜 spawn 주입은 통과).
+  if (!deps.spawn) (await import('../task-agent/real-launch-guard.js')).refuseRealLaunchUnderTest('local-harness-spawn', args.slice(0, 2).join(' '));
   const spawn = deps.spawn ?? ((await import('node:child_process')).spawn as unknown as DetachedSpawn);
   const { getElanousConfigDirOverride } = await import('../elanous-config-dir.js');
   const { prodInstanceRoot } = await import('../instance/resolve.js');
@@ -366,9 +378,26 @@ function runLinkLine(card: TaskCard): string[] {
   return [`런: ${card.runId} · 골: ${card.goalId ?? '-'} · PR: ${pr}${card.runChildId ? ` · 자식 런: ${card.runChildId}` : ''}`];
 }
 
+/** RUN-IDENTITY-TAGS — 신분 한 줄 + Pod 라벨 한 줄(원장 정본 2줄 렌더 · 신분 없는 카드는 «미기록»으로 적고 기본값 정책을 밝힌다). */
+function cardIdentityLines(card: TaskCard): string[] {
+  const identity = card.identity;
+  const { labels } = taskCardLabelContext({ id: card.id });
+  // 경계: Pod 에 실제로 붙는 라벨은 카드 id 하나뿐이다 — 신분 값은 Pod 라벨에 아직 안 실린다(RUN-IDENTITY-ADMIT 몫). 화면도 그렇게 말한다.
+  const podLine = `Pod 라벨 ${Object.entries(labels).map(([key, value]) => `${key}=${value}`).join(' ')} (신분 값은 Pod 라벨 미탑재 — RUN-IDENTITY-ADMIT)`;
+  if (!identity) return [`신분 미기록 — 원장에 identity 없음 · 승인·선점은 기본 class=${runPriorityClass(identity)} 로 읽는다`, podLine];
+  // ⛔ 모르는 칸을 기본값으로 보이지 않는다 — 원장에 없는 칸은 «미기록»으로 적는다(확인된 칸만 값으로).
+  const identityText = RUN_TAG_KEYS.map((key) => `${key}=${runIdentityFieldText(identity, key)}`).join(' · ');
+  const originParts = [identity.origin?.checklistId, identity.origin?.version, identity.origin?.seat, identity.origin?.launcher].filter((part) => part !== undefined);
+  return [
+    `신분 ${identityText}${originParts.length > 0 ? ` — 출생 ${originParts.join(' · ')}` : ''}`,
+    podLine,
+  ];
+}
+
 function taskCardLines(card: TaskCard): string[] {
   return [
     [card.id, card.status, card.seat ?? '-', card.checklistId ?? '-', card.createdAt, card.text].join('\t'),
+    ...cardIdentityLines(card),
     ...(card.mission ? [`미션: ${card.mission} · after: ${card.after?.length ? card.after.join(', ') : '-'}`] : []),
     ...runLinkLine(card),
     ...liveMoveLines(card),
@@ -786,7 +815,9 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
     .action((opts: { version: string; cell?: string; traffic?: string; json?: boolean }) => {
       try {
         validateVersion(opts.version);
-        const snapshot = listChecklist(opts.version);
+        const snapshot = (deps.greenSweepChecklist ?? listChecklist)(opts.version);
+        const run = deps.greenSweepRun ?? ((command: string, args: string[]) => spawnSync(command, args,
+          { cwd: process.cwd(), encoding: 'utf8', timeout: 20_000 }));
         const cards = Object.values(readTaskAgentState<{ tasks?: Record<string, TaskCard> }>(deps.taskStatePath ?? taskStatePathDefault()).tasks ?? {});
         let holds: Set<string> | null = null;
         if (opts.traffic) {
@@ -800,14 +831,11 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
         }
         const prCache = new Map<number, GreenSweepPr | null>();
         const ambiguousPrs = ambiguousGreenSweepPrs(snapshot.items, opts.version, cards);
-        const origin = spawnSync('git', ['remote', 'get-url', 'origin'],
-          { cwd: process.cwd(), encoding: 'utf8', timeout: 20_000 });
+        const origin = run('git', ['remote', 'get-url', 'origin']);
         const originRepo = origin.status === 0
           ? /github\.com[:/]([^/\s]+\/[^/\s]+?)(?:\.git)?$/i.exec(origin.stdout.trim())?.[1]?.toLowerCase() : undefined;
-        const localMain = spawnSync('git', ['rev-parse', 'origin/main'],
-          { cwd: process.cwd(), encoding: 'utf8', timeout: 20_000 });
-        const remoteMain = spawnSync('git', ['ls-remote', 'origin', 'refs/heads/main'],
-          { cwd: process.cwd(), encoding: 'utf8', timeout: 20_000 });
+        const localMain = run('git', ['rev-parse', 'origin/main']);
+        const remoteMain = run('git', ['ls-remote', 'origin', 'refs/heads/main']);
         const localMainSha = localMain.status === 0 ? localMain.stdout.trim() : '';
         const remoteMainSha = remoteMain.status === 0 ? remoteMain.stdout.trim().split(/\s+/)[0] : '';
         const mainFresh = /^[a-f0-9]{40}$/i.test(localMainSha) && localMainSha === remoteMainSha;
@@ -817,8 +845,7 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
           return candidates.map((candidate) => {
             let pr = prCache.get(candidate.pr);
             if (pr === undefined) {
-              const view = spawnSync('gh', ['pr', 'view', String(candidate.pr), '--json', 'number,state,mergeCommit,url'],
-                { cwd: process.cwd(), encoding: 'utf8', timeout: 20_000 });
+              const view = run('gh', ['pr', 'view', String(candidate.pr), '--json', 'number,state,mergeCommit,url']);
               try {
                 if (view.status !== 0) throw new Error('gh failed');
                 const parsed = JSON.parse(view.stdout) as { number?: number; state?: string; mergeCommit?: { oid?: string }; url?: string };
@@ -827,16 +854,31 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
               } catch { pr = null; }
               prCache.set(candidate.pr, pr);
             }
-            const sha = pr?.mergeSha;
+            // A component PR stays CLOSED after a merged train. Reverify the integration PR
+            // recorded on the card before using its merge commit as landing evidence.
+            let landingPr = pr;
+            const train = candidate.card?.trainLanding;
+            if (pr?.state === 'CLOSED' && train?.componentPr === candidate.pr && /^[a-f0-9]{40}$/i.test(train.mergeSha)) {
+              const view = run('gh', ['pr', 'view', String(train.integrationPr), '--json', 'number,state,mergeCommit']);
+              try {
+                if (view.status === 0) {
+                  const parsed = JSON.parse(view.stdout) as { number?: number; state?: string; mergeCommit?: { oid?: string } };
+                  if (parsed.number === train.integrationPr && parsed.state === 'MERGED'
+                    && parsed.mergeCommit?.oid?.toLowerCase() === train.mergeSha.toLowerCase()) {
+                    landingPr = { ...pr, state: 'MERGED', mergeSha: train.mergeSha, viaTrain: { integrationPr: train.integrationPr } };
+                  }
+                }
+              } catch { /* Unverified train is still a CLOSED component PR. */ }
+            }
+            const sha = landingPr?.mergeSha;
             const prRepo = /^https:\/\/github\.com\/([^/]+\/[^/]+)\/pull\/\d+(?:\/|$)/i.exec(pr?.url ?? '')?.[1]?.toLowerCase();
             const repositoryMatches = originRepo && prRepo ? originRepo === prRepo : null;
             const ancestor = !mainFresh || !sha || !/^[a-f0-9]{40}$/i.test(sha) ? null : (() => {
-              const check = spawnSync('git', ['merge-base', '--is-ancestor', sha, 'origin/main'],
-                { cwd: process.cwd(), encoding: 'utf8', timeout: 20_000 });
+              const check = run('git', ['merge-base', '--is-ancestor', sha, 'origin/main']);
               return check.status === 0 ? true : check.status === 1 ? false : null;
             })();
             const decision = decideGreenSweep({ item, candidate, candidateCount: candidates.length,
-              pr: pr ?? null, ancestor, hold: holds === null ? null : holds.has(item.id), repositoryMatches,
+              pr: landingPr ?? null, ancestor, hold: holds === null ? null : holds.has(item.id), repositoryMatches,
               ambiguousAcrossCells: ambiguousPrs.has(candidate.pr) });
             observeGreenSweep(decision);
             return decision;
@@ -954,9 +996,13 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
     .option('--ta-land', 'TA-LIVE-LAND-2 — 호스트는 재게이트만 하고 병합은 TASK-AGENT 의 propose-land(`pr land --expected-head`)에 맡긴다 · 카드 taLand ⊕ 발사 env ELANOUS_TA_LAND=1 · taskAgent.liveMoves 에 propose-land 가 없으면 종전대로 호스트가 병합')
     .option('--child-llm <provider/model>', 'TASKS-HAND-CHILD-LLM — 구현 자식 LLM(예: grok/grok-4.7) → 발사 인자 --child-llm-provider <provider> --child-llm-model <model> · «첫» `/` 에서만 가른다(모델 id 의 `/` 는 보존) · openrouter 는 모델 id 가 openrouter/ 접두를 포함하므로 전체를 모델로(openrouter/z-ai/glm-5.3 → --child-llm-model openrouter/z-ai/glm-5.3) · 카드 childLlm · 안 주면 명령·카드 무변경')
     .option('--child-llm-effort <level>', '구현 자식 추론 노력 → 발사 인자 --child-llm-effort(검증은 하니스 · --child-llm 과 함께)')
+    .addOption(new Option('--tier <level>', '디스패처 난이도(하|중|상|특) — 카드에 보존해 수리 모델 정책에 사용').choices(['하', '중', '상', '특']))
+    .option('--tag <k=v>', 'RUN-IDENTITY-TAGS — 출생 신분을 덮는다(class|care|rights|protect 의 k=v · 반복: --tag class=gate --tag protect=true) — 카드 원장 identity 에 남는다', (value: string, previous: string[] | undefined) => [...(previous ?? []), value])
     .option('--json', 'JSON 출력')
-    .action(async (text: string | undefined, opts: { seat?: TaskSeat; checklist?: string; version?: string; completion?: CompletionKind; mission?: string; project?: string; target?: string; goal?: string; milestone?: string; live?: boolean; taLand?: boolean; childLlm?: string; childLlmEffort?: string; json?: boolean }) => {
+    .action(async (text: string | undefined, opts: { seat?: TaskSeat; checklist?: string; version?: string; completion?: CompletionKind; mission?: string; project?: string; target?: string; goal?: string; milestone?: string; live?: boolean; taLand?: boolean; childLlm?: string; childLlmEffort?: string; tier?: TaskCard['tier']; tag?: string[]; json?: boolean }) => {
       const suppliedText = text !== undefined;
+      /** RUN-IDENTITY-TAGS — 칸을 찾은 판(출생 신분이 그 판의 칸 우선순위를 읽는다 · 개발 판 밖 칸도). */
+      let birthBoardVersion: string | undefined;
       if (opts.version !== undefined && opts.checklist === undefined) {
         out('--version 은 --checklist 와 함께 준다');
         process.exitCode = 1;
@@ -1014,6 +1060,7 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
           return;
         }
         if (matches.length > 1) console.error(`⚠ 체크리스트 칸 ${opts.checklist} 중복: ${matches.map((match) => match.version).join(', ')} — 가장 가까운 판 ${matches[0]!.version} 선택 (--version 으로 고정 가능)`);
+        birthBoardVersion = matches[0]!.version;
         if (opts.mission === undefined && text === undefined) text = title;
       }
       if (opts.checklist !== undefined && opts.mission === undefined && suppliedText && !text!.split(/\r?\n/, 1)[0]!.startsWith('대상 경로:')) {
@@ -1032,8 +1079,8 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
         process.exitCode = 1;
         return;
       }
-      if (opts.mission !== undefined && (opts.completion !== undefined || opts.project !== undefined || opts.goal !== undefined || opts.milestone !== undefined || opts.taLand === true || opts.childLlm !== undefined || opts.childLlmEffort !== undefined)) {
-        out('--completion/--project/--target/--goal/--milestone/--ta-land/--child-llm 은 과제 한 줄에만 준다 — --mission 조각은 종전처럼 code-pr 이다');
+      if (opts.mission !== undefined && (opts.completion !== undefined || opts.project !== undefined || opts.goal !== undefined || opts.milestone !== undefined || opts.taLand === true || opts.childLlm !== undefined || opts.childLlmEffort !== undefined || opts.tier !== undefined || opts.tag !== undefined)) {
+        out('--completion/--project/--target/--goal/--milestone/--ta-land/--child-llm/--tier/--tag 는 과제 한 줄에만 준다 — --mission 조각은 종전처럼 code-pr 이다');
         process.exitCode = 1;
         return;
       }
@@ -1089,6 +1136,9 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
           ...(opts.taLand === true ? { taLand: true } : {}),
           ...(opts.childLlm !== undefined ? { childLlm: opts.childLlm } : {}),
           ...(opts.childLlmEffort !== undefined ? { childLlmEffort: opts.childLlmEffort } : {}),
+          ...(opts.tier !== undefined ? { tier: opts.tier } : {}),
+          ...(opts.tag !== undefined ? { tags: opts.tag } : {}),
+          ...(birthBoardVersion !== undefined ? { checklistVersion: birthBoardVersion } : {}),
           ...(deps.taskStatePath ? { statePath: deps.taskStatePath } : {}),
           ...(deps.taskCompositionRoot ? { compositionRoot: deps.taskCompositionRoot } : {}),
           launcher: deps.taskLauncher ?? defaultTaskLauncher,
@@ -1096,10 +1146,12 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
         if (opts.json) out(JSON.stringify(result));
         else {
           out(`${result.card.id}\t${result.mode}\t${result.launched ? 'launched' : 'not launched'}`);
-          out(`elanous ${result.move.command!.map(shellQuote).join(' ')}`);
+          if (result.move.command) out(`elanous ${result.move.command.map(shellQuote).join(' ')}`);
+          else out(result.move.reason);
           if (result.cwd) out(`(cwd: ${result.cwd})`);
           if (result.card.taLand) out('(ta-land — 발사 env ELANOUS_TA_LAND=1 · 원격 또는 로컬 부모 · taskAgent.liveMoves 에 propose-land 가 있으면 병합은 TASK-AGENT 몫, 없으면 종전대로 호스트 병합)');
-          if (!result.launched) out('(shadow — 띄우지 않았다 · 띄우려면 --live)');
+          if (!result.launched && result.card.alreadyDoneCandidate) out('(main 증거 통과 — 발사 0 · green 후보만 기록, 주인 판정 대기)');
+          else if (!result.launched) out('(shadow — 띄우지 않았다 · 띄우려면 --live)');
         }
       } catch (error) {
         out(error instanceof Error ? error.message : '과제 넘기기 실패');
@@ -1107,6 +1159,32 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
       }
     });
 
+  tasks.command('tag <id> <k=v>')
+    .description('RUN-IDENTITY-TAGS — 카드의 런 신분 태그를 바꾼다(class|care|rights|protect 의 k=v · 카드 history 에 감사 줄 run-tag-change {from, to, by, reason} 이 남는다 · 카드 상태 파일이 원장 정본 · 목록 밖 값은 거부)')
+    .option('--by <seat>', '바꾼 자리(예: OP·MK·TC·UX) — 안 주면 호출 자리 ELANOUS_TRACK, 그것도 없으면 «unknown» 으로 감사 줄에 적는다(지어내지 않는다)')
+    .option('--reason <text>', '왜 바꾸나 — 감사 줄에 남긴다')
+    .option('--json', '바뀐 카드를 JSON 으로 출력')
+    .action((id: string, kv: string, opts: { by?: string; reason?: string; json?: boolean }) => {
+      try {
+        const by = opts.by?.trim() || process.env.ELANOUS_TRACK?.trim() || 'unknown';
+        const card = runTagChange(id, { tag: kv, by, ...(opts.reason !== undefined ? { reason: opts.reason } : {}) }, deps.taskStatePath ?? taskStatePathDefault());
+        if (card === undefined) {
+          out(`카드가 없습니다: ${id}`);
+          process.exitCode = 1;
+          return;
+        }
+        if (opts.json) {
+          out(JSON.stringify(card));
+          return;
+        }
+        out(`${card.id}\t${kv}`);
+        for (const line of cardIdentityLines(card)) out(line);
+      } catch (error) {
+        out(error instanceof Error ? error.message : '태그 바꾸기 실패');
+        process.exitCode = 1;
+      }
+    });
+
   tasks.command('hand-move <id>')
     .description('HAND-MOVE-LEDGER — 자리가 손으로 마무리한 수(기존 실패 면제 · diff 재적용 · 범위 자르기 · 쪼개기 · 다른 모델 의견)를 그 카드 history 에 한 줄로 남긴다 — live-move 와 같은 원장 칸 · 기존 줄은 건드리지 않는다')
     .requiredOption('--kind <kind>', `손으로 쓴 수 (${HAND_MOVE_KINDS.join('|')})`)
@@ -1493,8 +1571,11 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
       try {
         if (!id) {
           const { bindMirroredRemoteRejudgeCards } = await import('../task-agent/remote-rejudge-bind.js');
+          const { mirrorRemoteRunLedgers } = await import('../task-agent/parent-host.js');
           const cards = readTaskAgentState<{ tasks?: Record<string, TaskCard> }>(statePath).tasks ?? {};
-          const binding = await bindMirroredRemoteRejudgeCards(cards, statePath);
+          const binding = await bindMirroredRemoteRejudgeCards(cards, statePath, deps.cardRunEvidence?.ssh
+            ? { mirror: (target, runId, root) => mirrorRemoteRunLedgers(target, runId, root, deps.cardRunEvidence!.ssh) }
+            : {});
           try { debug.log('task-agent', 'remote-rejudge-bind', binding); } catch { /* fail-soft */ }
         }
         ids = id ? [id] : rejudgeCandidates(readTaskAgentState<{ tasks?: Record<string, TaskCard> }>(statePath).tasks ?? {});
@@ -1503,6 +1584,8 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
       }
       const { configuredTaskAgentLiveMoves } = await import('../task-agent/live-moves.js');
       const liveMoves = deps.rejudge?.liveMoves ?? await configuredTaskAgentLiveMoves();
+      const repairBudget = opts.all ? { max: (await import('../user-config.js')).getUserConfig().taskAgent?.repairMaxPerTick ?? 3,
+        requested: 0, capped: 0 } : undefined;
       const all = [];
       for (const cardId of ids) {
         await mirrorRemoteCardLedger(cardId, deps);
@@ -1510,7 +1593,8 @@ export function registerTasksCommands(program: Command, deps: TasksCliDeps = {})
           try { debug.log('task-agent', 'card-binding-replay-failed', { card: cardId, reason: error instanceof Error ? error.message : String(error) }); } catch { /* fail-soft */ }
         }
         let outcomes: Awaited<ReturnType<typeof rejudgeCardOnHead>>;
-        try { outcomes = await rejudgeCardOnHead(cardId, { ...deps.rejudge, liveMoves, live: { ...deps.rejudge?.live, statePath } }); } catch (error) {
+        try { outcomes = await rejudgeCardOnHead(cardId, { ...deps.rejudge, liveMoves,
+          ...(repairBudget ? { repairBudget } : {}), live: { ...deps.rejudge?.live, statePath } }); } catch (error) {
           // 카드 하나의 예외가 --all 의 나머지 카드 판단을 멈추지 않게 — 사유를 남기고 다음 카드로.
           const reason = (error instanceof Error ? error.message : String(error)).slice(-300);
           try { debug.log('task-agent', 'rejudge-on-head', { card: cardId, pr: null, fromHead: null, toHead: null, step: 'target', decision: 'rejudge-threw', reason }, { level: 'warn' }); } catch { /* fail-soft */ }

package/src/cli/usage-cli.ts

@@ -9,13 +9,16 @@ import { join } from 'node:path';
 import type { Command } from 'commander';
 import { collectUnifiedUsage, formatUnifiedUsage } from '../budget/unified-usage.js';
 import { consumeCodexResetCredits, listCodexResetCredits } from '../budget/codex-reset-credits.js';
-import { rollupRunUsage, type RunUsageInput } from '../budget/run-usage-rollup.js';
+import { excludeCoveredPodRawRows, rollupRunUsage, type RunUsageInput } from '../budget/run-usage-rollup.js';
 import { dedupePodRollupRows } from '../../scripts/usage-rollup.js';
 import { formatUsageOutcomes, outcomeTableHasCodexGrokUnknown, queryUsageOutcomes, type UsageOutcomesDeps, type UsageOutcomesReport } from '../budget/usage-outcomes.js';
 import { LogStore, logsDbPath, type LogQuery, type LogStoreRow } from '../mss/logging/log-store.js';
 import { LOGS_SINCE_OPTION, parseSince } from './logs-cli.js';
 import { formatCodexCreditPlan, type CodexCreditPlan } from '../budget/codex-credit-plan.js';
 import { codexCreditPlanFromDisk } from './codex-credit-plan-view.js';
+import { getUserConfig } from '../user-config.js';
+import { defaultSshRunner, type SshRunner } from '../task-agent/parent-host.js';
+import { shellQuote } from '../task-agent/task-hand.js';
 
 export interface UsageCliDeps {
   readonly collect?: typeof collectUnifiedUsage;
@@ -24,6 +27,9 @@ export interface UsageCliDeps {
   readonly out?: { log: (s: string) => void };
   /** Read-only LogStore query seam; returns stored llm-usage rows, newest first. */
   readonly readRunLogs?: (query: LogQuery) => LogStoreRow[];
+  /** Federation seams: the configured TA parent hosts plus this HQ host, and bounded SSH. */
+  readonly usageHosts?: () => { local: string; remote: string[] };
+  readonly ssh?: SshRunner;
   /** 시험 심 — 실물 네트워크를 안 탄다. */
   readonly list?: typeof listCodexResetCredits;
   readonly consume?: typeof consumeCodexResetCredits;
@@ -61,8 +67,16 @@ function readRunLogs(query: LogQuery): LogStoreRow[] {
   }
 }
 
+function configuredUsageHosts(): { local: string; remote: string[] } {
+  const config = getUserConfig();
+  const local = config.hq?.hostName?.trim() || '';
+  const parents = config.taskAgent?.parentHost;
+  const entries = Array.isArray(parents) ? parents : parents ? [parents] : [];
+  return { local, remote: [...new Set(entries.map((entry) => entry.host?.trim()).filter((host): host is string => !!host && host !== local))] };
+}
+
 type UsageAxis = 'stage' | 'model' | 'account';
-type ExtendedRunUsageInput = RunUsageInput & { stage?: string | null; account?: string | null };
+type ExtendedRunUsageInput = RunUsageInput & { stage?: string | null; account?: string | null; origin?: string; podJob?: string; job?: string; measured?: boolean };
 type AxisUsageRow = {
   stage?: string;
   model?: string;
@@ -82,15 +96,78 @@ type AxisUsageRow = {
   rankUsd: number;
 };
 
+type FederatedUsageRow = {
+  runId?: string; role?: string; site?: string; stage?: string; model?: string; account?: string;
+  billingProvider?: string; billing?: string; hostIds: string[]; rankUsd?: number;
+  calls: number; inputTokens: number; outputTokens: number; cacheReadInputTokens: number;
+  cacheCreationInputTokens: number; reasoningOutputTokens: number; usdKnown: number;
+  unknownCostCalls: number; includedCalls: number; apiEquivalentUsd: number;
+};
+type HostMeasurement = { host: string; status: 'ok' | 'unmeasured'; reason?: string };
+const SUM_FIELDS = ['calls', 'inputTokens', 'outputTokens', 'cacheReadInputTokens', 'cacheCreationInputTokens', 'reasoningOutputTokens', 'usdKnown', 'unknownCostCalls', 'includedCalls', 'apiEquivalentUsd'] as const;
+const SSH_HOST = /^[A-Za-z0-9][A-Za-z0-9._@-]{0,127}$/;
+
+function validUsageRows(value: unknown, axis: 'run' | 'role' | UsageAxis): value is FederatedUsageRow[] {
+  if (!Array.isArray(value)) return false;
+  const key = axis === 'run' ? 'runId' : axis;
+  return value.every((candidate) => {
+    if (!candidate || typeof candidate !== 'object' || Array.isArray(candidate)) return false;
+    const row = candidate as Record<string, unknown>;
+    return typeof row[key] === 'string' && Array.isArray(row.hostIds)
+      && row.hostIds.every((host: unknown) => typeof host === 'string')
+      && (axis !== 'run' && axis !== 'role'
+        || ['model', 'billingProvider', 'billing', ...(axis === 'role' ? ['site'] : [])]
+          .every((field) => typeof row[field] === 'string'))
+      && SUM_FIELDS.every((field) => {
+        const number = row[field];
+        return typeof number === 'number' && Number.isFinite(number) && number >= 0;
+      })
+      && (axis !== 'stage' && axis !== 'model' && axis !== 'account'
+        || typeof row.rankUsd === 'number' && Number.isFinite(row.rankUsd));
+  });
+}
+
+function mergeUsageRows(groups: readonly FederatedUsageRow[][], axis: 'run' | 'role' | UsageAxis): FederatedUsageRow[] {
+  const merged = new Map<string, FederatedUsageRow>();
+  for (const rows of groups) for (const row of rows) {
+    const key = axis === 'run' ? JSON.stringify([row.runId, row.model, row.billingProvider, row.billing])
+      : axis === 'role' ? JSON.stringify([row.role, row.site, row.model, row.billingProvider, row.billing])
+        : JSON.stringify(row[axis]);
+    const previous = merged.get(key);
+    if (!previous) { merged.set(key, { ...row, hostIds: [...row.hostIds] }); continue; }
+    for (const field of SUM_FIELDS) previous[field] += row[field];
+    previous.hostIds = [...new Set([...previous.hostIds, ...row.hostIds])];
+    if (axis === 'stage' || axis === 'model' || axis === 'account') previous.rankUsd = previous.usdKnown + previous.apiEquivalentUsd;
+  }
+  return [...merged.values()];
+}
+
+function readRemoteUsage(host: string, axis: 'run' | 'role' | UsageAxis, opts: { run?: string; sinceMs?: number }, ssh: SshRunner): { rows?: FederatedUsageRow[]; reason?: string } {
+  if (!SSH_HOST.test(host)) return { reason: '호스트 이름 오류' };
+  const args = ['eln', '--config-dir', '"$HOME"/.elanous', 'usage', 'runs', '--by', shellQuote(axis), '--json'];
+  if (opts.run !== undefined) args.push('--run', shellQuote(opts.run));
+  if (opts.sinceMs !== undefined) args.push('--since', shellQuote(new Date(opts.sinceMs).toISOString()));
+  try {
+    // The local usage command returns [] when its store is absent. Check the
+    // same configured store first so federation cannot count absence as zero.
+    const result = ssh(host, 'test -f "$HOME"/.elanous/logs/logs.db || { echo usage-store-missing >&2; exit 68; }; ' + args.join(' '), 20_000);
+    if (result.status === 68 || result.stderr.includes('usage-store-missing')) return { reason: '원격 logs.db 없음' };
+    if (result.status !== 0) return { reason: result.status === null ? '시간 초과 또는 SSH 실패' : `SSH/원격 명령 rc=${result.status}` };
+    const parsed: unknown = JSON.parse(result.stdout);
+    return validUsageRows(parsed, axis) ? { rows: parsed } : { reason: '원격 JSON 형식 오류' };
+  } catch { return { reason: '원격 JSON 또는 SSH 실행 오류' }; }
+}
+
 function usageData(row: LogStoreRow, unwrapPod = false): ExtendedRunUsageInput | null {
   if (row.category !== 'llm.usage' || row.event !== 'llm-usage' || !row.data) return null;
   try {
     let value: unknown = JSON.parse(row.data);
     if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
-    const wrapper = value as { origin?: unknown; originalData?: unknown };
-    if (unwrapPod && wrapper.origin === 'pod') {
-      value = typeof wrapper.originalData === 'string' ? JSON.parse(wrapper.originalData) : wrapper.originalData;
-      if (!value || typeof value !== 'object' || Array.isArray(value)) return null;
+    const wrapper = value as { origin?: unknown; podJob?: unknown; originalData?: unknown };
+    if (unwrapPod && wrapper.origin === 'pod' && wrapper.originalData !== undefined) {
+      const original = typeof wrapper.originalData === 'string' ? JSON.parse(wrapper.originalData) : wrapper.originalData;
+      if (!original || typeof original !== 'object' || Array.isArray(original)) return null;
+      value = { ...original, origin: 'pod', podJob: wrapper.podJob };
     }
     return value as ExtendedRunUsageInput;
   } catch { return null; }
@@ -176,8 +253,9 @@ export function registerUsageCommand(program: Command, deps: UsageCliDeps = {}):
     .option('--run <runId>', '런 ID 정확 일치')
     .option('--by <axis>', '집계 축 (run | role | stage | model | account)', 'run')
     .option(...LOGS_SINCE_OPTION)
+    .option('--hosts <scope>', '호스트 연합 (all: 이 호스트 + 설정된 taskAgent.parentHost)')
     .option('--json', '집계 행 JSON 출력')
-    .action((opts: { run?: string; by: string; since?: string; json?: boolean }, command: Command) => {
+    .action((opts: { run?: string; by: string; since?: string; hosts?: string; json?: boolean }, command: Command) => {
       const json = opts.json || command.optsWithGlobals<{ json?: boolean }>().json;
       if (!isUsageAxis(opts.by)) {
         out.log('⛔ --by 는 run | role | stage | model | account');
@@ -190,16 +268,71 @@ export function registerUsageCommand(program: Command, deps: UsageCliDeps = {}):
         exit(2);
         return;
       }
-      const rows = (deps.readRunLogs ?? readRunLogs)({
-        exactCategories: ['llm.usage'], events: ['llm-usage'],
-        ...(sinceMs !== undefined ? { sinceMs } : {}),
-      });
+      if (opts.hosts !== undefined && opts.hosts !== 'all') {
+        out.log(`⛔ --hosts 는 all 만 지원: '${opts.hosts}'`);
+        exit(2);
+        return;
+      }
+      const localUnavailable = opts.hosts === 'all' && !deps.readRunLogs && !existsSync(logsDbPath())
+        ? '로컬 logs.db 없음' : undefined;
+      const emitFederated = (localRows: FederatedUsageRow[], localFailure?: string): void => {
+        const roster = (deps.usageHosts ?? configuredUsageHosts)();
+        if (!roster.local) {
+          const reason = 'hq.hostName 설정 없음 — 로컬 호스트와 원격 중복 여부를 확인할 수 없음';
+          const hosts = [...new Set(roster.remote)].map((host) => ({ host, status: 'unmeasured' as const, reason: '로컬 식별 불가로 조회 중지' }));
+          if (json) out.log(JSON.stringify({ rows: [], hosts, complete: false, reason }, null, 2));
+          else out.log(`호스트 연합: 못 잼 (${reason})`);
+          return;
+        }
+        const hosts: HostMeasurement[] = [localFailure
+          ? { host: roster.local, status: 'unmeasured', reason: localFailure }
+          : { host: roster.local, status: 'ok' }];
+        const parts: FederatedUsageRow[][] = localFailure ? [] : [localRows];
+        const rosterReason = roster.remote.length === 0 ? 'taskAgent.parentHost 설정 없음' : undefined;
+        for (const host of [...new Set(roster.remote.filter((name) => name !== roster.local))]) {
+          const remote = readRemoteUsage(host, opts.by as 'run' | 'role' | UsageAxis,
+            { run: opts.run, sinceMs }, deps.ssh ?? defaultSshRunner);
+          if (remote.rows) { hosts.push({ host, status: 'ok' }); parts.push(remote.rows); }
+          else hosts.push({ host, status: 'unmeasured', reason: remote.reason ?? '원인 미상' });
+        }
+        const complete = !rosterReason && hosts.every((host) => host.status === 'ok');
+        const rows = mergeUsageRows(parts, opts.by as 'run' | 'role' | UsageAxis);
+        if (opts.by === 'role') rows.sort((a, b) => b.calls - a.calls);
+        if (opts.by === 'stage' || opts.by === 'model' || opts.by === 'account') rows.sort((a, b) => (b.rankUsd ?? 0) - (a.rankUsd ?? 0) || b.calls - a.calls);
+        if (json) { out.log(JSON.stringify({ rows, hosts, complete, ...(rosterReason ? { reason: rosterReason } : {}) }, null, 2)); return; }
+        out.log(`호스트 ${hosts.filter((host) => host.status === 'ok').length}/${hosts.length} 측정 · ${complete ? '완결' : '부분 합계'}`);
+        if (rosterReason) out.log(`호스트 목록: 못 잼 (${rosterReason})`);
+        for (const host of hosts) if (host.status === 'unmeasured') out.log(`${host.host}: 못 잼 (${host.reason})`);
+        if (rows.length === 0) { out.log('(일치하는 런 사용량 없음)'); return; }
+        for (const row of rows) {
+          if (opts.by === 'stage' || opts.by === 'model' || opts.by === 'account') out.log(formatAxisUsage(row as AxisUsageRow, opts.by));
+          else if (opts.by === 'role') out.log(`${row.role}  ${row.site}  ${row.model}  ${row.billingProvider}/${row.billing}  calls=${row.calls}  input=${row.inputTokens}  output=${row.outputTokens}  usdKnown=${row.usdKnown}  unknownCostCalls=${row.unknownCostCalls}  includedCalls=${row.includedCalls}  apiEquivalentUsd=${row.apiEquivalentUsd}`);
+          else out.log(`${row.runId}  ${row.model}  ${row.billingProvider}/${row.billing}  hosts=${row.hostIds.join(',') || '(none)'}  calls=${row.calls}  input=${row.inputTokens}  output=${row.outputTokens}  cacheRead=${row.cacheReadInputTokens}  cacheCreation=${row.cacheCreationInputTokens}  reasoning=${row.reasoningOutputTokens}  usdKnown=${row.usdKnown}  unknownCostCalls=${row.unknownCostCalls}  includedCalls=${row.includedCalls}  apiEquivalentUsd=${row.apiEquivalentUsd}`);
+        }
+      };
+      let rows: LogStoreRow[] = [];
+      let localFailure = localUnavailable;
+      if (!localFailure) {
+        try {
+          rows = (deps.readRunLogs ?? readRunLogs)({
+            exactCategories: ['llm.usage'], events: ['llm-usage'],
+            ...(sinceMs !== undefined ? { sinceMs } : {}),
+          });
+        } catch (error) {
+          if (opts.hosts !== 'all') throw error;
+          localFailure = '로컬 logs.db 조회 실패';
+        }
+      }
       const unwrapPod = opts.by === 'stage' || opts.by === 'model' || opts.by === 'account';
       // ⭐ METER-POD-ROLLUP-GAP-2 — Pod 사용량 재방출 행(podRollupKey)은 «더 완전한 한 행»만 센다(키 없는 행은 그대로).
-      const inputs = dedupePodRollupRows(rows.map((row) => usageData(row, unwrapPod)).filter((data): data is ExtendedRunUsageInput => data !== null))
+      const selected = rows.map((row) => usageData(row, unwrapPod))
+        .filter((data): data is ExtendedRunUsageInput => data !== null)
         .filter((data) => opts.run === undefined || data.runId === opts.run);
+      // A returned Pod raw row and its host rollup describe the same usage. Keep raw rows when no measured rollup exists.
+      const inputs = dedupePodRollupRows(unwrapPod ? excludeCoveredPodRawRows(selected) : selected);
       if (opts.by === 'stage' || opts.by === 'model' || opts.by === 'account') {
         const report = rollupByAxis(inputs, opts.by);
+        if (opts.hosts === 'all') { emitFederated(report, localFailure); return; }
         if (json) {
           out.log(JSON.stringify(report, null, 2));
           return;
@@ -209,6 +342,7 @@ export function registerUsageCommand(program: Command, deps: UsageCliDeps = {}):
         return;
       }
       const report = rollupRunUsage(inputs, { by: opts.by });
+      if (opts.hosts === 'all') { emitFederated(report, localFailure); return; }
       if (opts.by === 'role') report.sort((a, b) => b.calls - a.calls);
       if (json) {
         out.log(JSON.stringify(report, null, 2));

package/src/cli/usage-daily-cli.ts

@@ -0,0 +1,84 @@
+import type { Command } from 'commander';
+import { logsDbPath } from '../mss/logging/log-store.js';
+import { readUsageDaily, type DailyUsageRow } from '../budget/usage-daily-store.js';
+
+type Axis = 'day' | 'model' | 'role' | 'stage' | 'account';
+const metricFields = ['calls', 'inputTokens', 'outputTokens', 'cacheReadInputTokens', 'cacheCreationInputTokens',
+  'reasoningOutputTokens', 'usdKnown', 'unknownCostCalls', 'includedCalls', 'apiEquivalentUsd'] as const;
+type Period = 'day' | 'hour';
+type Summary = Pick<DailyUsageRow, typeof metricFields[number]> & { period: string; key: string };
+
+export function summarizeDailyUsage(rows: readonly DailyUsageRow[], axis: Axis, period: Period = 'day'): Summary[] {
+  const groups = new Map<string, Summary>();
+  for (const row of rows) {
+    const bucket = row[period];
+    const key = axis === 'day' ? bucket : row[axis];
+    const id = JSON.stringify([bucket, key]);
+    let summary = groups.get(id);
+    if (!summary) {
+      summary = { period: bucket, key, calls: 0, inputTokens: 0, outputTokens: 0, cacheReadInputTokens: 0,
+        cacheCreationInputTokens: 0, reasoningOutputTokens: 0, usdKnown: 0, unknownCostCalls: 0,
+        includedCalls: 0, apiEquivalentUsd: 0 };
+      groups.set(id, summary);
+    }
+    for (const field of metricFields) summary[field] += row[field];
+  }
+  return [...groups.values()].sort((a, b) => a.period.localeCompare(b.period) || a.key.localeCompare(b.key));
+}
+
+export function registerUsageDailyCommand(program: Command, deps: {
+  path?: () => string; read?: typeof readUsageDaily;
+  out?: (line: string) => void; exit?: (code: number) => void;
+} = {}): void {
+  const usage = program.commands.find((command) => command.name() === 'usage');
+  if (!usage) throw new Error('usage command must be registered before usage daily');
+  const out = deps.out ?? console.log;
+  const exit = deps.exit ?? ((code: number) => { process.exitCode = code; });
+  usage.command('daily')
+    .description('현재 logs.db에 남은 호스트 시간·일 LLM 사용량 (UTC)')
+    .option('--since <day>', 'UTC 시작일 YYYY-MM-DD')
+    .option('--period <period>', 'day | hour', 'day')
+    .option('--by <axis>', 'day | model | role | stage | account', 'day')
+    .option('--json', 'JSON 출력')
+    .action((opts: { since?: string; period: string; by: string; json?: boolean }) => {
+      const parsedSince = opts.since === undefined ? null : Date.parse(`${opts.since}T00:00:00Z`);
+      if (!['day', 'model', 'role', 'stage', 'account'].includes(opts.by) || !['day', 'hour'].includes(opts.period)
+        || opts.since !== undefined && (!/^\d{4}-\d{2}-\d{2}$/.test(opts.since)
+          || !Number.isFinite(parsedSince) || new Date(parsedSince!).toISOString().slice(0, 10) !== opts.since)) {
+        const detail = '--period day|hour · --by day|model|role|stage|account · --since YYYY-MM-DD (UTC)';
+        if (opts.json) out(JSON.stringify({ status: 'error', reason: 'invalid-arguments', detail }));
+        else out(`⛔ ${detail}`);
+        exit(2); return;
+      }
+      const path = (deps.path ?? logsDbPath)();
+      const scope = { source: 'current-logs-db', sinceDay: opts.since ?? null, timeZone: 'UTC' };
+      const unavailable = (reason: 'logs-db-missing' | 'logs-db-unreadable', detail?: string) => {
+        if (opts.json) out(JSON.stringify({ status: 'unmeasured', hostStatus: 'unmeasured', podStatus: 'unmeasured',
+          reason, scope, ...(detail === undefined ? {} : { detail }), rows: [] }));
+        else out(`사용량 집계 불가: ${reason === 'logs-db-missing' ? 'logs.db 없음' : 'logs.db 읽기 실패'} · UTC${opts.since ? ` · ${opts.since} 이후` : ''} · Pod 사용량 측정 불가${detail ? ` (${detail})` : ''}`);
+        exit(1);
+      };
+      let source: ReturnType<typeof readUsageDaily>;
+      try {
+        source = (deps.read ?? readUsageDaily)(path, opts.since);
+      }
+      catch (error) {
+        unavailable('logs-db-unreadable', String(error)); return;
+      }
+      if (source === null) {
+        unavailable('logs-db-missing'); return;
+      }
+      const report = { status: 'partial', hostStatus: 'measured-within-current-logs-horizon',
+        podStatus: 'unmeasured', podObservedRows: source.podObservedRows,
+        unclassifiedRows: source.unclassifiedRows, sourceMaxId: source.sourceMaxId,
+        scope,
+        timeZone: 'UTC', period: opts.period, by: opts.by,
+        rows: summarizeDailyUsage(source.rows, opts.by as Axis, opts.period as Period) };
+      if (opts.json) { out(JSON.stringify(report)); return; }
+      out(`집계 범위: 현재 logs.db에 남은 로그 · UTC${opts.since ? ` · ${opts.since} 이후` : ''} (보존 기간 밖은 포함되지 않음)`);
+      out(`Pod 사용량: 측정 불가 · 위 범위에서 ${report.podObservedRows}행 관측 (0행도 사용량 0을 뜻하지 않음)`);
+      if (report.unclassifiedRows > 0) out(`분류 불가 사용량: 측정 불가 · 위 범위에서 ${report.unclassifiedRows}행 관측`);
+      if (!report.rows.length) { out('(현재 로그에 남은 호스트 사용량 없음 · 과거 로그는 복구 불가)'); return; }
+      for (const row of report.rows) out(`${row.period} ${opts.by}=${row.key} calls=${row.calls} input=${row.inputTokens} output=${row.outputTokens} cacheRead=${row.cacheReadInputTokens} usdKnown=${row.usdKnown} unknownCostCalls=${row.unknownCostCalls}`);
+    });
+}

package/src/context-bus/context-first.ts

@@ -69,6 +69,19 @@ export function isOperationalQuery(text: string | undefined): boolean {
   return !!text && OPERATIONAL_QUERY.test(text);
 }
 
+/** 칸 3 a59c1c24c — «맥락 먼저 판단»의 공통 게이트 결정: 개시 대기 소진 → 표면 스위치 → 운영 질문 스킵.
+ *  Telegram(maybeSendContextFirst)과 Discord(maybeSendContextFirst)가 같은 한 지점에서 판단한다. */
+export function takeContextFirstOpening(opts: {
+  gate: ReturnType<typeof createContextFirstGate>;
+  key: string;
+  text?: string;
+  enabled?: boolean;
+}): boolean {
+  if (!opts.gate.take(opts.key)) return false;
+  if (opts.enabled === false) return false;
+  return !isOperationalQuery(opts.text);
+}
+
 export function renderContextFirst(
   read: (options: {}, deps?: ContextNowDeps) => ContextNowAnswer,
   deps: ContextNowDeps | undefined,