u1s1-cli 1.3.1 → 1.3.2

package/dist/api.d.ts

@@ -72,6 +72,8 @@ export interface ModelsResponse {
     announcement?: ApiAnnouncement | null;
     /** Opaque, device-bound canary echoed only by the official signing proxy. */
     clientAttestation?: string;
+    /** Remaining lifetime of the canary, so the proxy can refresh it before it expires. */
+    clientAttestationExpiresInSeconds?: number;
 }
 /** 401:凭证失效(设备被移除/换过钥匙),调用方应引导重新登录而不是继续硬跑。 */
 export declare class AuthError extends Error {

package/dist/api.js

@@ -82,11 +82,13 @@ export async function fetchModels(cfg) {
     if (!body || !Array.isArray(body.data))
         throw new Error("服务端模型列表格式不正确");
     const token = body.client_attestation?.token;
+    const expiresIn = body.client_attestation?.expires_in;
     return {
         models: body.data,
         features: body.features ?? {},
         announcement: body.announcement,
         clientAttestation: typeof token === "string" && token.length <= 1024 ? token : undefined,
+        clientAttestationExpiresInSeconds: typeof expiresIn === "number" && Number.isFinite(expiresIn) && expiresIn > 0 ? expiresIn : undefined,
     };
 }
 /**

package/dist/device-auth.d.ts

@@ -11,17 +11,44 @@ export declare function dpopHeaders(cfg: CliConfig, method: string, url: string)
 export declare function authorizedFetch(cfg: CliConfig, input: string | URL, init?: RequestInit): Promise<Response>;
 /** Buffer a loopback request only up to the same JSON limit enforced by Gateway. */
 export declare function readSigningProxyRequestBody(request: IncomingMessage, maxBytes?: number): Promise<Buffer | undefined>;
+/**
+ * How the proxy obtains and refreshes the device attestation canary. The token
+ * is device-bound and expires (7 days server-side); the proxy keeps it fresh so
+ * a healthy Gateway always sees a valid attestation instead of falling back to
+ * the weaker "legacy official" verdict when a transient /v1/models fetch missed.
+ */
+export interface ClientAttestationSource {
+    token?: string;
+    expiresInSeconds?: number;
+    /** Fetch a fresh token (e.g. via GET /v1/models). Single-flighted by the proxy. */
+    refresh?: () => Promise<{
+        token?: string;
+        expiresInSeconds?: number;
+    }>;
+}
+interface AttestationHolder {
+    token?: string;
+    expiresAtMs?: number;
+    refresh?: () => Promise<{
+        token?: string;
+        expiresInSeconds?: number;
+    }>;
+    refreshing?: Promise<void>;
+    lastFailureMs?: number;
+}
 interface SigningProxy {
     baseUrl: string;
     localKey: string;
     token: string;
     client: ClientSurface;
-    clientAttestation?: string;
+    attestation: AttestationHolder;
 }
+/** Attach a fresh (self-healing) attestation header to an outbound proxy request. */
+export declare function attachAttestationHeader(holder: AttestationHolder, headers: Headers): Promise<void>;
 export type ClientSurface = "terminal" | "web" | "desktop" | "cloud";
 /**
  * pi accepts static provider headers only. Keep it behind a loopback proxy that
  * replaces the local bearer credential with a fresh DPoP proof per request.
  */
-export declare function ensureSigningProxy(cfg: CliConfig, fallbackClient?: ClientSurface, clientAttestation?: string): Promise<SigningProxy>;
+export declare function ensureSigningProxy(cfg: CliConfig, fallbackClient?: ClientSurface, attestationSource?: ClientAttestationSource): Promise<SigningProxy>;
 export {};

package/dist/device-auth.js

@@ -110,7 +110,81 @@ export async function readSigningProxyRequestBody(request, maxBytes = SIGNING_PR
     }
     return chunks.length ? Buffer.concat(chunks, total) : undefined;
 }
+// Refresh once we are within a day of the server-side 7-day expiry; back off for
+// a while after a failed refresh so a flaky Gateway is not hammered per request.
+const ATTESTATION_REFRESH_MARGIN_MS = 24 * 60 * 60 * 1000;
+const ATTESTATION_REFRESH_COOLDOWN_MS = 30_000;
+// Only ever block a request while we have no token at all, and even then only
+// briefly — a Gateway too slow to answer would fail the real request anyway.
+const ATTESTATION_BLOCK_TIMEOUT_MS = 4_000;
 let signingProxy;
+function unrefDelay(ms) {
+    return new Promise((resolve) => {
+        const timer = setTimeout(resolve, ms);
+        if (typeof timer.unref === "function")
+            timer.unref();
+    });
+}
+function applyAttestation(holder, result) {
+    if (typeof result.token !== "string" || result.token.length === 0 || result.token.length > 1024)
+        return;
+    holder.token = result.token;
+    holder.expiresAtMs = typeof result.expiresInSeconds === "number" && result.expiresInSeconds > 0
+        ? Date.now() + result.expiresInSeconds * 1000
+        : undefined;
+}
+/** Seed the mutable holder from a new ensureSigningProxy call without dropping a fresher token. */
+function updateAttestationHolder(holder, source) {
+    if (!source)
+        return;
+    if (source.refresh)
+        holder.refresh = source.refresh;
+    if (source.token && !holder.token) {
+        applyAttestation(holder, { token: source.token, expiresInSeconds: source.expiresInSeconds });
+    }
+}
+/**
+ * Kick off a single-flight refresh when the token is missing or nearing expiry.
+ * Returns the in-flight refresh promise (or undefined when no refresh is due),
+ * so the caller can decide whether to wait for it.
+ */
+function ensureFreshAttestation(holder) {
+    if (!holder.refresh)
+        return undefined;
+    const now = Date.now();
+    const stale = !holder.token
+        || (holder.expiresAtMs !== undefined && now >= holder.expiresAtMs - ATTESTATION_REFRESH_MARGIN_MS);
+    if (!stale)
+        return undefined;
+    if (holder.refreshing)
+        return holder.refreshing;
+    if (holder.lastFailureMs !== undefined && now - holder.lastFailureMs < ATTESTATION_REFRESH_COOLDOWN_MS) {
+        return undefined;
+    }
+    const run = (async () => {
+        try {
+            applyAttestation(holder, await holder.refresh());
+            holder.lastFailureMs = undefined;
+        }
+        catch {
+            holder.lastFailureMs = Date.now();
+        }
+        finally {
+            holder.refreshing = undefined;
+        }
+    })();
+    holder.refreshing = run;
+    return run;
+}
+/** Attach a fresh (self-healing) attestation header to an outbound proxy request. */
+export async function attachAttestationHeader(holder, headers) {
+    const refreshing = ensureFreshAttestation(holder);
+    if (refreshing && !holder.token) {
+        await Promise.race([refreshing, unrefDelay(ATTESTATION_BLOCK_TIMEOUT_MS)]);
+    }
+    if (holder.token)
+        headers.set("x-u1s1-attestation", holder.token);
+}
 function clientSurface(fallback) {
     const explicit = process.env["U1S1_CLIENT"];
     if (explicit === "terminal" || explicit === "web" || explicit === "desktop" || explicit === "cloud") {
@@ -122,14 +196,17 @@ function clientSurface(fallback) {
  * pi accepts static provider headers only. Keep it behind a loopback proxy that
  * replaces the local bearer credential with a fresh DPoP proof per request.
  */
-export async function ensureSigningProxy(cfg, fallbackClient = "terminal", clientAttestation) {
+export async function ensureSigningProxy(cfg, fallbackClient = "terminal", attestationSource) {
     if (!hasDeviceCredential(cfg))
         throw new Error("当前安装需要重新登录，以创建设备凭证");
     const client = clientSurface(fallbackClient);
     const current = signingProxy;
-    if (current && current.token === cfg.deviceToken && current.client === client
-        && current.clientAttestation === clientAttestation)
+    if (current && current.token === cfg.deviceToken && current.client === client) {
+        updateAttestationHolder(current.attestation, attestationSource);
         return current;
+    }
+    const attestation = {};
+    updateAttestationHolder(attestation, attestationSource);
     const localKey = `local-${randomBytes(32).toString("hex")}`;
     const upstreamOrigin = new URL(cfg.baseUrl).origin;
     const server = createServer(async (req, res) => {
@@ -163,8 +240,7 @@ export async function ensureSigningProxy(cfg, fallbackClient = "terminal", clien
                 outboundHeaders.set("x-u1s1-client", client);
                 outboundHeaders.set("x-u1s1-version", VERSION);
                 outboundHeaders.set("x-u1s1-platform", `${process.platform}-${process.arch}`);
-                if (clientAttestation)
-                    outboundHeaders.set("x-u1s1-attestation", clientAttestation);
+                await attachAttestationHeader(attestation, outboundHeaders);
                 const upstream = await authorizedFetch(cfg, target, {
                     method: req.method ?? "GET",
                     headers: outboundHeaders,
@@ -216,7 +292,7 @@ export async function ensureSigningProxy(cfg, fallbackClient = "terminal", clien
         localKey,
         token: cfg.deviceToken,
         client,
-        clientAttestation,
+        attestation,
     };
     return signingProxy;
 }

package/dist/index.js

@@ -197,7 +197,17 @@ async function runAgent(cfg, args) {
     // it after the live model list arrives; explicit user choices remain intact.
     ensureDefaultSettings(MODELS);
     // pi provider 只支持静态 header；指向本机 signing proxy，由它逐请求附 DPoP proof。
-    const signing = await ensureSigningProxy(cfg, "terminal", modelsResp?.clientAttestation);
+    const signing = await ensureSigningProxy(cfg, "terminal", {
+        token: modelsResp?.clientAttestation,
+        expiresInSeconds: modelsResp?.clientAttestationExpiresInSeconds,
+        refresh: async () => {
+            const refreshed = await fetchModels(cfg);
+            return {
+                token: refreshed.clientAttestation,
+                expiresInSeconds: refreshed.clientAttestationExpiresInSeconds,
+            };
+        },
+    });
     const officialCfg = { ...cfg, baseUrl: signing.baseUrl, apiKey: signing.localKey };
     ensureBrandPrompt(await shellReady);
     ensureProviderModels(officialCfg);

package/dist/tools.d.ts

@@ -58,6 +58,10 @@ export declare function createImageTool(cfg: Pick<CliConfig, "baseUrl" | "apiKey
     path: string;
     size: string | null;
     bytes: number;
+    displayImage: {
+        data: string;
+        mimeType: string;
+    };
 }, any> & import("@earendil-works/pi-coding-agent").ToolDefinition<any, any, any>;
 export interface FetchToolConfig {
     baseUrl: string;

package/dist/tools.js

@@ -406,7 +406,7 @@ export function createImageTool(cfg) {
         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. " +
+            "Saves the result as a local image file and displays it directly in supported chat UIs. " +
             "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 image generation/editing (text-to-image, editing, multi-image composition)",
@@ -415,6 +415,7 @@ export function createImageTool(cfg) {
             "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`.",
+            "A successful result is already displayed in supported chat UIs; never open an OS image viewer or claim that you opened one when the user asks to see it.",
         ],
         parameters: Type.Object({
             prompt: Type.String({
@@ -442,9 +443,17 @@ export function createImageTool(cfg) {
             mkdirSync(dirname(path), { recursive: true });
             writeFileSync(path, bytes);
             const sizeNote = result.size ? ` (${result.size})` : "";
+            const mimeType = REF_IMAGE_MIME[urlExt] ?? "image/jpeg";
             return {
-                content: [{ type: "text", text: `图片已保存: ${path}${sizeNote}` }],
-                details: { path, size: result.size, bytes: bytes.byteLength },
+                content: [{ type: "text", text: `图片已保存并在对话中展示: ${path}${sizeNote}` }],
+                // displayImage 只给 UI 预览，不放进 content：避免每轮都把整张 2K/4K
+                // 图片送回模型占用 context。pi-web-ui 会从 tool details 序列化它。
+                details: {
+                    path,
+                    size: result.size,
+                    bytes: bytes.byteLength,
+                    displayImage: { data: Buffer.from(bytes).toString("base64"), mimeType },
+                },
             };
         },
     });

package/dist/web.js

@@ -55,21 +55,33 @@ export async function prepareWebEnv(cfg) {
     // 老网关没有 /v1/image,image_gen 缺失时按关闭处理,不注册生图工具
     let imageGenEnabled = false;
     let clientAttestation;
+    let clientAttestationExpiresInSeconds;
     const endpointsReady = loadCustomEndpoints(cfg);
     try {
-        const { models, features, clientAttestation: attestation } = await fetchModels(cfg);
+        const { models, features, clientAttestation: attestation, clientAttestationExpiresInSeconds: attestationTtl } = 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;
+        clientAttestationExpiresInSeconds = attestationTtl;
     }
     catch (e) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
     await endpointsReady;
     ensureDefaultSettings(MODELS);
-    const signing = await ensureSigningProxy(cfg, "desktop", clientAttestation);
+    const signing = await ensureSigningProxy(cfg, "desktop", {
+        token: clientAttestation,
+        expiresInSeconds: clientAttestationExpiresInSeconds,
+        refresh: async () => {
+            const refreshed = await fetchModels(cfg);
+            return {
+                token: refreshed.clientAttestation,
+                expiresInSeconds: refreshed.clientAttestationExpiresInSeconds,
+            };
+        },
+    });
     const officialCfg = { ...cfg, baseUrl: signing.baseUrl, apiKey: signing.localKey };
     webOfficialCfg = officialCfg;
     const modelsPath = refreshWebModels();

package/package.json

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