u1s1-cli 0.13.7 → 0.14.0

package/dist/agent-setup.d.ts

@@ -24,6 +24,7 @@ export declare function cleanupBrandThemes(): void;
 export declare function writeWebToolsExtension(cfg: CliConfig, features: {
     webSearch: boolean;
     webFetchRender: boolean;
+    imageGen: boolean;
 }): void;
 /**
  * pi-web-ui 的就绪检测只认 <agentDir>/auth.json 里有没有凭据条目(models.json

package/dist/agent-setup.js

@@ -130,12 +130,16 @@ export function writeWebToolsExtension(cfg, features) {
     const searchLine = features.webSearch
         ? `  pi.registerTool(tools.createSearchTool({ baseUrl: ${JSON.stringify(cfg.baseUrl)}, apiKey: process.env.U1S1_API_KEY }));\n`
         : "";
+    const imageLine = features.imageGen
+        ? `  pi.registerTool(tools.createImageTool({ baseUrl: ${JSON.stringify(cfg.baseUrl)}, apiKey: process.env.U1S1_API_KEY }));\n`
+        : "";
     writeFileSync(join(dir, "u1s1-tools.js"), `// 由 u1s1 每次启动自动生成,请勿手改\n` +
         `export default async function (pi) {\n` +
         `  if (process.env.U1S1_TOOLS_VIA_EXTENSION !== "1") return;\n` +
         `  const tools = await import(${JSON.stringify(toolsUrl)});\n` +
         searchLine +
         `  pi.registerTool(tools.createFetchTool({ baseUrl: ${JSON.stringify(cfg.baseUrl)}, apiKey: process.env.U1S1_API_KEY, renderFallback: ${features.webFetchRender} }));\n` +
+        imageLine +
         `}\n`);
 }
 /**

package/dist/api.d.ts

@@ -48,6 +48,8 @@ export interface ApiFeatures {
     web_search?: boolean;
     /** 网关配了 Browser Rendering 才为 true;老网关没有 /v1/fetch,缺失按关闭处理。 */
     web_fetch_render?: boolean;
+    /** 网关配了方舟 ARK_API_KEY 才为 true;老网关没有 /v1/image,缺失按关闭处理。 */
+    image_gen?: boolean;
 }
 export interface ModelsResponse {
     models: ApiModel[];
@@ -95,4 +97,16 @@ export declare function renderPage(cfg: Pick<CliConfig, "baseUrl" | "apiKey">, u
     url: string;
     markdown: string;
 }>;
+export interface ImageGenRequest {
+    prompt: string;
+    /** 参考图:http(s) URL 或 data:image/... base64,最多 10 张。 */
+    images?: string[];
+    /** 1K/2K/4K 或 宽x高(如 2048x2048);缺省由服务端定(2K)。 */
+    size?: string;
+}
+/** 生图走网关代理(方舟 key 只在服务端);返回 TOS 图片 URL(24h 有效),调用方应立即下载。 */
+export declare function generateImage(cfg: Pick<CliConfig, "baseUrl" | "apiKey">, req: ImageGenRequest, signal?: AbortSignal): Promise<{
+    url: string;
+    size: string | null;
+}>;
 export declare function fetchMe(cfg: CliConfig): Promise<MeResponse>;

package/dist/api.js

@@ -107,6 +107,35 @@ export async function renderPage(cfg, url, signal) {
     }
     return (await resp.json());
 }
+/** 生图走网关代理(方舟 key 只在服务端);返回 TOS 图片 URL(24h 有效),调用方应立即下载。 */
+export async function generateImage(cfg, req, signal) {
+    if (!cfg.apiKey)
+        throw new Error("没有配置 API Key");
+    let resp;
+    try {
+        resp = await fetch(`${cfg.baseUrl}/image`, {
+            method: "POST",
+            headers: {
+                ...authHeaders(cfg.apiKey),
+                "content-type": "application/json",
+            },
+            body: JSON.stringify(req),
+            signal,
+        });
+    }
+    catch (e) {
+        if (signal?.aborted)
+            throw e;
+        throw new Error(`连不上 ${cfg.baseUrl},检查一下网络?`);
+    }
+    if (resp.status === 401)
+        throw new Error("这把 Key 不对或已失效,去 https://u1s1.io/dashboard 看看");
+    if (!resp.ok) {
+        const body = (await resp.json().catch(() => null));
+        throw new Error(body?.error?.message ?? `图片生成服务返回 ${resp.status},稍后再试`);
+    }
+    return (await resp.json());
+}
 export async function fetchMe(cfg) {
     if (!cfg.apiKey)
         throw new Error("没有配置 API Key");

package/dist/index.js

@@ -147,12 +147,15 @@ async function runAgent(cfg, args) {
     let webSearchEnabled = true;
     // 老网关没有 /v1/fetch,web_fetch_render 缺失时按关闭处理,直连失败不去白调
     let webFetchRenderEnabled = false;
+    // 老网关没有 /v1/image,image_gen 缺失时按关闭处理,不注册生图工具
+    let imageGenEnabled = false;
     const endpointsReady = loadCustomEndpoints(cfg);
     try {
         const { models, features } = await fetchModels(cfg);
         setModelsFromApi(models.map(apiModelToDef));
         webSearchEnabled = features.web_search !== false;
         webFetchRenderEnabled = features.web_fetch_render === true;
+        imageGenEnabled = features.image_gen === true;
     }
     catch (e) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
@@ -161,7 +164,11 @@ async function runAgent(cfg, args) {
     ensureBrandPrompt(await shellReady);
     ensureProviderModels(cfg);
     // 联网工具经 agentDir/extensions 投影,TUI 和 u1s1 web 共用一份注册
-    writeWebToolsExtension(cfg, { webSearch: webSearchEnabled, webFetchRender: webFetchRenderEnabled });
+    writeWebToolsExtension(cfg, {
+        webSearch: webSearchEnabled,
+        webFetchRender: webFetchRenderEnabled,
+        imageGen: imageGenEnabled,
+    });
     ensureTmuxKeyboardProtocol();
     // must be set before pi reads them (getAgentDir() reads at call time, env at import is fine too)
     process.env["PI_CODING_AGENT_DIR"] = agentDir;

package/dist/tools.d.ts

@@ -8,6 +8,17 @@ export declare function createSearchTool(cfg: Pick<CliConfig, "baseUrl" | "apiKe
     query: string;
     count: number;
 }, any> & import("@earendil-works/pi-coding-agent").ToolDefinition<any, any, any>;
+/** 生图工具:走 u1s1 网关代理火山方舟 Seedream,上游 key 不落到用户机器上。 */
+export declare function createImageTool(cfg: Pick<CliConfig, "baseUrl" | "apiKey">): import("@earendil-works/pi-coding-agent").ToolDefinition<Type.TObject<{
+    prompt: Type.TString;
+    images: Type.TOptional<Type.TArray<Type.TString>>;
+    size: Type.TOptional<Type.TString>;
+    save_path: Type.TOptional<Type.TString>;
+}>, {
+    path: string;
+    size: string | null;
+    bytes: number;
+}, any> & import("@earendil-works/pi-coding-agent").ToolDefinition<any, any, any>;
 export interface FetchToolConfig {
     baseUrl: string;
     apiKey?: string;

package/dist/tools.js

@@ -1,6 +1,8 @@
+import { existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from "node:fs";
+import { dirname, extname, resolve } from "node:path";
 import { defineTool } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
-import { renderPage, searchWeb } from "./api.js";
+import { generateImage, renderPage, searchWeb } from "./api.js";
 const FETCH_TIMEOUT_MS = 20_000;
 const MAX_FETCH_BYTES = 2_000_000;
 const MAX_TEXT_CHARS = 30_000;
@@ -108,6 +110,105 @@ export function createSearchTool(cfg) {
         },
     });
 }
+/** 生图链路 = 网关排队 + 方舟生成(2K 实测 ~10s,4K 更久)+ 下载落盘。 */
+const IMAGE_TIMEOUT_MS = 150_000;
+/** 方舟单张参考图原图上限 10MB。 */
+const MAX_REF_IMAGE_BYTES = 10 * 1024 * 1024;
+const REF_IMAGE_MIME = {
+    ".png": "image/png",
+    ".jpg": "image/jpeg",
+    ".jpeg": "image/jpeg",
+    ".webp": "image/webp",
+    ".bmp": "image/bmp",
+    ".gif": "image/gif",
+};
+/** 本地图片路径 → data URL;http(s) URL 原样透传给网关。 */
+function refImageToPayload(ref) {
+    const s = ref.trim();
+    if (/^https?:\/\//.test(s))
+        return s;
+    const path = resolve(s);
+    if (!existsSync(path))
+        throw new Error(`参考图不存在: ${s}`);
+    const mime = REF_IMAGE_MIME[extname(path).toLowerCase()];
+    if (!mime)
+        throw new Error(`参考图格式不支持: ${s}(支持 png/jpg/jpeg/webp/bmp/gif)`);
+    if (statSync(path).size > MAX_REF_IMAGE_BYTES)
+        throw new Error(`参考图超过 10MB: ${s}`);
+    return `data:${mime};base64,${readFileSync(path).toString("base64")}`;
+}
+/** 结果落盘路径:模型没指定时按时间戳起名,已存在就加序号,不覆盖旧图。 */
+function resolveSavePath(savePath, urlExt) {
+    if (savePath?.trim())
+        return resolve(savePath.trim());
+    const stamp = new Date()
+        .toISOString()
+        .replace(/[-:]/g, "")
+        .replace(/T(\d{6}).*/, "-$1");
+    const base = resolve(`image-${stamp}`);
+    let path = `${base}${urlExt}`;
+    for (let i = 1; existsSync(path); i++)
+        path = `${base}-${i}${urlExt}`;
+    return path;
+}
+/** 生图工具:走 u1s1 网关代理火山方舟 Seedream,上游 key 不落到用户机器上。 */
+export function createImageTool(cfg) {
+    return defineTool({
+        name: "generate_image",
+        label: "生成图片",
+        description: "Generate an image from a text prompt, or edit/compose existing images, using the Seedream image model. " +
+            "Saves the result as a local image file and returns its path. " +
+            "Pass local file paths or http(s) URLs in `images` to edit an image or use references (style transfer, adding elements, combining up to 10 images). " +
+            "Prompts work in Chinese or English; describe content, style, composition, and any text to render.",
+        promptSnippet: "AI 生成/修改图片（文生图、改图、多图合成）",
+        promptGuidelines: [
+            "Use generate_image when the user wants a picture created or an existing image modified (logo, illustration, poster, placeholder art, 改图/换风格).",
+            "Each call generates one image and costs the user credits; refine the prompt first instead of regenerating repeatedly.",
+            "To edit an existing image, pass its path in `images` and describe only the change in `prompt`.",
+        ],
+        parameters: Type.Object({
+            prompt: Type.String({
+                description: "What to generate or how to edit the reference images. Be specific about subject, style, composition, colors, and any text to appear in the image.",
+            }),
+            images: Type.Optional(Type.Array(Type.String(), {
+                description: "Reference images to edit or draw from: local file paths or http(s) URLs, up to 10. Omit for pure text-to-image.",
+            })),
+            size: Type.Optional(Type.String({
+                description: 'Output resolution: "2K" (default, aspect ratio auto-adapts to the prompt), "4K", or explicit "WIDTHxHEIGHT" like "2048x2048" / "1664x2496".',
+            })),
+            save_path: Type.Optional(Type.String({
+                description: "Where to save the image (relative to cwd). Defaults to image-<timestamp>.<ext> in the current directory.",
+            })),
+        }),
+        async execute(_toolCallId, params, signal) {
+            const timeout = AbortSignal.timeout(IMAGE_TIMEOUT_MS);
+            const abort = signal ? AbortSignal.any([signal, timeout]) : timeout;
+            const images = (params.images ?? []).map(refImageToPayload);
+            const result = await generateImage(cfg, { prompt: params.prompt, images: images.length ? images : undefined, size: params.size }, abort);
+            let resp;
+            try {
+                resp = await fetch(result.url, { signal: abort });
+            }
+            catch (e) {
+                if (signal?.aborted)
+                    throw e;
+                throw new Error(`图片生成成功但下载失败: ${e.message}`);
+            }
+            if (!resp.ok)
+                throw new Error(`图片生成成功但下载失败: HTTP ${resp.status}`);
+            const bytes = new Uint8Array(await resp.arrayBuffer());
+            const urlExt = extname(new URL(result.url).pathname).toLowerCase() || ".jpeg";
+            const path = resolveSavePath(params.save_path, urlExt);
+            mkdirSync(dirname(path), { recursive: true });
+            writeFileSync(path, bytes);
+            const sizeNote = result.size ? ` (${result.size})` : "";
+            return {
+                content: [{ type: "text", text: `图片已保存: ${path}${sizeNote}` }],
+                details: { path, size: result.size, bytes: bytes.byteLength },
+            };
+        },
+    });
+}
 /** 直连失败里值得换浏览器再试的一类:网络不通/超时,或典型的反爬状态码。 */
 class DirectFetchError extends Error {
     renderWorthy;

package/dist/web.js

@@ -32,12 +32,15 @@ export async function prepareWebEnv(cfg) {
     let webSearchEnabled = true;
     // 老网关没有 /v1/fetch,web_fetch_render 缺失时按关闭处理,直连失败不去白调
     let webFetchRenderEnabled = false;
+    // 老网关没有 /v1/image,image_gen 缺失时按关闭处理,不注册生图工具
+    let imageGenEnabled = false;
     const endpointsReady = loadCustomEndpoints(cfg);
     try {
         const { models, features } = await fetchModels(cfg);
         setModelsFromApi(models.map(apiModelToDef));
         webSearchEnabled = features.web_search !== false;
         webFetchRenderEnabled = features.web_fetch_render === true;
+        imageGenEnabled = features.image_gen === true;
     }
     catch (e) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
@@ -48,7 +51,11 @@ export async function prepareWebEnv(cfg) {
     // pi-web-ui 靠 auth.json 判断「已配置」,否则网页会弹 pi 安装引导
     ensureAuthCredential();
     // 联网工具经 agentDir/extensions 投影,和 TUI 共用一份注册
-    writeWebToolsExtension(cfg, { webSearch: webSearchEnabled, webFetchRender: webFetchRenderEnabled });
+    writeWebToolsExtension(cfg, {
+        webSearch: webSearchEnabled,
+        webFetchRender: webFetchRenderEnabled,
+        imageGen: imageGenEnabled,
+    });
     // 网页版新会话从 settings.json 的 defaultModel 取模型(TUI 是每次传 --model),
     // 确保它有值;resolvePreferredModel 优先尊重已有的 in-session 选择,不会回退覆盖。
     const pref = resolvePreferredModel(cfg);

package/package.json

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