@chrischall/gemini-mcp 0.7.2 → 0.8.0

package/dist/tools/shared.js

@@ -1,16 +1,11 @@
 import { z } from 'zod';
-import { textResult, McpToolError } from '@chrischall/mcp-utils';
+import { textResult, McpToolError, readEnvVar } from '@chrischall/mcp-utils';
 import { client } from '../client.js';
 import { writeImage, resolveOutputDir, resolveVideoPath, videoMimeType } from '../images.js';
 /** Supported output aspect ratios (Gemini image API). */
 export const ASPECT_RATIOS = ['1:1', '2:3', '3:2', '3:4', '4:3', '4:5', '5:4', '9:16', '16:9', '21:9', '1:4', '4:1', '1:8', '8:1'];
 /** Supported output resolutions. `512` is Flash-only (0.5K); `1K`/`2K`/`4K` work on all image models. */
 export const IMAGE_SIZES = ['512', '1K', '2K', '4K'];
-/**
- * The model/aspect/size/output fields every generation tool shares. Defined once
- * here so descriptions can't drift between `generate.ts` and `set.ts`. Spread
- * into each tool's `inputSchema`.
- */
 /**
  * When to pick which Nano Banana model — shared by every tool's `model` param
  * so the guidance can't drift between them.
@@ -20,6 +15,22 @@ export const MODEL_CHOICE_GUIDE = 'gemini-3.1-flash-image (Nano Banana 2) is the
     'processing and consistency. gemini-3-pro-image (Nano Banana Pro) is the premium choice for the most complex ' +
     'visual tasks — highest world knowledge, advanced localization, accurate brand consistency, precision creative control. ' +
     'gemini-3.1-flash-lite-image (Nano Banana 2 Lite) is the fastest/cheapest for simple tasks (1K only, no search grounding).';
+/**
+ * Per-call upstream timeout override, shared by every generation tool
+ * (spread via {@link sharedImageSchema}; `gemini_interact` imports it directly
+ * since its schema doesn't take the seed/clipboard fields).
+ */
+export const timeoutMsSchema = z
+    .number()
+    .int()
+    .positive()
+    .optional()
+    .describe('Upstream request timeout in ms for this call (default: $GEMINI_TIMEOUT_MS, else 60000 — or 120000 when image_size is 4K, which routinely runs past 60s)');
+/**
+ * The model/aspect/size/output fields every generation tool shares. Defined once
+ * here so descriptions can't drift between `generate.ts` and `set.ts`. Spread
+ * into each tool's `inputSchema`.
+ */
 export const sharedImageSchema = {
     // Bare id only: the model is interpolated into the URL path
     // (`/models/${model}:generateContent`), so slashes/colons/queries must be
@@ -37,6 +48,7 @@ export const sharedImageSchema = {
     thinking_level: z.enum(['minimal', 'high']).optional().describe('Reasoning depth (Gemini 3 models); higher can help complex/structural edits'),
     google_search: z.boolean().optional().describe('Ground the image in live Google Search results (current events, weather, data)'),
     from_clipboard: z.boolean().optional().describe('Use the image currently on the macOS system clipboard as an input (downscaled to JPEG)'),
+    timeout_ms: timeoutMsSchema,
 };
 /**
  * Turn the `video_url` / `video_path` tool args into the client's video opts.
@@ -71,6 +83,45 @@ export const videoPathSchema = z
 export function pickSeed(seed) {
     return seed ?? Math.floor(Math.random() * 2_147_483_000);
 }
+// Progress-heartbeat cadence while a generation is in flight. MCP hosts
+// enforce their own tools/call timeout (surfaced as -32001) but reset it on
+// notifications/progress, so a heartbeat lets a 4K/Pro generation outlive the
+// host's default budget. Tunable via $GEMINI_HEARTBEAT_MS (0 disables).
+const HEARTBEAT_DEFAULT_MS = 10_000;
+/**
+ * Run `fn`, emitting a `notifications/progress` heartbeat while it is pending —
+ * but only when the caller asked for progress (sent a `progressToken`).
+ * Send failures are swallowed (the client may have abandoned the request);
+ * `fn`'s result/rejection passes through untouched.
+ */
+export async function withProgressHeartbeat(extra, message, fn) {
+    const progressToken = extra?._meta?.progressToken;
+    const send = extra?.sendNotification;
+    const env = Number(readEnvVar('GEMINI_HEARTBEAT_MS'));
+    const intervalMs = Number.isFinite(env) ? env : HEARTBEAT_DEFAULT_MS;
+    if (progressToken === undefined || !send || intervalMs <= 0)
+        return fn();
+    let ticks = 0;
+    const timer = setInterval(() => {
+        ticks++;
+        void send({
+            method: 'notifications/progress',
+            params: {
+                progressToken,
+                progress: ticks,
+                message: `${message} — still working (${Math.round((ticks * intervalMs) / 1000)}s)`,
+            },
+        }).catch(() => { });
+    }, intervalMs);
+    // Never hold the process open just for a heartbeat.
+    timer.unref?.();
+    try {
+        return await fn();
+    }
+    finally {
+        clearInterval(timer);
+    }
+}
 /** Build the result metadata echoed to the caller (omitting unset optionals). */
 export function buildMeta(model, seed, opts) {
     const meta = { model, seed };
@@ -86,7 +137,8 @@ export function buildMeta(model, seed, opts) {
  * Optional `meta` is merged into the disk-path JSON result, or prepended as a
  * text block in inline mode (only if meta has keys).
  * Optional `onWritten` receives the absolute paths written in disk mode (never
- * called inline) — lets a tool remember its own outputs.
+ * called inline) — lets a tool remember its own outputs or write sidecar
+ * files; an async callback is awaited before the result is returned.
  */
 export async function emit(named, opts, meta, onWritten) {
     if (opts.inline) {
@@ -102,6 +154,6 @@ export async function emit(named, opts, meta, onWritten) {
     const images = [];
     for (const n of named)
         images.push(await writeImage(dir, n.base, n.image.base64, n.image.mimeType));
-    onWritten?.(images);
+    await onWritten?.(images);
     return textResult({ images, ...meta });
 }

package/dist/version.js

@@ -1,2 +1,2 @@
 /** Single source of the server version. release-please bumps the literal below. */
-export const VERSION = '0.7.2'; // x-release-please-version
+export const VERSION = '0.8.0'; // x-release-please-version

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrischall/gemini-mcp",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "mcpName": "io.github.chrischall/gemini-mcp",
   "description": "Gemini image-generation MCP server for Claude — developed and maintained by AI (Claude Code)",
   "author": "Claude Code (AI) <https://www.anthropic.com/claude>",
@@ -44,7 +44,7 @@
     "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@chrischall/mcp-utils": "^0.10.3",
+    "@chrischall/mcp-utils": "^0.12.0",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "dotenv": "^17.4.0",
     "zod": "^4.4.2"

package/server.json

@@ -6,12 +6,12 @@
     "url": "https://github.com/chrischall/gemini-mcp",
     "source": "github"
   },
-  "version": "0.7.2",
+  "version": "0.8.0",
   "packages": [
     {
       "registryType": "npm",
       "identifier": "@chrischall/gemini-mcp",
-      "version": "0.7.2",
+      "version": "0.8.0",
       "transport": {
         "type": "stdio"
       },