fix: parent tool spans to the correct generation

Author: csh-scl

.github/workflows/ci.yml

@@ -32,3 +32,5 @@ jobs:
         run: pnpm run format:check
       - name: Build
         run: pnpm run build
+      - name: Test
+        run: pnpm run test

CONTRIBUTING.md

@@ -16,6 +16,12 @@ Build the plugin:
 pnpm run build
 ```
 
+Run the tests:
+
+```bash
+pnpm test
+```
+
 Format files:
 
 ```bash

package.json

@@ -39,7 +39,8 @@
   "scripts": {
     "build": "tsc",
     "format": "prettier --write .",
-    "format:check": "prettier --check ."
+    "format:check": "prettier --check .",
+    "test": "tsc && node --test test/*.test.js"
   },
   "dependencies": {
     "@langfuse/otel": "^5.4.1",
@@ -50,6 +51,7 @@
     "effect": "^3.21.2"
   },
   "devDependencies": {
+    "@opentelemetry/context-async-hooks": "2.7.1",
     "prettier": "^3.8.3",
     "typescript": "^6.0.3"
   }

pnpm-lock.yaml

@@ -23,6 +23,7 @@ type SessionNextEvent =
       properties: {
         sessionID: string;
         timestamp: number;
+        assistantMessageID?: string;
         agent: string;
         model: NonNullable<ActiveGenerationStep["model"]>;
         snapshot?: string;
@@ -39,9 +40,23 @@ type SessionNextEvent =
       properties: {
         sessionID: string;
         timestamp: number;
+        assistantMessageID?: string;
         error: { message: string };
       };
     }
+  | {
+      id: string;
+      type: "session.next.tool.called";
+      properties: {
+        timestamp: number;
+        sessionID: string;
+        assistantMessageID?: string;
+        callID: string;
+        tool: string;
+        input: Record<string, unknown>;
+        provider: { executed: boolean; metadata?: unknown };
+      };
+    }
   | {
       id: string;
       type: "session.next.retried";
@@ -172,6 +187,7 @@ const eventHook = (event: OpencodeEvent, shutdown?: () => Promise<void>) =>
     if (event.type === "session.next.step.started") {
       langfuse.startActiveGenerationStep({
         sessionID: event.properties.sessionID,
+        assistantMessageID: event.properties.assistantMessageID,
         agent: event.properties.agent,
         model: event.properties.model,
         started: event.properties.timestamp,
@@ -183,11 +199,23 @@ const eventHook = (event: OpencodeEvent, shutdown?: () => Promise<void>) =>
       langfuse.traceFailedGenerationStep({
         id: event.id,
         sessionID: event.properties.sessionID,
+        assistantMessageID: event.properties.assistantMessageID,
         completed: event.properties.timestamp,
         error: event.properties.error,
       });
     }
 
+    if (event.type === "session.next.tool.called") {
+      const messageID = event.properties.assistantMessageID;
+
+      if (messageID) {
+        langfuse.rememberToolCall({
+          callID: event.properties.callID,
+          messageID,
+        });
+      }
+    }
+
     if (event.type === "session.next.retried") {
       langfuse.traceEvent({
         id: event.id,
@@ -228,7 +256,25 @@ const eventHook = (event: OpencodeEvent, shutdown?: () => Promise<void>) =>
     if (event.type === "message.updated") {
       const message = event.properties.info;
 
-      if (message.role !== "assistant" || !message.time.completed) {
+      if (message.role !== "assistant") {
+        return;
+      }
+
+      // session.next.step.started is not exposed to plugins by every OpenCode
+      // version. message.updated is emitted when the assistant message is
+      // created, before any of that generation's tools execute.
+      langfuse.startActiveGenerationStep({
+        sessionID: message.sessionID,
+        assistantMessageID: message.id,
+        agent: message.mode,
+        model: {
+          id: message.modelID,
+          providerID: message.providerID,
+        },
+        started: message.time.created,
+      });
+
+      if (!message.time.completed) {
         return;
       }