@getverbal/cli 0.7.0 → 0.8.0

package/dist/cli.js

@@ -113,7 +113,7 @@ function compareSemver(a, b) {
   }
   return 0;
 }
-var VERSION = "0.7.0";
+var VERSION = "0.8.0";
 
 // src/auth/credentials.ts
 import { readFileSync, writeFileSync, rmSync, mkdirSync, chmodSync, renameSync } from "node:fs";
@@ -19231,7 +19231,7 @@ function readJsonLines(filePath) {
   }
   return results;
 }
-function flattenContent(content) {
+function flattenContent(content, opts) {
   if (!content)
     return;
   if (typeof content === "string")
@@ -19241,8 +19241,15 @@ function flattenContent(content) {
       if (!item || typeof item !== "object")
         return "";
       const typed = item;
-      if (typed.type === "thinking" || typed.type === "tool_use" || typed.type === "reasoning")
+      if (typed.type === "tool_use")
         return "";
+      if (typed.type === "thinking" || typed.type === "reasoning") {
+        if (opts?.includeThinking) {
+          const thinkingText = typed.text ?? typed.input_text ?? typed.output_text ?? "";
+          return thinkingText ? `[thinking]${thinkingText}[/thinking]` : "";
+        }
+        return "";
+      }
       return typed.text ?? typed.input_text ?? typed.output_text ?? "";
     }).filter(Boolean);
     return parts.length ? parts.join(`
@@ -19257,6 +19264,102 @@ function estimateTokens(prompt, response) {
 }
 var init_parsing_utils = () => {};
 
+// src/agent-hooks/tool-extraction.ts
+function parseToolInput(toolName, input) {
+  const isShell = SHELL_TOOL_NAMES.has(toolName);
+  const truncLimit = isShell ? TRUNCATION_BASH : TRUNCATION_DEFAULT;
+  let raw;
+  let command;
+  if (typeof input === "string") {
+    raw = input.slice(0, truncLimit);
+    if (isShell) {
+      if (input.length > 0) {
+        try {
+          const parsed = JSON.parse(input);
+          command = extractCommandFromObject(parsed);
+        } catch {
+          command = input.slice(0, truncLimit);
+        }
+      }
+    }
+  } else if (input !== null && typeof input === "object") {
+    if (isShell) {
+      command = extractCommandFromObject(input);
+    }
+    try {
+      raw = JSON.stringify(input).slice(0, truncLimit);
+    } catch {
+      raw = String(input).slice(0, truncLimit);
+    }
+  } else {
+    raw = String(input ?? "").slice(0, truncLimit);
+  }
+  if (command !== undefined) {
+    command = command.slice(0, truncLimit);
+  }
+  const command_type = command !== undefined ? detectCommandType(command) : undefined;
+  return { raw, command, command_type };
+}
+function extractCommandFromObject(obj) {
+  const cmd = obj["command"] ?? obj["cmd"] ?? obj["shell_command"];
+  return typeof cmd === "string" ? cmd : undefined;
+}
+function detectCommandType(command) {
+  const first = command.trim().split(/\s+/)[0] ?? "";
+  const basename = first.split("/").pop() ?? first;
+  return COMMAND_TYPE_MAP[basename.toLowerCase()] ?? "shell";
+}
+var SHELL_TOOL_NAMES, TRUNCATION_BASH = 2000, TRUNCATION_DEFAULT = 500, COMMAND_TYPE_MAP;
+var init_tool_extraction = __esm(() => {
+  SHELL_TOOL_NAMES = new Set([
+    "Bash",
+    "bash",
+    "shell",
+    "Shell",
+    "exec",
+    "run_command",
+    "computer"
+  ]);
+  COMMAND_TYPE_MAP = {
+    git: "git",
+    npm: "npm",
+    npx: "npm",
+    bun: "bun",
+    bunx: "bun",
+    node: "node",
+    python: "python",
+    python3: "python",
+    pip: "python",
+    pip3: "python",
+    tsc: "typescript",
+    vitest: "test",
+    jest: "test",
+    pytest: "test",
+    mocha: "test",
+    curl: "http",
+    wget: "http",
+    cat: "file",
+    ls: "file",
+    find: "file",
+    cp: "file",
+    mv: "file",
+    rm: "file",
+    mkdir: "file",
+    grep: "search",
+    rg: "search",
+    sed: "transform",
+    awk: "transform",
+    docker: "docker",
+    "docker-compose": "docker",
+    kubectl: "kubernetes",
+    helm: "kubernetes",
+    terraform: "infrastructure",
+    gh: "github",
+    supabase: "supabase",
+    bd: "beads"
+  };
+});
+
 // src/platforms/parsers/claude-code.ts
 import fs7 from "node:fs";
 import path6 from "node:path";
@@ -19296,6 +19399,101 @@ function findConversationFiles(baseDir) {
   walk(baseDir);
   return results;
 }
+function extractToolCallTraces(entries) {
+  const toolUseBlocks = new Map;
+  for (const entry of entries) {
+    const content = entry.message?.content;
+    if (!Array.isArray(content))
+      continue;
+    if ((entry.message?.role ?? entry.type) !== "assistant")
+      continue;
+    for (const block of content) {
+      if (!block || typeof block !== "object")
+        continue;
+      const b = block;
+      if (b.type === "tool_use" && typeof b.id === "string") {
+        toolUseBlocks.set(b.id, {
+          id: b.id,
+          name: b.name ?? "unknown",
+          input: b.input,
+          startTimestamp: b.start_timestamp,
+          stopTimestamp: b.stop_timestamp,
+          entryTimestamp: entry.timestamp
+        });
+      }
+    }
+  }
+  const toolResults = new Map;
+  for (const entry of entries) {
+    const content = entry.message?.content ?? entry.content;
+    if (!Array.isArray(content))
+      continue;
+    const role = entry.message?.role ?? entry.type;
+    if (role !== "user" && role !== "human")
+      continue;
+    for (const block of content) {
+      if (!block || typeof block !== "object")
+        continue;
+      const b = block;
+      if (b.type === "tool_result" && typeof b.tool_use_id === "string") {
+        const rawContent = b.content;
+        let output = "";
+        if (typeof rawContent === "string") {
+          output = rawContent.slice(0, 500);
+        } else if (Array.isArray(rawContent)) {
+          output = rawContent.map((c) => {
+            if (!c || typeof c !== "object")
+              return "";
+            return c.text ?? "";
+          }).join(`
+`).slice(0, 500);
+        }
+        toolResults.set(b.tool_use_id, {
+          toolUseId: b.tool_use_id,
+          isError: Boolean(b.is_error),
+          output
+        });
+      }
+    }
+  }
+  const traces = [];
+  for (const [id, toolUse] of toolUseBlocks) {
+    const result = toolResults.get(id);
+    const startTs = toolUse.startTimestamp ?? toolUse.entryTimestamp ?? new Date().toISOString();
+    const stopTs = toolUse.stopTimestamp ?? startTs;
+    const durationMs = startTs && stopTs ? Math.max(0, new Date(stopTs).getTime() - new Date(startTs).getTime()) : undefined;
+    const parsed = parseToolInput(toolUse.name, toolUse.input);
+    const startedMetadata = {
+      tool: toolUse.name
+    };
+    if (parsed.command !== undefined)
+      startedMetadata["command"] = parsed.command;
+    if (parsed.command_type !== undefined)
+      startedMetadata["command_type"] = parsed.command_type;
+    traces.push({
+      type: "step.started",
+      step_id: id,
+      name: toolUse.name,
+      timestamp: startTs,
+      input: parsed.raw,
+      metadata: startedMetadata
+    });
+    traces.push({
+      type: "step.completed",
+      step_id: id,
+      name: toolUse.name,
+      timestamp: stopTs,
+      output: result?.output,
+      metadata: {
+        tool: toolUse.name,
+        success: result ? !result.isError : true,
+        duration_ms: durationMs,
+        ...parsed.command_type !== undefined ? { command_type: parsed.command_type } : {}
+      }
+    });
+  }
+  return traces;
+}
 
 class ClaudeCodeParser {
   info = {
@@ -19316,6 +19514,7 @@ class ClaudeCodeParser {
     const sessions = claudeState?.sessions ?? {};
     const warnings = [];
     const events = [];
+    const toolCalls = [];
     const files = this.discover();
     for (const filePath of files) {
       const relative = path6.relative(this.baseDir, filePath);
@@ -19381,6 +19580,8 @@ class ClaudeCodeParser {
           events.push(event);
         }
       }
+      const fileToolCalls = extractToolCallTraces(newEntries);
+      toolCalls.push(...fileToolCalls);
       const lastEntry = newEntries[newEntries.length - 1];
       const lastEntryId = getEntryId(lastEntry);
       if (lastEntryId) {
@@ -19392,11 +19593,12 @@ class ClaudeCodeParser {
       sessions,
       lastSyncTimestamp: new Date().toISOString()
     };
-    return { events, newState, warnings };
+    return { events, newState, warnings, ...toolCalls.length > 0 ? { toolCalls } : {} };
   }
 }
 var init_claude_code = __esm(() => {
   init_parsing_utils();
+  init_tool_extraction();
 });
 
 // src/platforms/parsers/codex.ts
@@ -20093,6 +20295,9 @@ async function syncPlatforms(config, options = {}) {
         platformCost += event.cost ?? 0;
         await ingestor.track(event);
       }
+      if (config.traceEnabled && config.traceUrl && result.toolCalls && result.toolCalls.length > 0) {
+        await sendToolCallTraces(config, parser.info.id, result.toolCalls);
+      }
       savePlatformState(config.stateDir, parser.info.id, result.newState);
       platformResults.push({
         id: parser.info.id,
@@ -20117,6 +20322,31 @@ async function syncPlatforms(config, options = {}) {
   ingestor.destroy();
   return { platforms: platformResults, totalEvents, totalCost };
 }
+async function sendToolCallTraces(config, platformId, toolCalls) {
+  if (!config.traceUrl)
+    return;
+  const payload = {
+    trace_id: `sync:${platformId}:${new Date().toISOString()}`,
+    name: `${platformId}-tool-calls`,
+    events: toolCalls
+  };
+  try {
+    const response = await fetch(config.traceUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${config.apiKey}`
+      },
+      body: JSON.stringify(payload)
+    });
+    if (!response.ok) {
+      const text = await response.text();
+      console.warn(`[VerbalTrace] Tool call trace ingest failed (${response.status}): ${text}`);
+    }
+  } catch (error) {
+    console.warn("[VerbalTrace] Tool call trace ingest failed:", error);
+  }
+}
 function mapParsedEventToUsageEvent(event, project) {
   const cost = event.billing_type === "subscription" ? 0 : calculateCost(event.model, event.tokens_in, event.tokens_out, event.cache_read_tokens, event.cache_write_tokens);
   return {
@@ -20437,6 +20667,234 @@ var init_update = __esm(() => {
   import_picocolors7 = __toESM(require_picocolors(), 1);
 });
 
+// src/commands/keys.ts
+var exports_keys = {};
+__export(exports_keys, {
+  runKeys: () => runKeys
+});
+import { createInterface as createInterface4 } from "node:readline/promises";
+function isValidProvider(value) {
+  return VALID_PROVIDERS.includes(value);
+}
+async function keysAdd(provider) {
+  if (!isValidProvider(provider)) {
+    console.error(import_picocolors8.default.red(`✗ Invalid provider: ${import_picocolors8.default.bold(provider)}`));
+    console.log(import_picocolors8.default.dim(`  Valid providers: ${VALID_PROVIDERS.join(", ")}`));
+    process.exitCode = 1;
+    return;
+  }
+  const credentials = await readCredentials();
+  if (!credentials) {
+    console.error(import_picocolors8.default.red("✗ Not authenticated. Run `getverbal init` first."));
+    process.exitCode = 1;
+    return;
+  }
+  const displayName = PROVIDER_DISPLAY[provider];
+  const rl = createInterface4({ input: process.stdin, output: process.stdout });
+  try {
+    const apiKey = await rl.question(`Enter your ${displayName} Admin API key: `);
+    if (!apiKey.trim()) {
+      console.error(import_picocolors8.default.red("✗ API key cannot be empty."));
+      process.exitCode = 1;
+      return;
+    }
+    const res = await fetch(`${credentials.api_url}/api/v1/provider-keys`, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${credentials.api_key}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ provider, key: apiKey.trim() })
+    });
+    if (!res.ok) {
+      const body = await res.text().catch(() => "");
+      let errorMessage = `HTTP ${res.status}`;
+      try {
+        const json = JSON.parse(body);
+        if (json.error)
+          errorMessage = json.error;
+      } catch {}
+      console.error(import_picocolors8.default.red(`✗ Failed to add ${displayName} key: ${errorMessage}`));
+      process.exitCode = 1;
+      return;
+    }
+    const data = await res.json();
+    console.log();
+    console.log(import_picocolors8.default.green(`✓ ${displayName} API key added`));
+    console.log(import_picocolors8.default.dim(`  Prefix: ${data.key_prefix}`));
+    if (data.verified) {
+      console.log(import_picocolors8.default.green(`  ✓ Key verified`));
+    } else {
+      console.log(import_picocolors8.default.dim(`  Key stored (verification pending)`));
+    }
+  } finally {
+    rl.close();
+  }
+}
+async function keysList() {
+  const credentials = await readCredentials();
+  if (!credentials) {
+    console.error(import_picocolors8.default.red("✗ Not authenticated. Run `getverbal init` first."));
+    process.exitCode = 1;
+    return;
+  }
+  const res = await fetch(`${credentials.api_url}/api/v1/provider-keys`, {
+    method: "GET",
+    headers: {
+      Authorization: `Bearer ${credentials.api_key}`
+    }
+  });
+  if (!res.ok) {
+    const body = await res.text().catch(() => "");
+    let errorMessage = `HTTP ${res.status}`;
+    try {
+      const json2 = JSON.parse(body);
+      if (json2.error)
+        errorMessage = json2.error;
+    } catch {}
+    console.error(import_picocolors8.default.red(`✗ Failed to list provider keys: ${errorMessage}`));
+    process.exitCode = 1;
+    return;
+  }
+  const json = await res.json();
+  const data = json.keys ?? [];
+  if (data.length === 0) {
+    console.log(import_picocolors8.default.dim("No provider keys configured. Run `getverbal keys add <provider>` to add one."));
+    return;
+  }
+  console.log();
+  console.log(import_picocolors8.default.bold("Provider Keys:"));
+  console.log();
+  const COL_PROVIDER = 12;
+  const COL_PREFIX = 20;
+  const COL_STATUS = 16;
+  const header = import_picocolors8.default.dim("Provider".padEnd(COL_PROVIDER)) + import_picocolors8.default.dim("Key Prefix".padEnd(COL_PREFIX)) + import_picocolors8.default.dim("Sync Status".padEnd(COL_STATUS)) + import_picocolors8.default.dim("Last Synced");
+  console.log("  " + header);
+  console.log("  " + import_picocolors8.default.dim("─".repeat(64)));
+  for (const key of data) {
+    const lastSync = key.last_sync_at ? new Date(key.last_sync_at).toLocaleDateString() : import_picocolors8.default.dim("Never");
+    const statusColor = key.sync_status === "ok" || key.sync_status === "active" ? import_picocolors8.default.green(key.sync_status) : import_picocolors8.default.yellow(key.sync_status);
+    const row = key.provider.padEnd(COL_PROVIDER) + key.key_prefix.padEnd(COL_PREFIX) + statusColor.padEnd(COL_STATUS + 10) + lastSync;
+    console.log("  " + row);
+  }
+  console.log();
+}
+async function keysRemove(provider) {
+  if (!isValidProvider(provider)) {
+    console.error(import_picocolors8.default.red(`✗ Invalid provider: ${import_picocolors8.default.bold(provider)}`));
+    console.log(import_picocolors8.default.dim(`  Valid providers: ${VALID_PROVIDERS.join(", ")}`));
+    process.exitCode = 1;
+    return;
+  }
+  const credentials = await readCredentials();
+  if (!credentials) {
+    console.error(import_picocolors8.default.red("✗ Not authenticated. Run `getverbal init` first."));
+    process.exitCode = 1;
+    return;
+  }
+  const displayName = PROVIDER_DISPLAY[provider];
+  const rl = createInterface4({ input: process.stdin, output: process.stdout });
+  try {
+    const answer = await rl.question(`Remove ${import_picocolors8.default.bold(displayName)} key? (y/N) `);
+    const trimmed = answer.trim().toLowerCase();
+    if (trimmed !== "y" && trimmed !== "yes") {
+      console.log(import_picocolors8.default.dim("Cancelled."));
+      return;
+    }
+    const url = new URL(`${credentials.api_url}/api/v1/provider-keys`);
+    url.searchParams.set("provider", provider);
+    const res = await fetch(url.toString(), {
+      method: "DELETE",
+      headers: {
+        Authorization: `Bearer ${credentials.api_key}`
+      }
+    });
+    if (!res.ok) {
+      const body = await res.text().catch(() => "");
+      let errorMessage = `HTTP ${res.status}`;
+      try {
+        const json = JSON.parse(body);
+        if (json.error)
+          errorMessage = json.error;
+      } catch {}
+      console.error(import_picocolors8.default.red(`✗ Failed to remove ${displayName} key: ${errorMessage}`));
+      process.exitCode = 1;
+      return;
+    }
+    console.log(import_picocolors8.default.green(`✓ ${displayName} key removed`));
+  } finally {
+    rl.close();
+  }
+}
+async function runKeys(args) {
+  const subcommand = args[0];
+  switch (subcommand) {
+    case "add": {
+      const provider = args[1];
+      if (!provider) {
+        console.error(import_picocolors8.default.red("✗ Missing provider. Usage: getverbal keys add <provider>"));
+        console.log(import_picocolors8.default.dim(`  Valid providers: ${VALID_PROVIDERS.join(", ")}`));
+        process.exitCode = 1;
+        return;
+      }
+      await keysAdd(provider);
+      break;
+    }
+    case "list":
+      await keysList();
+      break;
+    case "remove": {
+      const provider = args[1];
+      if (!provider) {
+        console.error(import_picocolors8.default.red("✗ Missing provider. Usage: getverbal keys remove <provider>"));
+        console.log(import_picocolors8.default.dim(`  Valid providers: ${VALID_PROVIDERS.join(", ")}`));
+        process.exitCode = 1;
+        return;
+      }
+      await keysRemove(provider);
+      break;
+    }
+    case "--help":
+    case "-h":
+    case undefined:
+      console.log(KEYS_HELP);
+      break;
+    default:
+      console.error(`${import_picocolors8.default.red("Unknown subcommand:")} ${subcommand}
+`);
+      console.log(KEYS_HELP);
+      process.exitCode = 1;
+  }
+}
+var import_picocolors8, VALID_PROVIDERS, PROVIDER_DISPLAY, KEYS_HELP;
+var init_keys = __esm(() => {
+  init_credentials();
+  import_picocolors8 = __toESM(require_picocolors(), 1);
+  VALID_PROVIDERS = ["anthropic", "openai", "google"];
+  PROVIDER_DISPLAY = {
+    anthropic: "Anthropic",
+    openai: "OpenAI",
+    google: "Google"
+  };
+  KEYS_HELP = `
+${import_picocolors8.default.bold("getverbal keys")} — Manage provider API keys
+
+${import_picocolors8.default.dim("Usage:")}  getverbal keys <subcommand> [provider]
+
+${import_picocolors8.default.dim("Subcommands:")}
+  add <provider>     Add a provider API key
+  list               List all configured provider keys
+  remove <provider>  Remove a provider API key
+
+${import_picocolors8.default.dim("Providers:")}  ${VALID_PROVIDERS.join(", ")}
+
+${import_picocolors8.default.dim("Examples:")}
+  getverbal keys add anthropic
+  getverbal keys list
+  getverbal keys remove openai
+`.trim();
+});
+
 // src/commands/sync.ts
 var exports_sync = {};
 __export(exports_sync, {
@@ -20445,12 +20903,12 @@ __export(exports_sync, {
 async function runSync() {
   const creds = await readCredentials();
   if (!creds) {
-    console.error(import_picocolors8.default.red("Not authenticated. Run `getverbal init` first."));
+    console.error(import_picocolors9.default.red("Not authenticated. Run `getverbal init` first."));
     process.exitCode = 1;
     return;
   }
   console.log(`
-${import_picocolors8.default.bold("Syncing AI tool usage...")}
+${import_picocolors9.default.bold("Syncing AI tool usage...")}
 `);
   const stateDir = getDefaultStateDir();
   let result;
@@ -20465,36 +20923,36 @@ ${import_picocolors8.default.bold("Syncing AI tool usage...")}
       stateDir
     });
   } catch (err) {
-    console.error(import_picocolors8.default.red(`Sync failed: ${err instanceof Error ? err.message : String(err)}`));
+    console.error(import_picocolors9.default.red(`Sync failed: ${err instanceof Error ? err.message : String(err)}`));
     process.exitCode = 1;
     return;
   }
   for (const p of result.platforms) {
     if (p.error) {
-      console.log(`  ${import_picocolors8.default.dim(p.id.padEnd(14))} ${import_picocolors8.default.yellow("⚠")} ${import_picocolors8.default.dim(p.error)}`);
+      console.log(`  ${import_picocolors9.default.dim(p.id.padEnd(14))} ${import_picocolors9.default.yellow("⚠")} ${import_picocolors9.default.dim(p.error)}`);
     } else if (p.events === 0) {
-      console.log(`  ${import_picocolors8.default.dim(p.id.padEnd(14))} ${import_picocolors8.default.dim("0 events")}   ${import_picocolors8.default.green("✓")}`);
+      console.log(`  ${import_picocolors9.default.dim(p.id.padEnd(14))} ${import_picocolors9.default.dim("0 events")}   ${import_picocolors9.default.green("✓")}`);
     } else {
-      const costStr = p.totalCost > 0 ? `$${p.totalCost.toFixed(2)}` : import_picocolors8.default.dim("—");
-      const billingNote = p.totalCost === 0 && p.events > 0 ? import_picocolors8.default.dim(" (subscription)") : "";
-      console.log(`  ${import_picocolors8.default.dim(p.id.padEnd(14))} ${import_picocolors8.default.bold(String(p.events))} events   ${costStr}${billingNote}   ${import_picocolors8.default.green("✓")}`);
+      const costStr = p.totalCost > 0 ? `$${p.totalCost.toFixed(2)}` : import_picocolors9.default.dim("—");
+      const billingNote = p.totalCost === 0 && p.events > 0 ? import_picocolors9.default.dim(" (subscription)") : "";
+      console.log(`  ${import_picocolors9.default.dim(p.id.padEnd(14))} ${import_picocolors9.default.bold(String(p.events))} events   ${costStr}${billingNote}   ${import_picocolors9.default.green("✓")}`);
     }
   }
   console.log();
   if (result.totalEvents === 0) {
-    console.log(import_picocolors8.default.dim("No new events since last sync."));
+    console.log(import_picocolors9.default.dim("No new events since last sync."));
   } else {
     const costStr = result.totalCost > 0 ? `, $${result.totalCost.toFixed(2)} in spend` : "";
-    console.log(`${import_picocolors8.default.green("✓")} ${import_picocolors8.default.bold(String(result.totalEvents))} events synced${costStr}`);
+    console.log(`${import_picocolors9.default.green("✓")} ${import_picocolors9.default.bold(String(result.totalEvents))} events synced${costStr}`);
   }
   console.log();
 }
-var import_picocolors8, DEFAULT_BATCH_SIZE = 50, DEFAULT_FLUSH_MS = 0, DEFAULT_TIMEOUT_MS = 30000;
+var import_picocolors9, DEFAULT_BATCH_SIZE = 50, DEFAULT_FLUSH_MS = 0, DEFAULT_TIMEOUT_MS = 30000;
 var init_sync = __esm(() => {
   init_credentials();
   init_orchestrator();
   init_preflight_state();
-  import_picocolors8 = __toESM(require_picocolors(), 1);
+  import_picocolors9 = __toESM(require_picocolors(), 1);
 });
 
 // node_modules/zod/v4/core/core.js
@@ -34918,102 +35376,6 @@ async function sendTrace(config3, traceId, name, events) {
   }
 }
 
-// src/agent-hooks/tool-extraction.ts
-function parseToolInput(toolName, input) {
-  const isShell = SHELL_TOOL_NAMES.has(toolName);
-  const truncLimit = isShell ? TRUNCATION_BASH : TRUNCATION_DEFAULT;
-  let raw;
-  let command;
-  if (typeof input === "string") {
-    raw = input.slice(0, truncLimit);
-    if (isShell) {
-      if (input.length > 0) {
-        try {
-          const parsed = JSON.parse(input);
-          command = extractCommandFromObject(parsed);
-        } catch {
-          command = input.slice(0, truncLimit);
-        }
-      }
-    }
-  } else if (input !== null && typeof input === "object") {
-    if (isShell) {
-      command = extractCommandFromObject(input);
-    }
-    try {
-      raw = JSON.stringify(input).slice(0, truncLimit);
-    } catch {
-      raw = String(input).slice(0, truncLimit);
-    }
-  } else {
-    raw = String(input ?? "").slice(0, truncLimit);
-  }
-  if (command !== undefined) {
-    command = command.slice(0, truncLimit);
-  }
-  const command_type = command !== undefined ? detectCommandType(command) : undefined;
-  return { raw, command, command_type };
-}
-function extractCommandFromObject(obj) {
-  const cmd = obj["command"] ?? obj["cmd"] ?? obj["shell_command"];
-  return typeof cmd === "string" ? cmd : undefined;
-}
-function detectCommandType(command) {
-  const first = command.trim().split(/\s+/)[0] ?? "";
-  const basename = first.split("/").pop() ?? first;
-  return COMMAND_TYPE_MAP[basename.toLowerCase()] ?? "shell";
-}
-var SHELL_TOOL_NAMES, TRUNCATION_BASH = 2000, TRUNCATION_DEFAULT = 500, COMMAND_TYPE_MAP;
-var init_tool_extraction = __esm(() => {
-  SHELL_TOOL_NAMES = new Set([
-    "Bash",
-    "bash",
-    "shell",
-    "Shell",
-    "exec",
-    "run_command",
-    "computer"
-  ]);
-  COMMAND_TYPE_MAP = {
-    git: "git",
-    npm: "npm",
-    npx: "npm",
-    bun: "bun",
-    bunx: "bun",
-    node: "node",
-    python: "python",
-    python3: "python",
-    pip: "python",
-    pip3: "python",
-    tsc: "typescript",
-    vitest: "test",
-    jest: "test",
-    pytest: "test",
-    mocha: "test",
-    curl: "http",
-    wget: "http",
-    cat: "file",
-    ls: "file",
-    find: "file",
-    cp: "file",
-    mv: "file",
-    rm: "file",
-    mkdir: "file",
-    grep: "search",
-    rg: "search",
-    sed: "transform",
-    awk: "transform",
-    docker: "docker",
-    "docker-compose": "docker",
-    kubectl: "kubernetes",
-    helm: "kubernetes",
-    terraform: "infrastructure",
-    gh: "github",
-    supabase: "supabase",
-    bd: "beads"
-  };
-});
-
 // src/agent-hooks/claude.ts
 import fs13 from "node:fs";
 async function ingestClaudeHookInput(input, config3) {
@@ -35189,28 +35551,9 @@ function readJsonLines2(filePath) {
 function extractMessage3(entry) {
   const message = entry.message;
   const role = message?.role ?? entry.type;
-  const content = flattenContent2(message?.content ?? entry.content);
+  const content = flattenContent(message?.content ?? entry.content);
   return { role, content };
 }
-function flattenContent2(content) {
-  if (!content)
-    return;
-  if (typeof content === "string")
-    return content;
-  if (Array.isArray(content)) {
-    const parts = content.map((item) => {
-      if (!item || typeof item !== "object")
-        return "";
-      const typed = item;
-      if (typed.type === "thinking" || typed.type === "tool_use")
-        return "";
-      return typed.text ?? typed.input_text ?? typed.output_text ?? "";
-    }).filter(Boolean);
-    return parts.length ? parts.join(`
-`) : undefined;
-  }
-  return;
-}
 function getEntryId2(entry) {
   return entry.uuid ?? entry.message?.id ?? entry.id ?? entry.messageId;
 }
@@ -35222,6 +35565,7 @@ var init_claude = __esm(() => {
   init_ingest();
   init_state2();
   init_tool_extraction();
+  init_parsing_utils();
 });
 
 // src/agent-hooks/codex.ts
@@ -35501,22 +35845,22 @@ function extractMessage4(entry) {
     const payload = entry.payload;
     if (payload.type === "message") {
       const role = payload.role;
-      const content = flattenContent3(payload.content);
+      const content = flattenContent2(payload.content);
       if (role)
         return { role, content };
     }
   }
   if (entry.type === "message" && entry.role) {
-    return { role: entry.role, content: flattenContent3(entry.content) };
+    return { role: entry.role, content: flattenContent2(entry.content) };
   }
   if (entry.type === "user" || entry.type === "assistant") {
     const role = entry.type;
-    const content = flattenContent3(entry.content ?? entry.message);
+    const content = flattenContent2(entry.content ?? entry.message);
     return { role, content };
   }
   return null;
 }
-function flattenContent3(content) {
+function flattenContent2(content) {
   if (!content)
     return;
   if (typeof content === "string")
@@ -36141,8 +36485,8 @@ function printUpdateNotice(currentVersion) {
     if (compareSemver(currentVersion, cache.latest) >= 0)
       return;
     const lines = [
-      `Update available: ${import_picocolors9.default.dim(currentVersion)} → ${import_picocolors9.default.green(cache.latest)}`,
-      `Run ${import_picocolors9.default.cyan("getverbal update")} to upgrade`
+      `Update available: ${import_picocolors10.default.dim(currentVersion)} → ${import_picocolors10.default.green(cache.latest)}`,
+      `Run ${import_picocolors10.default.cyan("getverbal update")} to upgrade`
     ];
     if (cache.message) {
       lines.push("");
@@ -36160,14 +36504,14 @@ function printUpdateNotice(currentVersion) {
     console.log(`└${border}┘`);
   } catch {}
 }
-var import_picocolors9;
+var import_picocolors10;
 var init_notify = __esm(() => {
   init_credentials();
-  import_picocolors9 = __toESM(require_picocolors(), 1);
+  import_picocolors10 = __toESM(require_picocolors(), 1);
 });
 
 // src/cli.ts
-var import_picocolors10 = __toESM(require_picocolors(), 1);
+var import_picocolors11 = __toESM(require_picocolors(), 1);
 
 // src/commands/init.ts
 var import_picocolors = __toESM(require_picocolors(), 1);
@@ -37095,6 +37439,58 @@ async function runInit() {
         console.log(import_picocolors.default.yellow("    Cursor sync requires Bun runtime. Run via: bunx getverbal sync"));
       }
     }
+    {
+      console.log();
+      console.log(import_picocolors.default.bold("Connect provider billing") + import_picocolors.default.dim(" (optional)"));
+      console.log(import_picocolors.default.dim("  Verbal can pull your API spend directly from providers."));
+      console.log();
+      const providers = [
+        { id: "anthropic", label: "Anthropic" },
+        { id: "openai", label: "OpenAI" }
+      ];
+      let keysAdded = 0;
+      for (const provider of providers) {
+        const connect = await confirm(rl, `  Connect ${provider.label} API billing?`, false);
+        if (!connect) {
+          console.log(import_picocolors.default.dim(`  Skipped.`));
+          continue;
+        }
+        const key = await rl.question(`  Enter your ${provider.label} Admin API key: `);
+        const trimmedKey = key.trim();
+        if (!trimmedKey) {
+          console.log(import_picocolors.default.dim("  No key entered. Skipped."));
+          continue;
+        }
+        try {
+          const res = await fetch(`${credentials.api_url}/api/v1/provider-keys`, {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json",
+              Authorization: `Bearer ${credentials.api_key}`
+            },
+            body: JSON.stringify({ provider: provider.id, key: trimmedKey })
+          });
+          if (res.ok) {
+            const data = await res.json();
+            const prefix = data.key_prefix ?? trimmedKey.slice(0, 10);
+            console.log(import_picocolors.default.green(`  ✓ ${provider.label} key added (prefix: ${prefix})`));
+            keysAdded++;
+          } else {
+            const errData = await res.json().catch(() => ({}));
+            const errMsg = errData.error ?? `HTTP ${res.status}`;
+            console.log(import_picocolors.default.yellow(`  ⚠ ${provider.label} key not saved: ${errMsg}`));
+          }
+        } catch (err) {
+          const msg = err instanceof Error ? err.message : String(err);
+          console.log(import_picocolors.default.yellow(`  ⚠ Could not save ${provider.label} key: ${msg}`));
+        }
+      }
+      if (keysAdded > 0) {
+        console.log();
+        console.log(import_picocolors.default.green(`  ✓ ${keysAdded} provider key${keysAdded > 1 ? "s" : ""} connected`) + import_picocolors.default.dim(" — billing data will sync automatically"));
+      }
+      console.log();
+    }
     process.stdout.write(import_picocolors.default.dim("Verifying connection..."));
     try {
       await verifyConnection(credentials);
@@ -37266,25 +37662,26 @@ async function runDashboard() {
 
 // src/cli.ts
 var HELP = `
-${import_picocolors10.default.bold("getverbal")} — AI Spend Tracker
+${import_picocolors11.default.bold("getverbal")} — AI Spend Tracker
 
-${import_picocolors10.default.dim("Usage:")}  getverbal <command> [options]
+${import_picocolors11.default.dim("Usage:")}  getverbal <command> [options]
 
-${import_picocolors10.default.dim("Commands:")}
+${import_picocolors11.default.dim("Commands:")}
   init        Authenticate, detect tools, configure, and import history
   status      Show current configuration and connection status
   dashboard   Open your Verbal dashboard in the browser
   import      Bulk import from exports or local tool history
+  keys        Manage provider API keys (add, list, remove)
   sync        Sync usage data from all detected AI tools
   update      Update getverbal to the latest version
   logout      Remove stored credentials
   uninstall   Remove Verbal from all AI tools and delete credentials
 
-${import_picocolors10.default.dim("Machine commands (invoked by AI tools):")}
+${import_picocolors11.default.dim("Machine commands (invoked by AI tools):")}
   mcp-serve   Start MCP server (stdio)
   hooks       Agent hook utilities
 
-${import_picocolors10.default.dim("Options:")}
+${import_picocolors11.default.dim("Options:")}
   --help, -h      Show this help message
   --version, -v   Show version number
 `.trim();
@@ -37316,6 +37713,11 @@ async function main2() {
       await runUpdate2(VERSION);
       break;
     }
+    case "keys": {
+      const { runKeys: runKeys2 } = await Promise.resolve().then(() => (init_keys(), exports_keys));
+      await runKeys2(process.argv.slice(3));
+      break;
+    }
     case "sync": {
       const { runSync: runSync2 } = await Promise.resolve().then(() => (init_sync(), exports_sync));
       await runSync2();
@@ -37347,7 +37749,7 @@ async function main2() {
       console.log(HELP);
       return;
     default:
-      console.error(`${import_picocolors10.default.red("Unknown command:")} ${command}
+      console.error(`${import_picocolors11.default.red("Unknown command:")} ${command}
 `);
       console.log(HELP);
       process.exitCode = 1;
@@ -37360,6 +37762,6 @@ async function main2() {
   }
 }
 main2().catch((err) => {
-  console.error(import_picocolors10.default.red(err instanceof Error ? err.message : "An unexpected error occurred"));
+  console.error(import_picocolors11.default.red(err instanceof Error ? err.message : "An unexpected error occurred"));
   process.exitCode = 1;
 });