u1s1-cli 1.2.9 → 1.3.1

package/dist/login.js

@@ -1,11 +1,25 @@
 import { createRequire } from "node:module";
 import { hostname, platform } from "node:os";
-import { fetchMe } from "./api.js";
+import { fetchMe, readJsonResponseCapped } from "./api.js";
 import { printConsoleBanner } from "./brand.js";
 import { loadConfig, saveConfig } from "./config.js";
 import { generateDeviceKeyPair, hasDeviceCredential } from "./device-auth.js";
 const require = createRequire(import.meta.url);
 const VERSION = require("../package.json").version;
+const MAX_DEVICE_AUTH_RESPONSE_BYTES = 64 * 1024;
+function boundedInteger(value, fallback, min, max) {
+    return typeof value === "number" && Number.isSafeInteger(value) && value >= min && value <= max
+        ? value
+        : fallback;
+}
+function boundedCredential(value, prefix) {
+    return typeof value === "string"
+        && value.startsWith(prefix)
+        && value.length <= 4_096
+        && !/[\u0000-\u001f\u007f]/.test(value)
+        ? value
+        : null;
+}
 function tryOpenBrowser(url) {
     import("node:child_process")
         .then(({ spawn }) => {
@@ -36,16 +50,26 @@ export async function startDeviceLogin(origin) {
             }),
             signal: AbortSignal.timeout(15_000),
         });
-        if (!resp.ok)
+        if (!resp.ok) {
+            void resp.body?.cancel("device login start rejected").catch(() => { });
             return null;
-        const data = (await resp.json());
-        if (typeof data.verify_url !== "string" || typeof data.poll_secret !== "string")
+        }
+        const data = await readJsonResponseCapped(resp, MAX_DEVICE_AUTH_RESPONSE_BYTES);
+        if (typeof data.verify_url !== "string"
+            || data.verify_url.length > 2_048
+            || typeof data.poll_secret !== "string"
+            || !data.poll_secret
+            || data.poll_secret.length > 4_096
+            || /[\u0000-\u001f\u007f]/.test(data.poll_secret))
+            return null;
+        const verifyUrl = new URL(data.verify_url);
+        if (!["http:", "https:"].includes(verifyUrl.protocol) || verifyUrl.username || verifyUrl.password)
             return null;
         return {
-            verify_url: data.verify_url,
+            verify_url: verifyUrl.toString(),
             poll_secret: data.poll_secret,
-            interval: data.interval || 2,
-            expires_in: data.expires_in || 900,
+            interval: boundedInteger(data.interval, 2, 1, 30),
+            expires_in: boundedInteger(data.expires_in, 900, 1, 1_800),
             private_jwk: pair.privateJwk,
             public_jwk: pair.publicJwk,
         };
@@ -56,9 +80,11 @@ export async function startDeviceLogin(origin) {
 }
 /** 轮询等浏览器批准；只接受带设备凭证的新网关响应。outcome 可带出失败原因。 */
 export async function pollDeviceLogin(origin, start, outcome) {
-    const deadline = Date.now() + start.expires_in * 1000;
+    const interval = boundedInteger(start.interval, 2, 1, 30);
+    const expiresIn = boundedInteger(start.expires_in, 900, 1, 1_800);
+    const deadline = Date.now() + expiresIn * 1000;
     while (Date.now() < deadline) {
-        await sleep(start.interval * 1000);
+        await sleep(interval * 1000);
         try {
             const resp = await fetch(`${origin}/auth/device/poll`, {
                 method: "POST",
@@ -66,14 +92,22 @@ export async function pollDeviceLogin(origin, start, outcome) {
                 body: JSON.stringify({ poll_secret: start.poll_secret }),
                 signal: AbortSignal.timeout(10_000),
             });
-            if (!resp.ok)
+            if (!resp.ok) {
+                void resp.body?.cancel("device login poll rejected").catch(() => { });
                 continue;
-            const data = (await resp.json());
-            if (data.status === "ok" && data.api_key && data.device_token) {
+            }
+            const data = await readJsonResponseCapped(resp, MAX_DEVICE_AUTH_RESPONSE_BYTES);
+            const apiKey = boundedCredential(data.api_key, "u1s1-");
+            const deviceToken = boundedCredential(data.device_token, "u1s1d-");
+            if (data.status === "ok" && apiKey && deviceToken) {
                 return {
-                    apiKey: data.api_key,
-                    deviceToken: data.device_token,
-                    deviceId: data.device_id,
+                    apiKey,
+                    deviceToken,
+                    deviceId: typeof data.device_id === "number"
+                        && Number.isSafeInteger(data.device_id)
+                        && data.device_id > 0
+                        ? data.device_id
+                        : undefined,
                     devicePrivateJwk: start.private_jwk,
                     devicePublicJwk: start.public_jwk,
                 };

package/dist/model.d.ts

@@ -1 +1,7 @@
+import { type ModelsResponse } from "./api.js";
+import { type CliConfig } from "./config.js";
+type ModelFetcher = (cfg: CliConfig) => Promise<ModelsResponse>;
+/** Refresh official models while preserving the built-in list as an explicit offline fallback. */
+export declare function refreshOfficialModels(cfg: CliConfig, fetcher?: ModelFetcher): Promise<string | null>;
 export declare function modelCommand(nameOrAlias?: string): Promise<void>;
+export {};

package/dist/model.js

@@ -1,9 +1,28 @@
-import { loadCustomEndpoints } from "./api.js";
-import { CUSTOM_ENDPOINTS, findModel, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, resolvePreferredModel, } from "./config.js";
+import { fetchModels, loadCustomEndpoints } from "./api.js";
+import { apiModelToDef, CUSTOM_ENDPOINTS, findModel, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, resolvePreferredModel, setModelsFromApi, } from "./config.js";
+/** Refresh official models while preserving the built-in list as an explicit offline fallback. */
+export async function refreshOfficialModels(cfg, fetcher = fetchModels) {
+    try {
+        const { models } = await fetcher(cfg);
+        if (models.length === 0)
+            return "线上模型列表为空";
+        setModelsFromApi(models.map(apiModelToDef));
+        return null;
+    }
+    catch (error) {
+        return error instanceof Error ? error.message : String(error);
+    }
+}
 export async function modelCommand(nameOrAlias) {
     const cfg = loadConfig();
-    // 云端可能刚改过端点配置;拉一次(失败回退本地缓存),再解析当前默认
-    await loadCustomEndpoints(cfg);
+    // Fetch both live catalogues before resolving the persisted default.
+    const [officialModelsError] = await Promise.all([
+        refreshOfficialModels(cfg),
+        loadCustomEndpoints(cfg),
+    ]);
+    if (officialModelsError) {
+        console.error(`  获取线上模型列表失败，使用内置列表：${officialModelsError}`);
+    }
     const current = resolvePreferredModel(cfg);
     if (!nameOrAlias) {
         console.log("");
@@ -26,7 +45,7 @@ export async function modelCommand(nameOrAlias) {
             }
         }
         console.log("");
-        console.log("  切换:u1s1 model grok / u1s1 model deepseek(对话里 /model 同样会记住)");
+        console.log("  切换:u1s1 model <model-id>(对话里 /model 同样会记住)");
         if (CUSTOM_ENDPOINTS.length) {
             console.log("  端点模型重名时可加限定:u1s1 model 端点名:模型id");
         }

package/dist/search-tools.js

@@ -2,7 +2,7 @@ import { spawnSync } from "node:child_process";
 import { chmodSync, createWriteStream, existsSync, mkdirSync, readdirSync, renameSync, rmSync } from "node:fs";
 import { arch, platform } from "node:os";
 import { join } from "node:path";
-import { Readable } from "node:stream";
+import { Readable, Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { agentDir } from "./config.js";
 /**
@@ -24,6 +24,7 @@ const TOOLS = [
 ];
 const binDir = join(agentDir, "bin");
 const DOWNLOAD_TIMEOUT_MS = 60_000;
+const MAX_TOOL_ARCHIVE_BYTES = 64 * 1024 * 1024;
 function archStr() {
     const a = arch();
     return a === "arm64" ? "aarch64" : a === "x64" ? "x86_64" : null;
@@ -110,11 +111,23 @@ async function install(tool, baseUrl, binName) {
     });
     if (!res.ok || !res.body)
         throw new Error(`HTTP ${res.status}`);
+    const declaredLength = Number(res.headers.get("content-length"));
+    if (Number.isFinite(declaredLength) && declaredLength > MAX_TOOL_ARCHIVE_BYTES) {
+        void res.body.cancel("tool archive exceeded limit").catch(() => { });
+        throw new Error(`下载文件超过 ${MAX_TOOL_ARCHIVE_BYTES} bytes`);
+    }
     const archive = join(binDir, asset);
     // fd/rg 并行安装,解压目录按工具名+pid 隔离,避免互踩
     const extractDir = join(binDir, `preseed_${tool.bin}_${process.pid}`);
     try {
-        await pipeline(Readable.fromWeb(res.body), createWriteStream(archive));
+        let received = 0;
+        const limiter = new Transform({
+            transform(chunk, _encoding, callback) {
+                received += chunk.byteLength;
+                callback(received > MAX_TOOL_ARCHIVE_BYTES ? new Error("tool archive exceeded limit") : null, received > MAX_TOOL_ARCHIVE_BYTES ? undefined : chunk);
+            },
+        });
+        await pipeline(Readable.fromWeb(res.body), limiter, createWriteStream(archive));
         mkdirSync(extractDir, { recursive: true });
         if (!extract(archive, extractDir))
             throw new Error(`解压失败 ${asset}`);

package/dist/subagent.d.ts

@@ -30,6 +30,19 @@ export interface SubagentOutcome {
     text: string;
     usage: SubagentUsage;
 }
+type PromptSession = {
+    prompt(task: string): Promise<void>;
+    abort(): Promise<void>;
+};
+/**
+ * Run one prompt while preserving the reason that stopped it. AgentSession.abort()
+ * resolves the active prompt normally, so the caller must not infer success merely
+ * because prompt() settled after a timeout or parent cancellation.
+ */
+export declare function promptSubagentSession(session: PromptSession, task: string, options: {
+    timeoutMs: number;
+    signal?: AbortSignal;
+}): Promise<void>;
 /**
  * Spawn 一个独立上下文的子 agent 执行任务,返回其最终文本输出。
  * 模型解析:"provider/id" 精确匹配;裸 id(如 deepseek-v4-flash)先按原样找,
@@ -47,3 +60,4 @@ export declare function runPool<T>(input: {
     run: (item: T, index: number) => Promise<void>;
     signal?: AbortSignal;
 }): Promise<void>;
+export {};

package/dist/subagent.js

@@ -6,6 +6,45 @@ export const SUBAGENT_CONCURRENCY = 4;
 export const SUBAGENT_TIMEOUT_MS = 15 * 60_000;
 /** ModelRuntime 进程内只建一次(auth/models 解析有启动开销)。 */
 let sharedModelRuntime;
+function cancelledError(signal) {
+    return new Error("已取消", { cause: signal.reason });
+}
+/**
+ * Run one prompt while preserving the reason that stopped it. AgentSession.abort()
+ * resolves the active prompt normally, so the caller must not infer success merely
+ * because prompt() settled after a timeout or parent cancellation.
+ */
+export async function promptSubagentSession(session, task, options) {
+    if (options.signal?.aborted)
+        throw cancelledError(options.signal);
+    let timedOut = false;
+    let promptError;
+    const abortSession = () => {
+        void session.abort().catch(() => { });
+    };
+    const timer = setTimeout(() => {
+        timedOut = true;
+        abortSession();
+    }, options.timeoutMs);
+    const onParentAbort = abortSession;
+    options.signal?.addEventListener("abort", onParentAbort, { once: true });
+    try {
+        await session.prompt(task);
+    }
+    catch (error) {
+        promptError = error;
+    }
+    finally {
+        clearTimeout(timer);
+        options.signal?.removeEventListener("abort", onParentAbort);
+    }
+    if (options.signal?.aborted)
+        throw cancelledError(options.signal);
+    if (timedOut)
+        throw new Error(`子任务超时(${options.timeoutMs}ms)`, { cause: promptError });
+    if (promptError)
+        throw promptError;
+}
 /** 从会话消息里取最后一条非空 assistant 文本作为子 agent 的最终输出。 */
 function extractFinalText(messages) {
     for (let i = messages.length - 1; i >= 0; i--) {
@@ -59,6 +98,8 @@ function extractUsage(messages, model) {
  * 失败(模型错误/超时/取消)抛错,由调用方决定容错语义。
  */
 export async function runSubagent(opts) {
+    if (opts.signal?.aborted)
+        throw cancelledError(opts.signal);
     sharedModelRuntime ??= await ModelRuntime.create();
     let model;
     if (opts.model) {
@@ -98,22 +139,17 @@ export async function runSubagent(opts) {
         ...(model ? { model } : {}),
         ...(opts.noTools ? { noTools: "all" } : {}),
     });
-    const timeoutMs = opts.timeoutMs ?? SUBAGENT_TIMEOUT_MS;
-    const timer = setTimeout(() => void session.abort(), timeoutMs);
-    const onParentAbort = () => void session.abort();
-    opts.signal?.addEventListener("abort", onParentAbort, { once: true });
     try {
-        await session.prompt(opts.task);
+        await promptSubagentSession(session, opts.task, {
+            timeoutMs: opts.timeoutMs ?? SUBAGENT_TIMEOUT_MS,
+            signal: opts.signal,
+        });
+        const messages = session.messages;
+        return { ok: true, text: extractFinalText(messages), usage: extractUsage(messages, model) };
     }
     finally {
-        clearTimeout(timer);
-        opts.signal?.removeEventListener("abort", onParentAbort);
         session.dispose();
     }
-    if (opts.signal?.aborted)
-        throw new Error("已取消");
-    const messages = session.messages;
-    return { ok: true, text: extractFinalText(messages), usage: extractUsage(messages, model) };
 }
 /**
  * 固定并发的工作池:limit 个工人依次领任务跑完一个补位一个。

package/dist/tools.d.ts

@@ -3,6 +3,8 @@ import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
 import type { CliConfig } from "./config.js";
 export declare function truncate(text: string): string;
+/** 只下载前 maxBytes 就断流,超大页面不用整个拉完再丢。 */
+export declare function readBodyCapped(resp: Response, maxBytes: number): Promise<Uint8Array>;
 /** 联网工具通用渲染:调用行不占位,收起时只显一行摘要,ctrl+o 展开全文,出错显一行 ✗ */
 export declare function compactResultRender(input: {
     result: {
@@ -43,6 +45,8 @@ export declare function downloadGeneratedImage(url: string, signal: AbortSignal,
     attempts?: number;
     retryDelayMs?: number;
     fetchImpl?: typeof fetch;
+    maxBytes?: number;
+    attemptTimeoutMs?: number;
 }): Promise<Uint8Array>;
 /** 生图工具:走 u1s1 网关代理火山方舟 Seedream,上游 key 不落到用户机器上。 */
 export declare function createImageTool(cfg: Pick<CliConfig, "baseUrl" | "apiKey">): import("@earendil-works/pi-coding-agent").ToolDefinition<Type.TObject<{

package/dist/tools.js

@@ -8,6 +8,8 @@ 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;
+const MAX_GENERATED_IMAGE_BYTES = 64 * 1024 * 1024;
+const IMAGE_DOWNLOAD_TIMEOUT_MS = 60_000;
 /** 云端渲染是真开浏览器,比直连慢得多,给宽裕些。 */
 const RENDER_TIMEOUT_MS = 45_000;
 /** 200 但榨出的正文比这还短,多半是 JS 渲染的空壳页,值得上浏览器再试。 */
@@ -39,31 +41,37 @@ export function truncate(text) {
     return `${text.slice(0, MAX_TEXT_CHARS)}\n\n…（内容过长已截断，共 ${text.length} 字符）`;
 }
 /** 只下载前 maxBytes 就断流,超大页面不用整个拉完再丢。 */
-async function readBodyCapped(resp, maxBytes) {
+export async function readBodyCapped(resp, maxBytes) {
     if (!resp.body)
         return new Uint8Array(await resp.arrayBuffer()).subarray(0, maxBytes);
     const reader = resp.body.getReader();
     const chunks = [];
     let total = 0;
-    for (;;) {
-        const { done, value } = await reader.read();
-        if (done)
-            break;
-        chunks.push(value);
-        total += value.byteLength;
-        if (total >= maxBytes) {
-            void reader.cancel().catch(() => { });
-            break;
+    try {
+        for (;;) {
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            chunks.push(value);
+            total += value.byteLength;
+            if (total >= maxBytes) {
+                void reader.cancel("web fetch body limit reached").catch(() => { });
+                break;
+            }
         }
     }
+    finally {
+        reader.releaseLock();
+    }
     const out = new Uint8Array(Math.min(total, maxBytes));
     let offset = 0;
     for (const chunk of chunks) {
         const room = out.byteLength - offset;
         if (room <= 0)
             break;
-        out.set(room < chunk.byteLength ? chunk.subarray(0, room) : chunk, offset);
-        offset += chunk.byteLength;
+        const copied = Math.min(room, chunk.byteLength);
+        out.set(copied < chunk.byteLength ? chunk.subarray(0, copied) : chunk, offset);
+        offset += copied;
     }
     return out;
 }
@@ -316,6 +324,44 @@ async function abortableDelay(ms, signal) {
         signal.addEventListener("abort", onAbort, { once: true });
     });
 }
+class GeneratedImageTooLargeError extends Error {
+}
+async function readGeneratedImageBody(resp, maxBytes) {
+    const declaredLength = Number(resp.headers.get("content-length"));
+    if (Number.isFinite(declaredLength) && declaredLength > maxBytes) {
+        if (resp.body)
+            void resp.body.cancel("generated image body limit reached").catch(() => { });
+        throw new GeneratedImageTooLargeError(`图片文件超过下载上限 ${Math.floor(maxBytes / 1024 / 1024)} MiB`);
+    }
+    if (!resp.body)
+        return new Uint8Array();
+    const reader = resp.body.getReader();
+    const chunks = [];
+    let total = 0;
+    try {
+        for (;;) {
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            if (total + value.byteLength > maxBytes) {
+                void reader.cancel("generated image body limit reached").catch(() => { });
+                throw new GeneratedImageTooLargeError(`图片文件超过下载上限 ${Math.floor(maxBytes / 1024 / 1024)} MiB`);
+            }
+            chunks.push(value);
+            total += value.byteLength;
+        }
+    }
+    finally {
+        reader.releaseLock();
+    }
+    const bytes = new Uint8Array(total);
+    let offset = 0;
+    for (const chunk of chunks) {
+        bytes.set(chunk, offset);
+        offset += chunk.byteLength;
+    }
+    return bytes;
+}
 /**
  * 下载方舟返回的同一个临时 URL。fetch() 拿到响应头后,body 仍可能在
  * arrayBuffer() 阶段以 Undici `terminated` 断流,所以两步必须放在同一个
@@ -325,17 +371,27 @@ export async function downloadGeneratedImage(url, signal, options = {}) {
     const attempts = Math.max(1, Math.floor(options.attempts ?? IMAGE_DOWNLOAD_ATTEMPTS));
     const retryDelayMs = Math.max(0, options.retryDelayMs ?? IMAGE_DOWNLOAD_RETRY_DELAY_MS);
     const fetchImpl = options.fetchImpl ?? fetch;
+    const maxBytes = Math.max(1, Math.floor(options.maxBytes ?? MAX_GENERATED_IMAGE_BYTES));
+    const attemptTimeoutMs = Math.max(1, Math.floor(options.attemptTimeoutMs ?? IMAGE_DOWNLOAD_TIMEOUT_MS));
     let lastError;
     for (let attempt = 1; attempt <= attempts; attempt++) {
         try {
-            const resp = await fetchImpl(url, { signal });
-            if (!resp.ok)
+            const resp = await fetchImpl(url, {
+                signal: AbortSignal.any([signal, AbortSignal.timeout(attemptTimeoutMs)]),
+            });
+            if (!resp.ok) {
+                if (resp.body)
+                    void resp.body.cancel("generated image HTTP error").catch(() => { });
                 throw new Error(`HTTP ${resp.status}`);
-            return new Uint8Array(await resp.arrayBuffer());
+            }
+            return await readGeneratedImageBody(resp, maxBytes);
         }
         catch (error) {
             if (signal.aborted)
                 throw error;
+            if (error instanceof GeneratedImageTooLargeError) {
+                throw new Error(`图片已经生成,但${error.message}。不要重新调用 generate_image,可在 24 小时内手动下载: ${url}`, { cause: error });
+            }
             lastError = error;
             if (attempt < attempts)
                 await abortableDelay(retryDelayMs * attempt, signal);
@@ -425,13 +481,25 @@ async function fetchDirect(url, signal) {
         throw new DirectFetchError(`打不开 ${url.href}: ${e.message}`, true);
     }
     if (!resp.ok) {
+        void resp.body?.cancel("web fetch rejected HTTP response").catch(() => undefined);
         throw new DirectFetchError(`${url.href} 返回 ${resp.status} ${resp.statusText}`, RENDER_WORTHY_STATUS.has(resp.status));
     }
     const type = resp.headers.get("content-type") ?? "";
     if (!/text\/|json|xml|javascript/i.test(type)) {
+        void resp.body?.cancel("web fetch rejected non-text response").catch(() => undefined);
         throw new DirectFetchError(`${url.href} 不是文本内容 (${type || "unknown"}),读不了`, false);
     }
-    const raw = decodeBody(await readBodyCapped(resp, MAX_FETCH_BYTES), type);
+    let bytes;
+    try {
+        bytes = await readBodyCapped(resp, MAX_FETCH_BYTES);
+    }
+    catch (error) {
+        if (signal?.aborted)
+            throw error;
+        const detail = error instanceof Error ? error.message : String(error);
+        throw new DirectFetchError(`${url.href} 正文读取失败: ${detail}`, true);
+    }
+    const raw = decodeBody(bytes, type);
     const isHtml = /html|xml/i.test(type);
     return { text: isHtml ? htmlToText(raw) : raw.trim(), contentType: type, isHtml };
 }

package/dist/update.js

@@ -1,14 +1,24 @@
-import { execSync, spawnSync } from "node:child_process";
+import { execFileSync, spawnSync } from "node:child_process";
 import { mkdtempSync, readFileSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { isPortableInstall } from "./config.js";
+import { readJsonResponseCapped, readResponseTextCapped } from "./api.js";
 const require = createRequire(import.meta.url);
 const pkg = require("../package.json");
 export const VERSION = pkg.version;
 export const PACKAGE_NAME = "u1s1-cli";
+const MAX_NPM_METADATA_BYTES = 64 * 1024;
+const MAX_INSTALL_SCRIPT_BYTES = 1024 * 1024;
+function publishedVersion(value) {
+    return typeof value === "string"
+        && value.length <= 100
+        && /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(value)
+        ? value
+        : undefined;
+}
 /** engines.node 里要求的最低版本(如 ">=22.19.0" → "22.19.0");解析不出返回 undefined。 */
 function requiredNodeVersion() {
     const m = /(\d+\.\d+\.\d+)/.exec(pkg.engines?.node ?? "");
@@ -36,8 +46,8 @@ export async function getLatestVersion() {
         });
         if (!res.ok)
             return undefined;
-        const body = (await res.json());
-        return body.version;
+        const body = await readJsonResponseCapped(res, MAX_NPM_METADATA_BYTES);
+        return publishedVersion(body.version);
     }
     catch {
         return undefined;
@@ -97,7 +107,7 @@ async function portableSelfUpdate(latest) {
         });
         if (!res.ok)
             throw new Error(`HTTP ${res.status}`);
-        script = await res.text();
+        script = await readResponseTextCapped(res, MAX_INSTALL_SCRIPT_BYTES);
     }
     catch {
         console.error("安装脚本下载失败。请手动运行:");
@@ -107,7 +117,7 @@ async function portableSelfUpdate(latest) {
     const tmp = join(mkdtempSync(join(tmpdir(), "u1s1-update-")), "install.sh");
     writeFileSync(tmp, script, { mode: 0o755 });
     try {
-        execSync(`bash ${JSON.stringify(tmp)}`, { stdio: "inherit" });
+        execFileSync("bash", [tmp], { stdio: "inherit" });
     }
     catch {
         console.error("\n自动升级失败。请手动运行:");
@@ -171,8 +181,10 @@ export async function update() {
     console.log(`正在用 ${pm} 更新 ${PACKAGE_NAME}…`);
     try {
         // npm 压掉 EBADENGINE 等警告墙,对新手只有噪音;出错时 error 仍会显示
-        const installCmd = pm === "npm" ? `npm install -g --loglevel=error ${PACKAGE_NAME}@latest` : `${pm} add -g ${PACKAGE_NAME}@latest`;
-        execSync(installCmd, { stdio: "inherit" });
+        const args = pm === "npm"
+            ? ["install", "-g", "--loglevel=error", `${PACKAGE_NAME}@latest`]
+            : ["add", "-g", `${PACKAGE_NAME}@latest`];
+        execFileSync(pm, args, { stdio: "inherit" });
         console.log(`\n✅ 已更新到 v${latest}，重启 u1s1 后生效。`);
     }
     catch {

package/dist/web.js

@@ -54,20 +54,22 @@ export async function prepareWebEnv(cfg) {
     let webFetchRenderEnabled = false;
     // 老网关没有 /v1/image,image_gen 缺失时按关闭处理,不注册生图工具
     let imageGenEnabled = false;
+    let clientAttestation;
     const endpointsReady = loadCustomEndpoints(cfg);
     try {
-        const { models, features } = await fetchModels(cfg);
+        const { models, features, clientAttestation: attestation } = await fetchModels(cfg);
         setModelsFromApi(models.map(apiModelToDef));
         webSearchEnabled = features.web_search !== false;
         webFetchRenderEnabled = features.web_fetch_render === true;
         imageGenEnabled = features.image_gen === true;
+        clientAttestation = attestation;
     }
     catch (e) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
     await endpointsReady;
     ensureDefaultSettings(MODELS);
-    const signing = await ensureSigningProxy(cfg, "desktop");
+    const signing = await ensureSigningProxy(cfg, "desktop", clientAttestation);
     const officialCfg = { ...cfg, baseUrl: signing.baseUrl, apiKey: signing.localKey };
     webOfficialCfg = officialCfg;
     const modelsPath = refreshWebModels();

package/dist/workflow/runner.d.ts

@@ -3,6 +3,22 @@ import { type ParentModelRef } from "../subagent.js";
 export declare const WORKFLOW_TIMEOUT_MS: number;
 /** 默认整个 run 的 token 预算;0 或负数表示不设限。 */
 export declare const WORKFLOW_DEFAULT_BUDGET_TOKENS = 20000000;
+interface ProgressEntry {
+    key: string;
+    /** 任务摘要(前 120 字),调试/排查用,key 才是身份。 */
+    task: string;
+    ok: boolean;
+    text: string;
+    ms: number;
+}
+/** JSONL 进度存档:一行一个已完成的子任务,断点续跑时按 key 跳过。 */
+export declare class ProgressStore {
+    #private;
+    readonly path: string;
+    constructor(path: string);
+    getSuccessful(key: string): ProgressEntry | undefined;
+    append(entry: ProgressEntry): void;
+}
 /** 静态白名单校验:语法能编译 + 不碰沙箱之外的任何能力。 */
 export declare function validateScript(code: string): string[];
 export interface WorkflowRunResult {
@@ -46,3 +62,4 @@ export declare function runWorkflow(opts: WorkflowRunOptions): Promise<WorkflowR
 export declare function workflowsDir(): string;
 /** 内联脚本落盘,返回脚本路径(进度存档按同名约定派生)。 */
 export declare function saveWorkflowScript(code: string): string;
+export {};

package/dist/workflow/runner.js

@@ -15,7 +15,7 @@ const MAX_LOG_LINES = 60;
 /** 默认整个 run 的 token 预算;0 或负数表示不设限。 */
 export const WORKFLOW_DEFAULT_BUDGET_TOKENS = 20_000_000;
 /** JSONL 进度存档:一行一个已完成的子任务,断点续跑时按 key 跳过。 */
-class ProgressStore {
+export class ProgressStore {
     path;
     #cache = new Map();
     constructor(path) {
@@ -36,8 +36,9 @@ class ProgressStore {
             }
         }
     }
-    get(key) {
-        return this.#cache.get(key);
+    getSuccessful(key) {
+        const entry = this.#cache.get(key);
+        return entry?.ok === true && typeof entry.text === "string" ? entry : undefined;
     }
     append(entry) {
         this.#cache.set(entry.key, entry);
@@ -154,14 +155,12 @@ export async function runWorkflow(opts) {
         }
         const key = taskKey(task, model);
         if (opts.resume) {
-            const prev = store.get(key);
+            const prev = store.getSuccessful(key);
             if (prev) {
                 stats.cached++;
                 progress.cached = stats.cached;
                 reportProgress();
-                if (prev.ok)
-                    return prev.text;
-                throw new Error(prev.text);
+                return prev.text;
             }
         }
         stats.spawns++;