sprag-cli 3.67.0 → 3.69.0

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 } = {}) {

package/src/{codex-route-scan.js → codex/route-scan.js}

@@ -1,17 +1,17 @@
 import { readFileSync, mkdirSync } from 'node:fs';
 import { join, resolve } from 'node:path';
 import { randomUUID } from 'node:crypto';
-import { userDataDir } from './paths.js';
-import { writeViaTmp } from './state-file.js';
-import { loadConfig } from './config.js';
-import { findProjectRoot } from './harness.js';
-import { discoverCodexSessionFiles, parseCodexTurns } from './codex-parser.js';
+import { userDataDir } from '../paths.js';
+import { writeViaTmp } from '../state-file.js';
+import { loadConfig } from '../config.js';
+import { findProjectRoot } from '../harness.js';
+import { discoverCodexSessionFiles, parseCodexTurns } from './parser.js';
 import { categorize, isSkippable, tierOf, calibrateThresholds, MIN_RECURRENCE,
-  RESCAN_MIN_INTERVAL_MS, RESCAN_BIG_DELTA_BYTES, RESCAN_MAX_AGE_MS } from './route-scan.js';
-import { codexPromptCategory, loadCodexModelRules, sharedCodexModelRules, codexSharedTargets } from './codex-delegation.js';
-import { codexRunCost, codexPriceBook, isDirectOpenAI, readCodexPrices } from './codex-cache-policy.js';
-import { OPENAI_PRICES_CHECKED_AT } from './openai-prices.js';
-import { refreshCodexLedger } from './codex-ledger.js';
+  RESCAN_MIN_INTERVAL_MS, RESCAN_BIG_DELTA_BYTES, RESCAN_MAX_AGE_MS } from '../route-scan.js';
+import { codexPromptCategory, loadCodexModelRules, sharedCodexModelRules, codexSharedTargets } from './delegation.js';
+import { codexRunCost, codexPriceBook, isDirectOpenAI, readCodexPrices } from './cache-policy.js';
+import { OPENAI_PRICES_CHECKED_AT } from '../openai-prices.js';
+import { refreshCodexLedger } from './ledger.js';
 
 /*
  * Codex route-scan: recurring easy turns become delegation-rule candidates.

package/src/{codex-rule-health.js → codex/rule-health.js}

@@ -1,8 +1,8 @@
 import { resolve } from 'node:path';
-import { loadCodexLedger } from './codex-ledger.js';
-import { isFailedRun } from './route-scan.js';
-import { wilsonLowerBound, HEALTH_ERR_RATE, HEALTH_MIN_SAMPLE_DELEGATED } from './model-rules.js';
-import { loadSharedModelRules, sharedModelRulesForProject, realProjectRoot } from './shared-model-rules.js';
+import { loadCodexLedger } from './ledger.js';
+import { isFailedRun } from '../route-scan.js';
+import { wilsonLowerBound, HEALTH_ERR_RATE, HEALTH_MIN_SAMPLE_DELEGATED } from '../model-rules.js';
+import { loadSharedModelRules, sharedModelRulesForProject, realProjectRoot } from '../shared-model-rules.js';
 
 /**
  * Measured outcome of one Codex rule, judged as Claude's rule health judges

package/src/commands/codex-delegate.js

@@ -1,15 +1,15 @@
 import { loadConfig, saveConfig } from '../config.js';
-import { configureCodexHooks } from '../codex-installer.js';
+import { configureCodexHooks } from '../codex/installer.js';
 import { validateCodexTarget, loadCodexModelRules, addCodexModelRule, removeCodexModelRule,
   validateCodexSharedTarget, codexSharedTargets, codexDelegateMinContext, DEFAULT_DELEGATE_MIN_CONTEXT,
-  autoCodexSharedTargets, codexDelegateEnabled, codexImplementationHint } from '../codex-delegation.js';
-import { findCodexCandidate, resolveCodexCandidate } from '../codex-route-scan.js';
-import { codexRoutingSavedTotals, loadCodexLedger } from '../codex-ledger.js';
-import { codexRuleHealth, codexRulesInReview, codexSharedRuleHealth } from '../codex-rule-health.js';
+  autoCodexSharedTargets, codexDelegateEnabled, codexImplementationHint } from '../codex/delegation.js';
+import { findCodexCandidate, resolveCodexCandidate } from '../codex/route-scan.js';
+import { codexRoutingSavedTotals, loadCodexLedger } from '../codex/ledger.js';
+import { codexRuleHealth, codexRulesInReview, codexSharedRuleHealth } from '../codex/rule-health.js';
 import { signedUsd } from '../money.js';
 import { codexProviderName, codexModelName } from '../agent.js';
 import { loadSharedModelRules, sharedModelRulesForProject, SHARED_RULE_TIERS } from '../shared-model-rules.js';
-import { codexDelegationDiagnostics } from '../codex-delegation-diagnostics.js';
+import { codexDelegationDiagnostics } from '../codex/delegation-diagnostics.js';
 
 // Starts from the working directory, as the hooks do, so a project policy
 // stored under either agent's project root is counted.