elanous 0.2.17 → 0.2.18

package/src/execution-loop/gates.ts

@@ -3,6 +3,7 @@ import { decideBudget, readBudgetInputsLive, type BudgetDecision, type BudgetInp
 import { resolveHarnessSubstrate, type ResolvedHarnessSubstrate } from '../harness/harness-substrate-default.js';
 import { podMemoryLimitFor } from '../task-orchestrator/surfaces/self-implement-pod.js';
 import { recallMemoryContext } from '../agent-substrate/execution/memory-context.js';
+import { CONTEXT_CARD_SCREEN_CHARS } from '../context-card/index.js';
 
 export interface GateResult<T> {
   decision: T;
@@ -169,6 +170,7 @@ export async function relationGate(
 export interface MemoryGateDeps {
   recall: (query: string) => Promise<string>;
   priorAbandonment: (goalId: string) => Promise<string | undefined> | string | undefined;
+  priorMustFix?: (goalId: string) => readonly string[];
 }
 
 export interface MemoryDecision {
@@ -183,15 +185,22 @@ export async function memoryGate(
   card: Pick<TaskCard, 'goalId' | 'title'>,
   deps: MemoryGateDeps = { recall: recallMemoryContext, priorAbandonment: () => undefined },
 ): Promise<GateResult<MemoryDecision>> {
-  const [context, priorAbandonment] = await Promise.all([
+  const [recall, priorAbandonment] = await Promise.all([
     deps.recall(card.title), deps.priorAbandonment(card.goalId),
   ]);
+  // must-fix 와 recall 은 서로 독립이다 — recall 이 비어도 앞선 must-fix 는 맥락에 남는다.
+  const mustFix = deps.priorMustFix?.(card.goalId) ?? [];
+  const mustFixBlock = mustFix.length ? `앞선 must-fix:\n${mustFix.map((item) => `- ${item}`).join('\n')}` : '';
+  const combined = [mustFixBlock, recall].filter(Boolean).join('\n');
+  const codePoints = [...combined];
+  const truncated = codePoints.length > CONTEXT_CARD_SCREEN_CHARS;
+  const context = truncated ? codePoints.slice(0, CONTEXT_CARD_SCREEN_CHARS).join('') : combined;
   const decision: MemoryDecision = {
     action: 'record', context, fragmentIds: [],
     ...(priorAbandonment === undefined ? {} : { priorAbandonment }),
   };
   return {
     decision,
-    explanation: `memory=${context ? 'recalled' : 'none or unavailable'}; prior abandonment=${priorAbandonment ?? 'unknown'}; fragment IDs unavailable from recall API`,
+    explanation: `memory=${recall ? 'recalled' : 'none or unavailable'}; prior abandonment=${priorAbandonment ?? 'unknown'}; fragment IDs unavailable from recall API${truncated ? `; truncated; chars=${[...context].length}/${CONTEXT_CARD_SCREEN_CHARS}` : ''}`,
   };
 }

package/src/flow-loop/split.ts

@@ -1,23 +1,27 @@
 import type { TaskCard } from '../task-cards/card-store.js';
 
-export interface SplitCell { id: string; title: string; seat?: string; host?: string }
+export interface SplitCell { id: string; title: string; kind?: string; seat?: string; host?: string }
 
 /** FLOW1: only explicitly assigned work may enter a seat's queue. The same proposal is used in shadow and live. */
 export function splitCard(card: TaskCard, _opts: { shadow?: boolean } = {}): SplitCell[] {
   const intake = [...card.sections].reverse().find(section => section.key.startsWith('intake:wish:'));
   let text = card.title;
+  let kind: string | undefined;
   if (intake) {
     let body: unknown;
     try { body = JSON.parse(intake.content); } catch { body = intake.content; }
     if (typeof body === 'string') text = body;
-    else if (body && typeof body === 'object' && typeof (body as { text?: unknown }).text === 'string') text = (body as { text: string }).text;
+    else if (body && typeof body === 'object') {
+      if (typeof (body as { text?: unknown }).text === 'string') text = (body as { text: string }).text;
+      if (typeof (body as { kind?: unknown }).kind === 'string') kind = (body as { kind: string }).kind;
+    }
   }
   const lines = text.split(/\r?\n/).map(line => line.trim()).filter(Boolean);
   const cells: SplitCell[] = lines.map((line, index) => {
     const match = /^(?:[-*]|\d+[.)])?\s*\[(OP|MK|TC|UX)\]\s*(.+)$/u.exec(line);
-    if (match) return { id: `${card.id}-${index + 1}`, title: match[2]!.trim(), seat: match[1]! };
+    if (match) return { id: `${card.id}-${index + 1}`, title: match[2]!.trim(), seat: match[1]!, ...(kind !== undefined ? { kind } : {}) };
     // 담당 없는 행도 칸으로 남긴다 — seat 가 없으니 대기열엔 못 들어가고 tick 이 unplaced-no-owner 로 센다.
-    return { id: `${card.id}-${index + 1}`, title: line.replace(/^(?:[-*]|\d+[.)])\s*/u, '') };
+    return { id: `${card.id}-${index + 1}`, title: line.replace(/^(?:[-*]|\d+[.)])\s*/u, ''), ...(kind !== undefined ? { kind } : {}) };
   });
   // 의뢰 본문이 있으면 담당이 하나도 없어도 행마다 칸으로 남긴다. 본문 없이 제목뿐일 때만 카드 한 칸.
   return intake || cells.some(cell => cell.seat) ? cells : [{ id: card.id, title: card.title }];

package/src/git-fs/worktree.ts

@@ -20,6 +20,9 @@ import { debug } from '../debug/log.js';
 import { getUserConfig } from '../user-config.js';
 
 const GIT_TIMEOUT_MS = 30_000;
+/** 얕은 클론(Pod `git clone --depth 50` · docker/harness/job.yaml)에서 base 를 가져올 깊이 — 클론과 같은 값.
+ *  ⛔ 깊이 없이 얕은 저장소로 다른 브랜치를 fetch 하면 그 브랜치의 «전 이력»을 받는다(실측 193s vs 4s · 30s 에 SIGTERM). */
+const SHALLOW_BASE_FETCH_DEPTH = 50;
 const WORKTREE_ADD_TIMEOUT_MS = 5 * 60_000;
 
 export interface WorktreeAddDeps {
@@ -439,14 +442,31 @@ export function syncBaseWithRemote(
   // 원격이 "그런 브랜치 없다" 고 답했다 ⇒ 축약 hex 여도 모호하지 않다.
   if (!hasRemote) return asSha(false) ?? { checkout: base, freshness: 'local-only' };
 
+  // ⭐ 얕은 저장소면 깊이를 묶는다 — 아니면 그 브랜치의 전 이력을 받느라 GIT_TIMEOUT_MS 를 넘긴다
+  //    (Pod 클론은 `--depth 50` · 비-main base 런이 전부 여기서 SIGTERM 으로 죽었다). 받은 tip 에서 갈리므로
+  //    이후 merge-base(HEAD ↔ 그 tip)는 tip 자체라 깊이 50 으로 족하다. 얕지 않으면 종전 인자 그대로다.
+  //    probe 를 못 읽으면 종전 경로로 간다(값은 'unknown' 으로 관측에 남긴다).
+  const shallowProbe = git('rev-parse', '--is-shallow-repository');
+  const shallowAnswer = shallowProbe.status === 0 ? (shallowProbe.stdout || '').trim() : '';
+  const shallow: boolean | 'unknown' = shallowAnswer === 'true' ? true : shallowAnswer === 'false' ? false : 'unknown';
+  const depth = shallow === true ? SHALLOW_BASE_FETCH_DEPTH : null;
+  const fetchArgs = depth === null ? ['fetch', 'origin', wanted] : ['fetch', `--depth=${depth}`, 'origin', wanted];
+  const fetchStartedAt = Date.now();
   // Only the no-runner fallback joins the shared retry seam; injected runners remain
   // an exact test/caller seam with their prior command count.
   const fetched = runner
-    ? git('fetch', 'origin', wanted)
-    : runGitCommand(repoRoot, ['fetch', 'origin', wanted], { encoding: 'utf8', timeout: GIT_TIMEOUT_MS });
+    ? git(...fetchArgs)
+    : runGitCommand(repoRoot, fetchArgs, { encoding: 'utf8', timeout: GIT_TIMEOUT_MS });
+  const fetchMs = Date.now() - fetchStartedAt;
+  debug.log('git-fs.worktree', 'base.fetch', { base, shallow, depth, ms: fetchMs, ok: fetched.status === 0, signal: fetched.signal ?? null }, fetched.status === 0 ? undefined : { level: 'warn' });
   if (fetched.status !== 0) {
     // origin 에 있는 것을 확인했는데 못 가져왔다 ⇒ 낡은 로컬로 진행하면 조용히 틀린다.
-    throw new Error(`git worktree base sync failed — origin/${remoteBranch} exists but fetch failed: status=${fetched.status}, signal=${fetched.signal ?? 'none'}, stdout=${JSON.stringify((fetched.stdout || '').trim().slice(0, 200))}, stderr=${JSON.stringify((fetched.stderr || '').trim().slice(0, 200))}`);
+    // spawnSync 의 timeout 은 SIGTERM 으로 끝난다 — 「실패」와 「시간 초과」를 문면에서 가른다.
+    const timedOut = fetched.status === null && fetched.signal === 'SIGTERM';
+    const what = timedOut
+      ? `fetch timed out after ${GIT_TIMEOUT_MS / 1000}s (shallow=${shallow}${depth === null ? '' : `, depth=${depth}`})`
+      : 'fetch failed';
+    throw new Error(`git worktree base sync failed — origin/${remoteBranch} exists but ${what}: status=${fetched.status}, signal=${fetched.signal ?? 'none'}, stdout=${JSON.stringify((fetched.stdout || '').trim().slice(0, 200))}, stderr=${JSON.stringify((fetched.stderr || '').trim().slice(0, 200))}`);
   }
   // ⭐ **가져온 것**에서 갈린다(리뷰 must-fix ②) — ls-remote 로 먼저 읽은 SHA 를 쓰면 그 사이 원격이
   //    전진했을 때 "원격 tip" 계약이 깨진다. FETCH_HEAD 가 방금 받은 tip 이다.

package/src/harness/harness-cli-command.ts

@@ -33,7 +33,7 @@ import { installDeliverableVerifyCliCommand, type InstallDeliverableVerifyCliDep
 import { getUserConfig } from '../user-config.js';
 import { resolveRepositoryName } from './repository-name.js';
 import { installHarnessCliSinkHook } from './harness-cli-sink.js';
-import { addHarnessQueue, HarnessQueueDuplicateError, harnessQueueReceiptPath, listHarnessQueue, queueSeatForCwd, reconcileHarnessQueue, removeHarnessQueue, tickHarnessQueue, type HarnessQueueDeps, type QueueItem, type QueueSeat } from './harness-queue.js';
+import { addHarnessQueue, HarnessQueueDuplicateError, harnessQueueReceiptPath, listHarnessQueue, queueSeatForCwd, reconcileHarnessQueue, removeHarnessQueue, setHarnessQueuePriority, tickHarnessQueue, type HarnessQueueDeps, type QueueItem, type QueueSeat } from './harness-queue.js';
 import { writeHarnessQueueReceipt } from './harness-queue-child.js';
 import { parseDoorSince, queryLaunchDoors, renderLaunchDoors, type DoorTable } from './launch-stamp.js';
 import { resolveHarnessSubstrate, type ResolvedHarnessSubstrate } from './harness-substrate-default.js';
@@ -2548,12 +2548,20 @@ export function installHarnessCliCommand(program: Command, deps: HarnessCliComma
       console.log(`${row.id} ${row.seat} ${row.kind} queued`);
     }));
   queue.command('list').description('대기·발사 원장 조회').action(() => queueAction(async () => {
-    for (const row of listHarnessQueue(queueDeps)) console.log(`${row.id} ${row.seat} ${row.status} ${row.kind} ${row.input}${row.waitingReason ? ` · ${row.waitingReason}` : ''}`);
+    for (const row of listHarnessQueue(queueDeps)) console.log(`${row.id} ${row.seat} ${row.status} ${row.kind} ${row.input}${row.priority === undefined ? '' : ` · prio ${row.priority}`}${row.waitingReason ? ` · ${row.waitingReason}` : ''}`);
   }));
   queue.command('remove <id>').description('대기 중 또는 종료 확인된 항목 제거').action((id: string) => queueAction(async () => {
     if (!await removeHarnessQueue(id, queueDeps)) throw new Error(`queue item active or not found: ${id}`);
     console.log(`${id} removed`);
   }));
+  queue.command('prio <id> <n>').description('대기 중 항목의 우선순위 재조정(클수록 먼저 · 다음 tick 부터)').action((id: string, n: string) => queueAction(async () => {
+    const value = Number(n);
+    if (!n.trim() || !Number.isFinite(value)) throw new Error(`harness queue prio: 수가 아니다 — ${n}`);
+    // A CLI call is the actor here; a seat or track that drives it names itself through the environment.
+    const by = process.env.ELANOUS_TRACK || process.env.ELANOUS_HARNESS_SEAT || 'cli';
+    const row = await setHarnessQueuePriority(id, value, by, queueDeps);
+    console.log(`${row.id} prio ${row.priority}`);
+  }));
   queue.command('reconcile <id>').description('불확정 발사를 확인하고 종료 또는 미발사 증거가 있으면 예약 해소').action((id: string) => queueAction(async () => {
     console.log(`${id} ${await reconcileHarnessQueue(id, queueDeps)}`);
   }));