@hasna/switcher 0.1.4 → 0.1.5

package/dist/cli/index.js

@@ -499,7 +499,7 @@ function canonicalPolicyJSON(value) {
 }
 
 // src/domain.ts
-var VERSION = "0.1.4";
+var VERSION = "0.1.5";
 var harnessSchema = z3.enum(["claude", "codex", "grok", "opencode", "opencode2", "pi", "omp", "dsh", "cline", "hermes", "prime-agent", "gemini", "aider", "kilo"]);
 var protocolSchema = z3.enum(["anthropic-messages", "openai-responses", "openai-chat", "gemini-generate-content"]);
 var idSchema = z3.string().regex(/^[a-zA-Z0-9][a-zA-Z0-9._-]{0,79}$/);
@@ -1358,6 +1358,122 @@ function clientFromEnv(env = process.env, options = {}) {
   return SwitcherClient.fromEnvironment(env, options);
 }
 
+// src/provider-stream.ts
+function terminalEventObserver(protocol, contentType) {
+  const enabled = contentType?.split(";", 1)[0].trim().toLowerCase() === "text/event-stream";
+  const decoder = new TextDecoder;
+  let line = "", data = [], size = 0, overflow = false, afterCR = false, complete = false;
+  const dispatchLine = () => {
+    if (!line) {
+      if (!overflow && data.length) {
+        const payload = data.join(`
+`);
+        if (protocol === "openai-chat")
+          complete ||= payload === "[DONE]";
+        else
+          try {
+            const value = JSON.parse(payload);
+            complete ||= protocol === "anthropic-messages" ? value?.type === "message_stop" : protocol === "openai-responses" && ["response.completed", "response.failed", "response.incomplete"].includes(value?.type);
+          } catch {}
+      }
+      data = [];
+      size = 0;
+      overflow = false;
+    } else if (!overflow && line.startsWith("data:"))
+      data.push(line.slice(5).replace(/^ /, ""));
+    line = "";
+  };
+  return (chunk) => {
+    if (!enabled || protocol === "gemini-generate-content")
+      return false;
+    for (const char of decoder.decode(chunk, { stream: true })) {
+      if (afterCR && char === `
+`) {
+        afterCR = false;
+        continue;
+      }
+      afterCR = char === "\r";
+      if (char === "\r" || char === `
+`)
+        dispatchLine();
+      else if (++size <= 131072)
+        line += char;
+      else {
+        overflow = true;
+        line = "oversized";
+      }
+    }
+    return complete;
+  };
+}
+function proxyProviderStream(input) {
+  const reader = input.response.body.getReader();
+  const terminal = terminalEventObserver(input.protocol, input.response.headers.get("content-type"));
+  let ended = false, output;
+  const end = (error) => {
+    if (ended)
+      return;
+    ended = true;
+    try {
+      if (error)
+        output.error(error);
+      else
+        output.close();
+    } catch {}
+    input.release();
+  };
+  const cancelReader = async () => {
+    input.abort.abort();
+    try {
+      await reader.cancel();
+    } catch {}
+  };
+  const stream = new ReadableStream({
+    start(controller) {
+      output = controller;
+    },
+    async pull(controller) {
+      try {
+        const chunk = await reader.read();
+        if (ended)
+          return;
+        if (chunk.done) {
+          input.inspect?.(new Uint8Array, true);
+          end();
+          return;
+        }
+        input.inspect?.(chunk.value);
+        const complete = terminal(chunk.value);
+        controller.enqueue(chunk.value);
+        if (complete) {
+          end();
+          await cancelReader();
+        }
+      } catch {
+        if (ended)
+          return;
+        if (input.requestSignal.aborted || input.abort.signal.aborted || input.closing())
+          end();
+        else {
+          input.interrupted?.();
+          end(new Error("Provider stream ended unexpectedly"));
+        }
+      }
+    },
+    async cancel() {
+      if (!ended) {
+        ended = true;
+        input.release();
+      }
+      await cancelReader();
+    }
+  });
+  return { stream, cancel: async () => {
+    end();
+    await cancelReader();
+  } };
+}
+
 // src/opencode-model-policy.ts
 var routeForAgent = (agent) => {
   const name = agent.name.toLowerCase();
@@ -2024,7 +2140,7 @@ var openapi_default = {
   openapi: "3.0.3",
   info: {
     title: "Switcher API",
-    version: "0.1.4",
+    version: "0.1.5",
     description: "Authenticated provider/profile/catalog control plane. Launches run locally; the API never returns provider credentials."
   },
   security: [
@@ -6107,55 +6223,8 @@ function geminiBridge(input) {
         release();
         return new Response(null, { status: response.status });
       }
-      const reader = response.body.getReader();
-      let ended = false, output;
-      const end = (error) => {
-        if (ended)
-          return;
-        ended = true;
-        try {
-          if (error && !closing)
-            output.error(error);
-          else
-            output.close();
-        } catch {}
-        release();
-      };
-      const stream = new ReadableStream({
-        start(controller) {
-          output = controller;
-        },
-        async pull(controller) {
-          try {
-            const chunk = await reader.read();
-            if (ended)
-              return;
-            if (chunk.done)
-              end();
-            else
-              controller.enqueue(chunk.value);
-          } catch {
-            end(new Error("Provider stream ended unexpectedly"));
-          }
-        },
-        async cancel() {
-          ended = true;
-          record2.abort.abort();
-          try {
-            await reader.cancel();
-          } finally {
-            release();
-          }
-        }
-      });
-      record2.cancel = async () => {
-        record2.abort.abort();
-        try {
-          await reader.cancel();
-        } catch {} finally {
-          end();
-        }
-      };
+      const { stream, cancel } = proxyProviderStream({ response, protocol: input.protocol, requestSignal: request.signal, abort: record2.abort, closing: () => closing, release });
+      record2.cancel = cancel;
       return new Response(stream, { status: response.status, headers: { "content-type": response.headers.get("content-type") ?? "application/json", "cache-control": "no-store" } });
     } catch {
       release();
@@ -6405,9 +6474,9 @@ function createInferenceGateway(input) {
         release();
         return new Response(null, { status: response.status });
       }
-      const reader = response.body.getReader(), decoder = new TextDecoder;
+      const decoder = new TextDecoder;
       const sse = response.headers.get("content-type")?.includes("text/event-stream");
-      let buffer = "", ended = false, output;
+      let buffer = "";
       const observe = (text) => {
         try {
           const value = JSON.parse(text);
@@ -6422,14 +6491,14 @@ function createInferenceGateway(input) {
       const inspect = (chunk, done = false) => {
         buffer += decoder.decode(chunk, { stream: !done });
         if (sse) {
-          let end2 = buffer.indexOf(`
+          let end = buffer.indexOf(`
 `);
-          while (end2 >= 0) {
-            const line = buffer.slice(0, end2).trim();
-            buffer = buffer.slice(end2 + 1);
+          while (end >= 0) {
+            const line = buffer.slice(0, end).trim();
+            buffer = buffer.slice(end + 1);
             if (line.startsWith("data:"))
               observe(line.slice(5).trim());
-            end2 = buffer.indexOf(`
+            end = buffer.indexOf(`
 `);
           }
           if (buffer.length > 131072)
@@ -6439,53 +6508,10 @@ function createInferenceGateway(input) {
         if (done && buffer)
           observe(buffer);
       };
-      const end = (error) => {
-        if (ended)
-          return;
-        ended = true;
-        try {
-          if (error && !closing)
-            output.error(error);
-          else
-            output.close();
-        } catch {}
-        release();
-      };
-      const stream = new ReadableStream({ start(controller) {
-        output = controller;
-      }, async pull(controller) {
-        try {
-          const chunk = await reader.read();
-          if (ended)
-            return;
-          if (chunk.done) {
-            inspect(new Uint8Array, true);
-            end();
-          } else {
-            inspect(chunk.value);
-            controller.enqueue(chunk.value);
-          }
-        } catch {
-          current.reason = "stream_interrupted";
-          end(new Error("Provider stream ended unexpectedly"));
-        }
-      }, async cancel() {
-        ended = true;
-        abort.abort();
-        try {
-          await reader.cancel();
-        } finally {
-          release();
-        }
+      const { stream, cancel } = proxyProviderStream({ response, protocol: input.protocol, requestSignal: request.signal, abort, closing: () => closing, release, inspect, interrupted: () => {
+        current.reason = "stream_interrupted";
       } });
-      record2.cancel = async () => {
-        abort.abort();
-        try {
-          await reader.cancel();
-        } catch {} finally {
-          end();
-        }
-      };
+      record2.cancel = cancel;
       return new Response(stream, { status: response.status, headers: { "content-type": response.headers.get("content-type") ?? "application/json", "cache-control": "no-store" } });
     } catch (error) {
       if (error instanceof Fault)
@@ -7875,45 +7901,8 @@ function createHermesBridge(input) {
           release();
           return new Response(null, { status: upstream.status });
         }
-        const reader = upstream.body.getReader();
-        let ended = false;
-        const end = () => {
-          if (ended)
-            return;
-          ended = true;
-          release();
-        };
-        const stream = new ReadableStream({
-          async pull(controller) {
-            try {
-              const chunk = await reader.read();
-              if (chunk.done) {
-                end();
-                controller.close();
-              } else
-                controller.enqueue(chunk.value);
-            } catch {
-              end();
-              controller.error(new Error("Provider stream ended unexpectedly"));
-            }
-          },
-          async cancel() {
-            ended = true;
-            abortController.abort();
-            try {
-              await reader.cancel();
-            } finally {
-              release();
-            }
-          }
-        });
-        record3.cancel = async () => {
-          abortController.abort();
-          try {
-            await reader.cancel();
-          } catch {}
-          end();
-        };
+        const { stream, cancel } = proxyProviderStream({ response: upstream, protocol: input.protocol, requestSignal: request.signal, abort: abortController, closing: () => closing, release });
+        record3.cancel = cancel;
         return new Response(stream, {
           status: upstream.status,
           headers: {
@@ -8589,56 +8578,8 @@ function grokBridge(input) {
         release();
         return new Response(null, { status: response.status });
       }
-      const reader = response.body.getReader();
-      let ended = false;
-      let output;
-      const end = (error) => {
-        if (ended)
-          return;
-        ended = true;
-        try {
-          if (error && !closing)
-            output.error(error);
-          else
-            output.close();
-        } catch {}
-        release();
-      };
-      const stream = new ReadableStream({
-        start(controller) {
-          output = controller;
-        },
-        async pull(controller) {
-          try {
-            const chunk = await reader.read();
-            if (ended)
-              return;
-            if (chunk.done)
-              end();
-            else
-              controller.enqueue(chunk.value);
-          } catch {
-            end(new Error("Provider stream ended unexpectedly"));
-          }
-        },
-        async cancel() {
-          ended = true;
-          record3.abort.abort();
-          try {
-            await reader.cancel();
-          } finally {
-            release();
-          }
-        }
-      });
-      record3.cancel = async () => {
-        record3.abort.abort();
-        try {
-          await reader.cancel();
-        } catch {} finally {
-          end();
-        }
-      };
+      const { stream, cancel } = proxyProviderStream({ response, protocol: input.protocol, requestSignal: request.signal, abort: record3.abort, closing: () => closing, release });
+      record3.cancel = cancel;
       return new Response(stream, { status: response.status, headers: { "content-type": response.headers.get("content-type") ?? "application/json", "cache-control": "no-store" } });
     } catch {
       release();

package/dist/domain.d.ts

@@ -3,7 +3,7 @@ import { type RoutingEvent } from "./model-policy-schema";
 export { modelPolicySchema, routingEventSchema, routingEventsSchema } from "./model-policy-schema";
 export type { ModelPolicy, RoutingEvent } from "./model-policy-schema";
 export type { AuthStyle } from "./auth";
-export declare const VERSION = "0.1.4";
+export declare const VERSION = "0.1.5";
 export declare const harnessSchema: z.ZodEnum<["claude", "codex", "grok", "opencode", "opencode2", "pi", "omp", "dsh", "cline", "hermes", "prime-agent", "gemini", "aider", "kilo"]>;
 export declare const protocolSchema: z.ZodEnum<["anthropic-messages", "openai-responses", "openai-chat", "gemini-generate-content"]>;
 export declare const idSchema: z.ZodString;

package/dist/mcp/index.js

@@ -55,7 +55,7 @@ var routingEventSchema = z.object({
 var routingEventsSchema = z.array(routingEventSchema).max(1000);
 
 // src/domain.ts
-var VERSION = "0.1.4";
+var VERSION = "0.1.5";
 var harnessSchema = z2.enum(["claude", "codex", "grok", "opencode", "opencode2", "pi", "omp", "dsh", "cline", "hermes", "prime-agent", "gemini", "aider", "kilo"]);
 var protocolSchema = z2.enum(["anthropic-messages", "openai-responses", "openai-chat", "gemini-generate-content"]);
 var idSchema = z2.string().regex(/^[a-zA-Z0-9][a-zA-Z0-9._-]{0,79}$/);

package/dist/provider-stream.d.ts

@@ -0,0 +1,17 @@
+import type { HarnessLaunchInput } from "./harness-types";
+/** Recognize whole SSE terminal events, never marker text inside a delta. */
+export declare function terminalEventObserver(protocol: HarnessLaunchInput["protocol"], contentType: string | null): (chunk: Uint8Array) => boolean;
+/** One lifecycle for all bridges: terminal SSE, caller cancellation, and real failure. */
+export declare function proxyProviderStream(input: {
+    response: Response;
+    protocol: HarnessLaunchInput["protocol"];
+    requestSignal: AbortSignal;
+    abort: AbortController;
+    closing: () => boolean;
+    release: () => void;
+    inspect?: (chunk: Uint8Array, done?: boolean) => void;
+    interrupted?: () => void;
+}): {
+    stream: ReadableStream<Uint8Array>;
+    cancel: () => Promise<void>;
+};

package/dist/serve/index.js

@@ -62,7 +62,7 @@ function canonicalPolicyJSON(value) {
 }
 
 // src/domain.ts
-var VERSION = "0.1.4";
+var VERSION = "0.1.5";
 var harnessSchema = z2.enum(["claude", "codex", "grok", "opencode", "opencode2", "pi", "omp", "dsh", "cline", "hermes", "prime-agent", "gemini", "aider", "kilo"]);
 var protocolSchema = z2.enum(["anthropic-messages", "openai-responses", "openai-chat", "gemini-generate-content"]);
 var idSchema = z2.string().regex(/^[a-zA-Z0-9][a-zA-Z0-9._-]{0,79}$/);
@@ -808,7 +808,7 @@ var openapi_default = {
   openapi: "3.0.3",
   info: {
     title: "Switcher API",
-    version: "0.1.4",
+    version: "0.1.5",
     description: "Authenticated provider/profile/catalog control plane. Launches run locally; the API never returns provider credentials."
   },
   security: [

package/openapi.json

@@ -2,7 +2,7 @@
   "openapi": "3.0.3",
   "info": {
     "title": "Switcher API",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "description": "Authenticated provider/profile/catalog control plane. Launches run locally; the API never returns provider credentials."
   },
   "security": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/switcher",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "description": "Universal provider and model switcher for coding harnesses with an API, SDK and self-hosted storage",
   "license": "Apache-2.0",