@bacnh85/pi-web 0.9.1 → 0.9.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.9.2 (2026-09-13)
+
+### Fixed
+
+Review hardening of the `web_image` fallback chain (3 review rounds):
+
+- **Cancellation semantics**: an aborted call now surfaces `AbortError`
+  immediately — before any provider client construction or fetch — instead of
+  walking the chain and reporting "all providers failed". An abort landing
+  mid-generation normalizes to `AbortError` with the in-flight provider error
+  preserved as `cause`; foreign abort-named errors from upstreams are recorded
+  as provider notes and the chain continues.
+- **`n` transparency**: when the gemini web tier returns fewer images than the
+  requested `n`, the result states it explicitly (`n` applies to the
+  `zai`/`custom` API providers; the gemini web tier returns its own count).
+  `out_dir` now resolves against the session cwd, not the process cwd.
+
 ## 0.9.1 (2026-09-13)
 
 ### Fixed

package/README.md

@@ -290,6 +290,9 @@ paths **plus inline image blocks** (multimodal models see the render
 immediately). `details` reports the winning provider, model, and fallback
 attempts.
 
+`n` (1–4) applies to the API providers (`zai`/`custom`); the Gemini web tier
+returns its own image count (surfaced as a provider note when fewer than `n`).
+
 **Guardrails** (soft, in-memory): per-provider `WEB_IMAGE_MIN_INTERVAL_MS`
 (default 5 s) and a `WEB_IMAGE_DAILY_CAP` (default 20/day, applied to the
 Gemini web tier only — keyed APIs are billed upstream and stay uncapped).

package/extensions/index.ts

@@ -541,7 +541,7 @@ export default function piWebExtension(pi: ExtensionAPI) {
         { default: "auto", description: "auto = gemini → zai (if ZAI_API_KEY) → custom (if WEB_IMAGE_API_BASE_URL); pin one to skip fallback." },
       )),
       model: Type.Optional(Type.String({ description: "Provider-specific model (e.g. glm-image, or a Gemini image-capable model id). Omit for the provider default." })),
-      n: Type.Optional(Type.Number({ default: 1, description: "Number of images, 1-4." })),
+      n: Type.Optional(Type.Number({ default: 1, description: "Number of images, 1-4 (applies to zai/custom; the gemini web tier returns its own count)." })),
       out_dir: Type.Optional(Type.String({ description: "Directory for saved images (default: fresh temp dir)." })),
       ...sharedControlSchema,
     }),
@@ -552,7 +552,7 @@ export default function piWebExtension(pi: ExtensionAPI) {
       const n = Math.min(Math.max(Math.trunc((params.n as number) ?? 1) || 1, 1), 4);
       const timeoutMs = Math.min(Math.max((params.timeout_ms as number) ?? 180_000, 10_000), 600_000);
       const outDir = params.out_dir
-        ? path.resolve(String(params.out_dir))
+        ? path.resolve(cwd, String(params.out_dir))
         : await fs.promises.mkdtemp(path.join(os.tmpdir(), "pi-web-image-"));
       const result = await generateImageWithFallback({
         prompt,
@@ -574,7 +574,7 @@ export default function piWebExtension(pi: ExtensionAPI) {
         ...(result.urls.length
           ? [`Not saved (image host unreachable from this machine — open directly):`, ...result.urls.map((u) => `  ${u}`)]
           : []),
-        result.attempts.length ? `Fallback attempts: ${result.attempts.join(" | ")}` : null,
+        result.attempts.length ? `Provider notes: ${result.attempts.join(" | ")}` : null,
       ].filter(Boolean).join("\n");
       const content: Array<{ type: "text"; text: string } | { type: "image"; data: string; mimeType: string }> = [
         { type: "text" as const, text },

package/extensions/lib/imageapi.ts

@@ -308,6 +308,13 @@ export async function generateImageWithFallback(params: ImageChainParams): Promi
   const chain = chainFor(params.provider);
   const attempts: string[] = [];
   for (const provider of chain) {
+    // Cancelled calls skip fallback entirely — before any provider client
+    // construction or fetch invocation.
+    if (params.signal?.aborted) {
+      const abortErr = new Error("web_image aborted");
+      abortErr.name = "AbortError";
+      throw abortErr;
+    }
     const configured =
       provider === "gemini" ? true : provider === "zai" ? Boolean(params.apiConfig.zai) : Boolean(params.apiConfig.custom);
     if (!configured) {
@@ -356,8 +363,24 @@ export async function generateImageWithFallback(params: ImageChainParams): Promi
         });
       }
       imageRateRecord(provider);
+      if (provider === "gemini" && params.n && params.n > 1 && result.paths.length < params.n) {
+        attempts.push(`gemini: n=${params.n} requested — the gemini web tier returns its own image count (${result.paths.length}); n applies to zai/custom`);
+      }
       return { provider, model: result.model, paths: result.paths, urls: result.urls ?? [], attempts };
     } catch (err) {
+      // Cancellation is not a provider failure: rethrow so aborted tool calls
+      // surface as AbortError instead of an "all providers failed" listing —
+      // even when a genuine provider error (AuthError, a failed save, …) was
+      // the error in flight when the abort landed.
+      if (params.signal?.aborted) {
+        if ((err as Error)?.name === "AbortError") throw err;
+        // cause keeps the in-flight provider error for diagnostics.
+        const abortErr = new Error("web_image aborted", { cause: err });
+        abortErr.name = "AbortError";
+        throw abortErr;
+      }
+      // A foreign AbortError-named error (not from the caller's signal) is a
+      // provider failure like any other — record it and keep the chain going.
       attempts.push(`${provider}: ${provider === "gemini" ? describeGeminiError(err) : describeImageApiError(err)}`);
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bacnh85/pi-web",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "Pi extension for web search, page extraction, Firecrawl scraping/crawling, Crawl4AI headless browser crawling, Gemini web-tier research, and free upstream image generation.",
   "type": "module",
   "license": "MIT",