@respan/cli 0.6.3 → 0.6.5

package/dist/hooks/claude-code.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);
@@ -870,24 +871,16 @@ function findLatestTranscript() {
     return null;
   }
 }
-async function main() {
+async function mainWorker() {
   const scriptStart = Date.now();
-  debug("Hook started");
-  if ((process.env.TRACE_TO_RESPAN ?? "").toLowerCase() !== "true") {
-    debug("Tracing disabled (TRACE_TO_RESPAN != true)");
-    process.exit(0);
-  }
+  debug("Worker started");
   const creds = resolveCredentials();
   if (!creds) {
     log("ERROR", "No API key found. Run: respan auth login");
-    process.exit(0);
-  }
-  const payload = readStdinPayload() ?? findLatestTranscript();
-  if (!payload) {
-    debug("No transcript file found");
-    process.exit(0);
+    return;
   }
-  const { sessionId, transcriptPath } = payload;
+  const sessionId = process.env._RESPAN_SESSION_ID;
+  const transcriptPath = process.env._RESPAN_TRANSCRIPT_PATH;
   debug(`Processing session: ${sessionId}`);
   let config = null;
   try {
@@ -907,10 +900,8 @@ async function main() {
     }
     if (cwd) {
       config = loadRespanConfig(path2.join(cwd, ".claude", "respan.json"));
-      debug(`Loaded respan.json config from ${cwd}`);
     }
-  } catch (e) {
-    debug(`Failed to load config: ${e}`);
+  } catch {
   }
   const maxAttempts = 3;
   let turns = 0;
@@ -932,20 +923,48 @@ 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 transcript: ${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_WORKER === "1") {
+    mainWorker().catch((e) => log("ERROR", `Worker crashed: ${e}`));
+    return;
+  }
+  debug("Hook started");
+  if ((process.env.TRACE_TO_RESPAN ?? "").toLowerCase() !== "true") {
+    debug("Tracing disabled (TRACE_TO_RESPAN != true)");
+    process.exit(0);
+  }
+  const payload = readStdinPayload() ?? findLatestTranscript();
+  if (!payload) {
+    debug("No transcript file found");
+    process.exit(0);
+  }
+  const { sessionId, transcriptPath } = payload;
+  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_WORKER: "1",
+        _RESPAN_SESSION_ID: sessionId,
+        _RESPAN_TRANSCRIPT_PATH: transcriptPath
+      },
+      stdio: "ignore",
+      detached: true
+    });
+    child.unref();
+    debug("Worker launched");
+  } catch (e) {
+    log("ERROR", `Failed to fork worker: ${e}`);
+  }
+}
+main();

package/dist/hooks/claude-code.js

@@ -14,6 +14,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(), '.claude', 'state');
@@ -550,27 +551,17 @@ function findLatestTranscript() {
     }
 }
 // ── Main ──────────────────────────────────────────────────────────
-async function main() {
+async function mainWorker() {
     const scriptStart = Date.now();
-    debug('Hook started');
-    if ((process.env.TRACE_TO_RESPAN ?? '').toLowerCase() !== 'true') {
-        debug('Tracing disabled (TRACE_TO_RESPAN != true)');
-        process.exit(0);
-    }
+    debug('Worker started');
     const creds = resolveCredentials();
     if (!creds) {
         log('ERROR', 'No API key found. Run: respan auth login');
-        process.exit(0);
-    }
-    // Find transcript
-    const payload = readStdinPayload() ?? findLatestTranscript();
-    if (!payload) {
-        debug('No transcript file found');
-        process.exit(0);
+        return;
     }
-    const { sessionId, transcriptPath } = payload;
+    const sessionId = process.env._RESPAN_SESSION_ID;
+    const transcriptPath = process.env._RESPAN_TRANSCRIPT_PATH;
     debug(`Processing session: ${sessionId}`);
-    // Load respan.json config from project directory
     let config = null;
     try {
         const content = fs.readFileSync(transcriptPath, 'utf-8');
@@ -590,13 +581,9 @@ async function main() {
         }
         if (cwd) {
             config = loadRespanConfig(path.join(cwd, '.claude', 'respan.json'));
-            debug(`Loaded respan.json config from ${cwd}`);
         }
     }
-    catch (e) {
-        debug(`Failed to load config: ${e}`);
-    }
-    // Process with retry
+    catch { }
     const maxAttempts = 3;
     let turns = 0;
     try {
@@ -619,23 +606,52 @@ 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 transcript: ${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_WORKER === '1') {
+        mainWorker().catch((e) => log('ERROR', `Worker crashed: ${e}`));
+        return;
+    }
+    debug('Hook started');
+    if ((process.env.TRACE_TO_RESPAN ?? '').toLowerCase() !== 'true') {
+        debug('Tracing disabled (TRACE_TO_RESPAN != true)');
+        process.exit(0);
+    }
+    const payload = readStdinPayload() ?? findLatestTranscript();
+    if (!payload) {
+        debug('No transcript file found');
+        process.exit(0);
+    }
+    // Fork self as detached worker so Claude Code doesn't block
+    const { sessionId, transcriptPath } = payload;
+    debug(`Forking worker for session: ${sessionId}`);
+    try {
+        const scriptPath = __filename || process.argv[1];
+        const child = execFile('node', [scriptPath], {
+            env: {
+                ...process.env,
+                _RESPAN_WORKER: '1',
+                _RESPAN_SESSION_ID: sessionId,
+                _RESPAN_TRANSCRIPT_PATH: transcriptPath,
+            },
+            stdio: 'ignore',
+            detached: true,
+        });
+        child.unref();
+        debug('Worker launched');
+    }
+    catch (e) {
+        log('ERROR', `Failed to fork worker: ${e}`);
+    }
+}
+main();

package/dist/hooks/gemini-cli.cjs

@@ -665,7 +665,6 @@ function processBeforeTool(hookData) {
   pending.push({ name: toolName, input: toolInput, start_time: nowISO() });
   state.pending_tools = pending;
   saveStreamState(sessionId, state);
-  process.stdout.write("{}\n");
 }
 function processAfterTool(hookData) {
   const sessionId = String(hookData.session_id ?? "unknown");
@@ -690,7 +689,6 @@ function processAfterTool(hookData) {
   state.pending_tools = pending;
   state.tool_details = completed;
   saveStreamState(sessionId, state);
-  process.stdout.write("{}\n");
 }
 function processChunk(hookData) {
   const sessionId = String(hookData.session_id ?? "unknown");
@@ -771,12 +769,12 @@ function processChunk(hookData) {
     }
     saveStreamState(sessionId, state);
     debug(`Tool call via response parts (finish=${finishReason}), tool_turns=${state.tool_turns}`);
-    process.stdout.write("{}\n");
     return;
   }
+  const hasPendingTools = (state.pending_tools ?? []).length > 0;
+  const hadToolsThisTurn = (state.tool_turns ?? 0) > 0 || hasPendingTools;
   const hasNewText = state.accumulated_text.length > (state.last_send_text_len ?? 0);
-  const shouldSend = (!toolCallDetected || isFinished) && hasNewText && state.accumulated_text && (!chunkText || isFinished);
-  process.stdout.write("{}\n");
+  const shouldSend = hasNewText && state.accumulated_text && (isFinished || !hadToolsThisTurn && !toolCallDetected && !chunkText);
   if (!shouldSend) {
     if (toolCallDetected) saveStreamState(sessionId, state);
     return;
@@ -817,10 +815,8 @@ function processChunk(hookData) {
 function main() {
   try {
     const raw = fs2.readFileSync(0, "utf-8");
-    if (!raw.trim()) {
-      process.stdout.write("{}\n");
-      return;
-    }
+    process.stdout.write("{}\n");
+    if (!raw.trim()) return;
     const hookData = JSON.parse(raw);
     const event = String(hookData.hook_event_name ?? "");
     const unlock = acquireLock(LOCK_PATH);
@@ -841,7 +837,6 @@ function main() {
     } else {
       log("ERROR", `Hook error: ${e}`);
     }
-    process.stdout.write("{}\n");
   }
 }
 main();

package/dist/hooks/gemini-cli.js

@@ -388,7 +388,6 @@ function processBeforeTool(hookData) {
     pending.push({ name: toolName, input: toolInput, start_time: nowISO() });
     state.pending_tools = pending;
     saveStreamState(sessionId, state);
-    process.stdout.write('{}\n');
 }
 function processAfterTool(hookData) {
     const sessionId = String(hookData.session_id ?? 'unknown');
@@ -415,7 +414,6 @@ function processAfterTool(hookData) {
     state.pending_tools = pending;
     state.tool_details = completed;
     saveStreamState(sessionId, state);
-    process.stdout.write('{}\n');
 }
 // ── AfterModel chunk processing ──────────────────────────────────
 function processChunk(hookData) {
@@ -507,16 +505,18 @@ function processChunk(hookData) {
         }
         saveStreamState(sessionId, state);
         debug(`Tool call via response parts (finish=${finishReason}), tool_turns=${state.tool_turns}`);
-        process.stdout.write('{}\n');
         return;
     }
-    // Detect completion and send
+    // Detect completion and send.
+    // If tools have been used this turn, only send on STOP to avoid
+    // splitting a multi-tool turn into separate traces.
+    const hasPendingTools = (state.pending_tools ?? []).length > 0;
+    const hadToolsThisTurn = (state.tool_turns ?? 0) > 0 || hasPendingTools;
     const hasNewText = state.accumulated_text.length > (state.last_send_text_len ?? 0);
-    const shouldSend = ((!toolCallDetected || isFinished)
-        && hasNewText
+    const shouldSend = (hasNewText
         && state.accumulated_text
-        && (!chunkText || isFinished));
-    process.stdout.write('{}\n');
+        && (isFinished
+            || (!hadToolsThisTurn && !toolCallDetected && !chunkText)));
     if (!shouldSend) {
         if (toolCallDetected)
             saveStreamState(sessionId, state);
@@ -552,10 +552,10 @@ function processChunk(hookData) {
 function main() {
     try {
         const raw = fs.readFileSync(0, 'utf-8');
-        if (!raw.trim()) {
-            process.stdout.write('{}\n');
+        // Respond to Gemini CLI immediately so it doesn't block
+        process.stdout.write('{}\n');
+        if (!raw.trim())
             return;
-        }
         const hookData = JSON.parse(raw);
         const event = String(hookData.hook_event_name ?? '');
         const unlock = acquireLock(LOCK_PATH);
@@ -581,7 +581,6 @@ function main() {
         else {
             log('ERROR', `Hook error: ${e}`);
         }
-        process.stdout.write('{}\n');
     }
 }
 main();