elanous 0.2.22 → 0.2.24

package/src/autopilot/system-lookback-run.ts

@@ -2,7 +2,7 @@
 //
 // system-lookback.ts 는 순수(의심 소스 매핑 + 프롬프트 빌더)였고, "실제 LLM 조사·소스 read 는
 // 배선측이 수행"이라 명시돼 있었다. 이 모듈이 그 배선이다: 모순 신호 → 의심 소스 파일 READ-ONLY
-// 발췌 → buildLookbackPrompt → Opus(claude-opus-4-8) 조사 → 결함 리포트. 수정 권한 없음(READ-ONLY).
+// 발췌 → buildLookbackPrompt → 역할 audit 이 고른 모델 조사 → 결함 리포트. 수정 권한 없음(READ-ONLY).
 //
 // escalate(mission-tool)가 시스템 결함 의심(systemSuspect) 페이즈에서 이 러너를 호출해 결함
 // 리포트를 얻고, 그 리포트를 수리 미션 골에 실어 스폰한다(system-repair-spawn). 진단 해상도 사다리
@@ -12,18 +12,24 @@ import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import type { ContradictionSignal } from './contradiction-detector.js';
 import { buildLookbackPrompt, suspectSourceFiles } from './system-lookback.js';
+import { resolveRoleLlm } from '../user-config.js';
+import { debug } from '../debug/log.js';
 
-/** R3 조사 LLM 호출 seam — 기본은 Opus(claude-opus-4-8·READ-ONLY 진단). 테스트/재사용 위해 주입 가능.
- *  llmReviewCritique(mission-se-bridge) 와 같은 streamLLM 패턴(모델만 Opus·진단은 길게 maxTokens 2500). */
+/** R3 조사 LLM 호출 seam — 역할 audit 모델(READ-ONLY 진단). 테스트/재사용 위해 주입 가능. */
 async function opusLookback(prompt: string): Promise<string> {
-  const { streamLLM, resolveDefaultProvider, getProvider } = await import('../llm.js');
-  const model = process.env.ELANOUS_LOOKBACK_MODEL || 'claude-opus-4-8';
-  // ★ claude 모델은 prefix 매칭(getProvider)으로 anthropic 확정(dogfood 2026-07-13 발견) —
-  //   resolveDefaultProvider 는 user-config provider(codex 등)를 모델 무관하게 반환해 claude 를
-  //   codex 로 오라우팅한다(Codex 400: model not supported). 폴백 방어까지.
-  const provider = model.startsWith('claude-') ? getProvider(model) : resolveDefaultProvider(model);
+  const { streamLLM, resolveDefaultProvider, getProvider, PROVIDERS } = await import('../llm.js');
+  const override = process.env.ELANOUS_LOOKBACK_MODEL;
+  const resolved = override ? undefined : resolveRoleLlm('audit');
+  const model = override || resolved!.model;
+  // 명시 env 모델의 provider 선택은 종전과 동일하다.
+  const provider = override
+    ? (model.startsWith('claude-') ? getProvider(model) : resolveDefaultProvider(model))
+    : PROVIDERS[resolved!.provider];
+  const providerName = override ? provider?.name : resolved!.provider;
+  if (!provider) throw new Error(`Unknown audit provider: ${providerName}`);
+  debug.log('llm.role-pin', 'resolved', { site: 'system-lookback', role: 'audit', model, provider: providerName, source: override ? 'env' : resolved!.source });
   return streamLLM([{ role: 'user', content: prompt }], () => {}, {
-    model, maxTokens: 2500, ...(provider ? { provider } : {}),
+    model, provider, usageRole: 'audit', maxTokens: 2500,
   });
 }
 

package/src/bench/bench.ts

@@ -0,0 +1,183 @@
+/**
+ * BENCH-ISOLATED-ARMS — 같은 골을 모델만 바꿔 여러 «팔»로 쏘는 벤치를 기준선과 떼어 놓는다.
+ *
+ * S: 벤치는 손 스크립트가 base sha 를 `bench/base-night-<sha12>` 로 push 하고 `harness ask --base` 로 쏜다.
+ * C: 그 벤치 가지로 다른 PR 이 squash 병합돼 기준선이 오염됐고(#26022), 팔 PR 이 PR 직전 main 동기화에서
+ *    merge-conflict 로 «실패»로 셈돼 판정이 흐려졌다.
+ * A: 기준선 가지 이름을 `bench/<id>/base` 하나로 고정하고, 그 이름 «자체»를 벤치 표지로 쓴다 —
+ *    호스트 → self orchestrate → Pod → 안쪽 harness ask 까지 `--base` 가 이미 흐르므로 새 배관이 없다.
+ *    - 팔 가지 = `bench/<id>/<arm>` (arm = 자식 모델에서 파생 ⊕ 런 접미 — 같은 모델 n 팔이 안 겹친다)
+ *    - PR base = `bench/<id>/base` · 라벨 `elanous:bench`
+ *    - PR 직전 main 동기화는 건너뛴다(관측 `bench`/`main-sync-skipped`) — 판정은 base 위 게이트·시험·리뷰
+ *    - 원장 = `<config dir>/bench/<id>.jsonl` · 읽기 = `elanous bench ls <id>`
+ *    ⛔ base 는 «자식 작업 가지의 출발점»(⊕ PR base)으로만 쓰인다 — 부모 cwd 를 base 트리로 옮기지 않는다.
+ *      부모·Pod 발사 코드는 지금 도는 코드다(원장 `parentCodeCommit` 이 그 커밋을 base sha 와 따로 적는다).
+ * ⛔ 착지 막기는 여기 몫이 아니다(LAND-BASE-MAIN-GUARD · base≠main 재사용 PR 거부).
+ */
+import { spawnSync } from 'node:child_process';
+import { appendFileSync, existsSync, mkdirSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+
+export const BENCH_LABEL = 'elanous:bench';
+export const BENCH_LOG_CATEGORY = 'bench';
+
+const BENCH_ID = /^[a-z0-9][a-z0-9._-]{0,63}$/i;
+const SHA = /^[0-9a-f]{7,40}$/i;
+
+export interface BenchSpec { readonly id: string; readonly sha?: string }
+
+/** `--bench <id>[:<base-sha>]` 를 푼다. ⛔ 모르는 꼴은 «거부»한다 — 조용히 고치면 다른 기준선으로 돈다. */
+export function parseBenchSpec(spec: string): BenchSpec {
+  const raw = spec.trim();
+  const colon = raw.indexOf(':');
+  const id = colon < 0 ? raw : raw.slice(0, colon);
+  const sha = colon < 0 ? undefined : raw.slice(colon + 1);
+  if (!BENCH_ID.test(id) || id === 'base') {
+    throw new Error(`--bench id 가 잘못됐다: ${JSON.stringify(id)} — 영숫자로 시작하는 [A-Za-z0-9._-] 64자 이내(슬래시 금지 · 'base' 금지)`);
+  }
+  if (sha !== undefined && !SHA.test(sha)) {
+    throw new Error(`--bench base sha 가 잘못됐다: ${JSON.stringify(sha)} — 16진 7~40자`);
+  }
+  return { id, ...(sha !== undefined ? { sha: sha.toLowerCase() } : {}) };
+}
+
+export function benchBaseBranch(id: string): string { return `bench/${id}/base`; }
+
+function stripRef(ref: string): string {
+  return ref.trim().replace(/^refs\/heads\//, '').replace(/^refs\/remotes\/origin\//, '').replace(/^origin\//, '');
+}
+
+/** `bench/<id>/base` 면 id, 아니면 null. `origin/`·`refs/heads/` 접두는 벗긴다. */
+export function benchIdFromBase(ref: string | undefined | null): string | null {
+  if (!ref) return null;
+  const m = /^bench\/([^/]+)\/base$/.exec(stripRef(ref));
+  return m && BENCH_ID.test(m[1]!) ? m[1]! : null;
+}
+
+/** `bench/<id>/<arm>`(arm ≠ base) 면 {id, arm}, 아니면 null. */
+export function parseBenchArmBranch(ref: string | undefined | null): { id: string; arm: string } | null {
+  if (!ref) return null;
+  const m = /^bench\/([^/]+)\/([^/]+)$/.exec(stripRef(ref));
+  if (!m || m[2] === 'base' || !BENCH_ID.test(m[1]!)) return null;
+  return { id: m[1]!, arm: m[2]! };
+}
+
+/** 팔 이름 — 자식 모델의 마지막 토막(`openrouter/z-ai/glm-5.3-flash` → `glm-5.3-flash`) ⊕ 런 접미 6자.
+ *  ⭐ 접미가 있어야 같은 모델 n 팔(sonnet1~3)이 같은 가지로 겹쳐 서로의 PR 을 덮지 않는다. */
+export function benchArmName(childModel: string | undefined, runId: string | undefined): string {
+  const last = childModel?.trim().split('/').filter(Boolean).at(-1) ?? '';
+  const slug = last.toLowerCase().replace(/[^a-z0-9._-]+/g, '-').replace(/^[-.]+|[-.]+$/g, '').slice(0, 40) || 'default';
+  const suffix = (runId ?? '').toLowerCase().replace(/^run-/, '').replace(/[^a-z0-9]/g, '').slice(0, 6);
+  return suffix ? `${slug}-${suffix}` : slug;
+}
+
+/** 벤치 base 위의 런이면 팔 가지 이름, 아니면 undefined(동작 불변). */
+export function benchArmBranchForBase(base: string | undefined, childModel: string | undefined, runId: string | undefined): string | undefined {
+  const id = benchIdFromBase(base);
+  return id ? `bench/${id}/${benchArmName(childModel, runId)}` : undefined;
+}
+
+export type BenchGitRun = (args: readonly string[]) => { status: number | null; stdout: string; stderr: string };
+
+export function defaultBenchGitRun(cwd: string): BenchGitRun {
+  return (args) => {
+    const r = spawnSync('git', [...args], { cwd, encoding: 'utf8', timeout: 120_000 });
+    return { status: r.status, stdout: String(r.stdout ?? ''), stderr: String(r.stderr ?? '') };
+  };
+}
+
+export interface BenchBase { readonly id: string; readonly branch: string; readonly sha: string; readonly created: boolean }
+
+/**
+ * 기준선 가지를 고정한다 — 없으면 만들고, 있으면 sha 일치를 확인한다(불일치 = 거부).
+ * sha 생략: 가지가 «없으면» 발사 시점 origin/main 으로 만들고, «있으면» 그 가지의 sha 를 그대로 쓴다
+ * (첫 팔이 정한 기준선을 뒤 팔이 따라간다 — main 이 그 사이 움직여도 팔끼리 같은 땅).
+ */
+export function ensureBenchBase(spec: BenchSpec, run: BenchGitRun): BenchBase {
+  const branch = benchBaseBranch(spec.id);
+  const must = (args: readonly string[], what: string) => {
+    const r = run(args);
+    if (r.status !== 0) throw new Error(`bench: ${what} 실패 (git ${args.join(' ')} rc=${r.status ?? 'signal'}): ${r.stderr.trim().split('\n')[0] ?? ''}`);
+    return r.stdout.trim();
+  };
+  const trackingFetch = ['fetch', '--no-tags', 'origin', `+refs/heads/${branch}:refs/remotes/origin/${branch}`] as const;
+  const remote = run(['ls-remote', '--exit-code', 'origin', `refs/heads/${branch}`]);
+  if (remote.status !== 0 && remote.status !== 2) {
+    throw new Error(`bench: origin 의 ${branch} 를 못 읽었다 (rc=${remote.status ?? 'signal'}) — 「없다」로 읽지 않는다: ${remote.stderr.trim().split('\n')[0] ?? ''}`);
+  }
+  const existing = remote.status === 0 ? remote.stdout.trim().split(/\s+/)[0]?.toLowerCase() : undefined;
+  if (existing) {
+    if (spec.sha && !existing.startsWith(spec.sha)) {
+      throw new Error(`bench: ${branch} 가 이미 ${existing.slice(0, 12)} 에 있다 — 요청 ${spec.sha.slice(0, 12)} 와 다르다(거부 · 다른 기준선이면 새 bench id 를 써라)`);
+    }
+    must(trackingFetch, `${branch} fetch`);
+    return { id: spec.id, branch, sha: existing, created: false };
+  }
+  must(['fetch', '--no-tags', 'origin', 'main'], 'origin main fetch');
+  const sha = must(['rev-parse', '--verify', `${spec.sha ?? 'origin/main'}^{commit}`], 'base sha 해석').toLowerCase();
+  must(['push', 'origin', `${sha}:refs/heads/${branch}`], `${branch} push`);
+  // push 는 원격 추적 ref 를 안 만든다 — 로컬 기질의 worktree 가 `origin/<branch>` 를 찾도록 한 번 당긴다.
+  must(trackingFetch, `${branch} fetch`);
+  return { id: spec.id, branch, sha, created: true };
+}
+
+export interface BenchLedgerRow {
+  readonly ts: string;
+  readonly event: 'launched' | 'finished';
+  readonly benchId: string;
+  readonly baseBranch: string;
+  readonly baseSha: string;
+  /** 부모(발사 프로세스)가 도는 코드 커밋 — base sha 와 따로 적는다(base 는 작업 가지 출발점에만 쓰인다). */
+  readonly parentCodeCommit?: string | null;
+  /** `harness.imageCommit` (Pod 이미지 pin) — 없으면 null(«못 읽음»과 «없음»을 같은 값으로: 원장엔 설정값만 싣는다). */
+  readonly imageCommit: string | null;
+  readonly childLlmProvider: string | null;
+  readonly childLlmModel: string | null;
+  /** 같은 bench id ⊕ 같은 자식 모델의 몇 번째 발사인가(1부터). */
+  readonly round: number;
+  readonly entrance?: string;
+  readonly substrate?: string;
+  readonly seat?: string;
+  readonly exitCode?: number;
+}
+
+export function benchLedgerPath(id: string, configDir: string): string {
+  return join(configDir, 'bench', `${id}.jsonl`);
+}
+
+export function readBenchLedger(id: string, configDir: string): BenchLedgerRow[] {
+  const path = benchLedgerPath(id, configDir);
+  if (!existsSync(path)) return [];
+  const rows: BenchLedgerRow[] = [];
+  for (const line of readFileSync(path, 'utf8').split('\n')) {
+    if (!line.trim()) continue;
+    try { rows.push(JSON.parse(line) as BenchLedgerRow); } catch { /* 깨진 줄은 건너뛴다 — 수는 renderBenchLs 가 따로 안 센다 */ }
+  }
+  return rows;
+}
+
+export function nextBenchRound(rows: readonly BenchLedgerRow[], childLlmModel: string | null): number {
+  return rows.filter((row) => row.event === 'launched' && (row.childLlmModel ?? null) === childLlmModel).length + 1;
+}
+
+export function appendBenchLedger(row: BenchLedgerRow, configDir: string): void {
+  const path = benchLedgerPath(row.benchId, configDir);
+  mkdirSync(join(configDir, 'bench'), { recursive: true, mode: 0o700 });
+  appendFileSync(path, `${JSON.stringify(row)}\n`, { mode: 0o600 });
+}
+
+export function renderBenchLs(id: string, rows: readonly BenchLedgerRow[]): string {
+  if (rows.length === 0) return `bench ${id}: 원장 줄 0 (기록 없음)`;
+  const lines = [`bench ${id}: ${rows.length}줄`];
+  for (const row of rows) {
+    lines.push([
+      row.ts, row.event, `round=${row.round}`, `base=${row.baseSha.slice(0, 12)}`,
+      `parent=${row.parentCodeCommit ? row.parentCodeCommit.slice(0, 12) : 'unknown'}`,
+      `image=${row.imageCommit ? row.imageCommit.slice(0, 12) : 'none'}`,
+      `child=${row.childLlmProvider ?? '-'}/${row.childLlmModel ?? '-'}`,
+      ...(row.substrate ? [`substrate=${row.substrate}`] : []),
+      ...(row.exitCode !== undefined ? [`rc=${row.exitCode}`] : []),
+    ].join(' '));
+  }
+  return lines.join('\n');
+}

package/src/boot/acp-server.ts

@@ -25,8 +25,8 @@
 // test.
 
 import { mkdirSync } from 'node:fs';
-import { getElanousConfigDir } from '../elanous-config-dir.js';
-import { dirname, join as joinPath } from 'node:path';
+import { defaultUnixSocketPath } from './acp-socket-path.js';
+import { dirname } from 'node:path';
 import { ensureAuthToken } from '../auth/acp-token.js';
 
 import {
@@ -38,6 +38,8 @@ import { runAcpServer, type AcpServerOptions } from '../acp/server.js';
 import type { LlmBrand } from '../llm-vision-capability.js';
 import { DEFAULT_NEXUS_HTTP_PORT } from '../nexus/default-port.js';
 
+export { defaultUnixSocketPath } from './acp-socket-path.js';
+
 export type AcpBootTransport = 'stdio' | 'unix-socket' | 'websocket';
 
 export interface AcpBootOptions {
@@ -56,11 +58,6 @@ export interface AcpBootOptions {
   toolCwd?: string;
 }
 
-/** Default socket path — XDG-ish; `~/.elanous/elanous.sock`. */
-export function defaultUnixSocketPath(): string {
-  return joinPath(getElanousConfigDir(), 'elanous.sock');
-}
-
 /** Default websocket bind port. Mnemonic: π × 10⁴. */
 export const DEFAULT_WEBSOCKET_PORT = DEFAULT_NEXUS_HTTP_PORT;
 

package/src/boot/acp-socket-path.ts

@@ -0,0 +1,7 @@
+import { join as joinPath } from 'node:path';
+import { getElanousConfigDir } from '../elanous-config-dir.js';
+
+/** Default socket path — XDG-ish; `~/.elanous/elanous.sock`. */
+export function defaultUnixSocketPath(): string {
+  return joinPath(getElanousConfigDir(), 'elanous.sock');
+}

package/src/briefing/brief-items.ts

@@ -20,6 +20,7 @@ export interface BriefWeeklyActions extends BriefActionCount {
 export type BriefDomain = (typeof BRIEF_DOMAINS)[number];
 export type BriefPriority = (typeof BRIEF_PRIORITIES)[number];
 export type BriefSlot = (typeof BRIEF_SLOTS)[number];
+export type BriefSendSlot = BriefSlot | 'realtime';
 
 const KST = 'Asia/Seoul';
 
@@ -95,6 +96,12 @@ function needsDecision(item: BriefItem, today: string): boolean {
   return item.priority === 'P0' || (item.deadline !== null && deadlineDate(item.deadline) === today);
 }
 
+/** Unsent decisions needing immediate delivery, using the same KST deadline rule as slot pages. */
+export function pendingRealtime(items: readonly BriefItem[], now: Date): BriefItem[] {
+  const today = dateKey(now, { timeZone: KST });
+  return items.filter(item => item.sent_at === null && needsDecision(item, today));
+}
+
 /**
  * One briefing page. Item text is copied verbatim.
  * Order: decisions due (P0, then a deadline of today) → domain groups →
@@ -105,13 +112,13 @@ export function composeBriefMarkdown(items: readonly BriefItem[], slot: BriefSlo
 }
 
 /** The ids are exactly the rows represented by the composed page, after deduplication. */
-export function composeBriefPage(items: readonly BriefItem[], slot: BriefSlot, now: Date): { markdown: string; ids: number[] } {
+export function composeBriefPage(items: readonly BriefItem[], slot: BriefSendSlot, now: Date): { markdown: string; ids: number[] } {
   const today = dateKey(now, { timeZone: KST });
   // A duplicate left out of a delivered page stays unsent in the ledger, but must not reappear on a later page.
   // A new undeliverable observation after a sent page is a new occurrence, not an old duplicate.
   const deliveredClaims = new Set(items.filter(item => item.sent_at !== null).map(item => normalizeClaim(item.text)));
-  const eligible = items.filter(item => item.sent_at === null && beforeSlot(item.created_at, slot, now)
-    && (item.source === 'outbound.undeliverable' || !deliveredClaims.has(normalizeClaim(item.text))));
+  const candidates = slot === 'realtime' ? pendingRealtime(items, now) : items.filter(item => item.sent_at === null && beforeSlot(item.created_at, slot, now));
+  const eligible = candidates.filter(item => item.source === 'outbound.undeliverable' || !deliveredClaims.has(normalizeClaim(item.text)));
   // Duplicate claims keep the copy that needs a decision today (P0 or due today), then the higher priority, then the earliest (ACP must-fix).
   const rank = (item: BriefItem) => [needsDecision(item, today) ? 0 : 1, BRIEF_PRIORITIES.indexOf(item.priority), item.id];
   const better = (a: BriefItem, b: BriefItem) => { const x = rank(a), y = rank(b); return x[0]! - y[0]! || x[1]! - y[1]! || x[2]! - y[2]!; };
@@ -354,6 +361,7 @@ export class BriefItemsLedger {
    * requirement funnel contributes ephemeral lines without adding ledger rows.
    */
   compose(slot: string): string {
+    if (!(BRIEF_SLOTS as readonly string[]).includes(slot)) throw new BriefItemsInputError('invalid slot');
     return this.composeWithIds(slot).markdown;
   }
 
@@ -361,7 +369,7 @@ export class BriefItemsLedger {
     return db.query('SELECT id, text, domain, priority, deadline, evidence, source, created_at, (SELECT MIN(sent_at) FROM sends WHERE sends.item_id = items.id) AS sent_at FROM items ORDER BY id').all() as BriefItem[];
   }
 
-  private pageFromDb(db: Database, slot: BriefSlot): { markdown: string; ids: number[] } {
+  private pageFromDb(db: Database, slot: BriefSendSlot): { markdown: string; ids: number[] } {
     const items = this.itemsFromDb(db);
     const now = this.now();
     const morningCutoff = Date.parse(`${dateKey(now, { timeZone: KST })}T08:30:00+09:00`);
@@ -383,26 +391,26 @@ export class BriefItemsLedger {
     const composed = composeBriefPage([...items, ...funnelItems], slot, now);
     // Ephemeral funnel lines appear on the page but have no ledger row to mark sent.
     const page = { markdown: composed.markdown, ids: composed.ids.filter(id => id > 0) };
-    const candidates = items.filter(item => item.sent_at === null && beforeSlot(item.created_at, slot, now)).length;
+    const candidates = (slot === 'realtime' ? pendingRealtime(items, now) : items.filter(item => item.sent_at === null && beforeSlot(item.created_at, slot, now))).length;
     this.log('briefing.items', 'composed', { slot, candidates, bytes: Buffer.byteLength(page.markdown) });
     return page;
   }
 
   /** Read-only page and the exact ledger item ids printed on it (after deduplication). */
   composeWithIds(slot: string): { markdown: string; ids: number[] } {
-    if (!(BRIEF_SLOTS as readonly string[]).includes(slot)) throw new BriefItemsInputError('invalid slot');
-    return this.using(db => this.pageFromDb(db, slot as BriefSlot));
+    if (slot !== 'realtime' && !(BRIEF_SLOTS as readonly string[]).includes(slot)) throw new BriefItemsInputError('invalid slot');
+    return this.using(db => this.pageFromDb(db, slot as BriefSendSlot));
   }
 
   /** Hold the ledger's SQLite writer lock from selecting unsent rows through delivery and marking.
    * A failed delivery rolls back and releases the lock; the next sender can retry.
    */
-  withSendLock<T>(slot: string, work: (page: { markdown: string; ids: number[] }, markSent: (ids: readonly number[], slot: BriefSlot) => number) => T): T {
-    if (!(BRIEF_SLOTS as readonly string[]).includes(slot)) throw new BriefItemsInputError('invalid slot');
+  withSendLock<T>(slot: string, work: (page: { markdown: string; ids: number[] }, markSent: (ids: readonly number[], slot: BriefSendSlot) => number) => T): T {
+    if (slot !== 'realtime' && !(BRIEF_SLOTS as readonly string[]).includes(slot)) throw new BriefItemsInputError('invalid slot');
     return this.using(db => {
       db.exec('BEGIN IMMEDIATE');
       try {
-        const page = this.pageFromDb(db, slot as BriefSlot);
+        const page = this.pageFromDb(db, slot as BriefSendSlot);
         const result = work(page, (ids, sentSlot) => {
           if (sentSlot !== slot || ids.length !== page.ids.length || ids.some((id, index) => id !== page.ids[index])) {
             throw new BriefItemsInputError('marked ids must match composed page');
@@ -418,7 +426,7 @@ export class BriefItemsLedger {
     });
   }
 
-  private markSentInDb(db: Database, ids: readonly number[], slot: BriefSlot): number {
+  private markSentInDb(db: Database, ids: readonly number[], slot: BriefSendSlot): number {
     const at = this.now().toISOString();
     const insert = db.query('INSERT INTO sends (item_id, slot, sent_at) VALUES (?, ?, ?)');
     let count = 0;
@@ -431,8 +439,8 @@ export class BriefItemsLedger {
    * Records that these items went out in a slot (append-only); later composes leave them out (ACP must-fix).
    * Only an actual sender calls this — compose itself stays read-only (no flag marks items it did not send).
    */
-  markSent(ids: readonly number[], slot: BriefSlot): number {
-    if (!(BRIEF_SLOTS as readonly string[]).includes(slot)) throw new BriefItemsInputError('invalid slot');
+  markSent(ids: readonly number[], slot: BriefSendSlot): number {
+    if (slot !== 'realtime' && !(BRIEF_SLOTS as readonly string[]).includes(slot)) throw new BriefItemsInputError('invalid slot');
     return this.using(db => db.transaction(() => this.markSentInDb(db, ids, slot))());
   }
 }

package/src/budget/fetchers/grok.ts

@@ -1,12 +1,12 @@
 // Grok budget fetcher adapter.
 //
 // Reuses `fetchGrokUsage` (src/grok/usage.ts). Existing subscription token
-// only. Does not infer a subscription-pool remaining/reset and does not
-// scrape a web page. Credit figures stay on the credits axis — they are
-// never written into RateWindow.remainingPercent.
+// only. Maps an explicitly returned weekly period + creditUsagePercent into
+// the provider's weekly quota window; credit balances remain on the credits axis.
 
 import {
   fetchGrokUsage,
+  grokUsageToSubscriptionAxis,
   grokUsageToCreditAxis,
   type GrokUsage,
 } from '../../grok/usage.js';
@@ -36,10 +36,20 @@ export function createGrokFetcher(opts: GrokFetcherOpts = {}): ProviderFetcher {
 
 export function grokUsageToSnapshot(usage: GrokUsage, fetchedAt: number = Date.now()): UsageSnapshot {
   const credits = creditsFromGrokUsage(usage);
+  const subscription = grokUsageToSubscriptionAxis(usage);
+  const windows = subscription.status === 'available'
+    ? [{
+        kind: 'weekly' as const,
+        windowMinutes: 10_080,
+        limit: 100,
+        used: 100 - subscription.remainingPercent,
+        remainingPercent: subscription.remainingPercent,
+        resetsAt: subscription.resetsAt,
+      }]
+    : [];
   return {
     provider: 'grok' as UsageProvider,
-    // ⛔ 크레딧 사용률을 구독 창 잔량처럼 보이게 하는 RateWindow 를 만들지 않는다.
-    windows: [],
+    windows,
     ...(credits ? { credits } : {}),
     fetchedAt,
     source: 'oauth-api',

package/src/budget/llm-cost.ts

@@ -11,6 +11,7 @@ import { findGrokModel } from '../grok/models.js';
 import { getUserConfig } from '../user-config.js';
 import { BUILTIN_CATALOG } from '../intelligence-map/model-catalog.js';
 import { getCatalog } from '../registry/loader.js';
+import { byokCostFor, type ByokActualCost, type ByokPartialCost } from '../llm/openrouter-byok-cost.js';
 
 export interface LlmPricingUsd {
   inputPerM: number;
@@ -23,6 +24,13 @@ export interface LlmPricingUsd {
   longContext?: { thresholdTokens: number; inputPerM: number; outputPerM: number; cacheReadPerM?: number; cacheWritePerM?: number };
 }
 
+/** AWS Bedrock Global Standard prices, USD per million tokens (AWS pricing API, ap-northeast-2). */
+export const BEDROCK_PRICING_USD: Readonly<Record<string, LlmPricingUsd>> = {
+  'claude-haiku-5-5': { inputPerM: 0.1, outputPerM: 0.5, cacheWritePerM: 0.125, cacheReadPerM: 0.01 },
+  'claude-sonnet-5-5': { inputPerM: 2, outputPerM: 10, cacheWritePerM: 2.5, cacheReadPerM: 0.1 },
+  'claude-opus-5-5': { inputPerM: 4, outputPerM: 20, cacheWritePerM: 5, cacheReadPerM: 0.2 },
+};
+
 export interface LlmCostUsage {
   model: string;
   inputTokens?: number;
@@ -46,7 +54,7 @@ export type LlmCostEstimate =
       kind: 'known';
       model: string;
       usd: number;
-      source: 'catalog' | 'config' | 'registry';
+      source: 'catalog' | 'bedrock-catalog' | 'config' | 'registry';
       cacheReadPricedAt: 'cache-read' | 'input-rate';
       cacheWritePricedAt: 'cache-write' | 'input-rate';
       /** 장문맥 단가로 매겼으면 `'long-context'` — 없으면 기본 단가. */
@@ -56,7 +64,7 @@ export type LlmCostEstimate =
       kind: 'partial';
       model: string;
       usd: number;
-      source: 'catalog' | 'config' | 'registry';
+      source: 'catalog' | 'bedrock-catalog' | 'config' | 'registry';
       cacheReadPricedAt: 'cache-read' | 'input-rate';
       cacheWritePricedAt: 'cache-write' | 'input-rate';
       pricedTier?: 'long-context';
@@ -147,6 +155,21 @@ export function normalizePricingModelId(model: string): string {
   return m;
 }
 
+/** Normalize a Bedrock Anthropic model id to its bare Claude pricing id. */
+export function bedrockPricingModelId(model: string): string {
+  return model.trim()
+    .replace(/^bedrock\//, '')
+    .replace(/^[a-z0-9-]+\.anthropic\./i, '')
+    .replace(/^anthropic\./, '')
+    .replace(/-v1:0$/, '');
+}
+
+function isBedrockPricingModel(model: string): boolean {
+  const trimmed = model.trim();
+  return /^(?:bedrock\/|[a-z0-9-]+\.anthropic\.|anthropic\.)/i.test(trimmed)
+    && bedrockPricingModelId(trimmed).startsWith('claude-');
+}
+
 /** 저장소의 모델 정본(intelligence-map BUILTIN_CATALOG) — 손 카탈로그 넷에 없는 모델(Claude 5 계열 등)의 입력·출력 단가.
  *  캐시 단가는 거기 없다 → Anthropic 모델은 공식 규칙(읽기 0.1× · 쓰기 5분 1.25×)으로 파생한다. 다른 벤더는 입력 단가로 매기고
  *  `cacheReadPricedAt: 'input-rate'` 로 그 사실을 드러낸다(추측하지 않는다). */
@@ -174,8 +197,8 @@ function registryPricing(model: string): LlmPricingUsd | undefined {
 function resolvePricing(
   model: string,
   opts?: EstimateLlmCostOptions,
-): { pricing: LlmPricingUsd; source: 'catalog' | 'config' | 'registry' } | undefined {
-  // ⭐ 순서: 손 카탈로그(정확) → 정규화 id → config 오버레이 → 저장소 정본 → 레지스트리. 앞이 이긴다.
+): { pricing: LlmPricingUsd; source: 'catalog' | 'bedrock-catalog' | 'config' | 'registry' } | undefined {
+  // ⭐ 순서: 손 카탈로그(정확) → 정규화 id → config 오버레이 → Bedrock 표 → 저장소 정본 → 레지스트리. 앞이 이긴다.
   const normalized = normalizePricingModelId(model);
   for (const id of normalized === model ? [model] : [model, normalized]) {
     const catalog = catalogPricing(id);
@@ -185,6 +208,10 @@ function resolvePricing(
     const overlay = opts?.configPricing?.[id];
     if (validPricing(overlay)) return { pricing: overlay, source: 'config' };
   }
+  if (isBedrockPricingModel(model)) {
+    const bedrock = BEDROCK_PRICING_USD[bedrockPricingModelId(model)];
+    if (validPricing(bedrock)) return { pricing: bedrock, source: 'bedrock-catalog' };
+  }
   const builtin = builtinCatalogPricing(normalized);
   if (validPricing(builtin)) return { pricing: builtin, source: 'catalog' };
   const registry = registryPricing(model);
@@ -297,11 +324,16 @@ export function llmUsageCostFields(
   usage: Omit<LlmCostUsage, 'model'>,
   opts?: EstimateLlmCostOptions,
   billing?: BillingRoute,
-): { cost: LlmCostEstimate | IncludedLlmCost | ActualLlmCost } {
+): { cost: LlmCostEstimate | IncludedLlmCost | ActualLlmCost | ByokActualCost | ByokPartialCost } {
   const resolved = opts ?? { configPricing: readLlmConfigPricing() };
   const estimate = estimateLlmCost({ model, ...usage }, resolved);
   // ⛔⭐ 구독을 API 단가로 «known» 이라 적지 않는다 — 09-25 벤치에서 codex 구독 팔이 `$7.81 known` 으로 보였다.
   // ⭐ BACKLOG C7 — provider 가 실어 보낸 «실제 청구액»이 있으면 그것이 비용이다(추정은 곁에 남긴다).
+  // OR-BYOK-COST — BYOK 면 «OR 청구 + 상류 청구»가 비용이다(상류를 모르면 partial · 0 으로 가정하지 않는다).
+  if (billing !== 'subscription' && billing !== 'local') {
+    const byok = byokCostFor(model, usage as Parameters<typeof byokCostFor>[1], estimate.kind === 'known' || estimate.kind === 'partial' ? estimate.usd : undefined);
+    if (byok) return { cost: byok };
+  }
   const reported = (usage as { reportedCostUsd?: unknown }).reportedCostUsd;
   if (typeof reported === 'number' && Number.isFinite(reported) && billing !== 'subscription' && billing !== 'local') {
     return { cost: { kind: 'actual', model, usd: reported, source: 'provider-reported', ...(estimate.kind === 'known' || estimate.kind === 'partial' ? { estimateUsd: estimate.usd } : {}) } };

package/src/budget/types.ts

@@ -158,18 +158,24 @@ export type ResetCreditExpiryAxis =
   | { readonly status: 'expired'; readonly expiresAt: string; readonly hasUnknownExpiry: boolean };
 
 export interface AccountUsageRow {
-  readonly provider: 'codex' | 'grok' | 'openrouter';
+  /** `zai` = GLM Coding Plan(ZAI-CODING-PLAN-PROVIDER) — `ZAI_API_KEY` 가 있을 때만 행이 생긴다. */
+  readonly provider: 'codex' | 'grok' | 'openrouter' | 'zai';
   readonly accountName: string;
   readonly accountCount: number;
   readonly soleAccount: boolean;
   readonly credits: CreditAxis;
   readonly subscription: SubscriptionAxis;
   readonly resetCredits: ResetCreditExpiryAxis;
+  /** 행 끝에 붙는 한 줄(출처·실수치) — 없으면 종전 문면과 바이트 동일. */
+  readonly note?: string;
 }
 
 export interface UnifiedUsageReport {
   readonly rows: readonly AccountUsageRow[];
-  readonly accountCounts: Readonly<Record<'codex' | 'grok' | 'openrouter', number>>;
+  /** `zai` 는 키가 있을 때만 실린다(없으면 종전 JSON 과 같다). */
+  readonly accountCounts: Readonly<Record<'codex' | 'grok' | 'openrouter', number>> & { readonly zai?: number };
+  /** GLM Coding Plan 상세(창 · 우리 적산 · 잔액 사용 · 마지막 한도 코드) — 키가 있을 때만. */
+  readonly zaiCodingPlan?: import('../llm/zai-coding-plan.js').ZaiUsageView;
 }
 
 export interface TurnSummary {