olakai-cli 0.2.0 → 0.2.1

package/dist/index.js

@@ -2183,8 +2183,8 @@ function registerActivityCommand(program2) {
 }
 
 // src/commands/monitor.ts
-import * as fs2 from "fs";
-import * as path2 from "path";
+import * as fs3 from "fs";
+import * as path3 from "path";
 import * as readline from "readline";
 
 // src/commands/monitor-transcript.ts
@@ -2236,6 +2236,7 @@ function parseTranscript(raw) {
   const lines = raw.split("\n");
   let lastUserText = "";
   let lastUserTimestamp = NaN;
+  let lastUserTimestampRaw;
   let lastAssistantText = "";
   let lastAssistantTimestamp = NaN;
   let lastAssistantModel = null;
@@ -2259,6 +2260,7 @@ function parseTranscript(raw) {
       lastUserText = text;
       lastUserTimestamp = parseTimestamp(parsed.timestamp);
       currentTurnUserTimestamp = lastUserTimestamp;
+      lastUserTimestampRaw = typeof parsed.timestamp === "string" && parsed.timestamp ? parsed.timestamp : void 0;
     } else if (parsed.type === "assistant" && parsed.message) {
       const text = extractTextContent(parsed.message.content);
       numTurns += 1;
@@ -2297,9 +2299,80 @@ function parseTranscript(raw) {
   if (skill) {
     result.skill = skill;
   }
+  if (lastUserTimestampRaw) {
+    result.userTurnTimestamp = lastUserTimestampRaw;
+  }
   return result;
 }
 
+// src/commands/monitor-state.ts
+import * as fs2 from "fs";
+import * as os2 from "os";
+import * as path2 from "path";
+var STATE_DIR_SEGMENTS = [".olakai", "monitor-state"];
+function getStateDir(homeDir) {
+  return path2.join(homeDir, ...STATE_DIR_SEGMENTS);
+}
+function getStateFile(sessionId, homeDir) {
+  return path2.join(getStateDir(homeDir), `${sessionId}.json`);
+}
+var debugLogger = null;
+function setDebugLogger(logger) {
+  debugLogger = logger;
+}
+function log(label, data) {
+  if (debugLogger) {
+    try {
+      debugLogger(label, data);
+    } catch {
+    }
+  }
+}
+function loadSessionState(sessionId, homeDir = os2.homedir()) {
+  if (!sessionId) return null;
+  const filePath = getStateFile(sessionId, homeDir);
+  try {
+    if (!fs2.existsSync(filePath)) return null;
+    const raw = fs2.readFileSync(filePath, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed?.lastUserTimestamp !== "string" || typeof parsed?.lastReportedAt !== "string" || typeof parsed?.numTurnsAtLastReport !== "number") {
+      return null;
+    }
+    return {
+      lastUserTimestamp: parsed.lastUserTimestamp,
+      lastReportedAt: parsed.lastReportedAt,
+      numTurnsAtLastReport: parsed.numTurnsAtLastReport
+    };
+  } catch (err) {
+    log("state-load-failed", {
+      sessionId,
+      error: err.message
+    });
+    return null;
+  }
+}
+function saveSessionState(sessionId, state, homeDir = os2.homedir()) {
+  if (!sessionId) return;
+  const dir = getStateDir(homeDir);
+  const filePath = getStateFile(sessionId, homeDir);
+  try {
+    if (!fs2.existsSync(dir)) {
+      fs2.mkdirSync(dir, { recursive: true });
+    }
+    fs2.writeFileSync(filePath, JSON.stringify(state, null, 2) + "\n", "utf-8");
+  } catch (err) {
+    log("state-save-failed", {
+      sessionId,
+      error: err.message
+    });
+  }
+}
+function shouldReportTurn(existing, currentUserTimestamp) {
+  if (!currentUserTimestamp) return true;
+  if (!existing) return true;
+  return existing.lastUserTimestamp !== currentUserTimestamp;
+}
+
 // src/commands/monitor.ts
 var CLAUDE_DIR = ".claude";
 var SETTINGS_FILE = "settings.json";
@@ -2361,39 +2434,55 @@ function prompt(question) {
 function findProjectRoot(startDir) {
   let dir = startDir ?? process.cwd();
   while (true) {
-    if (fs2.existsSync(path2.join(dir, CLAUDE_DIR))) {
+    if (fs3.existsSync(path3.join(dir, CLAUDE_DIR))) {
       return dir;
     }
-    const parent = path2.dirname(dir);
+    const parent = path3.dirname(dir);
     if (parent === dir) break;
     dir = parent;
   }
   return startDir ?? process.cwd();
 }
+function findConfiguredProjectRoot(startDir) {
+  let dir = startDir ?? process.cwd();
+  while (true) {
+    if (fs3.existsSync(path3.join(dir, CLAUDE_DIR, MONITOR_CONFIG_FILE))) {
+      return dir;
+    }
+    const parent = path3.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  return null;
+}
+function resolveProjectRootFromPayload(eventData, fallbackCwd) {
+  const payloadCwd = typeof eventData.cwd === "string" && eventData.cwd.trim() ? eventData.cwd : fallbackCwd;
+  return findConfiguredProjectRoot(payloadCwd);
+}
 function getClaudeDir(projectRoot) {
-  return path2.join(projectRoot, CLAUDE_DIR);
+  return path3.join(projectRoot, CLAUDE_DIR);
 }
 function getSettingsPath(projectRoot) {
-  return path2.join(getClaudeDir(projectRoot), SETTINGS_FILE);
+  return path3.join(getClaudeDir(projectRoot), SETTINGS_FILE);
 }
 function getMonitorConfigPath(projectRoot) {
-  return path2.join(getClaudeDir(projectRoot), MONITOR_CONFIG_FILE);
+  return path3.join(getClaudeDir(projectRoot), MONITOR_CONFIG_FILE);
 }
 function readJsonFile(filePath) {
   try {
-    if (!fs2.existsSync(filePath)) return null;
-    const content = fs2.readFileSync(filePath, "utf-8");
+    if (!fs3.existsSync(filePath)) return null;
+    const content = fs3.readFileSync(filePath, "utf-8");
     return JSON.parse(content);
   } catch {
     return null;
   }
 }
 function writeJsonFile(filePath, data) {
-  const dir = path2.dirname(filePath);
-  if (!fs2.existsSync(dir)) {
-    fs2.mkdirSync(dir, { recursive: true });
+  const dir = path3.dirname(filePath);
+  if (!fs3.existsSync(dir)) {
+    fs3.mkdirSync(dir, { recursive: true });
   }
-  fs2.writeFileSync(filePath, JSON.stringify(data, null, 2) + "\n", "utf-8");
+  fs3.writeFileSync(filePath, JSON.stringify(data, null, 2) + "\n", "utf-8");
 }
 function loadMonitorConfig(projectRoot) {
   const root = projectRoot ?? findProjectRoot();
@@ -2433,7 +2522,7 @@ async function initCommand() {
   }
   console.log("Setting up Claude Code monitoring for this workspace...\n");
   const projectRoot = process.cwd();
-  const dirName = path2.basename(projectRoot);
+  const dirName = path3.basename(projectRoot);
   let agent;
   const choice = await prompt(
     "Create a new agent or use an existing one? (new/existing) [new]: "
@@ -2484,8 +2573,8 @@ Select agent (1-${agents.length}): `);
     }
   }
   const claudeDir = getClaudeDir(projectRoot);
-  if (!fs2.existsSync(claudeDir)) {
-    fs2.mkdirSync(claudeDir, { recursive: true });
+  if (!fs3.existsSync(claudeDir)) {
+    fs3.mkdirSync(claudeDir, { recursive: true });
   }
   const settingsPath = getSettingsPath(projectRoot);
   const existingSettings = readJsonFile(settingsPath) ?? {};
@@ -2506,7 +2595,7 @@ Select agent (1-${agents.length}): `);
   };
   const monitorConfigPath = getMonitorConfigPath(projectRoot);
   writeJsonFile(monitorConfigPath, monitorConfig);
-  fs2.chmodSync(monitorConfigPath, 384);
+  fs3.chmodSync(monitorConfigPath, 384);
   console.log("");
   console.log(`\u2713 Agent "${agent.name}" configured (ID: ${agent.id})`);
   if (agent.apiKey?.key) {
@@ -2550,7 +2639,7 @@ function debugLog(label, data) {
     const logPath = `/tmp/olakai-monitor-debug-${process.pid}.log`;
     const line = `[${(/* @__PURE__ */ new Date()).toISOString()}] ${label}: ${typeof data === "string" ? data : JSON.stringify(data, null, 2)}
 `;
-    fs2.appendFileSync(logPath, line, "utf-8");
+    fs3.appendFileSync(logPath, line, "utf-8");
   } catch {
   }
 }
@@ -2567,7 +2656,7 @@ function extractFromTranscript(transcriptPath) {
   if (!transcriptPath) return empty;
   let raw;
   try {
-    raw = fs2.readFileSync(transcriptPath, "utf-8");
+    raw = fs3.readFileSync(transcriptPath, "utf-8");
   } catch (err) {
     debugLog("transcript-read-failed", {
       transcriptPath,
@@ -2592,11 +2681,8 @@ function extractSubagentName(event) {
   return void 0;
 }
 async function hookCommand(event) {
+  setDebugLogger(debugLog);
   try {
-    const config = loadMonitorConfig();
-    if (!config) {
-      return;
-    }
     const stdinData = await readStdin(3e3);
     debugLog("stdin-raw", stdinData);
     let eventData = {};
@@ -2605,15 +2691,42 @@ async function hookCommand(event) {
         eventData = JSON.parse(stdinData);
       } catch {
         debugLog("stdin-parse-failed", stdinData);
-        return;
       }
     }
     debugLog("event-parsed", { event, eventData });
+    const projectRoot = resolveProjectRootFromPayload(
+      eventData,
+      process.cwd()
+    );
+    if (!projectRoot) {
+      debugLog("config-not-found", {
+        startDir: typeof eventData.cwd === "string" && eventData.cwd.trim() ? eventData.cwd : process.cwd()
+      });
+      return;
+    }
+    const config = loadMonitorConfig(projectRoot);
+    if (!config) {
+      debugLog("config-load-failed", { projectRoot });
+      return;
+    }
     const payload = buildPayload(event, eventData, config);
     if (!payload) {
       return;
     }
     debugLog("payload-built", payload);
+    const sessionId = typeof eventData.session_id === "string" && eventData.session_id || void 0;
+    const extracted = extractFromTranscript(eventData.transcript_path);
+    const userTurnTimestamp = extracted.userTurnTimestamp;
+    if (sessionId) {
+      const existingState = loadSessionState(sessionId);
+      if (!shouldReportTurn(existingState, userTurnTimestamp)) {
+        debugLog("turn-dedup-skip", {
+          sessionId,
+          userTurnTimestamp
+        });
+        return;
+      }
+    }
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), 5e3);
     try {
@@ -2633,6 +2746,18 @@ async function hookCommand(event) {
     } finally {
       clearTimeout(timeoutId);
     }
+    if (sessionId && userTurnTimestamp) {
+      saveSessionState(sessionId, {
+        lastUserTimestamp: userTurnTimestamp,
+        lastReportedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        numTurnsAtLastReport: extracted.numTurns
+      });
+      debugLog("state-saved", {
+        sessionId,
+        userTurnTimestamp,
+        numTurns: extracted.numTurns
+      });
+    }
   } catch (err) {
     debugLog("hook-exception", err.message);
   }
@@ -2665,9 +2790,11 @@ function buildPayload(event, eventData, config) {
       } else if (extracted.skill) {
         customData.skill = extracted.skill;
       }
+      const payloadAssistant = eventData.last_assistant_message;
+      const response = typeof payloadAssistant === "string" && payloadAssistant.trim() ? payloadAssistant : extracted.response;
       return {
         prompt: extracted.prompt,
-        response: extracted.response,
+        response,
         chatId: sessionId,
         // Top-level source so the backend ExternalPromptRequestSchema
         // picks it up (matches regex ^[a-z0-9_-]+$).
@@ -2774,8 +2901,8 @@ async function disableCommand(options) {
   }
   if (!options.keepConfig) {
     const configPath = getMonitorConfigPath(projectRoot);
-    if (fs2.existsSync(configPath)) {
-      fs2.unlinkSync(configPath);
+    if (fs3.existsSync(configPath)) {
+      fs3.unlinkSync(configPath);
       console.log(`\u2713 Monitor config removed (${CLAUDE_DIR}/${MONITOR_CONFIG_FILE})`);
     }
   } else {