@crewhaus/tool-image-generation 0.7.0 → 0.8.0

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/NOTICE

@@ -0,0 +1,9 @@
+CrewHaus Factory
+Copyright 2026 Max Meier
+
+This product includes software developed by Max Meier
+(operating as StudioMax — https://studiomax.io) and contributors.
+
+The CrewHaus name and logo are trademarks of Max Meier. See
+https://github.com/crewhaus/factory/blob/main/TRADEMARK.md for the
+use-of-marks policy.

package/README.md

@@ -0,0 +1,46 @@
+# @crewhaus/tool-image-generation
+
+`ImageGenerate`: an image from a text prompt, through a remote API.
+
+```yaml
+tools:
+  - imageGenerate
+
+tool_config:
+  imageGenerate:
+    provider: openai        # openai (default when OPENAI_API_KEY is set) or mock
+    model: gpt-image-1      # optional; dall-e-3 by default
+```
+
+The key is read from `OPENAI_API_KEY`. It is never written in the spec.
+
+## Where the key is sent
+
+By default the key goes to `https://api.openai.com/v1` and nowhere else.
+
+`openaiBaseUrl` points the tool at an OpenAI-compatible proxy instead (not
+Azure OpenAI, whose paths and auth header differ). It is an origin and a path,
+with no query or fragment. Because
+the key goes wherever that URL points, a spec cannot set it alone — a spec can
+come from a template or a pull request. The operator approves the endpoint by
+setting `OPENAI_BASE_URL` to the same origin in the environment the harness
+starts in:
+
+```yaml
+tool_config:
+  imageGenerate:
+    openaiBaseUrl: https://llm-proxy.internal.example/v1
+```
+
+```sh
+OPENAI_BASE_URL=https://llm-proxy.internal.example/v1 bun agent.ts
+```
+
+- Anything but `https://api.openai.com` without that approval is refused at
+  boot and on every call, before a request is made.
+- Plain `http` is refused, because the key would cross the network
+  unencrypted. The one exception is a proxy on loopback (`http://127.0.0.1`,
+  `http://localhost`), and only with the same approval.
+- A URL with `user:password@` in it is refused.
+
+`provider: mock` needs no key and sends nothing; use it for offline tests.

package/dist/index.d.ts

@@ -17,6 +17,12 @@
  * include the URL in its reply; vision-capable models can see the
  * image inline on subsequent turns via WebFetch.
  *
+ * Bounds (0.7.1): the call ends when the turn's signal aborts (Ctrl-C,
+ * `turn_timeout_ms`, `deadline_ms`), when `tool_config.imageGenerate.timeoutMs`
+ * passes (default three minutes, request and body together), or when the
+ * body passes `maxResponseBytes` (default 32 MiB, refused rather than
+ * buffered); an error body is read only as far as its message shows.
+ *
  * Pillar 3: this tool is non-destructive (`destructive: false`) — it
  * doesn't write to the user's host filesystem; it issues a remote HTTP
  * request. Tool output is classified post-execution by runtime-core's
@@ -30,8 +36,26 @@ export type ImageGenerationConfig = {
     readonly provider?: ImageGenerationProvider;
     /** Provider-specific model id. Defaults: openai → "dall-e-3", replicate → "stability-ai/sdxl". */
     readonly model?: string;
-    /** Override the OpenAI base URL (for proxies / Azure OpenAI). */
+    /**
+     * Override the OpenAI base URL, for an OpenAI-compatible proxy (not Azure
+     * OpenAI, whose path, `api-version` query and `api-key` header differ). OPENAI_API_KEY
+     * goes wherever this points, so anything but `https://api.openai.com` must
+     * also be approved by the operator outside the spec — see
+     * {@link resolveOpenAIBaseUrl}.
+     */
     readonly openaiBaseUrl?: string;
+    /**
+     * How long one generation may take, request and response together, in
+     * milliseconds. Default 180000 (three minutes): a high-quality image can
+     * take close to two. Past it the call fails with "timed out".
+     */
+    readonly timeoutMs?: number;
+    /**
+     * The most response body read, in bytes. Default 33554432 (32 MiB; a
+     * 1792x1024 PNG as base64 is a few MB). A larger body is refused, not
+     * buffered.
+     */
+    readonly maxResponseBytes?: number;
     /** Override fetch implementation for tests. */
     readonly fetch?: typeof globalThis.fetch;
 };
@@ -46,6 +70,20 @@ export declare class ImageGenerationError extends CrewhausError {
  * env-driven defaults work without re-registering.
  */
 export declare function registerImageGenerationConfig(config: ImageGenerationConfig): void;
+/**
+ * Where OPENAI_API_KEY may be sent, and the only place it is sent.
+ *
+ * The base URL is `openaiBaseUrl` from the tool's config, else
+ * `https://api.openai.com/v1`. A spec can come from a template or a pull
+ * request, so it cannot choose where the key goes on its own:
+ *
+ *  - any origin but `https://api.openai.com` needs the operator's approval:
+ *    `OPENAI_BASE_URL` in the environment naming the same origin;
+ *  - plain http is refused, except on loopback (a local proxy) with that
+ *    same approval — the key would otherwise cross the network unencrypted;
+ *  - a URL with `user:password@` in it is refused.
+ */
+export declare function resolveOpenAIBaseUrl(cfg: ImageGenerationConfig, env: Readonly<Record<string, string | undefined>>): string;
 /**
  * 0.6.0 §4.4 — the config ONE call runs under: the serving candidate's
  * `tool_config.imageGenerate` block when its profile declares one

package/dist/index.js

@@ -17,6 +17,12 @@
  * include the URL in its reply; vision-capable models can see the
  * image inline on subsequent turns via WebFetch.
  *
+ * Bounds (0.7.1): the call ends when the turn's signal aborts (Ctrl-C,
+ * `turn_timeout_ms`, `deadline_ms`), when `tool_config.imageGenerate.timeoutMs`
+ * passes (default three minutes, request and body together), or when the
+ * body passes `maxResponseBytes` (default 32 MiB, refused rather than
+ * buffered); an error body is read only as far as its message shows.
+ *
  * Pillar 3: this tool is non-destructive (`destructive: false`) — it
  * doesn't write to the user's host filesystem; it issues a remote HTTP
  * request. Tool output is classified post-execution by runtime-core's
@@ -24,7 +30,36 @@
  */
 import { CrewhausError } from "@crewhaus/errors";
 import { buildTool } from "@crewhaus/tool-builder";
+import { readBodyBounded, withRawBody } from "@crewhaus/tool-fetch/body";
 import { z } from "zod";
+const DEFAULT_TIMEOUT_MS = 180_000;
+const DEFAULT_MAX_RESPONSE_BYTES = 32 * 1024 * 1024;
+/** An error body is shown only up to 500 characters, so only this much is read. */
+const ERROR_BODY_BYTES = 4096;
+/**
+ * The longest `timeoutMs` a timer can hold: a delay past 2^31-1 ms (about
+ * 24.8 days) overflows, and the runtime fires it after 1 ms instead.
+ */
+const MAX_TIMEOUT_MS = 2_147_483_647;
+/**
+ * Read `timeoutMs` / `maxResponseBytes` from a config block: a positive whole
+ * number (a `timeoutMs` no longer than {@link MAX_TIMEOUT_MS}), else the
+ * default. Anything else is refused with the key named, so a typo never
+ * silently becomes "no limit" — nor, for a timeout too long for a timer, a
+ * call that gives up after 1 ms and reports it timed out.
+ */
+function positiveLimit(cfg, key, fallback) {
+    const value = cfg[key];
+    if (value === undefined)
+        return fallback;
+    if (typeof value !== "number" || !Number.isSafeInteger(value) || value <= 0) {
+        throw new ImageGenerationError(`tool_config.imageGenerate.${key} must be a positive whole number${key === "timeoutMs" ? " of milliseconds" : " of bytes"}. Remove it for the default (${fallback}).`);
+    }
+    if (key === "timeoutMs" && value > MAX_TIMEOUT_MS) {
+        throw new ImageGenerationError(`tool_config.imageGenerate.timeoutMs is ${value} ms, longer than a timer can wait (${MAX_TIMEOUT_MS} ms, about 24 days). Use a smaller value, or remove it for the default (${fallback}).`);
+    }
+    return value;
+}
 const inputSchema = z.object({
     prompt: z
         .string()
@@ -54,8 +89,96 @@ let registeredConfig;
  * env-driven defaults work without re-registering.
  */
 export function registerImageGenerationConfig(config) {
+    if (config.fetch !== undefined && typeof config.fetch !== "function") {
+        throw new ImageGenerationError("tool_config.imageGenerate.fetch is not a setting a spec can write. Remove it.");
+    }
+    // Checked here as well as on every call, so a spec that points the key
+    // somewhere the operator did not approve fails at boot, where someone is
+    // looking, and not at the first image.
+    if (config.openaiBaseUrl !== undefined)
+        resolveOpenAIBaseUrl(config, processEnv());
+    positiveLimit(config, "timeoutMs", DEFAULT_TIMEOUT_MS);
+    positiveLimit(config, "maxResponseBytes", DEFAULT_MAX_RESPONSE_BYTES);
     registeredConfig = config;
 }
+/** The environment, or nothing where there is no `process` (a Worker without Node compat). */
+function processEnv() {
+    return typeof process === "undefined" ? {} : process.env;
+}
+const OPENAI_ORIGIN = "https://api.openai.com";
+const OPENAI_DEFAULT_BASE_URL = `${OPENAI_ORIGIN}/v1`;
+/**
+ * `text` without its trailing slashes. A loop, not `/\/+$/`, which rescans
+ * a run of slashes from every start and is quadratic in its length; a base
+ * URL comes from a spec, which may come from a template or a pull request.
+ */
+function withoutTrailingSlashes(text) {
+    let end = text.length;
+    while (end > 0 && text[end - 1] === "/")
+        end--;
+    return text.slice(0, end);
+}
+function isLoopbackHost(host) {
+    const h = host.replace(/^\[/, "").replace(/\]$/, "").toLowerCase();
+    return h === "localhost" || h === "::1" || /^127(\.\d{1,3}){3}$/.test(h);
+}
+/**
+ * Where OPENAI_API_KEY may be sent, and the only place it is sent.
+ *
+ * The base URL is `openaiBaseUrl` from the tool's config, else
+ * `https://api.openai.com/v1`. A spec can come from a template or a pull
+ * request, so it cannot choose where the key goes on its own:
+ *
+ *  - any origin but `https://api.openai.com` needs the operator's approval:
+ *    `OPENAI_BASE_URL` in the environment naming the same origin;
+ *  - plain http is refused, except on loopback (a local proxy) with that
+ *    same approval — the key would otherwise cross the network unencrypted;
+ *  - a URL with `user:password@` in it is refused.
+ */
+export function resolveOpenAIBaseUrl(cfg, env) {
+    const operator = env["OPENAI_BASE_URL"];
+    const raw = cfg.openaiBaseUrl ?? OPENAI_DEFAULT_BASE_URL;
+    let url;
+    try {
+        url = new URL(raw);
+    }
+    catch {
+        // Not quoted: text that does not parse cannot be told apart from a
+        // credential in it (a query, a userinfo, a password holding "/").
+        throw new ImageGenerationError("tool_config.imageGenerate.openaiBaseUrl is not an absolute URL (it is not quoted here, since a URL can carry a credential). Write it as https://host/v1.");
+    }
+    if (url.username !== "" || url.password !== "") {
+        throw new ImageGenerationError(`the OpenAI base URL for ${url.protocol}//${url.host} carries user:password@. Remove it; the key is sent from OPENAI_API_KEY.`);
+    }
+    // `${base}/images/generations` is appended as text, so a query or fragment
+    // in the base would swallow the path (and a query can carry a credential):
+    // refused, and not echoed.
+    if (url.search !== "" || url.hash !== "") {
+        throw new ImageGenerationError(`the OpenAI base URL for ${url.protocol}//${url.host} has a query or fragment. Write it as https://host/v1, with nothing after the path.`);
+    }
+    let approved = false;
+    if (operator !== undefined && operator !== "") {
+        try {
+            approved = new URL(operator).origin === url.origin;
+        }
+        catch {
+            approved = false;
+        }
+    }
+    const approve = `set OPENAI_BASE_URL=${url.origin}${withoutTrailingSlashes(url.pathname)} in the environment the harness starts in`;
+    if (url.protocol === "http:") {
+        if (!isLoopbackHost(url.hostname) || !approved) {
+            throw new ImageGenerationError(`the OpenAI base URL ${url.origin} is plain http, which would send OPENAI_API_KEY unencrypted. Use https. A proxy on loopback is allowed when the operator approves it: ${approve}.`);
+        }
+    }
+    else if (url.protocol !== "https:") {
+        throw new ImageGenerationError(`the OpenAI base URL ${url.origin} is not https. Write it as https://host/v1.`);
+    }
+    else if (url.origin !== OPENAI_ORIGIN && !approved) {
+        throw new ImageGenerationError(`tool_config.imageGenerate.openaiBaseUrl would send OPENAI_API_KEY to ${url.origin}. A spec cannot choose where the key goes; to approve this endpoint, ${approve}.`);
+    }
+    return withoutTrailingSlashes(raw);
+}
 /**
  * 0.6.0 §4.4 — the config ONE call runs under: the serving candidate's
  * `tool_config.imageGenerate` block when its profile declares one
@@ -71,7 +194,8 @@ export function resolveImageGenerationConfig(override) {
 }
 export const imageGenerate = buildTool({
     name: "ImageGenerate",
-    description: "Generate an image from a text prompt via a remote API. Returns a URL or base64 data URI. Use for: visual concepts, mockups, illustrations, social posts. Don't use for: 'edit this existing photo' (different tool needed).",
+    operativeArgs: [],
+    description: "Generate an image from a text prompt via a remote API. Returns a URL or base64 data URI. With the OpenAI provider every call is a billed generation on the operator's account, so generate only what the task needs. Use for: visual concepts, mockups, illustrations, social posts. Don't use for: 'edit this existing photo' (different tool needed).",
     inputSchema,
     destructive: false,
     readOnly: false, // not idempotent — each call mints a new image
@@ -85,7 +209,7 @@ export const imageGenerate = buildTool({
         const provider = cfg.provider ?? defaultProvider(process.env);
         const responseFormat = input.responseFormat ?? "url";
         if (provider === "openai") {
-            return await generateOpenAI(input, cfg, responseFormat);
+            return await generateOpenAI(input, cfg, responseFormat, ctx?.signal);
         }
         if (provider === "mock") {
             return await generateMock(input);
@@ -100,14 +224,126 @@ function defaultProvider(env) {
         return "mock";
     return "openai"; // surfaces a clear "missing OPENAI_API_KEY" error at call time
 }
-async function generateOpenAI(input, cfg, responseFormat) {
+// ---------------------------------------------------------------------------
+// Bounded request. This package ships in the cf-worker bundles, which cannot
+// take @crewhaus/tool-safety (Bun-only), so the bound is written here with
+// what workerd has too: AbortController, setTimeout and a stream reader.
+// ---------------------------------------------------------------------------
+const pinnedSignals = new WeakSet();
+const noop = () => undefined;
+/**
+ * Call `fn` once when `signal` aborts; returns the unsubscribe. Never leaves
+ * the caller's signal without a listener: on Bun, removing the last listener
+ * from an `AbortSignal.timeout()` signal cancels its timer for good (the rule
+ * tool-safety's `onAbort` follows), which would disarm the caller's deadline.
+ */
+function onAbort(signal, fn) {
+    if (signal === undefined)
+        return noop;
+    if (!pinnedSignals.has(signal)) {
+        pinnedSignals.add(signal);
+        signal.addEventListener("abort", noop, { once: true });
+    }
+    signal.addEventListener("abort", fn, { once: true });
+    return () => signal.removeEventListener("abort", fn);
+}
+/** A promise that rejects with `signal.reason` once `signal` aborts (our own
+ *  controller's signal, so its listener may come and go freely). */
+function rejectOnAbort(signal) {
+    const aborted = new Promise((_resolve, reject) => {
+        const fail = () => reject(signal.reason);
+        if (signal.aborted)
+            fail();
+        else
+            signal.addEventListener("abort", fail, { once: true });
+    });
+    aborted.catch(noop);
+    return aborted;
+}
+/**
+ * Read at most `maxBytes` of a body, racing every read against `signal`.
+ * Returns the bytes and whether more was there; the stream is cancelled at
+ * the cap, so the rest is never buffered. A response with no body stream
+ * reads as empty.
+ */
+async function readBodyCappedBytes(res, maxBytes, signal) {
+    const body = res.body;
+    if (body === null || body === undefined)
+        return { bytes: new Uint8Array(0), truncated: false };
+    const reader = body.getReader();
+    const aborted = rejectOnAbort(signal);
+    const chunks = [];
+    let total = 0;
+    let truncated = false;
+    try {
+        for (;;) {
+            const { done, value } = await Promise.race([reader.read(), aborted]);
+            if (done)
+                break;
+            if (total + value.byteLength > maxBytes) {
+                chunks.push(value.subarray(0, maxBytes - total));
+                total = maxBytes;
+                truncated = true;
+                break;
+            }
+            chunks.push(value);
+            total += value.byteLength;
+        }
+    }
+    finally {
+        // Stop the producer: past the cap, on an abort, or on a read error.
+        if (truncated || signal.aborted)
+            await reader.cancel().catch(noop);
+    }
+    const bytes = new Uint8Array(total);
+    let offset = 0;
+    for (const chunk of chunks) {
+        bytes.set(chunk, offset);
+        offset += chunk.byteLength;
+    }
+    return { bytes, truncated };
+}
+/** {@link readBodyCappedBytes}, as UTF-8 text. */
+async function readBodyCapped(res, maxBytes, signal) {
+    const { bytes, truncated } = await readBodyCappedBytes(res, maxBytes, signal);
+    return { text: new TextDecoder().decode(bytes), truncated };
+}
+/**
+ * {@link readBodyCapped} over the RAW body, then decoded with its output
+ * bounded by the same cap (tool-fetch's `readBodyBounded`, which is safe in
+ * a cf-worker bundle). A body that decodes past the cap reads as truncated;
+ * one that cannot be decoded is refused without quoting it.
+ */
+async function readDecoded(res, maxBytes, signal) {
+    const encoding = res.headers.get("content-encoding");
+    if (encoding === null)
+        return readBodyCapped(res, maxBytes, signal);
+    const raw = await readBodyCappedBytes(res, maxBytes, signal);
+    if (raw.truncated)
+        return { text: "", truncated: true };
+    const decoded = await readBodyBounded(new Response(raw.bytes, { headers: { "content-encoding": encoding } }), maxBytes);
+    if (decoded.ok)
+        return { text: new TextDecoder().decode(decoded.bytes), truncated: false };
+    if (decoded.code === "too-large")
+        return { text: "", truncated: true };
+    throw new ImageGenerationError(`OpenAI image-generation response ${decoded.reason}`);
+}
+async function generateOpenAI(input, cfg, responseFormat, callerSignal) {
     const apiKey = process.env["OPENAI_API_KEY"];
     if (!apiKey) {
         throw new ImageGenerationError("OPENAI_API_KEY is not set — required for provider=openai. Set the env var or switch to provider=mock for offline testing.");
     }
-    const baseUrl = cfg.openaiBaseUrl ?? "https://api.openai.com/v1";
+    const baseUrl = resolveOpenAIBaseUrl(cfg, processEnv());
     const model = cfg.model ?? "dall-e-3";
+    // A spec block can only carry a string here; a per-call (model-pool
+    // candidate) block used to reach `fetchFn(...)` and crash with "is not a
+    // function". Refused like the boot block's.
+    if (cfg.fetch !== undefined && typeof cfg.fetch !== "function") {
+        throw new ImageGenerationError("tool_config.imageGenerate.fetch is not a setting a spec can write. Remove it.");
+    }
     const fetchFn = cfg.fetch ?? globalThis.fetch;
+    const timeoutMs = positiveLimit(cfg, "timeoutMs", DEFAULT_TIMEOUT_MS);
+    const maxResponseBytes = positiveLimit(cfg, "maxResponseBytes", DEFAULT_MAX_RESPONSE_BYTES);
     const body = JSON.stringify({
         model,
         prompt: input.prompt,
@@ -116,19 +352,66 @@ async function generateOpenAI(input, cfg, responseFormat) {
         response_format: responseFormat,
         ...(model === "dall-e-3" ? { style: input.style ?? "vivid" } : {}),
     });
-    const res = await fetchFn(`${baseUrl}/images/generations`, {
-        method: "POST",
-        headers: {
-            Authorization: `Bearer ${apiKey}`,
-            "Content-Type": "application/json",
-        },
-        body,
-    });
-    if (!res.ok) {
-        const text = await res.text().catch(() => "");
-        throw new ImageGenerationError(`OpenAI image-generation request failed (${res.status} ${res.statusText}): ${text.slice(0, 500)}`);
+    // One deadline over the request and the body read, and the turn's own
+    // signal (Ctrl-C, turn_timeout_ms, deadline_ms) ends the call too.
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(new ImageGenerationError(`OpenAI image-generation request timed out after ${timeoutMs} ms`)), timeoutMs);
+    const cancel = () => ctrl.abort(new ImageGenerationError("OpenAI image-generation request was cancelled"));
+    if (callerSignal?.aborted === true)
+        cancel();
+    const unsubscribe = onAbort(callerSignal, cancel);
+    let json;
+    try {
+        // Raced as well as signalled: a fetch that ignores its signal (or is
+        // handed one already aborted) still cannot hold the turn.
+        // The body is asked for RAW (Bun's `decompress: false`, via tool-fetch's
+        // edge-safe `withRawBody`): otherwise Bun inflates a gzip, deflate, br or
+        // zstd reply in native code before any reader sees a byte, so the
+        // maxResponseBytes cap bounded nothing (C093). `readDecoded` decodes it,
+        // under the cap. On workerd this is a no-op and the body is read as
+        // 0.7.0 read it.
+        const res = await Promise.race([
+            fetchFn(`${baseUrl}/images/generations`, withRawBody({
+                method: "POST",
+                headers: {
+                    Authorization: `Bearer ${apiKey}`,
+                    "Content-Type": "application/json",
+                    "Accept-Encoding": "identity",
+                },
+                body,
+                signal: ctrl.signal,
+            })),
+            rejectOnAbort(ctrl.signal),
+        ]);
+        if (!res.ok) {
+            const { text } = await readDecoded(res, ERROR_BODY_BYTES, ctrl.signal).catch(() => ({
+                text: "",
+            }));
+            const shown = text.length > 500 ? `${text.slice(0, 500)}… (truncated)` : text;
+            throw new ImageGenerationError(`OpenAI image-generation request failed (${res.status} ${res.statusText}): ${shown}`);
+        }
+        const read = await readDecoded(res, maxResponseBytes, ctrl.signal);
+        if (read.truncated) {
+            throw new ImageGenerationError(`OpenAI image-generation response body exceeded ${maxResponseBytes} bytes (tool_config.imageGenerate.maxResponseBytes); nothing past the cap was read`);
+        }
+        try {
+            json = JSON.parse(read.text);
+        }
+        catch {
+            throw new ImageGenerationError(`OpenAI image-generation response was not JSON (${read.text.length} chars)`);
+        }
+    }
+    catch (err) {
+        // An abort surfaces as whatever the runtime throws; say which one it was.
+        if (ctrl.signal.aborted && ctrl.signal.reason instanceof ImageGenerationError) {
+            throw ctrl.signal.reason;
+        }
+        throw err;
+    }
+    finally {
+        clearTimeout(timer);
+        unsubscribe();
     }
-    const json = (await res.json());
     const first = json.data?.[0];
     if (!first) {
         throw new ImageGenerationError("OpenAI response missing data[0] — unexpected format");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crewhaus/tool-image-generation",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "type": "module",
   "description": "M4.1 — image-generation tool (DALL-E 3, Replicate, future Flux/SD). Calls remote API; no host writes; non-destructive.",
   "main": "dist/index.js",
@@ -8,16 +8,18 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
     }
   },
   "scripts": {
     "test": "bun test src"
   },
   "dependencies": {
-    "@crewhaus/errors": "0.7.0",
-    "@crewhaus/tool-builder": "0.7.0",
-    "@crewhaus/tool-catalog": "0.7.0",
+    "@crewhaus/errors": "0.8.0",
+    "@crewhaus/tool-builder": "0.8.0",
+    "@crewhaus/tool-catalog": "0.8.0",
+    "@crewhaus/tool-fetch": "0.8.0",
     "zod": "^3.23.8"
   },
   "license": "Apache-2.0",
@@ -38,5 +40,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "files": ["dist", "README.md", "LICENSE", "NOTICE"]
+  "files": ["dist", "README.md", "LICENSE", "NOTICE"],
+  "engines": {
+    "bun": ">=1.3.14"
+  }
 }