ai-sdk-provider-gemini-cli-agentic 0.1.1 → 0.1.3

package/dist/index.cjs

@@ -12,7 +12,9 @@ var zod = require('zod');
 function parseStreamJsonLine(line) {
   try {
     const event = JSON.parse(line);
-    if (!event.type || typeof event.type !== "string") return null;
+    if (!event || typeof event !== "object" || !("type" in event) || typeof event.type !== "string") {
+      return null;
+    }
     return event;
   } catch {
     return null;
@@ -259,7 +261,7 @@ var GeminiCliLanguageModel = class {
       allowedMcpServerNames: providerOptions.allowedMcpServerNames ?? this.settings.allowedMcpServerNames
     };
   }
-  buildArgs(promptText, settings = this.settings) {
+  buildArgs(settings = this.settings) {
     const base = resolveGeminiPath(settings.geminiPath, settings.allowNpx);
     const cmd = base.cmd;
     const args = [...base.args];
@@ -294,7 +296,7 @@ var GeminiCliLanguageModel = class {
         args.push("--resume", "latest");
       }
     }
-    args.push(promptText);
+    args.push("-");
     const env = {
       ...process.env,
       ...settings.env || {}
@@ -346,21 +348,45 @@ var GeminiCliLanguageModel = class {
       schema: geminiCliProviderOptionsSchema
     });
     const effectiveSettings = this.mergeSettings(providerOptions);
-    const { cmd, args, env, cwd, shell } = this.buildArgs(promptText, effectiveSettings);
-    this.logger.debug(`[gemini-cli] Executing: ${cmd} ${args.slice(0, -1).join(" ")} [prompt]`);
+    const { cmd, args, env, cwd, shell } = this.buildArgs(effectiveSettings);
+    this.logger.debug(`[gemini-cli] Executing: ${cmd} ${args.join(" ")}`);
     let text = "";
     let usage = createEmptyUsage();
     let finishReason = { unified: "stop", raw: void 0 };
     const content = [];
     const toolResults = /* @__PURE__ */ new Map();
-    const child = child_process.spawn(cmd, args, { env, cwd, shell, stdio: ["ignore", "pipe", "pipe"] });
+    const isWin = process.platform === "win32";
+    const child = child_process.spawn(cmd, args, {
+      env,
+      cwd,
+      shell,
+      stdio: ["pipe", "pipe", "pipe"],
+      detached: !isWin
+    });
+    const killProcessTree = (signal = "SIGTERM") => {
+      if (child.pid) {
+        if (isWin) {
+          child_process.spawn("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore" });
+        } else {
+          try {
+            process.kill(-child.pid, signal);
+          } catch {
+            child.kill(signal);
+          }
+        }
+      } else {
+        child.kill(signal);
+      }
+    };
+    child.stdin.write(promptText);
+    child.stdin.end();
     let onAbort;
     if (options.abortSignal) {
       if (options.abortSignal.aborted) {
-        child.kill("SIGTERM");
+        killProcessTree();
         throw options.abortSignal.reason ?? new Error("Request aborted");
       }
-      onAbort = () => child.kill("SIGTERM");
+      onAbort = () => killProcessTree();
       options.abortSignal.addEventListener("abort", onAbort, { once: true });
     }
     const startTime = Date.now();
@@ -478,24 +504,48 @@ var GeminiCliLanguageModel = class {
       schema: geminiCliProviderOptionsSchema
     });
     const effectiveSettings = this.mergeSettings(providerOptions);
-    const { cmd, args, env, cwd, shell } = this.buildArgs(promptText, effectiveSettings);
-    this.logger.debug(`[gemini-cli] Streaming: ${cmd} ${args.slice(0, -1).join(" ")} [prompt]`);
+    const { cmd, args, env, cwd, shell } = this.buildArgs(effectiveSettings);
+    this.logger.debug(`[gemini-cli] Streaming: ${cmd} ${args.join(" ")}`);
     const model = this;
     const abortSignal = options.abortSignal;
     const stream = new ReadableStream({
       start(controller) {
         const startTime = Date.now();
-        const child = child_process.spawn(cmd, args, { env, cwd, shell, stdio: ["ignore", "pipe", "pipe"] });
+        const isWin = process.platform === "win32";
+        const child = child_process.spawn(cmd, args, {
+          env,
+          cwd,
+          shell,
+          stdio: ["pipe", "pipe", "pipe"],
+          detached: !isWin
+        });
+        const killProcessTree = (signal = "SIGTERM") => {
+          if (child.pid) {
+            if (isWin) {
+              child_process.spawn("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore" });
+            } else {
+              try {
+                process.kill(-child.pid, signal);
+              } catch {
+                child.kill(signal);
+              }
+            }
+          } else {
+            child.kill(signal);
+          }
+        };
+        child.stdin.write(promptText);
+        child.stdin.end();
         controller.enqueue({ type: "stream-start", warnings });
         let stderr = "";
         let lastUsage;
         let textId;
         let lastStatus;
         const toolResults = /* @__PURE__ */ new Map();
-        const onAbort = () => child.kill("SIGTERM");
+        const onAbort = () => killProcessTree();
         if (abortSignal) {
           if (abortSignal.aborted) {
-            child.kill("SIGTERM");
+            killProcessTree();
             controller.error(abortSignal.reason ?? new Error("Request aborted"));
             return;
           }

package/dist/index.js

@@ -10,7 +10,9 @@ import { z } from 'zod';
 function parseStreamJsonLine(line) {
   try {
     const event = JSON.parse(line);
-    if (!event.type || typeof event.type !== "string") return null;
+    if (!event || typeof event !== "object" || !("type" in event) || typeof event.type !== "string") {
+      return null;
+    }
     return event;
   } catch {
     return null;
@@ -257,7 +259,7 @@ var GeminiCliLanguageModel = class {
       allowedMcpServerNames: providerOptions.allowedMcpServerNames ?? this.settings.allowedMcpServerNames
     };
   }
-  buildArgs(promptText, settings = this.settings) {
+  buildArgs(settings = this.settings) {
     const base = resolveGeminiPath(settings.geminiPath, settings.allowNpx);
     const cmd = base.cmd;
     const args = [...base.args];
@@ -292,7 +294,7 @@ var GeminiCliLanguageModel = class {
         args.push("--resume", "latest");
       }
     }
-    args.push(promptText);
+    args.push("-");
     const env = {
       ...process.env,
       ...settings.env || {}
@@ -344,21 +346,45 @@ var GeminiCliLanguageModel = class {
       schema: geminiCliProviderOptionsSchema
     });
     const effectiveSettings = this.mergeSettings(providerOptions);
-    const { cmd, args, env, cwd, shell } = this.buildArgs(promptText, effectiveSettings);
-    this.logger.debug(`[gemini-cli] Executing: ${cmd} ${args.slice(0, -1).join(" ")} [prompt]`);
+    const { cmd, args, env, cwd, shell } = this.buildArgs(effectiveSettings);
+    this.logger.debug(`[gemini-cli] Executing: ${cmd} ${args.join(" ")}`);
     let text = "";
     let usage = createEmptyUsage();
     let finishReason = { unified: "stop", raw: void 0 };
     const content = [];
     const toolResults = /* @__PURE__ */ new Map();
-    const child = spawn(cmd, args, { env, cwd, shell, stdio: ["ignore", "pipe", "pipe"] });
+    const isWin = process.platform === "win32";
+    const child = spawn(cmd, args, {
+      env,
+      cwd,
+      shell,
+      stdio: ["pipe", "pipe", "pipe"],
+      detached: !isWin
+    });
+    const killProcessTree = (signal = "SIGTERM") => {
+      if (child.pid) {
+        if (isWin) {
+          spawn("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore" });
+        } else {
+          try {
+            process.kill(-child.pid, signal);
+          } catch {
+            child.kill(signal);
+          }
+        }
+      } else {
+        child.kill(signal);
+      }
+    };
+    child.stdin.write(promptText);
+    child.stdin.end();
     let onAbort;
     if (options.abortSignal) {
       if (options.abortSignal.aborted) {
-        child.kill("SIGTERM");
+        killProcessTree();
         throw options.abortSignal.reason ?? new Error("Request aborted");
       }
-      onAbort = () => child.kill("SIGTERM");
+      onAbort = () => killProcessTree();
       options.abortSignal.addEventListener("abort", onAbort, { once: true });
     }
     const startTime = Date.now();
@@ -476,24 +502,48 @@ var GeminiCliLanguageModel = class {
       schema: geminiCliProviderOptionsSchema
     });
     const effectiveSettings = this.mergeSettings(providerOptions);
-    const { cmd, args, env, cwd, shell } = this.buildArgs(promptText, effectiveSettings);
-    this.logger.debug(`[gemini-cli] Streaming: ${cmd} ${args.slice(0, -1).join(" ")} [prompt]`);
+    const { cmd, args, env, cwd, shell } = this.buildArgs(effectiveSettings);
+    this.logger.debug(`[gemini-cli] Streaming: ${cmd} ${args.join(" ")}`);
     const model = this;
     const abortSignal = options.abortSignal;
     const stream = new ReadableStream({
       start(controller) {
         const startTime = Date.now();
-        const child = spawn(cmd, args, { env, cwd, shell, stdio: ["ignore", "pipe", "pipe"] });
+        const isWin = process.platform === "win32";
+        const child = spawn(cmd, args, {
+          env,
+          cwd,
+          shell,
+          stdio: ["pipe", "pipe", "pipe"],
+          detached: !isWin
+        });
+        const killProcessTree = (signal = "SIGTERM") => {
+          if (child.pid) {
+            if (isWin) {
+              spawn("taskkill", ["/pid", String(child.pid), "/T", "/F"], { stdio: "ignore" });
+            } else {
+              try {
+                process.kill(-child.pid, signal);
+              } catch {
+                child.kill(signal);
+              }
+            }
+          } else {
+            child.kill(signal);
+          }
+        };
+        child.stdin.write(promptText);
+        child.stdin.end();
         controller.enqueue({ type: "stream-start", warnings });
         let stderr = "";
         let lastUsage;
         let textId;
         let lastStatus;
         const toolResults = /* @__PURE__ */ new Map();
-        const onAbort = () => child.kill("SIGTERM");
+        const onAbort = () => killProcessTree();
         if (abortSignal) {
           if (abortSignal.aborted) {
-            child.kill("SIGTERM");
+            killProcessTree();
             controller.error(abortSignal.reason ?? new Error("Request aborted"));
             return;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-sdk-provider-gemini-cli-agentic",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "AI SDK v6 provider for Google Gemini CLI agentic mode",
   "keywords": [
     "ai-sdk",