@yhong91/vibetime 0.1.34 → 0.1.36

package/bin/vibetime.mjs

@@ -1928,7 +1928,7 @@ function countTextLines(text) {
 }
 
 // src/lib/constants.ts
-var PACKAGE_VERSION = true ? "0.1.34" : "0.1.1";
+var PACKAGE_VERSION = true ? "0.1.36" : "0.1.1";
 var DEFAULT_API_URL = "http://121.196.224.82:3001";
 var DEFAULT_BACKFILL_BATCH_SIZE = 50;
 var DEFAULT_BACKFILL_BATCH_BYTES = 800 * 1024;
@@ -4248,7 +4248,7 @@ async function parseCodebuddyTraceFile(filePath, options) {
       confidence: "partial"
     }), 0, "trace");
   }
-  if (trace.prompt && traceStartedAt) {
+  if (traceStartedAt) {
     const turnId = `turn_${createStableHash([sessionId, trace.traceId]).slice(0, 24)}`;
     push(baseEvent({
       ts: traceStartedAt,
@@ -4260,23 +4260,25 @@ async function parseCodebuddyTraceFile(filePath, options) {
       model,
       confidence: "partial"
     }), 0, "trace");
-    push(baseEvent({
-      ts: traceStartedAt,
-      type: "prompt.submitted",
-      sessionId,
-      turnId,
-      cwd,
-      project,
-      model,
-      confidence: "partial",
-      metrics: {
-        prompts: 1,
-        promptChars: trace.prompt.length
-      },
-      refs: stringRefs({
-        promptHash: trace.prompt ? `sha256:${createStableHash(trace.prompt)}` : void 0
-      })
-    }), 0, "trace");
+    if (trace.prompt) {
+      push(baseEvent({
+        ts: traceStartedAt,
+        type: "prompt.submitted",
+        sessionId,
+        turnId,
+        cwd,
+        project,
+        model,
+        confidence: "partial",
+        metrics: {
+          prompts: 1,
+          promptChars: trace.prompt.length
+        },
+        refs: stringRefs({
+          promptHash: `sha256:${createStableHash(trace.prompt)}`
+        })
+      }), 0, "trace");
+    }
     if (traceEndedAt) {
       push(baseEvent({
         ts: traceEndedAt,
@@ -9148,7 +9150,6 @@ function normalizeId(id) {
 // src/adapters/workbuddy.ts
 import { readFile as readFile12, readdir as readdir9, stat as stat10 } from "node:fs/promises";
 import path19 from "node:path";
-init_fs();
 function workbuddyProjectsDir(home, env) {
   const override = env?.WORKBUDDY_PROJECTS_DIR || env?.WORKBUDDY_HOME;
   if (override && override.trim()) {
@@ -9156,6 +9157,13 @@ function workbuddyProjectsDir(home, env) {
   }
   return path19.join(home, ".workbuddy", "projects");
 }
+function workbuddyBaseDir(home, env) {
+  const override = env?.WORKBUDDY_HOME;
+  if (override && override.trim()) {
+    return path19.resolve(override);
+  }
+  return path19.join(home, ".workbuddy");
+}
 function projectFromCwd(cwd, fallback) {
   if (!cwd) {
     return fallback;
@@ -9180,12 +9188,13 @@ function workbuddyUsageMetrics(record) {
   const providerData = objectField(record, "providerData");
   const usage = objectField(providerData, "usage");
   const rawUsage = objectField(providerData, "rawUsage");
-  if (Object.keys(usage).length === 0 && Object.keys(rawUsage).length === 0) {
+  const messageUsage = objectField(objectField(record, "message"), "usage");
+  if (Object.keys(usage).length === 0 && Object.keys(rawUsage).length === 0 && Object.keys(messageUsage).length === 0) {
     return void 0;
   }
-  const input = numberField(usage, "inputTokens") ?? numberField(rawUsage, "prompt_tokens") ?? 0;
-  const output = numberField(usage, "outputTokens") ?? numberField(rawUsage, "completion_tokens") ?? 0;
-  const total = numberField(usage, "totalTokens") ?? numberField(rawUsage, "total_tokens") ?? 0;
+  const input = numberField(usage, "inputTokens") ?? numberField(rawUsage, "prompt_tokens") ?? numberField(messageUsage, "input_tokens") ?? 0;
+  const output = numberField(usage, "outputTokens") ?? numberField(rawUsage, "completion_tokens") ?? numberField(messageUsage, "output_tokens") ?? 0;
+  const total = numberField(usage, "totalTokens") ?? numberField(rawUsage, "total_tokens") ?? numberField(messageUsage, "total_tokens") ?? 0;
   const cacheRead = workbuddyCachedTokens(usage, rawUsage);
   const cacheCreate = numberField(rawUsage, "cache_creation_input_tokens") ?? numberField(rawUsage, "prompt_cache_write_tokens") ?? 0;
   const reasoning = workbuddyReasoningTokens(usage, rawUsage);
@@ -9242,6 +9251,40 @@ function contentLength(value) {
   }
   return 0;
 }
+function isHiddenUserMessage(record) {
+  const providerData = objectField(record, "providerData");
+  return providerData.skipRun === true || providerData.isMeta === true || providerData.isCompactInternal === true || providerData.isCompact === true || providerData.isTeammateMessage === true || (stringField(providerData, "agentPurpose") || "").toLowerCase().includes("compact");
+}
+function workbuddySubagentRefs(lines) {
+  const refs2 = {};
+  const keys = [
+    ["parentSessionId", ["parent_session_id", "parentSessionId"]],
+    ["parentToolCallId", ["parent_tool_call_id", "parentToolCallId"]],
+    ["subagentId", ["agent_id", "agentId"]],
+    ["subagentType", ["agent_type", "agentType"]]
+  ];
+  for (const line of lines) {
+    const providerData = objectField(line.record, "providerData");
+    for (const [ref, aliases] of keys) {
+      if (refs2[ref]) {
+        continue;
+      }
+      for (const alias of aliases) {
+        const value = stringField(line.record, alias) || stringField(providerData, alias);
+        if (value) {
+          refs2[ref] = value;
+          break;
+        }
+      }
+    }
+  }
+  return refs2;
+}
+function toolCallFailed(record) {
+  const providerData = objectField(record, "providerData");
+  const status = stringField(record, "status");
+  return status === "failed" || status === "incomplete" || record.is_error === true || providerData.error != null || providerData.isError === true;
+}
 async function readWorkbuddyLines(filePath) {
   const text = await readFile12(filePath, "utf8");
   return text.split(/\r?\n/).map((line, index) => {
@@ -9270,8 +9313,32 @@ async function parseWorkbuddySessionFile(filePath, options) {
   const workspaceId = createWorkspaceId({ projectName: project, repoRoot: cwd });
   const sessionPrefix = `workbuddy:${sessionId}`;
   const toolStarts = /* @__PURE__ */ new Map();
+  const subagentRefs = workbuddySubagentRefs(lines);
   let currentTurnId = `${sessionPrefix}:turn:0`;
   let turnIndex = 0;
+  let turnLastTs;
+  let turnSawResponse = false;
+  let turnLastAssistantStatus;
+  const closeTurn = (line) => {
+    if (turnIndex === 0 || !turnSawResponse || !turnLastTs) {
+      return void 0;
+    }
+    const failed = turnLastAssistantStatus !== void 0 && ["incomplete", "failed", "cancelled"].includes(turnLastAssistantStatus);
+    return makeEvent({
+      schemaVersion: AGENT_TIME_SCHEMA_VERSION,
+      ts: turnLastTs,
+      type: failed ? "turn.failed" : "turn.completed",
+      source: "workbuddy",
+      workspaceId,
+      project,
+      cwd,
+      sessionId: sessionPrefix,
+      turnId: currentTurnId,
+      agent: "workbuddy",
+      confidence: "derived",
+      refs: { sourceId: `${currentTurnId}:end` }
+    }, line, filePath, options);
+  };
   const firstTs = lines.map((line) => timestampFrom(numberField(line.record, "timestamp"))).find(Boolean);
   if (firstTs) {
     const event = makeEvent({
@@ -9285,7 +9352,7 @@ async function parseWorkbuddySessionFile(filePath, options) {
       sessionId: sessionPrefix,
       agent: "workbuddy",
       confidence: "derived",
-      refs: { sourceId: `${sessionPrefix}:session` }
+      refs: { sourceId: `${sessionPrefix}:session`, ...subagentRefs }
     }, lines[0], filePath, options);
     if (event) events.push(event);
   }
@@ -9298,8 +9365,16 @@ async function parseWorkbuddySessionFile(filePath, options) {
     const type = stringField(record, "type");
     const sourceId = stringField(record, "id") || `${line.lineNumber}`;
     if (type === "message" && stringField(record, "role") === "user") {
+      if (isHiddenUserMessage(record)) {
+        continue;
+      }
+      const ended = closeTurn(line);
+      if (ended) events.push(ended);
       turnIndex += 1;
       currentTurnId = `${sessionPrefix}:turn:${turnIndex}`;
+      turnLastTs = ts;
+      turnSawResponse = false;
+      turnLastAssistantStatus = void 0;
       const promptChars = contentLength(record.content);
       for (const event of [
         makeEvent({
@@ -9336,7 +9411,36 @@ async function parseWorkbuddySessionFile(filePath, options) {
       }
       continue;
     }
+    if (type === "message" && stringField(record, "role") === "assistant") {
+      turnLastTs = ts;
+      turnSawResponse = true;
+      turnLastAssistantStatus = stringField(record, "status") || turnLastAssistantStatus;
+      const metrics = workbuddyUsageMetrics(record);
+      if (metrics) {
+        const model = stringField(objectField(record, "providerData"), "model");
+        const usage = makeEvent({
+          schemaVersion: AGENT_TIME_SCHEMA_VERSION,
+          ts,
+          type: "model.usage",
+          source: "workbuddy",
+          workspaceId,
+          project,
+          cwd,
+          sessionId: sessionPrefix,
+          turnId: currentTurnId,
+          agent: "workbuddy",
+          model,
+          metrics,
+          confidence: "partial",
+          refs: { sourceId: `${sourceId}:usage` }
+        }, line, filePath, options);
+        if (usage) events.push(usage);
+      }
+      continue;
+    }
     if (type === "function_call") {
+      turnLastTs = ts;
+      turnSawResponse = true;
       const tool = stringField(record, "name");
       const callId = stringField(record, "callId");
       if (tool && callId) {
@@ -9383,15 +9487,16 @@ async function parseWorkbuddySessionFile(filePath, options) {
       continue;
     }
     if (type === "function_call_result") {
+      turnLastTs = ts;
       const tool = stringField(record, "name") || "tool";
       const callId = stringField(record, "callId") || `${line.lineNumber}`;
       const start = toolStarts.get(`${sessionId}:${callId}`);
       const durationMs = start?.ts ? Math.max(0, Date.parse(ts) - Date.parse(start.ts)) : void 0;
-      const status = stringField(record, "status");
+      const failed = toolCallFailed(record);
       const completed = makeEvent({
         schemaVersion: AGENT_TIME_SCHEMA_VERSION,
         ts,
-        type: status === "failed" ? "tool.failed" : "tool.completed",
+        type: failed ? "tool.failed" : "tool.completed",
         source: "workbuddy",
         workspaceId,
         project,
@@ -9401,7 +9506,7 @@ async function parseWorkbuddySessionFile(filePath, options) {
         spanId: `${sessionPrefix}:tool:${callId}`,
         agent: "workbuddy",
         tool,
-        success: status !== "failed",
+        success: !failed,
         metrics: { toolDurationMs: durationMs, durationMs },
         confidence: start ? "derived" : "partial",
         refs: { sourceId: `${callId}:result` }
@@ -9410,6 +9515,10 @@ async function parseWorkbuddySessionFile(filePath, options) {
     }
   }
   const lastLine = lines.at(-1);
+  if (lastLine) {
+    const ended = closeTurn(lastLine);
+    if (ended) events.push(ended);
+  }
   const lastTs = lastLine ? timestampFrom(numberField(lastLine.record, "timestamp")) : void 0;
   if (lastLine && lastTs) {
     const event = makeEvent({
@@ -9453,6 +9562,23 @@ async function workbuddyBackfillFiles(sourceRoot, home, env) {
   }
   return files.sort((a, b) => a.path.localeCompare(b.path));
 }
+var workbuddyHandler = (msg) => hookHandler("workbuddy", msg);
+function hookConfig8() {
+  const anyTool = [{ matcher: ".*", hooks: [workbuddyHandler("Reporting tool activity")] }];
+  return {
+    hooks: {
+      SessionEnd: [{ hooks: [workbuddyHandler("Reporting session end")] }],
+      UserPromptSubmit: [{ hooks: [workbuddyHandler("Reporting prompt activity")] }],
+      PreToolUse: anyTool,
+      PostToolUse: anyTool,
+      PostToolUseFailure: anyTool,
+      Stop: [{ hooks: [workbuddyHandler("Reporting turn completion")] }],
+      StopFailure: [{ hooks: [workbuddyHandler("Reporting turn failure")] }],
+      SubagentStart: anyTool,
+      SubagentStop: [{ hooks: [workbuddyHandler("Reporting subagent completion")] }]
+    }
+  };
+}
 function createWorkbuddyAdapter() {
   return {
     id: "workbuddy",
@@ -9463,13 +9589,20 @@ function createWorkbuddyAdapter() {
       return workbuddyProjectsDir(home, env);
     },
     installedPath(home, env) {
-      return workbuddyProjectsDir(home, env);
+      return path19.join(workbuddyBaseDir(home, env), "settings.json");
     },
     async isInstalled(home, env) {
-      return pathExists(workbuddyProjectsDir(home, env));
+      return isHooksJsonInstalled(
+        path19.join(workbuddyBaseDir(home, env), "settings.json"),
+        "vibetime hook --agent workbuddy"
+      );
     },
-    installEntries() {
-      return [];
+    installEntries(home, env) {
+      return [{
+        kind: "hooks-json",
+        path: path19.join(workbuddyBaseDir(home, env), "settings.json"),
+        content: hookConfig8()
+      }];
     },
     sourcePaths(home, env) {
       return [workbuddyProjectsDir(home, env)];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@yhong91/vibetime",
   "type": "module",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "vibetime CLI — install AI-agent hooks (Claude Code, Codex, OpenCode, Pi) and report activity to vibetime.",
   "license": "MIT",
   "publishConfig": {