u1s1-cli 1.2.1 → 1.2.2

package/dist/api.d.ts

@@ -116,6 +116,14 @@ export interface ImageGenRequest {
     /** 1K/2K/4K 或 宽x高(如 2048x2048);缺省由服务端定(2K)。 */
     size?: string;
 }
+/**
+ * 新网关把结果同时放进响应头。这样即使 Cloudflare 到 Node 的 JSON body
+ * 在生成完成后被 Undici 报 `terminated`，也能继续下载已经计费的那张图。
+ */
+export declare function readGeneratedImageResponse(resp: Response): Promise<{
+    url: string;
+    size: string | null;
+}>;
 /** 生图走网关代理(方舟 key 只在服务端);返回 TOS 图片 URL(24h 有效),调用方应立即下载。 */
 export declare function generateImage(cfg: Pick<CliConfig, "baseUrl" | "apiKey">, req: ImageGenRequest, signal?: AbortSignal): Promise<{
     url: string;

package/dist/api.js

@@ -109,6 +109,52 @@ export async function renderPage(cfg, url, signal) {
     }
     return (await resp.json());
 }
+const IMAGE_URL_HEADER = "x-u1s1-image-url";
+const IMAGE_SIZE_HEADER = "x-u1s1-image-size";
+function imageResultFromHeaders(resp) {
+    const encodedUrl = resp.headers.get(IMAGE_URL_HEADER);
+    if (!encodedUrl)
+        return null;
+    try {
+        const url = decodeURIComponent(encodedUrl);
+        const parsed = new URL(url);
+        if (parsed.protocol !== "http:" && parsed.protocol !== "https:")
+            return null;
+        const encodedSize = resp.headers.get(IMAGE_SIZE_HEADER);
+        return { url, size: encodedSize ? decodeURIComponent(encodedSize) : null };
+    }
+    catch {
+        return null;
+    }
+}
+function responseErrorDetail(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const cause = error instanceof Error ? error.cause : undefined;
+    const code = cause && typeof cause === "object" && "code" in cause && typeof cause.code === "string" ? cause.code : "";
+    return code && !message.includes(code) ? `${message} (${code})` : message;
+}
+/**
+ * 新网关把结果同时放进响应头。这样即使 Cloudflare 到 Node 的 JSON body
+ * 在生成完成后被 Undici 报 `terminated`，也能继续下载已经计费的那张图。
+ */
+export async function readGeneratedImageResponse(resp) {
+    const headerResult = imageResultFromHeaders(resp);
+    if (headerResult) {
+        await resp.body?.cancel().catch(() => undefined);
+        return headerResult;
+    }
+    try {
+        const body = (await resp.json());
+        if (typeof body.url !== "string" || !/^https?:\/\//.test(body.url)) {
+            throw new Error("服务端没有返回图片下载地址");
+        }
+        return { url: body.url, size: typeof body.size === "string" ? body.size : null };
+    }
+    catch (error) {
+        throw new Error(`图片可能已经生成,但客户端下载结果响应失败: ${responseErrorDetail(error)}。` +
+            "不要重新调用 generate_image,请升级 u1s1 后再试", { cause: error });
+    }
+}
 /** 生图走网关代理(方舟 key 只在服务端);返回 TOS 图片 URL(24h 有效),调用方应立即下载。 */
 export async function generateImage(cfg, req, signal) {
     if (!cfg.apiKey)
@@ -136,7 +182,7 @@ export async function generateImage(cfg, req, signal) {
         const body = (await resp.json().catch(() => null));
         throw new Error(body?.error?.message ?? `图片生成服务返回 ${resp.status},稍后再试`);
     }
-    return (await resp.json());
+    return readGeneratedImageResponse(resp);
 }
 export async function fetchMe(cfg) {
     if (!cfg.apiKey)

package/dist/tools.js

@@ -352,6 +352,7 @@ export function createImageTool(cfg) {
         promptGuidelines: [
             "Use generate_image when the user wants a picture created or an existing image modified (logo, illustration, poster, placeholder art, style change).",
             "Each call generates one image and costs the user credits; refine the prompt first instead of regenerating repeatedly.",
+            "If an error says the image may/already has been generated or says not to call generate_image again, stop immediately; never retry with a new generation.",
             "To edit an existing image, pass its path in `images` and describe only the change in `prompt`.",
         ],
         parameters: Type.Object({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {