@danwahl/gemini-cli-mcp 0.1.6 → 0.1.8

package/dist/index.js

@@ -42,6 +42,11 @@ server.registerTool("cli", {
             .string()
             .optional()
             .describe("Resume a previous Gemini session by ID. The session ID is returned in the structured output of each call."),
+        timeout: z
+            .number()
+            .optional()
+            .default(120)
+            .describe("Timeout in seconds. Default: 120. Increase for complex multi-step tasks."),
     },
     outputSchema: {
         sessionId: z.string().nullable().describe("Gemini CLI session ID"),
@@ -53,8 +58,8 @@ server.registerTool("cli", {
         readOnlyHint: false,
         openWorldHint: true,
     },
-}, async ({ prompt, cwd, model, sessionId }) => {
-    const timeoutMs = 120_000;
+}, async ({ prompt, cwd, model, sessionId, timeout }) => {
+    const timeoutMs = (timeout ?? 120) * 1000;
     const result = await runGemini(prompt, cwd, model, timeoutMs, sessionId);
     if (result.isError) {
         return {

package/dist/lib.js

@@ -78,7 +78,7 @@ export function runGemini(prompt, cwd, model, timeoutMs, sessionId) {
         const args = buildGeminiArgs(prompt, model, sessionId);
         let child;
         try {
-            child = spawn("gemini", args, { cwd, env: process.env });
+            child = spawn("gemini", args, { cwd, env: process.env, detached: true });
         }
         catch (err) {
             resolve({
@@ -90,18 +90,36 @@ export function runGemini(prompt, cwd, model, timeoutMs, sessionId) {
         }
         let stdout = "";
         let stderr = "";
-        let timedOut = false;
+        let settled = false;
+        // Kill the entire process group (gemini + sandbox/tool grandchildren).
+        // Without this, grandchildren can keep stdio pipes open and `close` never fires.
+        const killGroup = (sig) => {
+            if (child.pid === undefined)
+                return;
+            try {
+                process.kill(-child.pid, sig);
+            }
+            catch {
+                // group already gone
+            }
+        };
+        const finish = (r) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            resolve(r);
+        };
         const timer = setTimeout(() => {
-            timedOut = true;
-            child.kill("SIGTERM");
-            setTimeout(() => {
-                try {
-                    child.kill("SIGKILL");
-                }
-                catch {
-                    // already dead
-                }
-            }, 5000);
+            killGroup("SIGTERM");
+            setTimeout(() => killGroup("SIGKILL"), 5000).unref();
+            // Resolve immediately — don't wait for `close`, which may never fire
+            // if grandchildren keep stdio pipes open.
+            finish({
+                output: { sessionId: null, response: "" },
+                isError: true,
+                errorMessage: `gemini timed out after ${timeoutMs / 1000}s`,
+            });
         }, timeoutMs);
         child.stdout?.on("data", (chunk) => {
             stdout += chunk.toString();
@@ -110,10 +128,9 @@ export function runGemini(prompt, cwd, model, timeoutMs, sessionId) {
             stderr += chunk.toString();
         });
         child.on("error", (err) => {
-            clearTimeout(timer);
             const isNotFound = err.code === "ENOENT" ||
                 err.message.includes("ENOENT");
-            resolve({
+            finish({
                 output: { sessionId: null, response: "" },
                 isError: true,
                 errorMessage: isNotFound
@@ -122,25 +139,16 @@ export function runGemini(prompt, cwd, model, timeoutMs, sessionId) {
             });
         });
         child.on("close", (code) => {
-            clearTimeout(timer);
-            if (timedOut) {
-                resolve({
-                    output: { sessionId: null, response: "" },
-                    isError: true,
-                    errorMessage: `gemini timed out after ${timeoutMs / 1000}s`,
-                });
-                return;
-            }
             if (code !== 0) {
                 const detail = stderr.trim() || stdout.trim() || `exit code ${code}`;
-                resolve({
+                finish({
                     output: { sessionId: null, response: "" },
                     isError: true,
                     errorMessage: `gemini exited with code ${code}: ${detail}`,
                 });
                 return;
             }
-            resolve({
+            finish({
                 output: parseGeminiOutput(stdout),
                 isError: false,
             });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@danwahl/gemini-cli-mcp",
   "type": "module",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "MCP server that exposes Gemini CLI as a single tool for Claude Code",
   "license": "MIT",
   "repository": {