olakai-cli 0.1.15 → 0.2.0

package/dist/index.js

@@ -2186,6 +2186,121 @@ function registerActivityCommand(program2) {
 import * as fs2 from "fs";
 import * as path2 from "path";
 import * as readline from "readline";
+
+// src/commands/monitor-transcript.ts
+var SKILL_REGEX = /^\/([\w-]+)(?:\s|$)/;
+function detectSkill(userMessage) {
+  if (typeof userMessage !== "string") return void 0;
+  const trimmed = userMessage.trimStart();
+  if (!trimmed) return void 0;
+  const match = SKILL_REGEX.exec(trimmed);
+  if (!match) return void 0;
+  return match[1];
+}
+function extractTextContent(content) {
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
+  const parts = [];
+  for (const block of content) {
+    if (block?.type === "text" && typeof block.text === "string") {
+      parts.push(block.text);
+    }
+  }
+  return parts.join("\n").trim();
+}
+function isMetaUserMessage(line, text) {
+  if (line.isMeta === true) return true;
+  if (!text) return true;
+  return text.includes("<command-name>") || text.includes("<local-command-caveat>") || text.includes("<command-message>");
+}
+function parseTimestamp(ts) {
+  if (typeof ts !== "string" || !ts) return NaN;
+  return Date.parse(ts);
+}
+function isCompactionEntry(line) {
+  if (line.type !== "system") return false;
+  const subtype = line.subtype ?? "";
+  return subtype === "compact_boundary" || subtype === "pre_compact" || subtype === "post_compact" || /compact/i.test(subtype);
+}
+function parseTranscript(raw) {
+  const empty = {
+    prompt: "",
+    response: "",
+    tokens: 0,
+    inputTokens: 0,
+    outputTokens: 0,
+    modelName: null,
+    numTurns: 0
+  };
+  if (!raw) return empty;
+  const lines = raw.split("\n");
+  let lastUserText = "";
+  let lastUserTimestamp = NaN;
+  let lastAssistantText = "";
+  let lastAssistantTimestamp = NaN;
+  let lastAssistantModel = null;
+  let lastAssistantInputTokens = 0;
+  let lastAssistantOutputTokens = 0;
+  let numTurns = 0;
+  let currentTurnUserTimestamp = NaN;
+  for (const rawLine of lines) {
+    if (!rawLine) continue;
+    let parsed;
+    try {
+      parsed = JSON.parse(rawLine);
+    } catch {
+      continue;
+    }
+    if (isCompactionEntry(parsed)) continue;
+    if (parsed.isSidechain === true) continue;
+    if (parsed.type === "user" && parsed.message) {
+      const text = extractTextContent(parsed.message.content);
+      if (isMetaUserMessage(parsed, text)) continue;
+      lastUserText = text;
+      lastUserTimestamp = parseTimestamp(parsed.timestamp);
+      currentTurnUserTimestamp = lastUserTimestamp;
+    } else if (parsed.type === "assistant" && parsed.message) {
+      const text = extractTextContent(parsed.message.content);
+      numTurns += 1;
+      if (text) lastAssistantText = text;
+      if (typeof parsed.message.model === "string") {
+        lastAssistantModel = parsed.message.model;
+      }
+      const usage = parsed.message.usage;
+      if (usage) {
+        const input = (usage.input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0);
+        const output = usage.output_tokens ?? 0;
+        lastAssistantInputTokens = input;
+        lastAssistantOutputTokens = output;
+      }
+      const ts = parseTimestamp(parsed.timestamp);
+      if (!Number.isNaN(ts)) {
+        lastAssistantTimestamp = ts;
+      }
+    }
+  }
+  const result = {
+    prompt: lastUserText,
+    response: lastAssistantText,
+    tokens: lastAssistantInputTokens + lastAssistantOutputTokens,
+    inputTokens: lastAssistantInputTokens,
+    outputTokens: lastAssistantOutputTokens,
+    modelName: lastAssistantModel,
+    numTurns
+  };
+  if (!Number.isNaN(currentTurnUserTimestamp) && !Number.isNaN(lastAssistantTimestamp) && lastAssistantTimestamp >= currentTurnUserTimestamp) {
+    result.latencyMs = Math.round(
+      lastAssistantTimestamp - currentTurnUserTimestamp
+    );
+  }
+  const skill = detectSkill(lastUserText);
+  if (skill) {
+    result.skill = skill;
+  }
+  return result;
+}
+
+// src/commands/monitor.ts
 var CLAUDE_DIR = ".claude";
 var SETTINGS_FILE = "settings.json";
 var MONITOR_CONFIG_FILE = "olakai-monitor.json";
@@ -2201,8 +2316,36 @@ var HOOK_DEFINITIONS = {
         }
       ]
     }
+  ],
+  SubagentStop: [
+    {
+      matcher: "",
+      hooks: [
+        {
+          type: "command",
+          command: "olakai monitor hook subagent-stop"
+        }
+      ]
+    }
   ]
 };
+function mergeHooksSettings(existing, definitions = HOOK_DEFINITIONS) {
+  const merged = {
+    ...existing ?? {}
+  };
+  for (const [event, defaultEntries] of Object.entries(definitions)) {
+    const existingEntries = merged[event] ?? [];
+    const hasOlakaiHook = existingEntries.some(
+      (e) => e.hooks.some((h) => h.command.includes(OLAKAI_HOOK_MARKER))
+    );
+    if (hasOlakaiHook) {
+      merged[event] = existingEntries;
+    } else {
+      merged[event] = [...existingEntries, ...defaultEntries];
+    }
+  }
+  return merged;
+}
 function prompt(question) {
   const rl = readline.createInterface({
     input: process.stdin,
@@ -2346,16 +2489,7 @@ Select agent (1-${agents.length}): `);
   }
   const settingsPath = getSettingsPath(projectRoot);
   const existingSettings = readJsonFile(settingsPath) ?? {};
-  const mergedHooks = {
-    ...existingSettings.hooks ?? {}
-  };
-  for (const [event, entries] of Object.entries(HOOK_DEFINITIONS)) {
-    const existing = mergedHooks[event] ?? [];
-    const filtered = existing.filter(
-      (e) => !e.hooks.some((h) => h.command.includes(OLAKAI_HOOK_MARKER))
-    );
-    mergedHooks[event] = [...filtered, ...entries];
-  }
+  const mergedHooks = mergeHooksSettings(existingSettings.hooks);
   const updatedSettings = {
     ...existingSettings,
     hooks: mergedHooks
@@ -2420,22 +2554,6 @@ function debugLog(label, data) {
   } catch {
   }
 }
-function extractTextContent(content) {
-  if (typeof content === "string") return content;
-  if (!Array.isArray(content)) return "";
-  const parts = [];
-  for (const block of content) {
-    if (block?.type === "text" && typeof block.text === "string") {
-      parts.push(block.text);
-    }
-  }
-  return parts.join("\n").trim();
-}
-function isMetaUserMessage(line, text) {
-  if (line.isMeta === true) return true;
-  if (!text) return true;
-  return text.includes("<command-name>") || text.includes("<local-command-caveat>") || text.includes("<command-message>");
-}
 function extractFromTranscript(transcriptPath) {
   const empty = {
     prompt: "",
@@ -2457,51 +2575,21 @@ function extractFromTranscript(transcriptPath) {
     });
     return empty;
   }
-  const lines = raw.split("\n");
-  let lastUserText = "";
-  let lastAssistantText = "";
-  let lastAssistantModel = null;
-  let lastAssistantInputTokens = 0;
-  let lastAssistantOutputTokens = 0;
-  let numTurns = 0;
-  for (const rawLine of lines) {
-    if (!rawLine) continue;
-    let parsed;
-    try {
-      parsed = JSON.parse(rawLine);
-    } catch {
-      continue;
-    }
-    if (parsed.isSidechain === true) continue;
-    if (parsed.type === "user" && parsed.message) {
-      const text = extractTextContent(parsed.message.content);
-      if (isMetaUserMessage(parsed, text)) continue;
-      lastUserText = text;
-    } else if (parsed.type === "assistant" && parsed.message) {
-      const text = extractTextContent(parsed.message.content);
-      numTurns += 1;
-      if (text) lastAssistantText = text;
-      if (typeof parsed.message.model === "string") {
-        lastAssistantModel = parsed.message.model;
-      }
-      const usage = parsed.message.usage;
-      if (usage) {
-        const input = (usage.input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0);
-        const output = usage.output_tokens ?? 0;
-        lastAssistantInputTokens = input;
-        lastAssistantOutputTokens = output;
-      }
+  return parseTranscript(raw);
+}
+function extractSubagentName(event) {
+  const candidates = [
+    event.agent_name,
+    event.subagent_type,
+    event.agent_type,
+    event.tool_input?.subagent_type
+  ];
+  for (const value of candidates) {
+    if (typeof value === "string" && value.trim()) {
+      return value.trim();
     }
   }
-  return {
-    prompt: lastUserText,
-    response: lastAssistantText,
-    tokens: lastAssistantInputTokens + lastAssistantOutputTokens,
-    inputTokens: lastAssistantInputTokens,
-    outputTokens: lastAssistantOutputTokens,
-    modelName: lastAssistantModel,
-    numTurns
-  };
+  return void 0;
 }
 async function hookCommand(event) {
   try {
@@ -2552,8 +2640,31 @@ async function hookCommand(event) {
 function buildPayload(event, eventData, config) {
   const sessionId = eventData.session_id ?? `claude-code-${Date.now()}`;
   switch (event) {
-    case "stop": {
+    case "stop":
+    case "subagent-stop": {
       const extracted = extractFromTranscript(eventData.transcript_path);
+      const isSubagent = event === "subagent-stop";
+      const customData = {
+        hookEvent: eventData.hook_event_name ?? (isSubagent ? "SubagentStop" : "Stop"),
+        sessionId,
+        transcriptPath: eventData.transcript_path ?? "",
+        cwd: eventData.cwd ?? "",
+        stopHookActive: eventData.stop_hook_active ?? false,
+        inputTokens: extracted.inputTokens,
+        outputTokens: extracted.outputTokens,
+        numTurns: extracted.numTurns
+      };
+      if (typeof extracted.latencyMs === "number") {
+        customData.latencyMs = extracted.latencyMs;
+      }
+      if (isSubagent) {
+        const subagent = extractSubagentName(eventData);
+        if (subagent) {
+          customData.subagent = subagent;
+        }
+      } else if (extracted.skill) {
+        customData.skill = extracted.skill;
+      }
       return {
         prompt: extracted.prompt,
         response: extracted.response,
@@ -2563,16 +2674,7 @@ function buildPayload(event, eventData, config) {
         source: config.source,
         modelName: extracted.modelName ?? void 0,
         tokens: extracted.tokens,
-        customData: {
-          hookEvent: eventData.hook_event_name ?? "Stop",
-          sessionId,
-          transcriptPath: eventData.transcript_path ?? "",
-          cwd: eventData.cwd ?? "",
-          stopHookActive: eventData.stop_hook_active ?? false,
-          inputTokens: extracted.inputTokens,
-          outputTokens: extracted.outputTokens,
-          numTurns: extracted.numTurns
-        }
+        customData
       };
     }
     default: