@respan/cli 0.6.9 → 0.7.1

package/dist/hooks/claude-code.cjs

@@ -340,7 +340,7 @@ function toOtlpPayload(spans) {
         })
       },
       scopeSpans: [{
-        scope: { name: "respan-cli-hooks", version: "0.5.3" },
+        scope: { name: "respan-cli-hooks", version: "0.7.0" },
         spans: otlpSpans
       }]
     }]

package/dist/hooks/codex-cli.cjs

@@ -26,6 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var fs2 = __toESM(require("node:fs"), 1);
 var os2 = __toESM(require("node:os"), 1);
 var path2 = __toESM(require("node:path"), 1);
+var import_node_child_process = require("node:child_process");
 
 // src/hooks/shared.ts
 var fs = __toESM(require("node:fs"), 1);
@@ -339,7 +340,7 @@ function toOtlpPayload(spans) {
         })
       },
       scopeSpans: [{
-        scope: { name: "respan-cli-hooks", version: "0.5.3" },
+        scope: { name: "respan-cli-hooks", version: "0.7.0" },
         spans: otlpSpans
       }]
     }]
@@ -699,50 +700,18 @@ function findLatestSessionFile() {
     return null;
   }
 }
-async function main() {
+async function mainWorker() {
   const scriptStart = Date.now();
-  debug("Codex hook started");
-  if (process.argv.length < 3) {
-    debug("No argument provided (expected JSON payload in argv[2])");
-    process.exit(0);
-  }
-  let payload;
-  try {
-    payload = JSON.parse(process.argv[2]);
-  } catch (e) {
-    debug(`Invalid JSON in argv[2]: ${e}`);
-    process.exit(0);
-  }
-  const eventType = String(payload.type ?? "");
-  if (eventType !== "agent-turn-complete") {
-    debug(`Ignoring event type: ${eventType}`);
-    process.exit(0);
-  }
-  let sessionId = String(payload["thread-id"] ?? "");
-  if (!sessionId) {
-    debug("No thread-id in notify payload");
-    process.exit(0);
-  }
-  debug(`Processing notify: type=${eventType}, session=${sessionId}`);
+  debug("Worker started");
+  const sessionId = process.env._RESPAN_CODEX_SESSION;
+  const sessionFile = process.env._RESPAN_CODEX_FILE;
+  const cwd = process.env._RESPAN_CODEX_CWD ?? "";
   const creds = resolveCredentials();
   if (!creds) {
-    log("ERROR", "No API key found. Run: respan auth login");
-    process.exit(0);
-  }
-  let sessionFile = findSessionFile(sessionId);
-  if (!sessionFile) {
-    const latest = findLatestSessionFile();
-    if (latest) {
-      sessionId = latest.sessionId;
-      sessionFile = latest.sessionFile;
-    } else {
-      debug("No session file found");
-      process.exit(0);
-    }
+    log("ERROR", "No API key");
+    return;
   }
-  const cwd = String(payload.cwd ?? "");
   const config = cwd ? loadRespanConfig(path2.join(cwd, ".codex", "respan.json")) : null;
-  if (config) debug(`Loaded respan.json config from ${cwd}`);
   const maxAttempts = 3;
   let turns = 0;
   try {
@@ -774,20 +743,73 @@ async function main() {
       }
       if (turns > 0) break;
       if (attempt < maxAttempts - 1) {
-        const delay = 500 * (attempt + 1);
-        debug(`No turns processed (attempt ${attempt + 1}/${maxAttempts}), retrying in ${delay}ms...`);
-        await new Promise((r) => setTimeout(r, delay));
+        await new Promise((r) => setTimeout(r, 500 * (attempt + 1)));
       }
     }
     const duration = (Date.now() - scriptStart) / 1e3;
     log("INFO", `Processed ${turns} turns in ${duration.toFixed(1)}s`);
-    if (duration > 180) log("WARN", `Hook took ${duration.toFixed(1)}s (>3min)`);
   } catch (e) {
     log("ERROR", `Failed to process session: ${e}`);
-    if (DEBUG_MODE) debug(String(e.stack ?? e));
   }
 }
-main().catch((e) => {
-  log("ERROR", `Hook crashed: ${e}`);
-  process.exit(1);
-});
+function main() {
+  if (process.env._RESPAN_CODEX_WORKER === "1") {
+    mainWorker().catch((e) => log("ERROR", `Worker crashed: ${e}`));
+    return;
+  }
+  debug("Codex hook started");
+  if (process.argv.length < 3) {
+    debug("No argument provided");
+    process.exit(0);
+  }
+  let payload;
+  try {
+    payload = JSON.parse(process.argv[2]);
+  } catch (e) {
+    debug(`Invalid JSON in argv[2]: ${e}`);
+    process.exit(0);
+  }
+  const eventType = String(payload.type ?? "");
+  if (eventType !== "agent-turn-complete") {
+    debug(`Ignoring event type: ${eventType}`);
+    process.exit(0);
+  }
+  let sessionId = String(payload["thread-id"] ?? "");
+  if (!sessionId) {
+    debug("No thread-id in notify payload");
+    process.exit(0);
+  }
+  let sessionFile = findSessionFile(sessionId);
+  if (!sessionFile) {
+    const latest = findLatestSessionFile();
+    if (latest) {
+      sessionId = latest.sessionId;
+      sessionFile = latest.sessionFile;
+    } else {
+      debug("No session file found");
+      process.exit(0);
+    }
+  }
+  const cwd = String(payload.cwd ?? "");
+  debug(`Forking worker for session: ${sessionId}`);
+  try {
+    const scriptPath = __filename || process.argv[1];
+    const child = (0, import_node_child_process.execFile)("node", [scriptPath], {
+      env: {
+        ...process.env,
+        _RESPAN_CODEX_WORKER: "1",
+        _RESPAN_CODEX_SESSION: sessionId,
+        _RESPAN_CODEX_FILE: sessionFile,
+        _RESPAN_CODEX_CWD: cwd
+      },
+      stdio: "ignore",
+      detached: true
+    });
+    child.unref();
+    debug("Worker launched");
+  } catch (e) {
+    log("ERROR", `Failed to fork worker: ${e}`);
+  }
+  process.exit(0);
+}
+main();

package/dist/hooks/codex-cli.js

@@ -16,6 +16,7 @@
 import * as fs from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
+import { execFile } from 'node:child_process';
 import { initLogging, log, debug, resolveCredentials, loadRespanConfig, loadState, saveState, acquireLock, sendSpans, addDefaultsToAll, resolveSpanFields, buildMetadata, nowISO, latencySeconds, truncate, } from './shared.js';
 // ── Config ────────────────────────────────────────────────────────
 const STATE_DIR = path.join(os.homedir(), '.codex', 'state');
@@ -363,57 +364,18 @@ function findLatestSessionFile() {
     }
 }
 // ── Main ──────────────────────────────────────────────────────────
-async function main() {
+async function mainWorker() {
     const scriptStart = Date.now();
-    debug('Codex hook started');
-    // Parse notify payload from argv[2] (argv[0]=node, argv[1]=script)
-    if (process.argv.length < 3) {
-        debug('No argument provided (expected JSON payload in argv[2])');
-        process.exit(0);
-    }
-    let payload;
-    try {
-        payload = JSON.parse(process.argv[2]);
-    }
-    catch (e) {
-        debug(`Invalid JSON in argv[2]: ${e}`);
-        process.exit(0);
-    }
-    const eventType = String(payload.type ?? '');
-    if (eventType !== 'agent-turn-complete') {
-        debug(`Ignoring event type: ${eventType}`);
-        process.exit(0);
-    }
-    let sessionId = String(payload['thread-id'] ?? '');
-    if (!sessionId) {
-        debug('No thread-id in notify payload');
-        process.exit(0);
-    }
-    debug(`Processing notify: type=${eventType}, session=${sessionId}`);
+    debug('Worker started');
+    const sessionId = process.env._RESPAN_CODEX_SESSION;
+    const sessionFile = process.env._RESPAN_CODEX_FILE;
+    const cwd = process.env._RESPAN_CODEX_CWD ?? '';
     const creds = resolveCredentials();
     if (!creds) {
-        log('ERROR', 'No API key found. Run: respan auth login');
-        process.exit(0);
-    }
-    // Find session file
-    let sessionFile = findSessionFile(sessionId);
-    if (!sessionFile) {
-        const latest = findLatestSessionFile();
-        if (latest) {
-            sessionId = latest.sessionId;
-            sessionFile = latest.sessionFile;
-        }
-        else {
-            debug('No session file found');
-            process.exit(0);
-        }
+        log('ERROR', 'No API key');
+        return;
     }
-    // Load config
-    const cwd = String(payload.cwd ?? '');
     const config = cwd ? loadRespanConfig(path.join(cwd, '.codex', 'respan.json')) : null;
-    if (config)
-        debug(`Loaded respan.json config from ${cwd}`);
-    // Process with retry
     const maxAttempts = 3;
     let turns = 0;
     try {
@@ -447,23 +409,80 @@ async function main() {
             if (turns > 0)
                 break;
             if (attempt < maxAttempts - 1) {
-                const delay = 500 * (attempt + 1);
-                debug(`No turns processed (attempt ${attempt + 1}/${maxAttempts}), retrying in ${delay}ms...`);
-                await new Promise((r) => setTimeout(r, delay));
+                await new Promise((r) => setTimeout(r, 500 * (attempt + 1)));
             }
         }
         const duration = (Date.now() - scriptStart) / 1000;
         log('INFO', `Processed ${turns} turns in ${duration.toFixed(1)}s`);
-        if (duration > 180)
-            log('WARN', `Hook took ${duration.toFixed(1)}s (>3min)`);
     }
     catch (e) {
         log('ERROR', `Failed to process session: ${e}`);
-        if (DEBUG_MODE)
-            debug(String(e.stack ?? e));
     }
 }
-main().catch((e) => {
-    log('ERROR', `Hook crashed: ${e}`);
-    process.exit(1);
-});
+function main() {
+    // Worker mode: re-invoked as detached subprocess
+    if (process.env._RESPAN_CODEX_WORKER === '1') {
+        mainWorker().catch((e) => log('ERROR', `Worker crashed: ${e}`));
+        return;
+    }
+    debug('Codex hook started');
+    if (process.argv.length < 3) {
+        debug('No argument provided');
+        process.exit(0);
+    }
+    let payload;
+    try {
+        payload = JSON.parse(process.argv[2]);
+    }
+    catch (e) {
+        debug(`Invalid JSON in argv[2]: ${e}`);
+        process.exit(0);
+    }
+    const eventType = String(payload.type ?? '');
+    if (eventType !== 'agent-turn-complete') {
+        debug(`Ignoring event type: ${eventType}`);
+        process.exit(0);
+    }
+    let sessionId = String(payload['thread-id'] ?? '');
+    if (!sessionId) {
+        debug('No thread-id in notify payload');
+        process.exit(0);
+    }
+    // Find session file
+    let sessionFile = findSessionFile(sessionId);
+    if (!sessionFile) {
+        const latest = findLatestSessionFile();
+        if (latest) {
+            sessionId = latest.sessionId;
+            sessionFile = latest.sessionFile;
+        }
+        else {
+            debug('No session file found');
+            process.exit(0);
+        }
+    }
+    // Fork self as detached worker so Codex CLI doesn't block
+    const cwd = String(payload.cwd ?? '');
+    debug(`Forking worker for session: ${sessionId}`);
+    try {
+        const scriptPath = __filename || process.argv[1];
+        const child = execFile('node', [scriptPath], {
+            env: {
+                ...process.env,
+                _RESPAN_CODEX_WORKER: '1',
+                _RESPAN_CODEX_SESSION: sessionId,
+                _RESPAN_CODEX_FILE: sessionFile,
+                _RESPAN_CODEX_CWD: cwd,
+            },
+            stdio: 'ignore',
+            detached: true,
+        });
+        child.unref();
+        debug('Worker launched');
+    }
+    catch (e) {
+        log('ERROR', `Failed to fork worker: ${e}`);
+    }
+    process.exit(0);
+}
+main();

package/dist/hooks/gemini-cli.cjs

@@ -318,7 +318,7 @@ function toOtlpPayload(spans) {
         })
       },
       scopeSpans: [{
-        scope: { name: "respan-cli-hooks", version: "0.5.3" },
+        scope: { name: "respan-cli-hooks", version: "0.7.0" },
         spans: otlpSpans
       }]
     }]
@@ -438,6 +438,34 @@ function detectModel(hookData) {
   const llmReq = hookData.llm_request ?? {};
   return String(llmReq.model ?? "") || "gemini-cli";
 }
+function buildToolSpan(detail, idx, traceUniqueId, rootSpanId, safeId, turnTs, workflowName, beginTime, endTime) {
+  const toolName = detail?.name ?? "";
+  const toolArgs = detail?.args ?? detail?.input ?? {};
+  const toolOutput = detail?.output ?? "";
+  const displayName = toolName ? toolDisplayName(toolName) : `Call ${idx + 1}`;
+  const toolInputStr = toolName ? formatToolInput(toolName, toolArgs) : "";
+  const toolMeta = {};
+  if (toolName) toolMeta.tool_name = toolName;
+  if (detail?.error) toolMeta.error = detail.error;
+  const toolStart = detail?.start_time ?? beginTime;
+  const toolEnd = detail?.end_time ?? endTime;
+  const toolLat = latencySeconds(toolStart, toolEnd);
+  return {
+    trace_unique_id: traceUniqueId,
+    span_unique_id: `gcli_${safeId}_${turnTs}_tool_${idx + 1}`,
+    span_parent_id: rootSpanId,
+    span_name: `Tool: ${displayName}`,
+    span_workflow_name: workflowName,
+    span_path: toolName ? `tool_${toolName}` : "tool_call",
+    provider_id: "",
+    metadata: toolMeta,
+    input: toolInputStr,
+    output: truncate(toolOutput, MAX_CHARS),
+    timestamp: toolEnd,
+    start_time: toolStart,
+    ...toolLat !== void 0 ? { latency: toolLat } : {}
+  };
+}
 function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurns, toolDetails, thoughtsTokens, textRounds, roundStartTimes) {
   const spans = [];
   const sessionId = String(hookData.session_id ?? "");
@@ -519,33 +547,7 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
     }
     if (r < rounds.length - 1) {
       while (toolIdx < toolDetails.length) {
-        const detail = toolDetails[toolIdx];
-        const toolName = detail?.name ?? "";
-        const toolArgs = detail?.args ?? detail?.input ?? {};
-        const toolOutput = detail?.output ?? "";
-        const displayName = toolName ? toolDisplayName(toolName) : `Call ${toolIdx + 1}`;
-        const toolInputStr = toolName ? formatToolInput(toolName, toolArgs) : "";
-        const toolMeta = {};
-        if (toolName) toolMeta.tool_name = toolName;
-        if (detail?.error) toolMeta.error = detail.error;
-        const toolStart = detail?.start_time ?? beginTime;
-        const toolEnd = detail?.end_time ?? endTime;
-        const toolLat = latencySeconds(toolStart, toolEnd);
-        spans.push({
-          trace_unique_id: traceUniqueId,
-          span_unique_id: `gcli_${safeId}_${turnTs}_tool_${toolIdx + 1}`,
-          span_parent_id: rootSpanId,
-          span_name: `Tool: ${displayName}`,
-          span_workflow_name: workflowName,
-          span_path: toolName ? `tool_${toolName}` : "tool_call",
-          provider_id: "",
-          metadata: toolMeta,
-          input: toolInputStr,
-          output: truncate(toolOutput, MAX_CHARS),
-          timestamp: toolEnd,
-          start_time: toolStart,
-          ...toolLat !== void 0 ? { latency: toolLat } : {}
-        });
+        spans.push(buildToolSpan(toolDetails[toolIdx], toolIdx, traceUniqueId, rootSpanId, safeId, turnTs, workflowName, beginTime, endTime));
         toolIdx++;
         const nextDetail = toolDetails[toolIdx];
         if (nextDetail && roundStarts[r + 1] && nextDetail.start_time && nextDetail.start_time > roundStarts[r + 1]) break;
@@ -553,33 +555,7 @@ function buildSpans(hookData, outputText, tokens, config, startTimeIso, toolTurn
     }
   }
   while (toolIdx < toolDetails.length) {
-    const detail = toolDetails[toolIdx];
-    const toolName = detail?.name ?? "";
-    const toolArgs = detail?.args ?? detail?.input ?? {};
-    const toolOutput = detail?.output ?? "";
-    const displayName = toolName ? toolDisplayName(toolName) : `Call ${toolIdx + 1}`;
-    const toolInputStr = toolName ? formatToolInput(toolName, toolArgs) : "";
-    const toolMeta = {};
-    if (toolName) toolMeta.tool_name = toolName;
-    if (detail?.error) toolMeta.error = detail.error;
-    const toolStart = detail?.start_time ?? beginTime;
-    const toolEnd = detail?.end_time ?? endTime;
-    const toolLat = latencySeconds(toolStart, toolEnd);
-    spans.push({
-      trace_unique_id: traceUniqueId,
-      span_unique_id: `gcli_${safeId}_${turnTs}_tool_${toolIdx + 1}`,
-      span_parent_id: rootSpanId,
-      span_name: `Tool: ${displayName}`,
-      span_workflow_name: workflowName,
-      span_path: toolName ? `tool_${toolName}` : "tool_call",
-      provider_id: "",
-      metadata: toolMeta,
-      input: toolInputStr,
-      output: truncate(toolOutput, MAX_CHARS),
-      timestamp: toolEnd,
-      start_time: toolStart,
-      ...toolLat !== void 0 ? { latency: toolLat } : {}
-    });
+    spans.push(buildToolSpan(toolDetails[toolIdx], toolIdx, traceUniqueId, rootSpanId, safeId, turnTs, workflowName, beginTime, endTime));
     toolIdx++;
   }
   if (thoughtsTokens > 0) {
@@ -716,7 +692,6 @@ function processBeforeTool(hookData) {
   pending.push({ name: toolName, input: toolInput, start_time: nowISO() });
   state.pending_tools = pending;
   state.send_version = (state.send_version ?? 0) + 1;
-  state.tool_turns = (state.tool_turns ?? 0) + 1;
   saveStreamState(sessionId, state);
 }
 function processAfterTool(hookData) {
@@ -873,35 +848,30 @@ function processChunk(hookData) {
   debug(`Delayed send (version=${state.send_version}, delay=${SEND_DELAY}s), ${state.accumulated_text.length} chars`);
   launchDelayedSend(sessionId, state.send_version, spans, creds.apiKey, creds.baseUrl);
 }
-function mainWorker(raw) {
+function processChunkInWorker(dataFile) {
   try {
+    const raw = fs2.readFileSync(dataFile, "utf-8");
+    fs2.unlinkSync(dataFile);
     if (!raw.trim()) return;
     const hookData = JSON.parse(raw);
-    const event = String(hookData.hook_event_name ?? "");
     const unlock = acquireLock(LOCK_PATH);
     try {
-      if (event === "BeforeTool") {
-        processBeforeTool(hookData);
-      } else if (event === "AfterTool") {
-        processAfterTool(hookData);
-      } else {
-        processChunk(hookData);
-      }
+      processChunk(hookData);
     } finally {
       unlock?.();
     }
   } catch (e) {
-    if (e instanceof SyntaxError) {
-      log("ERROR", `Invalid JSON from stdin: ${e}`);
-    } else {
-      log("ERROR", `Hook error: ${e}`);
+    log("ERROR", `Worker error: ${e}`);
+    try {
+      fs2.unlinkSync(dataFile);
+    } catch {
     }
   }
 }
 function main() {
   if (process.env._RESPAN_GEM_WORKER === "1") {
-    const raw2 = process.env._RESPAN_GEM_DATA ?? "";
-    mainWorker(raw2);
+    const dataFile = process.env._RESPAN_GEM_FILE ?? "";
+    if (dataFile) processChunkInWorker(dataFile);
     return;
   }
   let raw = "";
@@ -914,15 +884,34 @@ function main() {
     process.exit(0);
   }
   try {
-    const scriptPath = __filename || process.argv[1];
-    const child = (0, import_node_child_process.execFile)("node", [scriptPath], {
-      env: { ...process.env, _RESPAN_GEM_WORKER: "1", _RESPAN_GEM_DATA: raw },
-      stdio: "ignore",
-      detached: true
-    });
-    child.unref();
+    const hookData = JSON.parse(raw);
+    const event = String(hookData.hook_event_name ?? "");
+    if (event === "BeforeTool" || event === "AfterTool") {
+      const unlock = acquireLock(LOCK_PATH);
+      try {
+        if (event === "BeforeTool") processBeforeTool(hookData);
+        else processAfterTool(hookData);
+      } finally {
+        unlock?.();
+      }
+    } else {
+      const dataFile = path2.join(STATE_DIR, `respan_chunk_${process.pid}.json`);
+      fs2.mkdirSync(STATE_DIR, { recursive: true });
+      fs2.writeFileSync(dataFile, raw);
+      try {
+        const scriptPath = __filename || process.argv[1];
+        const child = (0, import_node_child_process.execFile)("node", [scriptPath], {
+          env: { ...process.env, _RESPAN_GEM_WORKER: "1", _RESPAN_GEM_FILE: dataFile },
+          stdio: "ignore",
+          detached: true
+        });
+        child.unref();
+      } catch (e) {
+        processChunkInWorker(dataFile);
+      }
+    }
   } catch (e) {
-    mainWorker(raw);
+    log("ERROR", `Hook error: ${e}`);
   }
   process.exit(0);
 }