ns-omp-provider 0.6.0 → 0.6.1

package/dist/index.js

@@ -1,4 +1,4 @@
-// ns-omp-provider 0.6.0 — bundles @ngosangns/ns-pi-provider@0.5.0 (MIT). See NOTICE.
+// ns-omp-provider 0.6.1 — bundles @ngosangns/ns-pi-provider@0.5.1 (MIT). See NOTICE.
 import { createRequire as __nsOmpCreateRequire } from 'node:module';
 const require = __nsOmpCreateRequire(import.meta.url);
 var __create = Object.create;
@@ -5348,12 +5348,17 @@ function readKiroEventStream(body, options) {
             iterResult = await iterator.next();
           }
         } catch (e) {
+          if (callerSignal?.aborted)
+            throw callerSignal.reason ?? e;
           const kiroError = e?.kiroError;
           if (kiroError)
             outcome.errorData = kiroError;
           outcome.error = e instanceof Error ? e.message : (typeof e === "object" && e !== null ? JSON.stringify(e) : String(e)) || "Unknown stream error";
           return;
         }
+        if (callerSignal?.aborted) {
+          throw callerSignal.reason ?? new Error("Request aborted");
+        }
         const { done, value } = iterResult;
         if (done)
           return;
@@ -9106,6 +9111,8 @@ function streamDevin(request) {
   return streamDevinInProcess(request);
 }
 async function* streamDevinInProcess(request) {
+  if (request.signal?.aborted)
+    throw request.signal.reason ?? new Error("Request aborted");
   const model = request.model;
   const fetchImpl = request.fetch ?? fetch;
   const baseUrl = (model.baseUrl || DEVIN_DEFAULT_BASE_URL).replace(/\/+$/, "");
@@ -9184,143 +9191,169 @@ async function* streamDevinInProcess(request) {
   };
   const reader = new ConnectFrameReader();
   const body = response.body.getReader();
-  for (; ; ) {
-    const { done, value } = await body.read();
-    if (value && value.length > 0)
-      reader.push(value);
+  const signal = request.signal;
+  const onAbort = () => {
+    void body.cancel(signal?.reason).catch(() => {
+    });
+  };
+  if (signal?.aborted)
+    onAbort();
+  else
+    signal?.addEventListener("abort", onAbort, { once: true });
+  const abortReason = () => signal?.reason ?? new Error("Request aborted");
+  try {
     for (; ; ) {
-      const envelope = reader.next();
-      if (envelope === null)
-        break;
-      if (envelope.endStream) {
-        const trailerError = readConnectTrailerError(new TextDecoder().decode(envelope.payload).trim());
-        if (trailerError === null)
-          continue;
-        logger.warn("stream rejected via Connect trailer", {
-          model: model.id,
-          code: trailerError.code,
-          message: trailerError.message,
-          ...trailerError.detail ? { detail: trailerError.detail } : {},
-          rawTrailer: trailerError.raw,
-          requestBytes: requestBytes.byteLength,
-          messages: request.messages.length,
-          hadOutput: sawAnyToken
-        });
-        let contextOverflow = false;
-        if (!sawAnyToken && trailerError.code.toLowerCase() === "invalid_argument" && /\binternal error\b/i.test(trailerError.message)) {
-          const historyBytes = toBinary(GetChatMessageRequestSchema, create(GetChatMessageRequestSchema, {
-            chatMessagePrompts: buildChatMessagePrompts(request.messages, turn.cascadeId)
-          })).byteLength;
-          contextOverflow = historyBytes >= LARGE_HISTORY_RECOVERY_BYTES;
-          if (contextOverflow) {
-            logger.warn("treating large-history invalid_argument as context overflow", {
-              model: model.id,
-              historyBytes
-            });
+      if (signal?.aborted)
+        throw abortReason();
+      let read;
+      try {
+        read = await body.read();
+      } catch (error2) {
+        if (signal?.aborted)
+          throw abortReason();
+        throw error2;
+      }
+      if (signal?.aborted)
+        throw abortReason();
+      const { done, value } = read;
+      if (value && value.length > 0)
+        reader.push(value);
+      for (; ; ) {
+        const envelope = reader.next();
+        if (envelope === null)
+          break;
+        if (envelope.endStream) {
+          const trailerError = readConnectTrailerError(new TextDecoder().decode(envelope.payload).trim());
+          if (trailerError === null)
+            continue;
+          logger.warn("stream rejected via Connect trailer", {
+            model: model.id,
+            code: trailerError.code,
+            message: trailerError.message,
+            ...trailerError.detail ? { detail: trailerError.detail } : {},
+            rawTrailer: trailerError.raw,
+            requestBytes: requestBytes.byteLength,
+            messages: request.messages.length,
+            hadOutput: sawAnyToken
+          });
+          let contextOverflow = false;
+          if (!sawAnyToken && trailerError.code.toLowerCase() === "invalid_argument" && /\binternal error\b/i.test(trailerError.message)) {
+            const historyBytes = toBinary(GetChatMessageRequestSchema, create(GetChatMessageRequestSchema, {
+              chatMessagePrompts: buildChatMessagePrompts(request.messages, turn.cascadeId)
+            })).byteLength;
+            contextOverflow = historyBytes >= LARGE_HISTORY_RECOVERY_BYTES;
+            if (contextOverflow) {
+              logger.warn("treating large-history invalid_argument as context overflow", {
+                model: model.id,
+                historyBytes
+              });
+            }
           }
+          throw new DevinStreamError(trailerError.formatted, trailerError.code, contextOverflow);
         }
-        throw new DevinStreamError(trailerError.formatted, trailerError.code, contextOverflow);
-      }
-      const msg = fromBinary(GetChatMessageResponseSchema, envelope.payload);
-      if (msg.messageId && !responseId)
-        responseId = msg.messageId;
-      if (msg.actualModelUid)
-        upstreamModel = msg.actualModelUid;
-      if (msg.deltaThinking) {
-        markToken();
-        if (openThinking === void 0) {
-          openThinking = { index: nextIndex++, text: "" };
-          yield { type: "thinking_start", index: openThinking.index };
-        }
-        openThinking.text += msg.deltaThinking;
-        yield { type: "thinking_delta", index: openThinking.index, delta: msg.deltaThinking };
-      }
-      if (msg.deltaSignature && openThinking !== void 0)
-        openThinking.signature = msg.deltaSignature;
-      if (msg.deltaText) {
-        markToken();
-        if (openThinking !== void 0) {
-          yield {
-            type: "thinking_end",
-            index: openThinking.index,
-            thinking: openThinking.text,
-            ...openThinking.signature ? { signature: openThinking.signature } : {}
-          };
-          openThinking = void 0;
+        const msg = fromBinary(GetChatMessageResponseSchema, envelope.payload);
+        if (msg.messageId && !responseId)
+          responseId = msg.messageId;
+        if (msg.actualModelUid)
+          upstreamModel = msg.actualModelUid;
+        if (msg.deltaThinking) {
+          markToken();
+          if (openThinking === void 0) {
+            openThinking = { index: nextIndex++, text: "" };
+            yield { type: "thinking_start", index: openThinking.index };
+          }
+          openThinking.text += msg.deltaThinking;
+          yield { type: "thinking_delta", index: openThinking.index, delta: msg.deltaThinking };
         }
-        if (openText === void 0) {
-          openText = { index: nextIndex++, text: "" };
-          yield { type: "text_start", index: openText.index };
+        if (msg.deltaSignature && openThinking !== void 0)
+          openThinking.signature = msg.deltaSignature;
+        if (msg.deltaText) {
+          markToken();
+          if (openThinking !== void 0) {
+            yield {
+              type: "thinking_end",
+              index: openThinking.index,
+              thinking: openThinking.text,
+              ...openThinking.signature ? { signature: openThinking.signature } : {}
+            };
+            openThinking = void 0;
+          }
+          if (openText === void 0) {
+            openText = { index: nextIndex++, text: "" };
+            yield { type: "text_start", index: openText.index };
+          }
+          openText.text += msg.deltaText;
+          yield { type: "text_delta", index: openText.index, delta: msg.deltaText };
         }
-        openText.text += msg.deltaText;
-        yield { type: "text_delta", index: openText.index, delta: msg.deltaText };
-      }
-      if (msg.deltaToolCalls.length > 0) {
-        markToken();
-        if (openText !== void 0) {
-          yield { type: "text_end", index: openText.index, text: openText.text };
-          openText = void 0;
+        if (msg.deltaToolCalls.length > 0) {
+          markToken();
+          if (openText !== void 0) {
+            yield { type: "text_end", index: openText.index, text: openText.text };
+            openText = void 0;
+          }
+          if (openThinking !== void 0) {
+            yield {
+              type: "thinking_end",
+              index: openThinking.index,
+              thinking: openThinking.text,
+              ...openThinking.signature ? { signature: openThinking.signature } : {}
+            };
+            openThinking = void 0;
+          }
+          for (const call of msg.deltaToolCalls) {
+            const toolCallId = call.id || activeToolCallId;
+            if (!toolCallId)
+              continue;
+            let block = toolBlocks.get(toolCallId);
+            if (block === void 0) {
+              block = { index: nextIndex++, name: call.name };
+              toolBlocks.set(toolCallId, block);
+              toolPartialJson.set(toolCallId, "");
+              yield { type: "tool_call_start", index: block.index, id: toolCallId, name: call.name };
+            }
+            if (call.name)
+              block.name = call.name;
+            activeToolCallId = toolCallId;
+            if (!call.argumentsJson)
+              continue;
+            const previousJson = toolPartialJson.get(toolCallId) ?? "";
+            const accumulated = call.argumentsJson.startsWith(previousJson) ? call.argumentsJson : previousJson + call.argumentsJson;
+            const delta = accumulated.slice(previousJson.length);
+            toolPartialJson.set(toolCallId, accumulated);
+            const throttled = parseStreamingJsonThrottled(accumulated, toolLastParseLen.get(toolCallId) ?? 0);
+            if (throttled)
+              toolLastParseLen.set(toolCallId, throttled.parsedLen);
+            yield { type: "tool_call_delta", index: block.index, id: toolCallId, argumentsDelta: delta };
+          }
         }
-        if (openThinking !== void 0) {
-          yield {
-            type: "thinking_end",
-            index: openThinking.index,
-            thinking: openThinking.text,
-            ...openThinking.signature ? { signature: openThinking.signature } : {}
+        if (msg.stopReason !== StopReason.UNSPECIFIED)
+          latestStopReason = msg.stopReason;
+        if (msg.usage || msg.creditCost || msg.committedCreditCost || msg.committedAcuCost) {
+          const usage = {
+            input: Number(msg.usage?.inputTokens ?? 0n),
+            output: Number(msg.usage?.outputTokens ?? 0n),
+            cacheRead: Number(msg.usage?.cacheReadTokens ?? 0n),
+            cacheWrite: Number(msg.usage?.cacheWriteTokens ?? 0n)
           };
-          openThinking = void 0;
-        }
-        for (const call of msg.deltaToolCalls) {
-          const toolCallId = call.id || activeToolCallId;
-          if (!toolCallId)
+          const totalTokens = usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+          const credits = msg.creditCost || msg.committedCreditCost || msg.committedAcuCost;
+          const moved = responseUsage === void 0 ? totalTokens > 0 || credits !== 0 : totalTokens !== responseUsage.totalTokens || credits !== (responseUsage.credits ?? 0);
+          if (!moved)
             continue;
-          let block = toolBlocks.get(toolCallId);
-          if (block === void 0) {
-            block = { index: nextIndex++, name: call.name };
-            toolBlocks.set(toolCallId, block);
-            toolPartialJson.set(toolCallId, "");
-            yield { type: "tool_call_start", index: block.index, id: toolCallId, name: call.name };
-          }
-          if (call.name)
-            block.name = call.name;
-          activeToolCallId = toolCallId;
-          if (!call.argumentsJson)
-            continue;
-          const previousJson = toolPartialJson.get(toolCallId) ?? "";
-          const accumulated = call.argumentsJson.startsWith(previousJson) ? call.argumentsJson : previousJson + call.argumentsJson;
-          const delta = accumulated.slice(previousJson.length);
-          toolPartialJson.set(toolCallId, accumulated);
-          const throttled = parseStreamingJsonThrottled(accumulated, toolLastParseLen.get(toolCallId) ?? 0);
-          if (throttled)
-            toolLastParseLen.set(toolCallId, throttled.parsedLen);
-          yield { type: "tool_call_delta", index: block.index, id: toolCallId, argumentsDelta: delta };
+          responseUsage = {
+            ...usage,
+            totalTokens,
+            ...credits ? { credits } : {},
+            cost: calculateDevinCost(model.cost, usage)
+          };
+          yield { type: "usage", usage: responseUsage };
         }
       }
-      if (msg.stopReason !== StopReason.UNSPECIFIED)
-        latestStopReason = msg.stopReason;
-      if (msg.usage || msg.creditCost || msg.committedCreditCost || msg.committedAcuCost) {
-        const usage = {
-          input: Number(msg.usage?.inputTokens ?? 0n),
-          output: Number(msg.usage?.outputTokens ?? 0n),
-          cacheRead: Number(msg.usage?.cacheReadTokens ?? 0n),
-          cacheWrite: Number(msg.usage?.cacheWriteTokens ?? 0n)
-        };
-        const totalTokens = usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
-        const credits = msg.creditCost || msg.committedCreditCost || msg.committedAcuCost;
-        const moved = responseUsage === void 0 ? totalTokens > 0 || credits !== 0 : totalTokens !== responseUsage.totalTokens || credits !== (responseUsage.credits ?? 0);
-        if (!moved)
-          continue;
-        responseUsage = {
-          ...usage,
-          totalTokens,
-          ...credits ? { credits } : {},
-          cost: calculateDevinCost(model.cost, usage)
-        };
-        yield { type: "usage", usage: responseUsage };
-      }
+      if (done)
+        break;
     }
-    if (done)
-      break;
+  } finally {
+    signal?.removeEventListener("abort", onAbort);
   }
   if (openText !== void 0) {
     yield { type: "text_end", index: openText.index, text: openText.text };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ns-omp-provider",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "OMP (oh-my-pi) plugin: Kiro, Devin, and Grok providers from @ngosangns/ns-pi-provider, wrapped for OMP's provider/extension API.",
   "type": "module",
   "license": "MIT",
@@ -63,12 +63,12 @@
     }
   },
   "devDependencies": {
-    "@ngosangns/ns-pi-provider": "0.5.0",
+    "@ngosangns/ns-pi-provider": "0.5.1",
     "@types/node": "^22.18.6",
     "esbuild": "^0.28.2",
     "typescript": "^5.9.2",
     "vitest": "^3.2.4",
-    "ns-bridge-core": "0.3.0"
+    "ns-bridge-core": "0.3.1"
   },
   "publishConfig": {
     "access": "public",