elanous 0.2.24 → 0.2.27

package/src/task-agent/cover.ts

@@ -32,7 +32,10 @@ export interface TaskAgentCoverInput {
   /** null means the pending-landing age source could not be read; [] means no pending landings. */
   pendingLandingAgeSeconds?: readonly number[] | null;
   /** A source reached the query safety limit; its aggregate is not known to be complete. */
-  truncated?: { taskAgentActions: boolean; allLands: boolean };
+  truncated?: { taskAgentActions: boolean; allLands: boolean; goalAsks?: boolean; goalRuns?: boolean };
+  /** Completed authoring provenance and terminal goal records. undefined = not wired; null = unreadable. */
+  goalAsks?: readonly { authorRunId: string; goalId: string }[] | null;
+  goalRuns?: readonly { goalId: string; outcome: string; stage?: string }[] | null;
 }
 
 export type LandingFailureReason = 'load' | 'oom' | 'time-limit' | 'conflict' | 'review' | 'other';
@@ -157,3 +160,84 @@ export function formatTaskAgentCover(row: CoverRow): string {
   const value = (count: number | null): string => count === null ? '-' : String(count);
   return `${row.verb}: TA ${value(row.byTaskAgent)}/${value(row.total)} (${row.ratio === null ? '-' : `${(row.ratio * 100).toFixed(1)}%`}) · live ${value(row.liveActions)} · shadow ${value(row.shadowActions)} · steward-transition ${row.stewardTransition}`;
 }
+
+/** 7동사의 이름 — 리뷰·착지·수리·검증·저작·구현·정리 (decision·deliver 는 7동사 밖이라 세지 않는다). */
+export type SevenVerbName = '리뷰' | '착지' | '수리' | '검증' | '저작' | '구현' | '정리';
+
+/** no-source 는 출처 배선이 없는 동사 · unreadable 은 해당 동사의 원천을 완전히 못 읽은 것이다. */
+export type SevenVerbState = 'live' | 'shadow-only' | 'none' | 'no-source' | 'unreadable';
+
+/** 7동사 출처 표의 한 칸 — source 는 그 동사를 관측하는 TASK-AGENT action kind, null 이면 출처가 아직 없다. */
+export interface SevenVerbSource {
+  verb: SevenVerbName;
+  source: Exclude<NextActionKind, 'decision' | 'deliver'> | 'goal-ask+goal-run' | null;
+}
+
+/** TA-THEME-VERBS-LIVE — 저작은 완료 골 조인; 구현·정리는 아직 출처가 없다. */
+export const SEVEN_VERB_SOURCES: readonly SevenVerbSource[] = [
+  { verb: '리뷰', source: 'review' },
+  { verb: '착지', source: 'land' },
+  { verb: '수리', source: 'retry' },
+  { verb: '검증', source: 'green' },
+  { verb: '저작', source: 'goal-ask+goal-run' },
+  { verb: '구현', source: null },
+  { verb: '정리', source: null },
+];
+
+/** 동사 하나의 관측 — 원장을 못 읽었으면 liveDone·shadow 는 null(0 이 아니다). */
+export interface SevenVerbLiveRow {
+  verb: SevenVerbName;
+  source: SevenVerbSource['source'];
+  liveDone: number | null;
+  shadow: number | null;
+  state: SevenVerbState;
+}
+
+/** 합계 — liveVerbs 는 원장을 못 읽었으면 null(0 으로 쓰지 않는다) · measuredVerbs 는 출처 있는 동사 수. */
+export interface SevenVerbLive {
+  verbs: SevenVerbLiveRow[];
+  liveVerbs: number | null;
+  measuredVerbs: number;
+}
+
+/** 행동 동사는 창 안의 done, 저작은 완료한 저작 원장과 착지 골의 조인. 각 출처의 null·절단은 해당 동사만 unreadable. */
+export function measureSevenVerbLive(input: TaskAgentCoverInput): SevenVerbLive {
+  const unreadable = input.taskAgentActions === null || input.truncated?.taskAgentActions === true;
+  const verbs = SEVEN_VERB_SOURCES.map(({ verb, source }): SevenVerbLiveRow => {
+    if (source === null) return { verb, source: null, liveDone: null, shadow: null, state: 'no-source' };
+    if (source !== 'goal-ask+goal-run' && unreadable) return { verb, source, liveDone: null, shadow: null, state: 'unreadable' };
+    if (source === 'goal-ask+goal-run') {
+      if (input.goalAsks == null || input.goalRuns == null || input.truncated?.goalAsks || input.truncated?.goalRuns) {
+        return { verb, source, liveDone: null, shadow: null, state: 'unreadable' };
+      }
+      const landed = new Set(input.goalRuns.filter((run) =>
+        run.stage === 'merged' && (run.outcome === 'completed' || run.outcome === 'merged')).map((run) => run.goalId));
+      const liveDone = new Set(input.goalAsks.filter((ask) => ask.authorRunId && landed.has(ask.goalId)).map((ask) => ask.goalId)).size;
+      return { verb, source, liveDone, shadow: 0, state: liveDone > 0 ? 'live' : 'none' };
+    }
+    const actions = input.taskAgentActions!.filter((action) => action.kind === source);
+    const liveDone = actions.filter((action) => action.result === 'done').length;
+    const shadow = actions.filter((action) => action.result === 'shadow').length;
+    return { verb, source, liveDone, shadow, state: liveDone >= 1 ? 'live' : shadow >= 1 ? 'shadow-only' : 'none' };
+  });
+  return {
+    verbs,
+    liveVerbs: verbs.some((row) => row.state === 'unreadable' && row.source !== null) ? null : verbs.filter((row) => row.state === 'live').length,
+    measuredVerbs: SEVEN_VERB_SOURCES.filter((row) => row.source !== null).length,
+  };
+}
+
+/** 한 줄 요약 — 못 읽었으면 n 자리를 `-` 로 적는다(0 으로 읽히지 않게). */
+export function formatSevenVerbLive(measurement: SevenVerbLive): string {
+  const total = SEVEN_VERB_SOURCES.length;
+  if (measurement.liveVerbs === null) {
+    const actionUnreadable = measurement.verbs.some((row) => row.source === 'review' && row.state === 'unreadable');
+    const authorUnreadable = measurement.verbs.some((row) => row.source === 'goal-ask+goal-run' && row.state === 'unreadable');
+    const reason = actionUnreadable && authorUnreadable ? '행동·저작·골 원장 null·절단'
+      : actionUnreadable ? '행동 원장 null·절단' : '저작·골 원장 null·절단';
+    const noSource = measurement.verbs.filter((row) => row.state === 'no-source').map((row) => row.verb).join('·');
+    return `${total}동사 live -/${total} · 못 잼(${reason})${noSource ? ` · 출처 없음 ${noSource}` : ''}`;
+  }
+  const noSource = measurement.verbs.filter((row) => row.state === 'no-source').map((row) => row.verb).join('·');
+  return `${total}동사 live ${measurement.liveVerbs}/${total}${noSource ? ` · 출처 없음 ${noSource}` : ''}`;
+}

package/src/task-agent/live-moves.ts

@@ -3,7 +3,7 @@
  *
  * - `review`: 수확 가능 런의 PR 에 elanous 리뷰를 «한 번» 요청한다 — PR 머리(sha)마다 한 번(카드 `reviewRequests` 이력).
  *   요청만 한다: 결과로 착지·재발사로 잇지 않는다(실행부 `executeNextAction` 의 review→land 사슬을 타지 않는다).
- *   TA-REVIEW-RESULT-CAPTURE — 자식 stdout(`--json`)은 결과 파일로 받고, 회수(`review-result-capture.ts`)는 «다음» 판단 틱이 한다 —
+ *   TA-REVIEW-RESULT-CAPTURE — 자식 stdout(`--json`)은 결과 파일로 받고, 자식 완료 뒤 해당 카드만 회수·재판정한다.
  *   회수한 pass 는 그 틱의 판단부·land 관문 입력(`selfReview`)이 될 뿐 land 판정 로직은 그대로다.
  * - `propose-green`: 카드에 green «제안»(`greenProposal`)만 적는다 — 체크리스트는 손대지 않는다.
  * - `propose-land`: 카드·현재 머리의 self review 통과(pass «또는» warn ⊕ must-fix 0 · TA-LAND-WARN-MUSTFIX0)·non-draft 를 확인하고 기존 `pr land` 를 머리 고정으로 한 번 부른다.
@@ -25,7 +25,7 @@ import type { DetachedSpawn } from '../cli/tasks-cli.js';
 import { LIVE_MOVE_HISTORY_EVENT, taskAgentStatePath, updateTaskCard, type TaskCard } from './task-hand.js';
 import { LIVE_RETRY_MOVES } from './judge.js';
 import { decisionCardGrounds, decisionRaiseArgs, type DecisionCardEvidence, type NextAction } from './actions.js';
-import { reviewResultPath } from './review-result-capture.js';
+import { reviewResultPath, TA_REVIEW_COMPLETION_CARD_ENV, TA_REVIEW_COMPLETION_RESULT_ENV, TA_REVIEW_COMPLETION_STATE_ENV } from './review-result-capture.js';
 import { buildPriorFixContext, PRIOR_FIX_SCOPE_LINE, priorFixBlock, priorFixObservation, type PriorDiffReader, type PriorFixContext } from './review-prior-fix.js';
 import { createLandWorktree, localHead, observeLandWorktree, type LandWorktree, type LandWorktreeFailure, type LandWorktreeInput, type LandWorktreeRemoval } from './land-worktree.js';
 
@@ -208,13 +208,18 @@ export function liveReviewArgs(entry: string, configDir: string, pr: number, int
  * 파이프가 아니라 파일 — 부모가 먼저 끝나도 자식이 EPIPE 로 죽지 않는다). 없으면 종전과 같다(stdio ignore).
  * `opts` 는 시험 몫(spawn·진입점·우주) — 기본은 실물.
  */
-export async function defaultRequestReview(pr: number, intent: string, cwd?: string, opts: { spawn?: DetachedSpawn; entry?: string; configDir?: string; resultPath?: string } = {}): Promise<void> {
+export async function defaultRequestReview(pr: number, intent: string, cwd?: string, opts: { spawn?: DetachedSpawn; entry?: string; configDir?: string; resultPath?: string; cardId?: string; statePath?: string } = {}): Promise<void> {
   const { spawnDetachedConfirmed, ELANOUS_CLI_ENTRY } = await import('../cli/tasks-cli.js');
   const { getElanousConfigDirOverride } = await import('../elanous-config-dir.js');
   const { effectiveInstanceRoot } = await import('../instance/resolve.js');
   const configDir = opts.configDir ?? getElanousConfigDirOverride() ?? effectiveInstanceRoot();
   const base = opts.spawn ?? (spawn as unknown as DetachedSpawn);
   const args = liveReviewArgs(opts.entry ?? ELANOUS_CLI_ENTRY, configDir, pr, intent);
+  const completionEnv = opts.resultPath && opts.cardId && opts.statePath ? {
+    [TA_REVIEW_COMPLETION_CARD_ENV]: opts.cardId,
+    [TA_REVIEW_COMPLETION_STATE_ENV]: opts.statePath,
+    [TA_REVIEW_COMPLETION_RESULT_ENV]: opts.resultPath,
+  } : undefined;
   if (!opts.resultPath) { await spawnDetachedConfirmed(base, process.execPath, args, undefined, cwd); return; }
   let fd: number;
   try {
@@ -229,7 +234,7 @@ export async function defaultRequestReview(pr: number, intent: string, cwd?: str
   const toFile: DetachedSpawn = (command, spawnArgs, options) =>
     (base as unknown as (c: string, a: string[], o: unknown) => ReturnType<DetachedSpawn>)(command, spawnArgs, { ...options, stdio: ['ignore', fd, 'ignore'] });
   try {
-    await spawnDetachedConfirmed(toFile, process.execPath, args, undefined, cwd);
+    await spawnDetachedConfirmed(toFile, process.execPath, args, undefined, cwd, completionEnv);
   } finally {
     try { closeSync(fd); } catch { /* the child keeps its own copy */ }
   }
@@ -360,7 +365,7 @@ export async function executeLiveReview(
       try { (deps.log ?? ((c, e, d) => debug.log(c, e, d)))('task-agent', 'review-prior-fix-filled', priorFixObservation(card.id, pr, prior)); } catch { /* fail-soft */ }
     }
     const intent = liveReviewIntent(card, ctx.runId, ctx.stopReason, prior);
-    await (deps.requestReview ? deps.requestReview(pr, intent, cwd, { resultPath }) : defaultRequestReview(pr, intent, cwd, { resultPath }));
+    await (deps.requestReview ? deps.requestReview(pr, intent, cwd, { resultPath }) : defaultRequestReview(pr, intent, cwd, { resultPath, cardId: card.id, statePath: path }));
   } catch (error) {
     const reason = error instanceof Error ? error.message : String(error);
     updateTaskCard(path, card.id, (current) => current?.reviewRequests?.some((entry) => entry.pr === pr && entry.head === head!.head && entry.at === at)
@@ -560,11 +565,14 @@ export async function executeLiveLand(
   const path = deps.statePath ?? taskAgentStatePath();
   const at = (deps.now ?? (() => new Date()))().toISOString();
   const local = (deps.landWorktree?.localHead ?? localHead)(cwd);
+  const landKey = `land:${card.id}:${view.head.slice(0, 12)}`;
   const needsLandWorktree = !!local && local.toLowerCase() !== view.head.toLowerCase();
   const createCap = landWorktreeCreateCap();
   let claimed = false;
   let missing = false;
   let cappedReason: string | undefined;
+  // This state-file lock is the cross-process card/head land claim. Both completion workers
+  // must pass it; an unfinished or successful attempt makes the second worker skip.
   // TA-LAND-RETRY-ON-INFRA — 같은 머리의 앞 시도들(잠금 안에서 읽은 «지금» 카드) · 재시도면 그 근거.
   let prior: LandAttempt[] = [];
   try {
@@ -590,7 +598,7 @@ export async function executeLiveLand(
   if (!claimed) {
     const last = prior.at(-1);
     const why = last ? ` (attempts ${prior.length} · last ${last.ok === false ? `class ${last.class ?? 'unclassified'}${last.reason ? ` ${last.reason}` : ''}` : last.ok === true ? 'ok' : 'unfinished'})` : '';
-    return observe(deps, withRepo({ kind, card: card.id, ok: true, executed: false, detail: `already attempted land for #${pr} head ${view.head.slice(0, 12)}${why}` }));
+    return observe(deps, withRepo({ kind, card: card.id, ok: true, executed: false, detail: `already attempted land for #${pr} head ${view.head.slice(0, 12)} · ${landKey} claimed — skip${why}` }));
   }
   const attempt = prior.length + 1;
   if (attempt > 1) {

package/src/task-agent/parent-host.ts

@@ -192,9 +192,9 @@ export function remoteParentAlive(parentHost: { host: string; pid?: number; runI
 }
 
 /** 발사 전 점검 결과 — `gaps` 가 비어야 원격으로 띄운다. */
-export interface ParentHostPreflight { ok: boolean; gaps: string[]; facts: Record<string, string> }
+export interface ParentHostPreflight { ok: boolean; gaps: string[]; warnings: string[]; facts: Record<string, string> }
 
-/** 원격 사실 한 번에 — key=value 줄. */
+/** 원격 사실 한 번에 — key=value 줄. LLM 자격은 «존재·개수»만 센다(값을 읽지도 찍지도 않는다). */
 export function preflightScript(target: ParentHostConfig): string {
   const elanous = remotePath(target.elanous ?? DEFAULT_REMOTE_ELANOUS);
   const configDir = remotePath(target.configDir ?? DEFAULT_REMOTE_CONFIG_DIR);
@@ -204,6 +204,9 @@ export function preflightScript(target: ParentHostConfig): string {
     `grep -Eq '"podPool"[[:space:]]*:[[:space:]]*"[^"[:space:]]+' ${configDir}/config.json 2>/dev/null && echo podPool=1`,
     `(cd ${shellQuote(target.cwd)} 2>/dev/null && git rev-parse --is-inside-work-tree >/dev/null 2>&1) && echo repo=1`,
     `command -v kubectl >/dev/null 2>&1 && echo kubectl=1`,
+    `n=$(grep -Ec '^[[:space:]]*"openai-codex(:[^"]*)?"[[:space:]]*:[[:space:]]*\\{' ${configDir}/auth.json 2>/dev/null); echo "codexAccounts=\${n:-0}"`,
+    `{ grep -Eq '"key"[[:space:]]*:[[:space:]]*"[^"]+"' "$HOME/.grok/auth.json" 2>/dev/null || [ -n "\${XAI_API_KEY:-}\${GROK_API_KEY:-}\${GROK_CODE_XAI_API_KEY:-}" ]; } && echo grok=1`,
+    `{ [ -s "\${ELANOUS_KEY_CACHE_DIR:-$HOME/.cache}/openrouter_api_key" ] || [ -n "\${OPENROUTER_API_KEY:-}" ]; } && echo openrouter=1`,
     `true`,
   ].join('; ');
 }
@@ -242,6 +245,16 @@ export function judgeParentHostFacts(facts: Record<string, string>, input: Omit<
   return gaps;
 }
 
+/** 순수 판정 — 원격 LLM 자격 사실 → 경고 목록(막지 않는다 · gaps 와 별개). 못 닿은 호스트는 사실이 없으므로 경고도 없다. */
+export function judgeParentHostCredentials(facts: Record<string, string>): string[] {
+  if (facts.unreachable) return [];
+  const warnings: string[] = [];
+  if (!(Number(facts.codexAccounts) > 1)) warnings.push('codex-accounts-low');
+  if (facts.grok !== '1') warnings.push('grok-credential-missing');
+  if (facts.openrouter !== '1') warnings.push('openrouter-key-missing');
+  return warnings;
+}
+
 export function preflightParentHost(input: PreflightInput): ParentHostPreflight {
   const ssh = input.ssh ?? defaultSshRunner;
   const facts: Record<string, string> = {};
@@ -252,7 +265,18 @@ export function preflightParentHost(input: PreflightInput): ParentHostPreflight
     if (at > 0) facts[line.slice(0, at).trim()] = line.slice(at + 1).trim();
   }
   const gaps = judgeParentHostFacts(facts, { localVersion: input.localVersion, launchHoldActive: input.launchHoldActive, podPoolOverride: Boolean(input.target.podPool) });
-  return { ok: gaps.length === 0, gaps, facts };
+  const warnings = judgeParentHostCredentials(facts);
+  if (warnings.length) {
+    try {
+      debug.log('task-agent.parent-host', 'credential-warning', {
+        host: input.target.host,
+        codexAccounts: Number(facts.codexAccounts) || 0,
+        grok: facts.grok === '1' ? 1 : 0,
+        openrouter: facts.openrouter === '1' ? 1 : 0,
+      });
+    } catch { /* fail-soft */ }
+  }
+  return { ok: gaps.length === 0, gaps, warnings, facts };
 }
 
 /** 원격이 «확실히 안 띄웠다»고 답했다 — 호출부가 로컬로 돌아가도 중복 발사가 아니다. */