sprag-cli 3.67.0 → 3.68.0

package/docs/CODEX.ko.md

@@ -38,6 +38,38 @@ macOS zsh 환경에서는 설치가 tmux 설치 여부를 먼저 확인합니다
 `sprag panel auto off --agent codex`로 끈 설정은 재설치해도 유지합니다.
 패널 실행 여부는 `sprag panel doctor --agent codex`로 확인하십시오.
 
+## 명령 한눈에 보기
+
+명령의 기본 대상은 Claude Code입니다. `--agent codex`를 붙이면 Codex를 고릅니다.
+
+```sh
+npm i -g sprag-cli --ignore-scripts  # Claude Code를 건드리지 않는 Codex 전용 설치
+sprag install --agent codex
+sprag --agent codex --days 7
+sprag panel --agent codex  # 별도 터미널에서 실시간 패널 실행
+sprag --statusline --agent codex --text
+sprag doctor --agent codex  # 문제가 생겼을 때만
+sprag route-scan --agent codex
+sprag seed --agent codex
+```
+
+설치 후 Codex의 `/hooks`에서 새 훅을 검토하고 신뢰해야 실행됩니다. Codex가 요구하는
+절차입니다. Codex 기본 상태줄은 셸 명령을 실행하지 않으므로, Sprag는 터미널 상태줄과 패널을
+따로 제공합니다. 기능별 지원 여부는 `sprag capabilities --agent codex`로 확인하십시오.
+
+## Claude Code와 Codex 비교
+
+| 기능 | Claude Code | Codex |
+|---|---|---|
+| 세션 지침 | `CLAUDE.md`와 훅 | `AGENTS.md`와 기본 훅 |
+| 실시간 상태 | 기본 상태줄에 명령 등록 | 별도 패널 또는 tmux 구성 |
+| 규칙 후보 | Claude 기록과 모델 등급 프리셋 | Codex 기록과 호환 래칫 프리셋 |
+| 모델 위임 | Haiku·Sonnet 등급 규칙 | 공급자 모델 ID와 범위별 규칙 |
+| 위임 원장 | Claude 실행별 예상 차액 | LiteLLM 단가와 하위 실행별 예상 차액 |
+
+두 연동을 함께 설치할 수 있습니다. `--agent codex`를 붙이지 않으면 기존 Claude 동작을 유지합니다.
+README의 금액 수치는 Claude Code 세션 기록에서 나온 값이며 Codex 벤치마크가 아닙니다.
+
 ## 지원 기능
 
 | 기능 | Codex 동작 |

package/docs/CODEX.md

@@ -72,6 +72,40 @@ fails, the preference stays unchanged. Review new or changed definitions in
 `/hooks`; registration does not grant trust. Turning a feature off keeps the
 shared hooks needed by other features.
 
+## Command Quick Reference
+
+Commands default to Claude Code. Add `--agent codex` to select Codex.
+
+```sh
+npm i -g sprag-cli --ignore-scripts  # Codex-only install, leaves Claude Code alone
+sprag install --agent codex
+sprag --agent codex --days 7
+sprag panel --agent codex  # live companion in a separate terminal
+sprag --statusline --agent codex --text
+sprag doctor --agent codex  # troubleshooting only
+sprag route-scan --agent codex
+sprag seed --agent codex
+```
+
+Review and trust the new hooks in Codex's `/hooks` menu; Codex requires that
+step. The native Codex footer does not accept shell commands, so Sprag provides
+a terminal statusline and a panel instead. Run `sprag capabilities --agent codex`
+for the support matrix.
+
+## Claude Code And Codex Compared
+
+| Workflow | Claude Code | Codex |
+|---|---|---|
+| Session instructions | `CLAUDE.md` and hooks | `AGENTS.md` and native hooks |
+| Live telemetry | Native statusline command | Companion panel or tmux layout |
+| Rule candidates | Claude transcripts and tier presets | Codex rollouts and compatible ratchet presets |
+| Model routing | Haiku/Sonnet tier rules | Explicit provider model IDs and scoped rules |
+| Routing ledger | Claude run estimates | Attributed child estimates with LiteLLM prices |
+
+Both integrations coexist. Commands without `--agent codex` retain Claude behavior.
+The dollar figures in the README come from Claude Code sessions, not from a Codex
+benchmark.
+
 ## Supported Workflows
 
 | Feature | Codex behavior |

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sprag-cli",
-  "version": "3.67.0",
-  "description": "Lower your Claude Code bill without changing how you work: simple tasks go to cheaper models, documents go in as compact Markdown, and the statusline shows spend and savings live. Works with Codex too.",
+  "version": "3.68.0",
+  "description": "Cut Claude Code and Codex token costs: cheaper-model routing, compact Markdown for documents, and a live statusline of spend and savings.",
   "type": "module",
   "bin": {
     "sprag": "bin/cli.js",
@@ -34,7 +34,7 @@
     "NOTICE"
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "keywords": [
     "claude-code",
@@ -52,7 +52,14 @@
     "subagent",
     "prompt-caching",
     "haiku",
-    "cli"
+    "cli",
+    "token",
+    "tokens",
+    "cost",
+    "llm-cost",
+    "cost-optimization",
+    "openai-codex",
+    "pptx-to-markdown"
   ],
   "license": "Apache-2.0",
   "repository": {

package/src/{codex-brief.js → codex/brief.js}

@@ -1,13 +1,13 @@
 import { createHash } from 'node:crypto';
 import { readFileSync, mkdirSync, readdirSync } from 'node:fs';
 import { join, resolve } from 'node:path';
-import { codexUserDir } from './agent.js';
-import { userDataDir } from './paths.js';
-import { writeViaTmp } from './state-file.js';
-import { readCodexSnapshot } from './codex-parser.js';
-import { loadCodexModelRules } from './codex-delegation.js';
-import { loadCodexLedger } from './codex-ledger.js';
-import { codexRulesInReview, codexSharedRuleHealth } from './codex-rule-health.js';
+import { codexUserDir } from '../agent.js';
+import { userDataDir } from '../paths.js';
+import { writeViaTmp } from '../state-file.js';
+import { readCodexSnapshot } from './parser.js';
+import { loadCodexModelRules } from './delegation.js';
+import { loadCodexLedger } from './ledger.js';
+import { codexRulesInReview, codexSharedRuleHealth } from './rule-health.js';
 
 const RESET_TOLERANCE_S = 300;
 const hash = (value) => createHash('sha256').update(value).digest('hex');

package/src/{codex-budget.js → codex/budget.js}

@@ -3,8 +3,8 @@ import { join } from 'node:path';
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { parse } from 'smol-toml';
-import { codexUserDir } from './agent.js';
-import { pickBudgetSource } from './litellm-budget.js';
+import { codexUserDir } from '../agent.js';
+import { pickBudgetSource } from '../litellm-budget.js';
 
 const run = promisify(execFile);
 

package/src/{codex-cache-policy.js → codex/cache-policy.js}

@@ -2,15 +2,15 @@ import { readFileSync, mkdirSync } from 'node:fs';
 import { join, resolve } from 'node:path';
 import { createHash, randomUUID } from 'node:crypto';
 import { parse } from 'smol-toml';
-import { codexUserDir } from './agent.js';
-import { userDataDir } from './paths.js';
-import { writeViaTmp } from './state-file.js';
-import { codexBudgetProvider, codexProviderKey } from './codex-budget.js';
-import { codexCachePolicy } from './codex-cache.js';
-import { PRICE_MAX_AGE_MS, gatewayPrices } from './gateway-prices.js';
-import { OPENAI_LIST_PRICES, OPENAI_PRICES_CHECKED_AT } from './openai-prices.js';
-
-export { PRICE_MAX_AGE_MS, rate, deploymentPrice, gatewayPrices, codexRunCost } from './gateway-prices.js';
+import { codexUserDir } from '../agent.js';
+import { userDataDir } from '../paths.js';
+import { writeViaTmp } from '../state-file.js';
+import { codexBudgetProvider, codexProviderKey } from './budget.js';
+import { codexCachePolicy } from './cache.js';
+import { PRICE_MAX_AGE_MS, gatewayPrices } from '../gateway-prices.js';
+import { OPENAI_LIST_PRICES, OPENAI_PRICES_CHECKED_AT } from '../openai-prices.js';
+
+export { PRICE_MAX_AGE_MS, rate, deploymentPrice, gatewayPrices, codexRunCost } from '../gateway-prices.js';
 
 export const CACHE_POLICY_MAX_AGE_MS = 300000;
 const OPENAI_POLICY = 'https://developers.openai.com/api/docs/guides/prompt-caching#cache-lifetime';

package/src/{codex-delegation-diagnostics.js → codex/delegation-diagnostics.js}

@@ -2,8 +2,8 @@ import { execFileSync } from 'node:child_process';
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { parse } from 'smol-toml';
-import { codexUserDir, codexModelName } from './agent.js';
-import { codexDelegationStatus } from './codex-ledger.js';
+import { codexUserDir, codexModelName } from '../agent.js';
+import { codexDelegationStatus } from './ledger.js';
 
 /** Local introspection only. A CLI feature flag cannot prove a model received a tool. */
 export function codexDelegationDiagnostics({ home = codexUserDir(), model = codexModelName({ home }), sessionId, dir,

package/src/{codex-delegation.js → codex/delegation.js}

@@ -2,17 +2,17 @@ import { readFileSync, readdirSync, mkdirSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 import { randomUUID } from 'node:crypto';
 import { parse } from 'smol-toml';
-import { userDataDir } from './paths.js';
-import { writeViaTmp } from './state-file.js';
-import { codexUserDir, codexProviderName } from './agent.js';
-import { categorize, ESCALATE_RE, EDIT_RE } from './route-scan.js';
-import { looksPasted } from './route-inject.js';
-import { newRouteId, recordCodexDelegation } from './codex-ledger.js';
-import { readCodexTailLines } from './codex-parser.js';
-import { loadConfig } from './config.js';
-import { loadSharedModelRules, sharedModelRulesForProject, sharedRuleBounds, SHARED_RULE_TIERS } from './shared-model-rules.js';
-import { codexPriceBook, readCodexPrices } from './codex-cache-policy.js';
-import { codexRunCost } from './gateway-prices.js';
+import { userDataDir } from '../paths.js';
+import { writeViaTmp } from '../state-file.js';
+import { codexUserDir, codexProviderName } from '../agent.js';
+import { categorize, ESCALATE_RE, EDIT_RE } from '../route-scan.js';
+import { looksPasted } from '../route-inject.js';
+import { newRouteId, recordCodexDelegation } from './ledger.js';
+import { readCodexTailLines } from './parser.js';
+import { loadConfig } from '../config.js';
+import { loadSharedModelRules, sharedModelRulesForProject, sharedRuleBounds, SHARED_RULE_TIERS } from '../shared-model-rules.js';
+import { codexPriceBook, readCodexPrices } from './cache-policy.js';
+import { codexRunCost } from '../gateway-prices.js';
 
 export const CODEX_ROUTE_CATEGORIES = ['paste', 'translate', 'explore', 'read', 'check', 'run'];
 const MARKER = '<!-- sprag:codex:delegation -->';

package/src/{codex-doc2md-ledger.js → codex/doc2md-ledger.js}

@@ -1,11 +1,11 @@
 import { createHash, randomUUID } from 'node:crypto';
 import { mkdirSync, readdirSync, readFileSync, realpathSync, statSync } from 'node:fs';
 import { extname, join, resolve } from 'node:path';
-import { codexUserDir } from './agent.js';
-import { userDataDir } from './paths.js';
-import { writeViaTmp } from './state-file.js';
-import { readResetMarks, isBeforeReset } from './saved-reset.cjs';
-import { codexPriceBook, readCodexPrices } from './codex-cache-policy.js';
+import { codexUserDir } from '../agent.js';
+import { userDataDir } from '../paths.js';
+import { writeViaTmp } from '../state-file.js';
+import { readResetMarks, isBeforeReset } from '../saved-reset.cjs';
+import { codexPriceBook, readCodexPrices } from './cache-policy.js';
 
 const hash = (value) => createHash('sha256').update(value).digest('hex');
 const ledgerDir = ({ home = codexUserDir(), dir = userDataDir() } = {}) => join(dir, 'codex-doc2md', hash(resolve(home)));

package/src/{codex-doc2md.js → codex/doc2md.js}

@@ -2,12 +2,12 @@ import { createRequire } from 'node:module';
 import { realpathSync, readFileSync, writeFileSync, renameSync, rmSync, openSync, readSync, closeSync } from 'node:fs';
 import { basename, dirname, resolve } from 'node:path';
 import { randomUUID } from 'node:crypto';
-import { recordCodexDocument } from './codex-doc2md-ledger.js';
-import { readCodexSnapshot } from './codex-parser.js';
+import { recordCodexDocument } from './doc2md-ledger.js';
+import { readCodexSnapshot } from './parser.js';
 
 const require = createRequire(import.meta.url);
-const doc2md = require('./doc2md.cjs');
-const lint = require('./korean-lint.cjs');
+const doc2md = require('../doc2md.cjs');
+const lint = require('../korean-lint.cjs');
 const shellTools = new Set(['Bash', 'exec_command', 'shell_command', 'shell']);
 
 /** Hook identity, never the user's default model or another project's session. */

package/src/{codex-doctor.js → codex/doctor.js}

@@ -1,10 +1,10 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { parse } from 'smol-toml';
-import { codexUserDir } from './agent.js';
-import { codexHookStatus } from './codex-installer.js';
-import { createPanelReader } from './codex-panel.js';
-import { panelHealth } from './codex-panel-state.js';
+import { codexUserDir } from '../agent.js';
+import { codexHookStatus } from './installer.js';
+import { createPanelReader } from './panel.js';
+import { panelHealth } from './panel-state.js';
 
 export const CODEX_CAPABILITIES = [
   { feature: 'statusline', support: 'supported', command: 'sprag --statusline --agent codex', note: 'Local terminal output; native footer accepts only Codex item identifiers.' },

package/src/{codex-harness.js → codex/harness.js}

@@ -1,11 +1,11 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 import { homedir } from 'node:os';
-import { codexUserDir } from './agent.js';
-import { loadConfig } from './config.js';
-import { koreanStyleEnabled, koreanStyleInjection } from './korean-style.js';
-import { codexToolEvents, codexLegacyToolEvent, readCodexTailLines, forkedCopyFilter } from './codex-parser.js';
-import { implementationDelegationRule } from './implementation-delegation.js';
+import { codexUserDir } from '../agent.js';
+import { loadConfig } from '../config.js';
+import { koreanStyleEnabled, koreanStyleInjection } from '../korean-style.js';
+import { codexToolEvents, codexLegacyToolEvent, readCodexTailLines, forkedCopyFilter } from './parser.js';
+import { implementationDelegationRule } from '../implementation-delegation.js';
 
 export const CODEX_BEGIN = '<!-- sprag:codex:harness:begin -->';
 export const CODEX_END = '<!-- sprag:codex:harness:end -->';

package/src/{codex-hooks.js → codex/hooks.js}

@@ -3,25 +3,25 @@ import { spawn } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import { mkdirSync, openSync, readFileSync, readSync, closeSync, statSync } from 'node:fs';
 import { join, resolve } from 'node:path';
-import { loadConfig, userLanguage } from './config.js';
-import { koreanStyleInjection, koreanStyleEnabled } from './korean-style.js';
-import { cohesionInjection } from './cohesion.js';
-import { codexHarnessPaths, syncCodexKoreanBlock } from './codex-harness.js';
-import { writeViaTmp } from './state-file.js';
-import { findProjectRoot } from './harness.js';
-import { runCodexBrief } from './codex-brief.js';
-import { codexDocumentTool, codexDocumentNote, convertCodexDocument, codexDocumentContext } from './codex-doc2md.js';
-import { codexDelegationTool, codexRouteHint, codexDelegateEnabled } from './codex-delegation.js';
-import { bindCodexSubagent, closeStaleCodexRoutes, unsettledCodexRoutes } from './codex-ledger.js';
-import { seedOfferBlock } from './seed-rules.js';
-import { readCodexRouteScan, openCodexCandidates, shouldRescanCodex } from './codex-route-scan.js';
-import { userDataDir } from './paths.js';
-import { debug } from './debug.js';
-import { updateOffer } from './update-notice.js';
+import { loadConfig, userLanguage } from '../config.js';
+import { koreanStyleInjection, koreanStyleEnabled } from '../korean-style.js';
+import { cohesionInjection } from '../cohesion.js';
+import { codexHarnessPaths, syncCodexKoreanBlock } from './harness.js';
+import { writeViaTmp } from '../state-file.js';
+import { findProjectRoot } from '../harness.js';
+import { runCodexBrief } from './brief.js';
+import { codexDocumentTool, codexDocumentNote, convertCodexDocument, codexDocumentContext } from './doc2md.js';
+import { codexDelegationTool, codexRouteHint, codexDelegateEnabled } from './delegation.js';
+import { bindCodexSubagent, closeStaleCodexRoutes, unsettledCodexRoutes } from './ledger.js';
+import { seedOfferBlock } from '../seed-rules.js';
+import { readCodexRouteScan, openCodexCandidates, shouldRescanCodex } from './route-scan.js';
+import { userDataDir } from '../paths.js';
+import { debug } from '../debug.js';
+import { updateOffer } from '../update-notice.js';
 
 const require = createRequire(import.meta.url);
-const lint = require('./korean-lint.cjs');
-const doc2md = require('./doc2md.cjs');
+const lint = require('../korean-lint.cjs');
+const doc2md = require('../doc2md.cjs');
 
 function context(event, text) {
   return text ? { hookSpecificOutput: { hookEventName: event, additionalContext: text } } : null;
@@ -167,7 +167,7 @@ export async function codexHookOutput(event, payload, { cfg = loadConfig(), refr
   if (!payload || typeof payload !== 'object') return null;
   if (event === 'stop') {
     if (payload.stop_hook_active || !koreanStyleEnabled(cfg) || cfg?.koreanReplyCheck === false) return null;
-    const { checkCodexReplyLanguage } = await import('./codex-reply-language.js');
+    const { checkCodexReplyLanguage } = await import('./reply-language.js');
     if (!checkCodexReplyLanguage(payload)) return null;
     return { decision: 'block', reason: '사용자는 한국어로 질문했는데 마지막 답변이 영어로 작성됐습니다. 같은 내용을 한국어로 다시 답하십시오. 코드, 명령어, 오류 원문, 커밋 메시지는 그대로 유지하십시오.' };
   }
@@ -180,9 +180,9 @@ export async function codexHookOutput(event, payload, { cfg = loadConfig(), refr
     const parts = [];
     // Keep the preset file current with this version's wording before it is read.
     if (event === 'session-start') {
-      try { (await import('./preset-ratchet.js')).preparePresetRatchet({ agent: 'codex' }); } catch (e) { debug('codex:preset', e); }
+      try { (await import('../preset-ratchet.js')).preparePresetRatchet({ agent: 'codex' }); } catch (e) { debug('codex:preset', e); }
     }
-    const { presetRatchetPath } = await import('./preset-ratchet.js');
+    const { presetRatchetPath } = await import('../preset-ratchet.js');
     // Lower priority survives the budget first. Rules and style move to a file
     // when they do not fit; offers and notices are simply left out.
     for (const [scope, ratchet] of [['global', codexHarnessPaths(root, 'global').ratchet],

package/src/{codex-installer.js → codex/installer.js}

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { join, dirname } from 'node:path';
-import { codexUserDir } from './agent.js';
-import { writeViaTmp } from './state-file.js';
+import { codexUserDir } from '../agent.js';
+import { writeViaTmp } from '../state-file.js';
 
 export const CODEX_HANDLERS = {
   SessionStart: { matcher: 'startup|resume|clear|compact', command: 'sprag codex-hook --agent codex --event session-start', timeout: 15 },

package/src/{codex-ledger.js → codex/ledger.js}

@@ -1,12 +1,12 @@
 import { appendFileSync, mkdirSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { randomBytes, randomUUID } from 'node:crypto';
-import { userDataDir } from './paths.js';
-import { writeViaTmp } from './state-file.js';
-import { roundUsd } from './savings-ledger.js';
-import { readResetMarks, isBeforeReset } from './saved-reset.cjs';
-import { discoverCodexSessionFiles, parseCodexTurns } from './codex-parser.js';
-import { codexRunCost, codexPriceBook, readCodexPrices } from './codex-cache-policy.js';
+import { userDataDir } from '../paths.js';
+import { writeViaTmp } from '../state-file.js';
+import { roundUsd } from '../savings-ledger.js';
+import { readResetMarks, isBeforeReset } from '../saved-reset.cjs';
+import { discoverCodexSessionFiles, parseCodexTurns } from './parser.js';
+import { codexRunCost, codexPriceBook, readCodexPrices } from './cache-policy.js';
 
 /*
  * Codex routing savings, kept apart from Claude's delegation ledger.

package/src/{codex-panel-launcher.js → codex/panel-launcher.js}

@@ -2,11 +2,11 @@ import { execFileSync } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import { fileURLToPath } from 'node:url';
 import { resolve } from 'node:path';
-import { codexUserDir } from './agent.js';
+import { codexUserDir } from '../agent.js';
 
 const quote = (value) => `'${String(value).replace(/'/g, `'"'"'`)}'`;
 
-export function panelLaunchCommand(root, { node = process.execPath, cli = fileURLToPath(new URL('../bin/cli.js', import.meta.url)), home = codexUserDir(), sessionId, sessionFile } = {}) {
+export function panelLaunchCommand(root, { node = process.execPath, cli = fileURLToPath(new URL('../../bin/cli.js', import.meta.url)), home = codexUserDir(), sessionId, sessionFile } = {}) {
   return ['env', `CODEX_HOME=${home}`, node, cli, 'panel', '--agent', 'codex', '--project', resolve(root),
     ...(sessionId ? ['--session', sessionId] : []), ...(sessionFile ? ['--session-file', sessionFile] : [])]
     .map(quote).join(' ');

package/src/{codex-panel-runner.js → codex/panel-runner.js}

@@ -3,8 +3,8 @@ import { mkdtempSync, readFileSync, rmSync } from 'node:fs';
 import { tmpdir, homedir } from 'node:os';
 import { join, resolve } from 'node:path';
 import { randomUUID } from 'node:crypto';
-import { panelLaunchCommand } from './codex-panel-launcher.js';
-import { createPanelBinding } from './codex-panel-session.js';
+import { panelLaunchCommand } from './panel-launcher.js';
+import { createPanelBinding } from './panel-session.js';
 
 const quote = (s) => `'${String(s).replace(/'/g, `'"'"'`)}'`;
 

package/src/{codex-panel-session.js → codex/panel-session.js}

@@ -1,6 +1,6 @@
 import { readFileSync, writeFileSync } from 'node:fs';
 import { isAbsolute } from 'node:path';
-import { writeViaTmp } from './state-file.js';
+import { writeViaTmp } from '../state-file.js';
 
 export function createPanelBinding(file) {
   writeFileSync(file, JSON.stringify({ version: 1, sessionId: null, transcriptPath: null }), { mode: 0o600 });

package/src/{codex-panel-setup.js → codex/panel-setup.js}

@@ -11,7 +11,7 @@
 import { execFileSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { basename, dirname, join } from 'node:path';
-import { installPanelShell } from './codex-panel-shell.js';
+import { installPanelShell } from './panel-shell.js';
 
 /** Whether a tmux binary answers `-V`. */
 export function tmuxAvailable({ exec = execFileSync } = {}) {

package/src/{codex-panel-state.js → codex/panel-state.js}

@@ -1,9 +1,9 @@
 import { createHash } from 'node:crypto';
 import { readFileSync, mkdirSync, readdirSync, lstatSync, unlinkSync } from 'node:fs';
 import { join, resolve } from 'node:path';
-import { userDataDir } from './paths.js';
-import { codexUserDir } from './agent.js';
-import { writeViaTmp, runHousekeeping, sweepStaleTmp } from './state-file.js';
+import { userDataDir } from '../paths.js';
+import { codexUserDir } from '../agent.js';
+import { writeViaTmp, runHousekeeping, sweepStaleTmp } from '../state-file.js';
 
 // Every panel session leaves a `-frame` and a `-hook` file behind, keyed by a
 // hash that is not reused once the session is gone. They are diagnostics for a

package/src/{codex-panel.js → codex/panel.js}

@@ -1,33 +1,39 @@
 import { resolve, relative, isAbsolute, basename } from 'node:path';
 import { realpathSync, statSync } from 'node:fs';
 import { stat } from 'node:fs/promises';
-import { readPanelBinding } from './codex-panel-session.js';
-import { discoverCodexSessionFiles, parseCodexSessionFile } from './codex-parser.js';
-import { codexHarnessStatus, codexRatchetCandidates } from './codex-harness.js';
-import { harnessListRules, findProjectRoot } from './harness.js';
-import { loadConfig, statuslineDefaults } from './config.js';
-import { glyphsFor } from './glyphs.js';
-import { gaugeBar, formatMoney } from './formatters/statusline.js';
-import { codexCacheTimer } from './codex-cache.js';
-import { readCodexCachePolicy, readCodexPrices, isDirectOpenAI } from './codex-cache-policy.js';
-import { codexIssues } from './codex-brief.js';
-import { labelForKey } from './window-labels.js';
-import { resolveLabelMode } from './statusline-mode.js';
-import { formatResetIn } from './format-time.js';
-import { codexDocumentTotals } from './codex-doc2md-ledger.js';
-import { codexHookStatus } from './codex-installer.js';
-import { koreanStyleEnabled } from './korean-style.js';
-import { codexRoutingSavedTotals, loadCodexLedger, codexDelegationStatus } from './codex-ledger.js';
-import { loadCodexModelRules, codexDelegateEnabled } from './codex-delegation.js';
-import { codexRulesInReview, codexSharedRuleHealth } from './codex-rule-health.js';
-import { readCodexRouteScan, openCodexCandidates } from './codex-route-scan.js';
-import { codexBudgetProvider } from './codex-budget.js';
-import { readUpdateChip } from './update-notice.js';
+import { readPanelBinding } from './panel-session.js';
+import { discoverCodexSessionFiles, parseCodexSessionFile } from './parser.js';
+import { codexHarnessStatus, codexRatchetCandidates } from './harness.js';
+import { harnessListRules, findProjectRoot } from '../harness.js';
+import { loadConfig, statuslineDefaults } from '../config.js';
+import { glyphsFor } from '../glyphs.js';
+import { gaugeBar, formatMoney, DEFAULT_SEGMENT_ORDER } from '../formatters/statusline.js';
+import { codexCacheTimer } from './cache.js';
+import { readCodexCachePolicy, readCodexPrices, isDirectOpenAI } from './cache-policy.js';
+import { codexIssues } from './brief.js';
+import { labelForKey } from '../window-labels.js';
+import { resolveLabelMode } from '../statusline-mode.js';
+import { formatResetIn } from '../format-time.js';
+import { codexDocumentTotals } from './doc2md-ledger.js';
+import { codexHookStatus } from './installer.js';
+import { koreanStyleEnabled } from '../korean-style.js';
+import { codexRoutingSavedTotals, loadCodexLedger, codexDelegationStatus } from './ledger.js';
+import { loadCodexModelRules, codexDelegateEnabled } from './delegation.js';
+import { codexRulesInReview, codexSharedRuleHealth } from './rule-health.js';
+import { readCodexRouteScan, openCodexCandidates } from './route-scan.js';
+import { codexBudgetProvider } from './budget.js';
+import { readUpdateChip } from '../update-notice.js';
 
-export const CODEX_SEGMENT_ORDER = [
-  'cap-warn', 'update', 'usage', 'ctx', 'ttl', 'model', 'effort',
-  'hit', 'saved', 'doc2md', 'routing', 'harness', 'korean', 'version',
-];
+const CODEX_SUPPORTED_SEGMENTS = new Set([
+  'cap-warn', 'spike', 'usage', 'ctx', 'ttl', 'model', 'effort',
+  'delegated', 'doc2md', 'hit', 'saved', 'harness', 'korean', 'version',
+]);
+// The Claude statusline order, restricted to what Codex draws. Codex keeps its
+// own upgrade chip right after the cap warning; the Claude line has no such
+// segment and moves `version` forward instead.
+export const CODEX_SEGMENT_ORDER = DEFAULT_SEGMENT_ORDER
+  .filter((name) => CODEX_SUPPORTED_SEGMENTS.has(name))
+  .flatMap((name) => (name === 'cap-warn' ? [name, 'update'] : [name]));
 
 // Only cache full-session parses. A moving time cutoff would make an unchanged
 // file's cached totals stale. The panel reports session totals, not window totals.
@@ -233,12 +239,13 @@ function panelGroups(data, { now, version = '', full = false, mode = full ? 'tex
   const level = (n) => n >= 90 ? 31 : n >= 70 ? 33 : 32;
   const bar = (n) => full ? gauge(n) : gaugeBar(n, mode === 'text' ? 'narrow' : mode);
   const warnings = [];
+  const contextWarnings = [];
   if (data.error) warnings.push(chip(`ERROR: ${terminalText(data.error)}`, 31));
   for (const issue of codexIssues(s, { now })) {
     const key = issue.key.slice(6), win = s.rateLimits?.[key];
     const text = issue.key === 'context' ? `WARNING: Ctx ${pct(context)}`
       : `WARNING: ${windowLabel(win.window_minutes, key)} limit ${pct(win.used_percent)}`;
-    warnings.push(chip(text, issue.level === 'critical' ? 31 : 33));
+    (issue.key === 'context' ? contextWarnings : warnings).push(chip(text, issue.level === 'critical' ? 31 : 33));
   }
   register('ctx', 'priority', context !== null ? [chip(full
     ? `Ctx ${bar(context)} ${pct(context)}  ${short(s.lastContextTokens)} / ${short(s.contextWindow)}`
@@ -274,6 +281,7 @@ function panelGroups(data, { now, version = '', full = false, mode = full ? 'tex
   }
   if (limits.length && s?.rateLimitsAt) limits.push(chip(`snapshot ${age(s.rateLimitsAt, now)}`));
   register('cap-warn', 'priority', warnings);
+  register('spike', 'priority', contextWarnings);
   register('usage', 'priority', limits);
   register('hit', 'totals', input > 0 ? [chip(`${icon('hit')}Cache hit ${pct(s.totals.cacheRead / input * 100)} (session)`,
     s.totals.cacheRead / input >= 0.85 ? 32 : s.totals.cacheRead / input >= 0.7 ? 33 : 31)] : []);
@@ -283,8 +291,14 @@ function panelGroups(data, { now, version = '', full = false, mode = full ? 'tex
     chip(`Reasoning ${short(s.reasoningOutputTokens)} (in output)`),
   ] : []);
   const docs = data.documents;
+  // Lifetime figures, in the Claude statusline's order: routing, then documents.
+  const delegation = data.delegation;
+  register('delegated', 'lifetime', [routingChip(data.routingSaved, chip),
+    delegation?.offers ? chip(`Delegation ${delegation.settled} completed / ${delegation.bound} bound / ${delegation.pending} pending / ${delegation.unclaimed} unclaimed (session)`,
+      delegation.unclaimed && !delegation.settled && !delegation.bound ? 33 : 90) : null,
+  ]);
   const docSavings = docs?.scope === 'codex-total' ? docs.savings : null;
-  register('doc2md', 'savings', [
+  register('doc2md', 'lifetime', [
     chip(`Doc2md saved ${docSavings?.priced ? `${signedMoney(docSavings.total)} est. (XML vs MD)`
       : `n/a (${docs?.docs ? `${docs.docs} unpriced docs` : 'no documents'})`}`, docSavings?.priced ? (docSavings.total < 0 ? 33 : 32) : 90),
     ...(docSavings?.priced && docSavings.unpriced ? [chip(`${docSavings.unpriced} docs unpriced`)] : []),
@@ -292,11 +306,6 @@ function panelGroups(data, { now, version = '', full = false, mode = full ? 'tex
     ...(docs.byExt || []).map((row) => chip(`${terminalText(row.ext)} ${number(row.docs)}x`)),
     ] : []),
   ]);
-  const delegation = data.delegation;
-  register('routing', 'savings', [routingChip(data.routingSaved, chip),
-    delegation?.offers ? chip(`Delegation ${delegation.settled} completed / ${delegation.bound} bound / ${delegation.pending} pending / ${delegation.unclaimed} unclaimed (session)`,
-      delegation.unclaimed && !delegation.settled && !delegation.bound ? 33 : 90) : null,
-  ]);
   register('harness', 'preferences', [
     chip(`${icon('harness')}Harness ${h?.error ? 'ERROR' : h ? `${h.configured}/${h.total}` : 'n/a'}`, h?.configured === 5 ? 32 : 33),
     chip(`Ratchet ${data.rules?.global ?? '?'}/${data.rules?.project ?? '?'}`),
@@ -322,7 +331,7 @@ function panelGroups(data, { now, version = '', full = false, mode = full ? 'tex
     chip(`SPRAG${version ? ` v${terminalText(version)}` : ''} / ${s ? age(s.lastActivity, now) : 'waiting'}`,
       s && (!s.lastActivity || now - new Date(s.lastActivity) > 300000) ? 33 : 90),
   ]);
-  // Keep session measurements together, before lifetime document counts.
+  // Adjacent entries with the same timeframe share a wrapping group.
   const groups = [];
   let lastGroup;
   for (const name of CODEX_SEGMENT_ORDER) {

package/src/{codex-parser.js → codex/parser.js}

@@ -1,8 +1,8 @@
-import { createReadStream, openSync, readSync, closeSync, fstatSync } from 'node:fs';
+import { openSync, readSync, closeSync, fstatSync } from 'node:fs';
 import { readdir, stat } from 'node:fs/promises';
-import { createInterface } from 'node:readline';
+import { transcriptLines } from '../transcript-lines.js';
 import { join, resolve } from 'node:path';
-import { codexUserDir } from './agent.js';
+import { codexUserDir } from '../agent.js';
 
 const count = (n) => Number.isSafeInteger(n) && n >= 0 ? n : 0;
 const emptyTotals = () => ({ input: 0, cacheRead: 0, cacheCreation: 0, ephemeral5m: 0, ephemeral1h: 0, output: 0 });
@@ -212,9 +212,7 @@ export async function parseCodexTurns(filePath, { cutoffMs = -Infinity } = {}) {
   let previousUsage = null;
   let current = null;
   let context = { model: null, effort: null, cwd: null };
-  const stream = createReadStream(filePath, { encoding: 'utf8' });
-  const lines = createInterface({ input: stream, crlfDelay: Infinity });
-  for await (const line of lines) {
+  for await (const line of transcriptLines(filePath)) {
     let e;
     try { e = JSON.parse(line); } catch { continue; }
     const p = e?.payload;
@@ -341,9 +339,7 @@ export async function parseCodexSessionFile(filePath, { cutoffMs = -Infinity } =
   };
   const copied = forkedCopyFilter();
   let previous = null;
-  const stream = createReadStream(filePath, { encoding: 'utf8' });
-  const lines = createInterface({ input: stream, crlfDelay: Infinity });
-  for await (const line of lines) {
+  for await (const line of transcriptLines(filePath)) {
     let e;
     try { e = JSON.parse(line); } catch { continue; }
     const p = e?.payload;

package/src/{codex-reply-language.js → codex/reply-language.js}

@@ -1,7 +1,7 @@
 import { createRequire } from 'node:module';
-import { forkedCopyFilter, codexToolEvents } from './codex-parser.js';
+import { forkedCopyFilter, codexToolEvents } from './parser.js';
 
-const { checkReplyLanguage } = createRequire(import.meta.url)('./reply-language.cjs');
+const { checkReplyLanguage } = createRequire(import.meta.url)('../reply-language.cjs');
 
 /** Ignore copied history and commentary; only the current turn's final reply counts. */
 export function lastCodexTurn(lines, { turnId, sessionId } = {}) {