throughline 0.10.0 → 0.10.1

package/src/token-monitor.mjs

@@ -28,6 +28,7 @@ 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';
+import { CODEX_HOST, CODEX_SESSION_PREFIX, codexSessionIdToThreadId } from './hosts/identity.mjs';
 
 const REFRESH_MS = 1000;
 // データ変化が無くても N ms ごとに再描画して「(24m ago)」表示を進める。
@@ -292,7 +293,7 @@ export function resolveColumns() {
 function formatLine({ state, usage, isActive, now = Date.now() }) {
   const project = basename(state.projectPath || '?');
   const shortId = formatShortSessionId(state);
-  const host = state.host === 'codex' ? 'Codex' : state.host === 'unknown' ? 'Unknown' : 'Claude';
+  const host = state.host === CODEX_HOST ? 'Codex' : state.host === 'unknown' ? 'Unknown' : 'Claude';
   const tokens = usage?.tokens ?? 0;
   const max = usage?.contextWindowSize ?? 200_000;
   const ratio = max > 0 ? tokens / max : 0;
@@ -337,8 +338,8 @@ function formatLine({ state, usage, isActive, now = Date.now() }) {
 
 function formatShortSessionId(state) {
   const sessionId = String(state?.sessionId ?? '');
-  if (state?.host === 'codex' && sessionId.startsWith('codex:')) {
-    return sessionId.slice('codex:'.length, 'codex:'.length + 8);
+  if (state?.host === CODEX_HOST && sessionId.startsWith(CODEX_SESSION_PREFIX)) {
+    return (codexSessionIdToThreadId(sessionId) ?? '').slice(0, 8);
   }
   return sessionId.slice(0, 8);
 }
@@ -372,7 +373,7 @@ function withLiveActivity(state, now = Date.now()) {
 }
 
 function resolveMonitorUsage(state) {
-  if (state.host === 'codex' && state.rolloutPath) {
+  if (state.host === CODEX_HOST && state.rolloutPath) {
     return buildCodexMonitorUsage(state.rolloutPath) ?? state.usage ?? null;
   }
   if (state.transcriptPath) {
@@ -410,8 +411,8 @@ function discoverCodexSessionStates(args = {}, cwd = process.cwd()) {
 
   lastCodexDiscoveryError = null;
   return candidates.map((candidate) => ({
-    sessionId: `codex:${candidate.id}`,
-    host: 'codex',
+    sessionId: `${CODEX_SESSION_PREFIX}${candidate.id}`,
+    host: CODEX_HOST,
     projectPath: normalizeProjectPath(candidate.cwd ?? cwd),
     transcriptPath: null,
     rolloutPath: candidate.rolloutPath,

package/src/turn-processor.mjs

@@ -46,7 +46,7 @@ import { readLatestUsage } from './transcript-usage.mjs';
 import { pathToFileURL } from 'node:url';
 import { recordRuntimeErrorBestEffort } from './runtime-error-store.mjs';
 import { writeCompletedTurnReceipt } from './completed-turn-receipts.mjs';
-import { normalizeHookPayload } from './hook-envelope.mjs';
+import { hostAdapterForSessionId, normalizeHookPayload } from './hosts/index.mjs';
 
 /** 直近 N ターンは bodies を生で残し、それより古いものだけ L1 要約する。 */
 export const L2_WINDOW = 20;
@@ -205,7 +205,7 @@ export async function run() {
     process.stderr.write(`[vscode-task] ${msg}\n`);
   }
 
-  if (!session_id.startsWith('grok:')) {
+  if (hostAdapterForSessionId(session_id).waitsForStopTranscriptFlush) {
     await waitForClaudeStopTranscriptFlush({
       transcriptPath: transcript_path,
       lastAssistantMessage: last_assistant_message,

package/src/hook-envelope.mjs

@@ -1,51 +0,0 @@
-// Grok sends Claude-compatible hook commands with a camelCase wire
-// (sessionId, hookEventName) and no session_id. Throughline treats that
-// envelope as host=grok: normalize to the Claude snake_case contract and
-// prefix session ids so they never mix with Claude predecessor search.
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-
-export const GROK_SESSION_PREFIX = 'grok:';
-
-export function isGrokEnvelope(payload) {
-  return payload !== null
-    && typeof payload === 'object'
-    && typeof payload.sessionId === 'string'
-    && payload.sessionId.length > 0
-    && typeof payload.hookEventName === 'string'
-    && payload.hookEventName.length > 0
-    && !Object.hasOwn(payload, 'session_id');
-}
-
-export function grokBareSessionId(sessionId) {
-  if (typeof sessionId !== 'string' || sessionId.length === 0) return null;
-  return sessionId.startsWith(GROK_SESSION_PREFIX)
-    ? sessionId.slice(GROK_SESSION_PREFIX.length)
-    : sessionId;
-}
-
-export function deriveGrokChatHistoryPath(projectPath, sessionId, { home = homedir() } = {}) {
-  const bare = grokBareSessionId(sessionId);
-  if (!projectPath || !bare) return null;
-  return join(home, '.grok', 'sessions', encodeURIComponent(projectPath), bare, 'chat_history.jsonl');
-}
-
-export function normalizeHookPayload(payload, { home = homedir() } = {}) {
-  if (!isGrokEnvelope(payload)) return payload;
-  const cwd = typeof payload.cwd === 'string' && payload.cwd.length > 0
-    ? payload.cwd
-    : (typeof payload.workspaceRoot === 'string' ? payload.workspaceRoot : undefined);
-  // Live Grok Stop sets transcriptPath to updates.jsonl (sessionUpdate frames,
-  // no user/assistant rows). L2 lives in chat_history.jsonl only.
-  const transcriptPath = deriveGrokChatHistoryPath(cwd, payload.sessionId, { home });
-  return {
-    ...payload,
-    session_id: `${GROK_SESSION_PREFIX}${payload.sessionId}`,
-    cwd,
-    source: payload.source,
-    prompt: payload.prompt,
-    hook_event_name: payload.hookEventName,
-    transcript_path: transcriptPath,
-    last_assistant_message: payload.lastAssistantMessage,
-  };
-}