@tangle-network/agent-provider-cli-bridge 0.2.25 → 0.2.27

package/dist/index.js

@@ -40,7 +40,10 @@ async function* streamCliBridgeTurn(fetchImpl, options, environmentInput, turn)
     if (!response.body)
         throw new Error("cli-bridge response body is empty");
     let text = "";
-    let usage;
+    const sessionId = turn.sessionId ?? environmentInput.idempotencyKey ?? environmentInput.name ?? "cli-bridge";
+    const messageId = turn.turnId ?? `${sessionId}:assistant`;
+    const emittedToolCalls = new Set();
+    let completed = false;
     for await (const event of parseSse(response.body)) {
         if (event === "[DONE]")
             break;
@@ -51,35 +54,80 @@ async function* streamCliBridgeTurn(fetchImpl, options, environmentInput, turn)
             const error = parsed.error;
             const message = typeof error.message === "string" ? error.message : "cli-bridge error";
             yield { type: "status", data: { status: "failed", error: message } };
-            return;
+            throw new Error(`cli-bridge: ${message}`);
         }
         const choice = Array.isArray(parsed.choices) ? parsed.choices[0] : undefined;
         const delta = choice?.delta;
         const chunk = delta && typeof delta.content === "string" ? delta.content : "";
         const nextUsage = usageFromOpenAi(parsed.usage);
         if (nextUsage) {
-            usage = mergeUsage(usage, nextUsage);
-            yield { type: "usage", data: { usage: nextUsage }, usage: nextUsage };
+            yield { type: "usage", data: {}, usage: nextUsage };
         }
         if (chunk) {
             text += chunk;
+            const part = {
+                id: `${messageId}:text`,
+                sessionID: sessionId,
+                messageID: messageId,
+                type: "text",
+                text,
+            };
+            const normalized = {
+                type: "message.part.updated",
+                part,
+                delta: chunk,
+            };
             yield {
                 type: "message.part.updated",
-                data: { delta: chunk },
+                data: { part, delta: chunk },
+                normalized,
+            };
+        }
+        for (const toolCall of toolCallsFromDelta(delta)) {
+            const callId = toolCall.id ?? `${messageId}:tool:${toolCall.index}`;
+            if (!toolCall.name || emittedToolCalls.has(callId))
+                continue;
+            emittedToolCalls.add(callId);
+            const part = {
+                id: callId,
+                sessionID: sessionId,
+                messageID: messageId,
+                type: "tool",
+                callID: callId,
+                tool: toolCall.name,
+                state: { status: "pending", input: {} },
+            };
+            const normalized = {
+                type: "message.part.updated",
+                part,
+            };
+            yield {
+                type: "message.part.updated",
+                data: { part },
+                normalized,
             };
         }
         if (choice?.finish_reason) {
+            if (choice.finish_reason === "error") {
+                yield {
+                    type: "status",
+                    data: { status: "failed", error: "cli-bridge returned finish_reason=error" },
+                };
+                throw new Error("cli-bridge returned finish_reason=error");
+            }
+            completed = true;
             yield {
                 type: "result",
                 data: {
                     finalText: text,
                     finishReason: choice.finish_reason,
-                    status: choice.finish_reason === "error" ? "failed" : "completed",
+                    status: "completed",
                 },
-                ...(usage ? { usage } : {}),
             };
         }
     }
+    if (!completed)
+        throw new Error("cli-bridge stream ended without a terminal result");
 }
 function toChatCompletionsBody(options, environmentInput, turn) {
     const profile = inlineProfile(environmentInput.profile);
@@ -137,14 +185,14 @@ async function* parseSse(body) {
             if (done)
                 break;
             buffer += decoder.decode(value, { stream: true });
-            let boundary = buffer.indexOf("\n\n");
-            while (boundary !== -1) {
-                const frame = buffer.slice(0, boundary);
-                buffer = buffer.slice(boundary + 2);
+            let boundary = findFrameBoundary(buffer);
+            while (boundary) {
+                const frame = buffer.slice(0, boundary.index);
+                buffer = buffer.slice(boundary.index + boundary.length);
                 const data = dataFromFrame(frame);
                 if (data !== undefined)
                     yield data;
-                boundary = buffer.indexOf("\n\n");
+                boundary = findFrameBoundary(buffer);
             }
         }
         if (buffer) {
@@ -157,6 +205,15 @@ async function* parseSse(body) {
         reader.releaseLock();
     }
 }
+function findFrameBoundary(value) {
+    const lf = value.indexOf("\n\n");
+    const crlf = value.indexOf("\r\n\r\n");
+    if (lf === -1 && crlf === -1)
+        return undefined;
+    if (crlf !== -1 && (lf === -1 || crlf < lf))
+        return { index: crlf, length: 4 };
+    return { index: lf, length: 2 };
+}
 function dataFromFrame(frame) {
     const lines = frame.split(/\r?\n/);
     const data = lines
@@ -165,6 +222,25 @@ function dataFromFrame(frame) {
         .join("\n");
     return data || undefined;
 }
+function toolCallsFromDelta(value) {
+    if (!value || typeof value !== "object")
+        return [];
+    const calls = value.tool_calls;
+    if (!Array.isArray(calls))
+        return [];
+    return calls.flatMap((call, position) => {
+        if (!call || typeof call !== "object")
+            return [];
+        const record = call;
+        const fn = record.function;
+        const name = fn && typeof fn === "object" && typeof fn.name === "string"
+            ? fn.name
+            : undefined;
+        const index = number(record.index) ?? position;
+        const id = typeof record.id === "string" ? record.id : undefined;
+        return [{ ...(id ? { id } : {}), index, ...(name ? { name } : {}) }];
+    });
+}
 function safeJson(value) {
     try {
         const parsed = JSON.parse(value);
@@ -182,15 +258,19 @@ function usageFromOpenAi(value) {
     const outputTokens = number(record.completion_tokens) ?? number(record.output_tokens);
     if (inputTokens === undefined && outputTokens === undefined)
         return undefined;
-    return { inputTokens: inputTokens ?? 0, outputTokens: outputTokens ?? 0 };
-}
-function mergeUsage(left, right) {
-    if (!left)
-        return right;
+    const totalTokens = number(record.total_tokens);
+    const cacheReadInputTokens = number(record.cache_read_input_tokens);
+    const cacheCreationInputTokens = number(record.cache_creation_input_tokens);
+    const reasoningTokens = number(record.reasoning_tokens);
+    const cost = number(record.cost);
     return {
-        inputTokens: left.inputTokens + right.inputTokens,
-        outputTokens: left.outputTokens + right.outputTokens,
-        ...(left.cost !== undefined || right.cost !== undefined ? { cost: (left.cost ?? 0) + (right.cost ?? 0) } : {}),
+        inputTokens: inputTokens ?? 0,
+        outputTokens: outputTokens ?? 0,
+        ...(totalTokens !== undefined ? { totalTokens } : {}),
+        ...(cacheReadInputTokens !== undefined ? { cacheReadInputTokens } : {}),
+        ...(cacheCreationInputTokens !== undefined ? { cacheCreationInputTokens } : {}),
+        ...(reasoningTokens !== undefined ? { reasoningTokens } : {}),
+        ...(cost !== undefined ? { cost } : {}),
     };
 }
 function number(value) {

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@tangle-network/agent-provider-cli-bridge",
-  "version": "0.2.25",
+  "version": "0.2.27",
   "description": "AgentEnvironmentProvider adapter for cli-bridge /v1/chat/completions",
   "type": "module",
   "license": "MIT",
-  "main": "dist/index.js",
-  "types": "src/index.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "types": "./src/index.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "repository": {
@@ -19,16 +20,7 @@
   },
   "publishConfig": {
     "access": "public",
-    "registry": "https://registry.npmjs.org",
-    "main": "./dist/index.js",
-    "types": "./dist/index.d.ts",
-    "exports": {
-      ".": {
-        "import": "./dist/index.js",
-        "types": "./dist/index.d.ts",
-        "default": "./dist/index.js"
-      }
-    }
+    "registry": "https://registry.npmjs.org"
   },
   "files": [
     "dist/index.d.ts",
@@ -36,19 +28,18 @@
     "README.md",
     "LICENSE"
   ],
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "check-types": "tsc --noEmit",
-    "clean": "rm -rf dist",
-    "prepublishOnly": "pnpm run build",
-    "test": "vitest run"
-  },
   "dependencies": {
     "@tangle-network/agent-interface": "0.34.0"
   },
   "devDependencies": {
-    "@types/node": "catalog:",
+    "@types/node": "25.6.0",
     "typescript": "^6.0.3",
-    "vitest": "catalog:"
+    "vitest": "^4.1.5"
+  },
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "check-types": "tsc --noEmit",
+    "clean": "rm -rf dist",
+    "test": "vitest run"
   }
-}
+}