throughline 0.4.6 → 0.4.8

package/src/cli/doctor.test.mjs

@@ -155,6 +155,8 @@ test('runCodexDiagnosis: reports env thread and captured DB session', () => {
 
     assert.match(output, /\[Codex primary\]/);
     assert.match(output, /Codex hooks feature:\s+not enabled/);
+    assert.match(output, /Codex UserPrompt hook:\s+not registered/);
+    assert.match(output, /Codex PostTool hook:\s+not registered/);
     assert.match(output, /Codex Stop hook:\s+not registered/);
     assert.match(output, /VSCode monitor task:\s+not registered/);
     assert.match(output, /created by the next VSCode hook event/);
@@ -328,7 +330,7 @@ test('buildCodexContextRefreshDiagnosis keeps ready label when restore safety is
   }
 });
 
-test('readCodexHookDiagnosis detects legacy bare Throughline Codex Stop hook', () => {
+test('readCodexHookDiagnosis detects Codex prompt and Stop hooks', () => {
   const codexHome = mkdtempSync(join(tmpdir(), 'tl-doctor-codex-home-'));
   try {
     mkdirSync(join(codexHome), { recursive: true });
@@ -337,6 +339,30 @@ test('readCodexHookDiagnosis detects legacy bare Throughline Codex Stop hook', (
       JSON.stringify(
         {
           hooks: {
+            UserPromptSubmit: [
+              {
+                hooks: [
+                  {
+                    type: 'command',
+                    command: '/usr/bin/node /pkg/bin/throughline.mjs codex-hook user-prompt-submit',
+                    timeoutSec: 30,
+                    async: false,
+                  },
+                ],
+              },
+            ],
+            PostToolUse: [
+              {
+                hooks: [
+                  {
+                    type: 'command',
+                    command: '/usr/bin/node /pkg/bin/throughline.mjs codex-hook post-tool-use',
+                    timeoutSec: 30,
+                    async: false,
+                  },
+                ],
+              },
+            ],
             Stop: [
               {
                 hooks: [
@@ -355,10 +381,16 @@ test('readCodexHookDiagnosis detects legacy bare Throughline Codex Stop hook', (
         2,
       ) + '\n',
     );
-    writeFileSync(join(codexHome, 'config.toml'), '[features]\ncodex_hooks = true\n');
+    writeFileSync(join(codexHome, 'config.toml'), '[features]\ncodex_hooks = true\nhooks = true\n');
 
     const diagnosis = readCodexHookDiagnosis(codexHome);
     assert.equal(diagnosis.featureEnabled, true);
+    assert.equal(diagnosis.codexHooksFeatureEnabled, true);
+    assert.equal(diagnosis.hooksFeatureEnabled, true);
+    assert.equal(diagnosis.managedPromptHooks.length, 1);
+    assert.equal(diagnosis.legacyManagedPromptHooks.length, 1);
+    assert.equal(diagnosis.managedPostToolUseHooks.length, 1);
+    assert.equal(diagnosis.legacyManagedPostToolUseHooks.length, 1);
     assert.equal(diagnosis.managedStopHooks.length, 1);
     assert.equal(diagnosis.legacyManagedStopHooks.length, 1);
   } finally {

package/src/cli/help.test.mjs

@@ -9,6 +9,8 @@ const REPO_ROOT = dirname(dirname(dirname(fileURLToPath(import.meta.url))));
 const BIN_PATH = join(REPO_ROOT, 'bin/throughline.mjs');
 const CODEX_HELP_COMMANDS = [
   'throughline codex-capture',
+  'throughline codex-hook user-prompt-submit',
+  'throughline codex-hook post-tool-use',
   'throughline codex-hook stop',
   'throughline codex-summarize',
   'throughline codex-resume',

package/src/cli/install.mjs

@@ -54,6 +54,8 @@ const SC_HOOKS = {
 
 const CODEX_COMMANDS = [
   'throughline codex-hook stop',
+  'throughline codex-hook user-prompt-submit',
+  'throughline codex-hook post-tool-use',
 ];
 
 function quoteCommandPath(p) {
@@ -67,6 +69,36 @@ export function buildCodexStopHookCommand({
   return `${quoteCommandPath(nodePath)} ${quoteCommandPath(cliScriptPath)} codex-hook stop`;
 }
 
+export function buildCodexUserPromptSubmitHookCommand({
+  nodePath = process.execPath,
+  cliScriptPath = join(PACKAGE_ROOT, 'bin', 'throughline.mjs'),
+} = {}) {
+  return `${quoteCommandPath(nodePath)} ${quoteCommandPath(cliScriptPath)} codex-hook user-prompt-submit`;
+}
+
+export function buildCodexPostToolUseHookCommand({
+  nodePath = process.execPath,
+  cliScriptPath = join(PACKAGE_ROOT, 'bin', 'throughline.mjs'),
+} = {}) {
+  return `${quoteCommandPath(nodePath)} ${quoteCommandPath(cliScriptPath)} codex-hook post-tool-use`;
+}
+
+export function isThroughlineCodexHookCommand(command) {
+  if (typeof command !== 'string') return false;
+  const normalized = command.replace(/["']/g, '');
+  return (
+    normalized === 'throughline codex-hook stop' ||
+    normalized === 'throughline codex-hook user-prompt-submit' ||
+    normalized === 'throughline codex-hook post-tool-use' ||
+    normalized.includes('throughline codex-hook stop') ||
+    normalized.includes('throughline codex-hook user-prompt-submit') ||
+    normalized.includes('throughline codex-hook post-tool-use') ||
+    normalized.includes('throughline.mjs codex-hook stop') ||
+    normalized.includes('throughline.mjs codex-hook user-prompt-submit') ||
+    normalized.includes('throughline.mjs codex-hook post-tool-use')
+  );
+}
+
 export function isThroughlineCodexStopCommand(command) {
   if (typeof command !== 'string') return false;
   const normalized = command.replace(/["']/g, '');
@@ -77,8 +109,40 @@ export function isThroughlineCodexStopCommand(command) {
   );
 }
 
+export function isThroughlineCodexPostToolUseCommand(command) {
+  if (typeof command !== 'string') return false;
+  const normalized = command.replace(/["']/g, '');
+  return (
+    normalized === 'throughline codex-hook post-tool-use' ||
+    normalized.includes('throughline codex-hook post-tool-use') ||
+    normalized.includes('throughline.mjs codex-hook post-tool-use')
+  );
+}
+
 function createCodexHooks() {
   return {
+    UserPromptSubmit: {
+      hooks: [
+        {
+          type: 'command',
+          command: buildCodexUserPromptSubmitHookCommand(),
+          timeoutSec: 30,
+          async: false,
+          statusMessage: null,
+        },
+      ],
+    },
+    PostToolUse: {
+      hooks: [
+        {
+          type: 'command',
+          command: buildCodexPostToolUseHookCommand(),
+          timeoutSec: 30,
+          async: false,
+          statusMessage: null,
+        },
+      ],
+    },
     Stop: {
       hooks: [
         {
@@ -253,11 +317,19 @@ function ensureCodexHooksFeature(configPath) {
   const existing = existsSync(configPath) ? readFileSync(configPath, 'utf8') : '';
   const lines = existing.split(/\r?\n/);
   const sectionStart = lines.findIndex((line) => line.trim() === '[features]');
+  const ensureFeatureLine = (featureLines, name) => {
+    const idx = featureLines.findIndex((line) => new RegExp(`^\\s*${name}\\s*=`).test(line));
+    if (idx === -1) {
+      featureLines.push(`${name} = true`);
+    } else {
+      featureLines[idx] = `${name} = true`;
+    }
+  };
   let updated;
 
   if (sectionStart === -1) {
     const prefix = existing.trimEnd();
-    updated = `${prefix}${prefix ? '\n\n' : ''}[features]\ncodex_hooks = true\n`;
+    updated = `${prefix}${prefix ? '\n\n' : ''}[features]\ncodex_hooks = true\nhooks = true\n`;
   } else {
     let sectionEnd = lines.length;
     for (let i = sectionStart + 1; i < lines.length; i++) {
@@ -267,14 +339,10 @@ function ensureCodexHooksFeature(configPath) {
       }
     }
 
-    const codexHooksLine = lines
-      .slice(sectionStart + 1, sectionEnd)
-      .findIndex((line) => /^\s*codex_hooks\s*=/.test(line));
-    if (codexHooksLine === -1) {
-      lines.splice(sectionStart + 1, 0, 'codex_hooks = true');
-    } else {
-      lines[sectionStart + 1 + codexHooksLine] = 'codex_hooks = true';
-    }
+    const featureLines = lines.slice(sectionStart + 1, sectionEnd);
+    ensureFeatureLine(featureLines, 'codex_hooks');
+    ensureFeatureLine(featureLines, 'hooks');
+    lines.splice(sectionStart + 1, sectionEnd - sectionStart - 1, ...featureLines);
     updated = lines.join('\n').replace(/\n*$/, '\n');
   }
 
@@ -294,7 +362,7 @@ function installCodexHooks() {
     const list = existingHooks[key] ?? [];
     const preserved = [];
     for (const group of list) {
-      const hooks = (group.hooks ?? []).filter(h => !isThroughlineCodexStopCommand(h.command));
+      const hooks = (group.hooks ?? []).filter(h => !isThroughlineCodexHookCommand(h.command));
       if (hooks.length > 0) preserved.push({ ...group, hooks });
     }
     existingHooks[key] = [entry, ...preserved];
@@ -323,7 +391,7 @@ function uninstallCodexHooks() {
         const hooks = (group.hooks ?? []).filter((hook) => {
           const shouldRemove =
             CODEX_COMMANDS.includes(hook.command) ||
-            isThroughlineCodexStopCommand(hook.command);
+            isThroughlineCodexHookCommand(hook.command);
           if (shouldRemove) removed++;
           return !shouldRemove;
         });
@@ -422,7 +490,9 @@ export async function run(args = []) {
   console.log('  Stop             → throughline process-turn   (L1 要約 + L2 本文保存 + L3 詳細保存)');
   console.log('  UserPromptSubmit → throughline prompt-submit  (/tl & /clear バトン書き込み)');
   if (codex) {
-    console.log(`  Codex Stop       → ${buildCodexStopHookCommand()} (Codex rollout capture + L1 要約)`);
+    console.log(`  Codex UserPromptSubmit → ${buildCodexUserPromptSubmitHookCommand()} (80% 到達時に current session へ $throughline 指示を注入)`);
+    console.log(`  Codex PostToolUse      → ${buildCodexPostToolUseHookCommand()} (tool loop 中も 80% 到達時に $throughline 指示を注入)`);
+    console.log(`  Codex Stop             → ${buildCodexStopHookCommand()} (Codex rollout capture + L1 要約)`);
   }
   console.log('');
   if (installedCommands.length > 0) {

package/src/cli/install.test.mjs

@@ -4,7 +4,13 @@ import { mkdtempSync, rmSync, existsSync, readFileSync, writeFileSync, mkdirSync
 import { tmpdir, homedir } from 'node:os';
 import { join } from 'node:path';
 
-import { buildCodexStopHookCommand, run, resolveThroughlineOnPath } from './install.mjs';
+import {
+  buildCodexPostToolUseHookCommand,
+  buildCodexStopHookCommand,
+  buildCodexUserPromptSubmitHookCommand,
+  run,
+  resolveThroughlineOnPath,
+} from './install.mjs';
 
 function makeTempHome() {
   const dir = mkdtempSync(join(tmpdir(), 'tl-install-test-'));
@@ -94,7 +100,7 @@ test('project install copies commands to cwd/.claude/commands/', async () => {
   }
 });
 
-test('global install registers Codex Stop hook and enables codex_hooks feature', async () => {
+test('global install registers Codex session hooks and enables hooks features', async () => {
   const home = makeTempHome();
   if (home.resolved !== home.dir) {
     home.restore();
@@ -104,15 +110,30 @@ test('global install registers Codex Stop hook and enables codex_hooks feature',
   try {
     await run([]);
     const hooks = JSON.parse(readFileSync(join(home.dir, '.codex', 'hooks.json'), 'utf8'));
-    const expectedCommand = buildCodexStopHookCommand();
+    const expectedStopCommand = buildCodexStopHookCommand();
+    const expectedPromptCommand = buildCodexUserPromptSubmitHookCommand();
+    const expectedPostToolUseCommand = buildCodexPostToolUseHookCommand();
     const codexHook = hooks.hooks.Stop
       .flatMap(g => g.hooks ?? [])
-      .find(h => h.command === expectedCommand);
+      .find(h => h.command === expectedStopCommand);
     assert.ok(codexHook, 'Codex Stop should have absolute throughline.mjs codex-hook stop');
     assert.equal(codexHook.async, false, 'Codex Stop hook should be synchronous for Codex');
     assert.equal(codexHook.timeoutSec, 300, 'Codex Stop hook should allow summarizer time');
+    const promptHook = hooks.hooks.UserPromptSubmit
+      .flatMap(g => g.hooks ?? [])
+      .find(h => h.command === expectedPromptCommand);
+    assert.ok(promptHook, 'Codex UserPromptSubmit should have absolute throughline.mjs codex-hook user-prompt-submit');
+    assert.equal(promptHook.async, false, 'Codex UserPromptSubmit hook should be synchronous for context injection');
+    assert.equal(promptHook.timeoutSec, 30, 'Codex UserPromptSubmit hook should be short');
+    const postToolUseHook = hooks.hooks.PostToolUse
+      .flatMap(g => g.hooks ?? [])
+      .find(h => h.command === expectedPostToolUseCommand);
+    assert.ok(postToolUseHook, 'Codex PostToolUse should have absolute throughline.mjs codex-hook post-tool-use');
+    assert.equal(postToolUseHook.async, false, 'Codex PostToolUse hook should be synchronous for context injection');
+    assert.equal(postToolUseHook.timeoutSec, 30, 'Codex PostToolUse hook should be short');
     const config = readFileSync(join(home.dir, '.codex', 'config.toml'), 'utf8');
     assert.match(config, /^\[features\]\ncodex_hooks = true/m);
+    assert.match(config, /^hooks = true/m);
   } finally {
     unsilence();
     home.restore();
@@ -215,21 +236,30 @@ test('global install preserves existing Codex hooks and is idempotent', async ()
     await run([]);
     await run([]);
     const hooks = JSON.parse(readFileSync(join(home.dir, '.codex', 'hooks.json'), 'utf8'));
-    const commands = hooks.hooks.Stop.flatMap(g => g.hooks ?? []).map(h => h.command);
-    const expectedCommand = buildCodexStopHookCommand();
-    assert.ok(commands.includes('/usr/bin/node /home/kite/.npm-global/bin/caveat codex-hook stop'));
-    assert.equal(commands.filter(c => c === expectedCommand).length, 1);
-    assert.ok(!commands.includes('throughline codex-hook stop'));
+    const stopCommands = hooks.hooks.Stop.flatMap(g => g.hooks ?? []).map(h => h.command);
+    const promptCommands = hooks.hooks.UserPromptSubmit.flatMap(g => g.hooks ?? []).map(h => h.command);
+    const postToolUseCommands = hooks.hooks.PostToolUse.flatMap(g => g.hooks ?? []).map(h => h.command);
+    const expectedStopCommand = buildCodexStopHookCommand();
+    const expectedPromptCommand = buildCodexUserPromptSubmitHookCommand();
+    const expectedPostToolUseCommand = buildCodexPostToolUseHookCommand();
+    assert.ok(stopCommands.includes('/usr/bin/node /home/kite/.npm-global/bin/caveat codex-hook stop'));
+    assert.equal(stopCommands.filter(c => c === expectedStopCommand).length, 1);
+    assert.equal(promptCommands.filter(c => c === expectedPromptCommand).length, 1);
+    assert.equal(postToolUseCommands.filter(c => c === expectedPostToolUseCommand).length, 1);
+    assert.ok(!stopCommands.includes('throughline codex-hook stop'));
+    assert.ok(!promptCommands.includes('throughline codex-hook user-prompt-submit'));
+    assert.ok(!postToolUseCommands.includes('throughline codex-hook post-tool-use'));
     const config = readFileSync(join(home.dir, '.codex', 'config.toml'), 'utf8');
     assert.match(config, /other = true/);
     assert.match(config, /codex_hooks = true/);
+    assert.match(config, /hooks = true/);
   } finally {
     unsilence();
     home.restore();
   }
 });
 
-test('global install updates existing Throughline Codex Stop hook shape', async () => {
+test('global install updates existing Throughline Codex hook shapes', async () => {
   const home = makeTempHome();
   if (home.resolved !== home.dir) {
     home.restore();
@@ -241,6 +271,32 @@ test('global install updates existing Throughline Codex Stop hook shape', async
     JSON.stringify(
       {
         hooks: {
+          UserPromptSubmit: [
+            {
+              hooks: [
+                {
+                  type: 'command',
+                  command: 'throughline codex-hook user-prompt-submit',
+                  timeoutSec: 300,
+                  async: true,
+                  statusMessage: null,
+                },
+              ],
+            },
+          ],
+          PostToolUse: [
+            {
+              hooks: [
+                {
+                  type: 'command',
+                  command: 'throughline codex-hook post-tool-use',
+                  timeoutSec: 300,
+                  async: true,
+                  statusMessage: null,
+                },
+              ],
+            },
+          ],
           Stop: [
             {
               hooks: [
@@ -264,17 +320,39 @@ test('global install updates existing Throughline Codex Stop hook shape', async
   try {
     await run([]);
     const hooks = JSON.parse(readFileSync(join(home.dir, '.codex', 'hooks.json'), 'utf8'));
-    const expectedCommand = buildCodexStopHookCommand();
+    const expectedStopCommand = buildCodexStopHookCommand();
+    const expectedPromptCommand = buildCodexUserPromptSubmitHookCommand();
+    const expectedPostToolUseCommand = buildCodexPostToolUseHookCommand();
     const codexHooks = hooks.hooks.Stop
       .flatMap(g => g.hooks ?? [])
-      .filter(h => h.command === expectedCommand);
+      .filter(h => h.command === expectedStopCommand);
     assert.equal(codexHooks.length, 1);
     assert.equal(codexHooks[0].async, false);
     assert.equal(codexHooks[0].timeoutSec, 300);
+    const promptHooks = hooks.hooks.UserPromptSubmit
+      .flatMap(g => g.hooks ?? [])
+      .filter(h => h.command === expectedPromptCommand);
+    assert.equal(promptHooks.length, 1);
+    assert.equal(promptHooks[0].async, false);
+    assert.equal(promptHooks[0].timeoutSec, 30);
+    const postToolUseHooks = hooks.hooks.PostToolUse
+      .flatMap(g => g.hooks ?? [])
+      .filter(h => h.command === expectedPostToolUseCommand);
+    assert.equal(postToolUseHooks.length, 1);
+    assert.equal(postToolUseHooks[0].async, false);
+    assert.equal(postToolUseHooks[0].timeoutSec, 30);
     assert.equal(
       hooks.hooks.Stop.flatMap(g => g.hooks ?? []).filter(h => h.command === 'throughline codex-hook stop').length,
       0,
     );
+    assert.equal(
+      hooks.hooks.UserPromptSubmit.flatMap(g => g.hooks ?? []).filter(h => h.command === 'throughline codex-hook user-prompt-submit').length,
+      0,
+    );
+    assert.equal(
+      hooks.hooks.PostToolUse.flatMap(g => g.hooks ?? []).filter(h => h.command === 'throughline codex-hook post-tool-use').length,
+      0,
+    );
   } finally {
     unsilence();
     home.restore();
@@ -330,10 +408,16 @@ test('global uninstall removes only Throughline-managed Codex hook', async () =>
 
     await run(['--uninstall']);
     const after = JSON.parse(readFileSync(hooksPath, 'utf8'));
-    const commands = after.hooks.Stop.flatMap(g => g.hooks ?? []).map(h => h.command);
-    assert.ok(commands.includes('/usr/bin/node /home/kite/.npm-global/bin/caveat codex-hook stop'));
-    assert.ok(!commands.includes('throughline codex-hook stop'));
-    assert.ok(!commands.some(c => c.includes('throughline.mjs codex-hook stop')));
+    const stopCommands = after.hooks.Stop.flatMap(g => g.hooks ?? []).map(h => h.command);
+    const promptCommands = after.hooks.UserPromptSubmit?.flatMap(g => g.hooks ?? []).map(h => h.command) ?? [];
+    const postToolUseCommands = after.hooks.PostToolUse?.flatMap(g => g.hooks ?? []).map(h => h.command) ?? [];
+    assert.ok(stopCommands.includes('/usr/bin/node /home/kite/.npm-global/bin/caveat codex-hook stop'));
+    assert.ok(!stopCommands.includes('throughline codex-hook stop'));
+    assert.ok(!stopCommands.some(c => c.includes('throughline.mjs codex-hook stop')));
+    assert.ok(!promptCommands.includes('throughline codex-hook user-prompt-submit'));
+    assert.ok(!promptCommands.some(c => c.includes('throughline.mjs codex-hook user-prompt-submit')));
+    assert.ok(!postToolUseCommands.includes('throughline codex-hook post-tool-use'));
+    assert.ok(!postToolUseCommands.some(c => c.includes('throughline.mjs codex-hook post-tool-use')));
   } finally {
     unsilence();
     home.restore();

package/src/codex-auto-refresh.mjs

@@ -2,7 +2,7 @@ import { runCodexTrimExecution } from './codex-app-server.mjs';
 import { buildCodexRolloutTrimSource } from './codex-rollout-memory.mjs';
 import { buildTrimPlan } from './trim-model.mjs';
 
-export const CODEX_AUTO_REFRESH_THRESHOLD = 0.9;
+export const CODEX_AUTO_REFRESH_THRESHOLD = 0.8;
 
 export function evaluateCodexAutoRefreshUsage(usage, { threshold = CODEX_AUTO_REFRESH_THRESHOLD } = {}) {
   if (!usage) {

package/src/codex-auto-refresh.test.mjs

@@ -7,10 +7,10 @@ import {
   runCodexAutoRefresh,
 } from './codex-auto-refresh.mjs';
 
-test('evaluateCodexAutoRefreshUsage: default threshold is 90%', () => {
-  assert.equal(CODEX_AUTO_REFRESH_THRESHOLD, 0.9);
+test('evaluateCodexAutoRefreshUsage: default threshold is 80%', () => {
+  assert.equal(CODEX_AUTO_REFRESH_THRESHOLD, 0.8);
   const below = evaluateCodexAutoRefreshUsage({
-    tokens: 232_559,
+    tokens: 206_719,
     contextWindowSize: 258_400,
     estimated: false,
     contextWindowEstimated: false,
@@ -19,7 +19,7 @@ test('evaluateCodexAutoRefreshUsage: default threshold is 90%', () => {
   assert.equal(below.reason, 'below_threshold');
 
   const atThreshold = evaluateCodexAutoRefreshUsage({
-    tokens: 232_560,
+    tokens: 206_720,
     contextWindowSize: 258_400,
     estimated: false,
     contextWindowEstimated: false,

package/src/token-monitor.mjs

@@ -25,6 +25,7 @@ import { statSync, existsSync, writeFileSync, mkdirSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { getStateDir, readAllSessionStates, snapshotStateMtimes, normalizeProjectPath, STALE_HIDE_MS } from './state-file.mjs';
 import { buildCodexMonitorUsage } from './codex-usage.mjs';
+import { listCodexThreadCandidates } from './codex-thread-index.mjs';
 import { readLatestUsage } from './transcript-usage.mjs';
 import { startSizeQuery } from './terminal-size.mjs';
 
@@ -290,7 +291,7 @@ export function resolveColumns() {
 
 function formatLine({ state, usage, isActive, now = Date.now() }) {
   const project = basename(state.projectPath || '?');
-  const shortId = state.sessionId.slice(0, 8);
+  const shortId = formatShortSessionId(state);
   const host = state.host === 'codex' ? 'Codex' : state.host === 'unknown' ? 'Unknown' : 'Claude';
   const tokens = usage?.tokens ?? 0;
   const max = usage?.contextWindowSize ?? 200_000;
@@ -318,11 +319,8 @@ function formatLine({ state, usage, isActive, now = Date.now() }) {
   const tokCol = `${formatNumber(tokens).padStart(6)} / ${formatNumber(max).padStart(6)}`;
   const estimateMark = usage?.estimated ? ' est' : '';
   const windowMark = usage?.contextWindowEstimated ? ' win?' : '';
-  const liveMark = usage?.liveTurn && usage?.transientOutputTokens
-    ? ` live+${formatNumber(usage.transientOutputTokens)}`
-    : '';
   const modelCol = usage?.model
-    ? color(ANSI.dim, `${usage.model}${estimateMark}${windowMark}${liveMark}`)
+    ? color(ANSI.dim, `${usage.model}${estimateMark}${windowMark}`)
     : color(ANSI.dim, '(未取得)');
   // 最終更新からの経過: 表示が「止まって見える」とき、それが idle なのか障害なのかを
   // 即座に判別できるようにする。updatedAt は state.writeSessionState 時の Date.now()。
@@ -337,6 +335,14 @@ function formatLine({ state, usage, isActive, now = Date.now() }) {
   return `${marker} ${projectCol} ${hostCol} ${idCol} ${agoCol} ${barCol} ${tokCol}  ${modelCol}${warn}`;
 }
 
+function formatShortSessionId(state) {
+  const sessionId = String(state?.sessionId ?? '');
+  if (state?.host === 'codex' && sessionId.startsWith('codex:')) {
+    return sessionId.slice('codex:'.length, 'codex:'.length + 8);
+  }
+  return sessionId.slice(0, 8);
+}
+
 function statFile(path) {
   if (!path || !existsSync(path)) return null;
   try {
@@ -375,6 +381,82 @@ function resolveMonitorUsage(state) {
   return state.usage ?? null;
 }
 
+let lastCodexDiscoveryError = null;
+
+function reportCodexDiscoveryError(err) {
+  const msg = err instanceof Error ? err.message : 'unknown error';
+  if (msg === lastCodexDiscoveryError) return;
+  lastCodexDiscoveryError = msg;
+  process.stderr.write(`[Throughline] codex discovery error: ${msg}\n`);
+}
+
+function codexDiscoveryOptions(args = {}, cwd = process.cwd()) {
+  const allProjects = Boolean(args.all || args.session);
+  return {
+    projectPath: cwd,
+    allProjects,
+    limit: allProjects ? 100 : 30,
+  };
+}
+
+function discoverCodexSessionStates(args = {}, cwd = process.cwd()) {
+  let candidates;
+  try {
+    candidates = listCodexThreadCandidates(codexDiscoveryOptions(args, cwd));
+  } catch (err) {
+    reportCodexDiscoveryError(err);
+    return [];
+  }
+
+  lastCodexDiscoveryError = null;
+  return candidates.map((candidate) => ({
+    sessionId: `codex:${candidate.id}`,
+    host: 'codex',
+    projectPath: normalizeProjectPath(candidate.cwd ?? cwd),
+    transcriptPath: null,
+    rolloutPath: candidate.rolloutPath,
+    pid: null,
+    updatedAt: codexCandidateUpdatedAt(candidate),
+    discoveredFrom: 'codex-rollout-discovery',
+  }));
+}
+
+function codexCandidateUpdatedAt(candidate) {
+  const mtime = Number(candidate?.mtimeMs);
+  if (Number.isFinite(mtime) && mtime > 0) return mtime;
+  const parsed = Date.parse(candidate?.updatedAt ?? '');
+  return Number.isFinite(parsed) ? parsed : 0;
+}
+
+function mergeCodexDiscoveredStates(states, discovered) {
+  const bySession = new Map();
+  for (const state of states) bySession.set(state.sessionId, state);
+
+  for (const state of discovered) {
+    const existing = bySession.get(state.sessionId);
+    if (!existing) {
+      bySession.set(state.sessionId, state);
+      continue;
+    }
+
+    bySession.set(state.sessionId, {
+      ...existing,
+      host: existing.host ?? state.host,
+      projectPath: existing.projectPath || state.projectPath,
+      rolloutPath: state.rolloutPath ?? existing.rolloutPath,
+      updatedAt: Math.max(Number(existing.updatedAt) || 0, Number(state.updatedAt) || 0),
+      discoveredFrom: state.discoveredFrom,
+    });
+  }
+
+  return Array.from(bySession.values());
+}
+
+function readMonitorStates(args = {}, cwd = process.cwd()) {
+  const states = readAllSessionStates();
+  return mergeCodexDiscoveredStates(states, discoverCodexSessionStates(args, cwd));
+}
+
 // --- フィルタ ---
 /**
  * セッション一覧に表示フィルタを適用する。
@@ -406,7 +488,7 @@ let lastRenderKey = '';
  * 注: state-file の mtime は Stop hook のタイミングで更新されるが、
  * transcript / rollout は実行中に太る。その live file 変化も render key に含める。
  */
-function computeRenderKey() {
+function computeRenderKey(args = {}, cwd = process.cwd()) {
   const parts = [];
   // state mtimes
   const mtimes = snapshotStateMtimes();
@@ -414,7 +496,7 @@ function computeRenderKey() {
   for (const name of names) parts.push(`s:${name}:${mtimes.get(name)}`);
   // live transcript / rollout sizes（state ファイルを読まずに直接 stat、IO 最小化）
   try {
-    const states = readAllSessionStates();
+    const states = readMonitorStates(args, cwd);
     for (const st of states) {
       for (const [kind, path] of [['t', st.transcriptPath], ['r', st.rolloutPath]]) {
         if (!path || !existsSync(path)) continue;
@@ -435,8 +517,8 @@ function computeRenderKey() {
 /**
  * 前回と比べてキーが変化していれば true。副作用として lastRenderKey を更新する。
  */
-function needsRerender() {
-  const key = computeRenderKey();
+function needsRerender(args = {}, cwd = process.cwd()) {
+  const key = computeRenderKey(args, cwd);
   if (key !== lastRenderKey) {
     lastRenderKey = key;
     return true;
@@ -451,7 +533,7 @@ function resetRenderKeyCache() {
 
 function renderFrame(args) {
   const now = Date.now();
-  const states = readAllSessionStates().map((state) => withLiveActivity(state, now));
+  const states = readMonitorStates(args).map((state) => withLiveActivity(state, now));
   const filtered = filterStates(states, args, process.cwd()).sort(
     (a, b) => b.updatedAt - a.updatedAt,
   );
@@ -665,7 +747,7 @@ export function main() {
       safeRenderFrame(args);
       return;
     }
-    if (needsRerender()) safeRenderFrame(args);
+    if (needsRerender(args)) safeRenderFrame(args);
     if (Date.now() - lastTimeAgoRefresh > TIME_AGO_REFRESH_MS) {
       lastTimeAgoRefresh = Date.now();
       safeRenderFrame(args);
@@ -741,6 +823,10 @@ export const _internal = {
   liveActivityMs,
   withLiveActivity,
   resolveMonitorUsage,
+  codexDiscoveryOptions,
+  discoverCodexSessionStates,
+  mergeCodexDiscoveredStates,
+  readMonitorStates,
 };
 
 // --- エントリポイント自動起動 ---