u1s1-cli 0.19.4 → 0.20.0

package/dist/agent-setup.js

@@ -1,5 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { dirname, join } from "node:path";
 import { agentDir, CUSTOM_ENDPOINTS, ENDPOINT_ID_RE, endpointKeyEnvName, MODELS, PROVIDER_ID, VERSION, } from "./config.js";
 const BRAND_APPEND = `## u1s1
 
@@ -50,6 +51,21 @@ export function ensureBrandPrompt(shell) {
         writeFileSync(p, content);
     }
 }
+/**
+ * 当前捆绑的 pi 引擎版本号。pi 的包 exports 只有 "import" 条目,
+ * require.resolve 会报 ERR_PACKAGE_PATH_NOT_EXPORTED,必须走
+ * import.meta.resolve;拿到入口文件(dist/index.js)后向上一级找包根。
+ */
+function bundledPiVersion() {
+    try {
+        const entry = fileURLToPath(import.meta.resolve("@earendil-works/pi-coding-agent"));
+        const pkg = JSON.parse(readFileSync(join(dirname(entry), "..", "package.json"), "utf8"));
+        return typeof pkg.version === "string" ? pkg.version : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /** Defaults that don't overwrite values the user already set. */
 export function ensureDefaultSettings() {
     mkdirSync(agentDir, { recursive: true });
@@ -105,6 +121,16 @@ export function ensureDefaultSettings() {
         delete settings.theme;
         changed = true;
     }
+    // 屏蔽 pi 引擎的启动更新日志(What's New):那是上游英文 changelog,且 pi 的
+    // 版本号体系(0.84.x)和 u1s1(0.19.x)完全对不上——settings 里「上次看到的
+    // 版本」一旦缺失或偏旧,升级后启动会一次性灌出几十条英文更新说明。
+    // u1s1 的版本动态走公告横幅和 u1s1 update,这里每次启动都把该记录钉死在
+    // 当前捆绑的引擎版本上,保证启动时永不弹 changelog。
+    const piVersion = bundledPiVersion();
+    if (piVersion && settings["lastChangelogVersion"] !== piVersion) {
+        settings["lastChangelogVersion"] = piVersion;
+        changed = true;
+    }
     if (changed)
         writeFileSync(p, JSON.stringify(settings, null, 2) + "\n");
 }

package/dist/api.js

@@ -1,13 +1,10 @@
 import { apiEndpointToCustom, loadEndpointsCache, saveEndpointsCache, setCustomEndpoints, VERSION, } from "./config.js";
-/** 网关按 x-u1s1-version 识别客户端版本(旧版 CLI 不带,提示升级)。 */
-function authHeaders(apiKey) {
-    return { authorization: `Bearer ${apiKey}`, "x-u1s1-version": VERSION };
-}
+import { authorizedFetch } from "./device-auth.js";
 export async function fetchModels(cfg) {
     let resp;
     try {
-        resp = await fetch(`${cfg.baseUrl}/models`, {
-            headers: authHeaders(cfg.apiKey),
+        resp = await authorizedFetch(cfg, `${cfg.baseUrl}/models`, {
+            headers: { "x-u1s1-version": VERSION },
         });
     }
     catch {
@@ -27,8 +24,8 @@ export async function fetchModels(cfg) {
 export async function fetchUserEndpoints(cfg) {
     let resp;
     try {
-        resp = await fetch(`${cfg.baseUrl}/endpoints`, {
-            headers: authHeaders(cfg.apiKey),
+        resp = await authorizedFetch(cfg, `${cfg.baseUrl}/endpoints`, {
+            headers: { "x-u1s1-version": VERSION },
         });
     }
     catch {
@@ -59,10 +56,10 @@ export async function searchWeb(cfg, query, maxResults, signal) {
         throw new Error("没有配置 API Key");
     let resp;
     try {
-        resp = await fetch(`${cfg.baseUrl}/search`, {
+        resp = await authorizedFetch(cfg, `${cfg.baseUrl}/search`, {
             method: "POST",
             headers: {
-                ...authHeaders(cfg.apiKey),
+                "x-u1s1-version": VERSION,
                 "content-type": "application/json",
             },
             body: JSON.stringify({ query, max_results: maxResults }),
@@ -86,10 +83,10 @@ export async function renderPage(cfg, url, signal) {
         throw new Error("没有配置 API Key");
     let resp;
     try {
-        resp = await fetch(`${cfg.baseUrl}/fetch`, {
+        resp = await authorizedFetch(cfg, `${cfg.baseUrl}/fetch`, {
             method: "POST",
             headers: {
-                ...authHeaders(cfg.apiKey),
+                "x-u1s1-version": VERSION,
                 "content-type": "application/json",
             },
             body: JSON.stringify({ url }),
@@ -113,10 +110,10 @@ export async function generateImage(cfg, req, signal) {
         throw new Error("没有配置 API Key");
     let resp;
     try {
-        resp = await fetch(`${cfg.baseUrl}/image`, {
+        resp = await authorizedFetch(cfg, `${cfg.baseUrl}/image`, {
             method: "POST",
             headers: {
-                ...authHeaders(cfg.apiKey),
+                "x-u1s1-version": VERSION,
                 "content-type": "application/json",
             },
             body: JSON.stringify(req),
@@ -141,8 +138,8 @@ export async function fetchMe(cfg) {
         throw new Error("没有配置 API Key");
     let resp;
     try {
-        resp = await fetch(`${cfg.baseUrl}/me`, {
-            headers: authHeaders(cfg.apiKey),
+        resp = await authorizedFetch(cfg, `${cfg.baseUrl}/me`, {
+            headers: { "x-u1s1-version": VERSION },
         });
     }
     catch {

package/dist/bench.js

@@ -4,6 +4,7 @@ import { fileURLToPath } from "node:url";
 import { homedir } from "node:os";
 import { CUSTOM_ENDPOINTS, loadConfig, MODELS, PROVIDER_ID, } from "./config.js";
 import { loadCustomEndpoints } from "./api.js";
+import { authorizedFetch, hasDeviceCredential } from "./device-auth.js";
 // ─── 工具 ───
 const BENCH_DIR = join(homedir(), ".u1s1", "bench");
 /** 题目未声明 maxScore 时的默认满分 */
@@ -231,7 +232,7 @@ function runCheck(response, check) {
     }
 }
 // ─── 模型调用 ───
-async function callModel(baseUrl, apiKey, modelId, prompt) {
+async function callModel(baseUrl, apiKey, modelId, prompt, officialCfg) {
     const start = performance.now();
     const isReasoning = /reasoner|grok/i.test(modelId);
     const body = {
@@ -245,12 +246,15 @@ async function callModel(baseUrl, apiKey, modelId, prompt) {
     if (apiKey)
         headers["authorization"] = `Bearer ${apiKey}`;
     try {
-        const res = await fetch(`${baseUrl}/chat/completions`, {
+        const request = {
             method: "POST",
             headers,
             body: JSON.stringify(body),
             signal: AbortSignal.timeout(120_000),
-        });
+        };
+        const res = officialCfg
+            ? await authorizedFetch(officialCfg, `${baseUrl}/chat/completions`, request)
+            : await fetch(`${baseUrl}/chat/completions`, request);
         const latencyMs = Math.round(performance.now() - start);
         if (!res.ok) {
             const errBody = await res.text().catch(() => "未知错误");
@@ -491,7 +495,7 @@ function listSuitesCommand() {
 }
 /** 把模型名解析成走 u1s1 默认端点的调用目标 */
 function u1s1Target(id, cfg) {
-    return { id, label: id, baseUrl: cfg.baseUrl, apiKey: cfg.apiKey, source: "u1s1" };
+    return { id, label: id, baseUrl: cfg.baseUrl, apiKey: cfg.apiKey, source: "u1s1", officialCfg: cfg };
 }
 /** 把用户输入的模型名解析成一个可调用的目标 */
 function resolveModelTarget(query, cfg) {
@@ -553,7 +557,7 @@ async function runBench(args) {
     if (delayMs > 0)
         console.log(`  ⏳ 题目间隔:${(delayMs / 1000).toFixed(0)}s(限流渠道用)`);
     const cfg = loadConfig();
-    if (!cfg.apiKey) {
+    if (!hasDeviceCredential(cfg)) {
         console.error("  还没有登录,先 u1s1 login");
         process.exit(1);
     }
@@ -581,7 +585,7 @@ async function runBench(args) {
         for (const q of suite.questions) {
             const label = `${target.label} / ${q.id}`;
             process.stdout.write(`  [${++done}/${total}] ${label.padEnd(40)} `);
-            const resp = await callModel(target.baseUrl, target.apiKey, target.id, q.prompt);
+            const resp = await callModel(target.baseUrl, target.apiKey, target.id, q.prompt, target.officialCfg);
             const costUsd = estimateCost(target.id, resp.tokensIn, resp.tokensOut);
             // 有评分规则且调用没出错时才打分
             const maxScore = q.maxScore ?? DEFAULT_MAX_SCORE;

package/dist/config.d.ts

@@ -1,3 +1,4 @@
+import type { webcrypto } from "node:crypto";
 export declare const VERSION: string;
 /**
  * 便携包安装(install.sh / install.ps1):包根旁边带自己的 node 运行时,
@@ -95,6 +96,11 @@ export declare function refValid(ref: ModelRef): boolean;
 export declare function findModel(query: string): ResolvedModel | undefined;
 export interface CliConfig {
     apiKey?: string;
+    /** Browser-approved sender-constrained credential used by official clients. */
+    deviceToken?: string;
+    deviceId?: number;
+    devicePrivateJwk?: webcrypto.JsonWebKey;
+    devicePublicJwk?: webcrypto.JsonWebKey;
     baseUrl: string;
     /** preferred model id (within modelProvider) */
     model?: string;

package/dist/config.js

@@ -207,8 +207,23 @@ export function resolvePreferredModel(cfg) {
 }
 export function loadConfig() {
     const file = (readJsonFile(configFile) ?? {});
+    const envJwk = (name) => {
+        const raw = process.env[name];
+        if (!raw)
+            return undefined;
+        try {
+            return JSON.parse(raw);
+        }
+        catch {
+            return undefined;
+        }
+    };
     return {
         apiKey: process.env["U1S1_API_KEY"] || file.apiKey,
+        deviceToken: process.env["U1S1_DEVICE_TOKEN"] || file.deviceToken,
+        deviceId: file.deviceId,
+        devicePrivateJwk: envJwk("U1S1_DEVICE_PRIVATE_JWK") || file.devicePrivateJwk,
+        devicePublicJwk: envJwk("U1S1_DEVICE_PUBLIC_JWK") || file.devicePublicJwk,
         baseUrl: process.env["U1S1_BASE_URL"] || file.baseUrl || DEFAULT_BASE_URL,
         // 有效性不在这里裁决:端点列表可能还没拉回来,交给 resolvePreferredModel
         model: file.model,

package/dist/deploy.js

@@ -2,6 +2,7 @@ import { existsSync, readdirSync, readFileSync, statSync, writeFileSync } from "
 import { basename, join, relative, resolve, sep } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { VERSION, u1s1Dir } from "./config.js";
+import { authorizedFetch } from "./device-auth.js";
 /**
  * u1s1 deploy:把静态网页一键发布到 <name>.u1s1.app。
  * 检测项目里的静态站点根目录 → 首次询问子域名(记在 ~/.u1s1/deploys.json)
@@ -11,9 +12,6 @@ const deploysFile = join(u1s1Dir, "deploys.json");
 /** 构建产物目录优先:Vite/Next 等项目根的 index.html 是源码,不是能直接上线的产物。 */
 const BUILD_DIRS = ["dist", "build", "out", "_site", "public"];
 const SKIP_DIRS = new Set(["node_modules", "__pycache__"]);
-function authHeaders(apiKey) {
-    return { authorization: `Bearer ${apiKey}`, "x-u1s1-version": VERSION };
-}
 function readDeploys() {
     try {
         return JSON.parse(readFileSync(deploysFile, "utf8"));
@@ -89,9 +87,9 @@ function fmtBytes(n) {
 async function api(cfg, method, path, body) {
     let resp;
     try {
-        resp = await fetch(`${cfg.baseUrl}${path}`, {
+        resp = await authorizedFetch(cfg, `${cfg.baseUrl}${path}`, {
             method,
-            headers: { ...authHeaders(cfg.apiKey), "content-type": "application/json" },
+            headers: { "x-u1s1-version": VERSION, "content-type": "application/json" },
             body: body === undefined ? undefined : JSON.stringify(body),
         });
     }
@@ -112,9 +110,9 @@ async function uploadAll(cfg, start, files) {
     const queue = [...files];
     const uploadOne = async (f) => {
         const qs = new URLSearchParams({ site: start.site, deploy_id: start.deploy_id, path: f.path });
-        const put = async () => fetch(`${cfg.baseUrl}/deploy/file?${qs}`, {
+        const put = async () => authorizedFetch(cfg, `${cfg.baseUrl}/deploy/file?${qs}`, {
             method: "PUT",
-            headers: { ...authHeaders(cfg.apiKey), "content-type": "application/octet-stream" },
+            headers: { "x-u1s1-version": VERSION, "content-type": "application/octet-stream" },
             body: readFileSync(f.abs),
         });
         let resp = await put().catch(() => null);

package/dist/device-auth.d.ts

@@ -0,0 +1,21 @@
+import { webcrypto } from "node:crypto";
+import type { CliConfig } from "./config.js";
+export declare function hasDeviceCredential(cfg: CliConfig): boolean;
+export declare function generateDeviceKeyPair(): Promise<{
+    privateJwk: webcrypto.JsonWebKey;
+    publicJwk: webcrypto.JsonWebKey;
+}>;
+export declare function dpopHeaders(cfg: CliConfig, method: string, url: string): Promise<Record<string, string>>;
+/** Fetch a gateway route with a fresh proof; generic keys remain a read-only compatibility fallback. */
+export declare function authorizedFetch(cfg: CliConfig, input: string | URL, init?: RequestInit): Promise<Response>;
+interface SigningProxy {
+    baseUrl: string;
+    localKey: string;
+    token: string;
+}
+/**
+ * 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): Promise<SigningProxy>;
+export {};

package/dist/device-auth.js

@@ -0,0 +1,153 @@
+import { createHash, randomBytes, randomUUID, webcrypto } from "node:crypto";
+import { createServer } from "node:http";
+const enc = new TextEncoder();
+let cachedPrivate;
+function b64url(value) {
+    const bytes = typeof value === "string" ? enc.encode(value) : value;
+    return Buffer.from(bytes).toString("base64url");
+}
+function dpopHtu(rawUrl) {
+    const url = new URL(rawUrl);
+    url.search = "";
+    url.hash = "";
+    return url.toString();
+}
+export function hasDeviceCredential(cfg) {
+    return !!(cfg.deviceToken?.startsWith("u1s1d-") &&
+        cfg.devicePrivateJwk?.kty === "EC" && cfg.devicePrivateJwk.crv === "P-256" &&
+        cfg.devicePublicJwk?.kty === "EC" && cfg.devicePublicJwk.crv === "P-256");
+}
+export async function generateDeviceKeyPair() {
+    const pair = await webcrypto.subtle.generateKey({ name: "ECDSA", namedCurve: "P-256" }, true, ["sign", "verify"]);
+    return {
+        privateJwk: await webcrypto.subtle.exportKey("jwk", pair.privateKey),
+        publicJwk: await webcrypto.subtle.exportKey("jwk", pair.publicKey),
+    };
+}
+async function privateKey(jwk) {
+    const serialized = JSON.stringify(jwk);
+    if (cachedPrivate?.serialized === serialized)
+        return cachedPrivate.key;
+    const key = await webcrypto.subtle.importKey("jwk", jwk, { name: "ECDSA", namedCurve: "P-256" }, false, ["sign"]);
+    cachedPrivate = { serialized, key };
+    return key;
+}
+export async function dpopHeaders(cfg, method, url) {
+    if (!hasDeviceCredential(cfg))
+        throw new Error("当前安装还没有设备凭证，请重新运行 u1s1 login");
+    const token = cfg.deviceToken;
+    const header = b64url(JSON.stringify({
+        typ: "dpop+jwt",
+        alg: "ES256",
+        jwk: cfg.devicePublicJwk,
+    }));
+    const ath = createHash("sha256").update(token).digest("base64url");
+    const payload = b64url(JSON.stringify({
+        jti: randomUUID().replace(/-/g, ""),
+        htm: method.toUpperCase(),
+        htu: dpopHtu(url),
+        iat: Math.floor(Date.now() / 1000),
+        ath,
+    }));
+    const signature = new Uint8Array(await webcrypto.subtle.sign({ name: "ECDSA", hash: "SHA-256" }, await privateKey(cfg.devicePrivateJwk), enc.encode(`${header}.${payload}`)));
+    return {
+        authorization: `DPoP ${token}`,
+        dpop: `${header}.${payload}.${b64url(signature)}`,
+    };
+}
+/** Fetch a gateway route with a fresh proof; generic keys remain a read-only compatibility fallback. */
+export async function authorizedFetch(cfg, input, init = {}) {
+    const url = String(input);
+    const headers = new Headers(init.headers);
+    if (hasDeviceCredential(cfg)) {
+        const signed = await dpopHeaders(cfg, init.method ?? "GET", url);
+        for (const [name, value] of Object.entries(signed))
+            headers.set(name, value);
+    }
+    else if (cfg.apiKey) {
+        headers.set("authorization", `Bearer ${cfg.apiKey}`);
+    }
+    else {
+        throw new Error("还没有登录，请运行 u1s1 login");
+    }
+    return fetch(url, { ...init, headers });
+}
+function requestHeaders(input) {
+    const headers = new Headers();
+    for (const [name, value] of Object.entries(input)) {
+        if (value === undefined || ["host", "connection", "content-length", "authorization", "dpop"].includes(name))
+            continue;
+        if (Array.isArray(value))
+            for (const item of value)
+                headers.append(name, item);
+        else
+            headers.set(name, value);
+    }
+    return headers;
+}
+let signingProxy;
+/**
+ * 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) {
+    if (!hasDeviceCredential(cfg))
+        throw new Error("当前安装需要重新登录，以创建设备凭证");
+    const current = signingProxy;
+    if (current && current.token === cfg.deviceToken)
+        return current;
+    const localKey = `local-${randomBytes(32).toString("hex")}`;
+    const upstreamOrigin = new URL(cfg.baseUrl).origin;
+    const server = createServer(async (req, res) => {
+        try {
+            if (req.headers.authorization !== `Bearer ${localKey}` || !req.url) {
+                res.writeHead(401, { "content-type": "application/json" });
+                res.end(JSON.stringify({ error: { message: "local signing proxy authentication failed" } }));
+                return;
+            }
+            // Only proxy the gateway namespace. Absolute-form request targets must not
+            // be allowed to override the configured upstream origin and steal a proof.
+            const localUrl = new URL(req.url, "http://127.0.0.1");
+            if (!localUrl.pathname.startsWith("/v1/")) {
+                res.writeHead(403, { "content-type": "application/json" });
+                res.end(JSON.stringify({ error: { message: "signing proxy only serves /v1/*" } }));
+                return;
+            }
+            const target = new URL(`${localUrl.pathname}${localUrl.search}`, upstreamOrigin).toString();
+            const chunks = [];
+            for await (const chunk of req)
+                chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+            const body = chunks.length ? Buffer.concat(chunks) : undefined;
+            const upstream = await authorizedFetch(cfg, target, {
+                method: req.method ?? "GET",
+                headers: requestHeaders(req.headers),
+                body,
+            });
+            const headers = {};
+            upstream.headers.forEach((value, name) => {
+                if (!["content-length", "transfer-encoding", "connection"].includes(name))
+                    headers[name] = value;
+            });
+            res.writeHead(upstream.status, headers);
+            if (upstream.body) {
+                for await (const chunk of upstream.body)
+                    res.write(chunk);
+            }
+            res.end();
+        }
+        catch (error) {
+            if (res.headersSent)
+                return void res.destroy(error);
+            res.writeHead(502, { "content-type": "application/json" });
+            res.end(JSON.stringify({ error: { message: error instanceof Error ? error.message : "signing proxy failed" } }));
+        }
+    });
+    await new Promise((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", resolve);
+    });
+    server.unref();
+    const port = server.address().port;
+    signingProxy = { baseUrl: `http://127.0.0.1:${port}/v1`, localKey, token: cfg.deviceToken };
+    return signingProxy;
+}

package/dist/index.js

@@ -9,6 +9,7 @@ import { ensureSearchTools } from "./search-tools.js";
 import { ensureUsableShell } from "./shell-doctor.js";
 import { applyBrandUi, setAnnouncement, setUpdateNotice } from "./style.js";
 import { fetchModels, loadCustomEndpoints } from "./api.js";
+import { ensureSigningProxy } from "./device-auth.js";
 const PACKAGE_NAME = "u1s1-cli";
 /** 启动时检测到的可自动安装的新版;TUI 退出后才装(见 installPendingUpdate)。 */
 let pendingUpdate;
@@ -164,11 +165,14 @@ async function runAgent(cfg, args) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
     await endpointsReady;
+    // pi provider 只支持静态 header；指向本机 signing proxy，由它逐请求附 DPoP proof。
+    const signing = await ensureSigningProxy(cfg);
+    const officialCfg = { ...cfg, baseUrl: signing.baseUrl, apiKey: signing.localKey };
     ensureBrandPrompt(await shellReady);
-    ensureProviderModels(cfg);
+    ensureProviderModels(officialCfg);
     ensureWorkflowPromptTemplate();
     // 联网工具经 agentDir/extensions 投影,TUI 和 u1s1 web 共用一份注册
-    writeWebToolsExtension(cfg, {
+    writeWebToolsExtension(officialCfg, {
         webSearch: webSearchEnabled,
         webFetchRender: webFetchRenderEnabled,
         imageGen: imageGenEnabled,
@@ -180,7 +184,7 @@ async function runAgent(cfg, args) {
     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;
-    process.env["U1S1_API_KEY"] = cfg.apiKey;
+    process.env["U1S1_API_KEY"] = officialCfg.apiKey;
     process.env["U1S1_TOOLS_VIA_EXTENSION"] = "1";
     // 自定义端点的密钥走环境变量引用(models.json 里只有 $VAR,不落明文)
     Object.assign(process.env, endpointKeyEnv());
@@ -260,7 +264,7 @@ async function runAgent(cfg, args) {
                 });
                 pi.registerProvider(PROVIDER_ID, {
                     name: "u1s1",
-                    baseUrl: cfg.baseUrl,
+                    baseUrl: officialCfg.baseUrl,
                     api: "openai-completions",
                     apiKey: "$U1S1_API_KEY",
                     models: toProviderModels(MODELS),
@@ -350,7 +354,19 @@ async function run() {
     }
     if (cmd === "logout") {
         const { saveConfig } = await import("./config.js");
-        saveConfig({ ...loadConfig(), apiKey: undefined });
+        const current = loadConfig();
+        if (current.deviceToken) {
+            const { authorizedFetch } = await import("./device-auth.js");
+            await authorizedFetch(current, `${current.baseUrl}/device`, { method: "DELETE" }).catch(() => null);
+        }
+        saveConfig({
+            ...current,
+            apiKey: undefined,
+            deviceToken: undefined,
+            deviceId: undefined,
+            devicePrivateJwk: undefined,
+            devicePublicJwk: undefined,
+        });
         console.log("已退出登录。");
         return;
     }

package/dist/login.d.ts

@@ -1,3 +1,4 @@
+import type { webcrypto } from "node:crypto";
 import { type CliConfig } from "./config.js";
 /** baseUrl 形如 https://api.u1s1.io/v1;auth 路由挂在同一域名的根路径。 */
 export declare function apiOrigin(cfg: CliConfig): string;
@@ -6,11 +7,20 @@ export interface DeviceStart {
     poll_secret: string;
     interval: number;
     expires_in: number;
+    private_jwk: webcrypto.JsonWebKey;
+    public_jwk: webcrypto.JsonWebKey;
 }
-/** 发起浏览器登录;网关太老或连不上时返回 null,退回手动粘贴。 */
+/** 发起浏览器设备登录；网关不支持或网络不可用时返回 null。 */
 export declare function startDeviceLogin(origin: string): Promise<DeviceStart | null>;
-/** 轮询等浏览器那边批准;拿到 key 返回,过期返回 null。 */
-export declare function pollDeviceLogin(origin: string, start: DeviceStart): Promise<string | null>;
+export interface DeviceLoginResult {
+    apiKey: string;
+    deviceToken: string;
+    deviceId?: number;
+    devicePrivateJwk: webcrypto.JsonWebKey;
+    devicePublicJwk: webcrypto.JsonWebKey;
+}
+/** 轮询等浏览器批准；只接受带设备凭证的新网关响应。 */
+export declare function pollDeviceLogin(origin: string, start: DeviceStart): Promise<DeviceLoginResult | null>;
 export declare function login(keyArg?: string): Promise<CliConfig>;
-/** Returns a config that definitely has an apiKey, prompting the user if needed. */
+/** Returns a config with a browser-approved, sender-constrained device credential. */
 export declare function ensureAuth(): Promise<CliConfig>;

package/dist/login.js

@@ -1,8 +1,9 @@
 import { createRequire } from "node:module";
-import { createInterface } from "node:readline/promises";
+import { hostname, platform } from "node:os";
 import { fetchMe } from "./api.js";
-import { DASHBOARD_URL, printConsoleBanner } from "./brand.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;
 function tryOpenBrowser(url) {
@@ -21,10 +22,19 @@ const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 export function apiOrigin(cfg) {
     return cfg.baseUrl.replace(/\/v1\/?$/, "");
 }
-/** 发起浏览器登录;网关太老或连不上时返回 null,退回手动粘贴。 */
+/** 发起浏览器设备登录；网关不支持或网络不可用时返回 null。 */
 export async function startDeviceLogin(origin) {
     try {
-        const resp = await fetch(`${origin}/auth/device/start`, { method: "POST" });
+        const pair = await generateDeviceKeyPair();
+        const resp = await fetch(`${origin}/auth/device/start`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({
+                public_jwk: pair.publicJwk,
+                device_name: `${hostname()} (${platform()})`,
+                client_version: VERSION,
+            }),
+        });
         if (!resp.ok)
             return null;
         const data = (await resp.json());
@@ -35,13 +45,15 @@ export async function startDeviceLogin(origin) {
             poll_secret: data.poll_secret,
             interval: data.interval || 2,
             expires_in: data.expires_in || 900,
+            private_jwk: pair.privateJwk,
+            public_jwk: pair.publicJwk,
         };
     }
     catch {
         return null;
     }
 }
-/** 轮询等浏览器那边批准;拿到 key 返回,过期返回 null。 */
+/** 轮询等浏览器批准；只接受带设备凭证的新网关响应。 */
 export async function pollDeviceLogin(origin, start) {
     const deadline = Date.now() + start.expires_in * 1000;
     while (Date.now() < deadline) {
@@ -55,8 +67,15 @@ export async function pollDeviceLogin(origin, start) {
             if (!resp.ok)
                 continue;
             const data = (await resp.json());
-            if (data.status === "ok" && data.api_key)
-                return data.api_key;
+            if (data.status === "ok" && data.api_key && data.device_token) {
+                return {
+                    apiKey: data.api_key,
+                    deviceToken: data.device_token,
+                    deviceId: data.device_id,
+                    devicePrivateJwk: start.private_jwk,
+                    devicePublicJwk: start.public_jwk,
+                };
+            }
             if (data.status === "expired")
                 return null;
         }
@@ -66,54 +85,30 @@ export async function pollDeviceLogin(origin, start) {
     }
     return null;
 }
-async function promptForKey() {
-    // 桌面图标双击启动时没有可交互的终端,rl.question 会无声挂死;
-    // 走到这个兜底说明 device login 不可用(网关太老/断网),只能明确报错。
-    if (!process.stdin.isTTY) {
-        console.error("  无法完成浏览器登录(网络问题或网关不可用),请稍后重试。");
-        process.exit(1);
-    }
-    console.log("  需要一把 API Key(免费):");
-    console.log(`  1. 打开 ${DASHBOARD_URL} 注册/登录(30 秒,注册领免费用量包:首月每天 1 亿 Token)`);
-    console.log("  2. 复制你的 API Key,粘贴到下面");
-    console.log("");
-    tryOpenBrowser(DASHBOARD_URL);
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    const key = (await rl.question("  粘贴 API Key: ")).trim();
-    rl.close();
-    return key;
-}
 export async function login(keyArg) {
     const cfg = loadConfig();
-    let key = keyArg?.trim();
-    if (!key) {
-        printConsoleBanner(VERSION);
-        const origin = apiOrigin(cfg);
-        const start = await startDeviceLogin(origin);
-        if (start) {
-            console.log("  用浏览器登录(注册领免费用量包,首月每天 1 亿 Token):");
-            console.log("");
-            console.log(`      ${start.verify_url}`);
-            console.log("");
-            console.log("  已经帮你打开浏览器了;如果没打开,把上面这行网址复制到浏览器打开。");
-            console.log("  在浏览器里登录并点「批准」后,这里会自动继续,等着就行……");
-            tryOpenBrowser(start.verify_url);
-            key = (await pollDeviceLogin(origin, start)) ?? undefined;
-            if (!key) {
-                console.error("  等了太久没等到浏览器登录。重新运行一次 u1s1,会给你一个新链接。");
-                process.exit(1);
-            }
-            console.log("");
-        }
-        else {
-            key = await promptForKey();
-        }
+    let credential;
+    if (keyArg?.trim()) {
+        console.log("  API Key 不能证明请求来自 u1s1 客户端，将改用浏览器批准本机设备。");
+    }
+    printConsoleBanner(VERSION);
+    const origin = apiOrigin(cfg);
+    const start = await startDeviceLogin(origin);
+    if (start) {
+        console.log("  用浏览器登录并批准这台设备:");
+        console.log("");
+        console.log(`      ${start.verify_url}`);
+        console.log("");
+        console.log("  已经帮你打开浏览器了;如果没打开,把上面这行网址复制到浏览器打开。");
+        console.log("  批准后，本机会用设备私钥为每次 API 请求签名。");
+        tryOpenBrowser(start.verify_url);
+        credential = (await pollDeviceLogin(origin, start)) ?? undefined;
     }
-    if (!key.startsWith("u1s1-")) {
-        console.error("  这不像一把 u1s1 的 Key(应该以 u1s1- 开头),再看看?");
+    if (!credential) {
+        console.error("  没能取得设备凭证。请确认网络正常并升级到最新版 u1s1 后重试。");
         process.exit(1);
     }
-    const next = { ...cfg, apiKey: key };
+    const next = { ...cfg, ...credential };
     const me = await fetchMe(next).catch((e) => {
         console.error(`  验证失败:${e.message}`);
         process.exit(1);
@@ -144,10 +139,10 @@ export async function login(keyArg) {
     console.log(`  ✓ 登录成功${me.email ? `(${me.email})` : ""},${quotaNote}。`);
     return next;
 }
-/** Returns a config that definitely has an apiKey, prompting the user if needed. */
+/** Returns a config with a browser-approved, sender-constrained device credential. */
 export async function ensureAuth() {
     const cfg = loadConfig();
-    if (cfg.apiKey)
+    if (hasDeviceCredential(cfg))
         return cfg;
     return login();
 }

package/dist/usage.js

@@ -1,5 +1,6 @@
 import { fetchMe } from "./api.js";
 import { loadConfig } from "./config.js";
+import { hasDeviceCredential } from "./device-auth.js";
 function bar(ratio, width = 24) {
     const filled = Math.round(Math.max(0, Math.min(1, ratio)) * width);
     return "█".repeat(filled) + "░".repeat(width - filled);
@@ -21,7 +22,7 @@ function fmtTokensCn(tokens) {
 }
 export async function usage() {
     const cfg = loadConfig();
-    if (!cfg.apiKey) {
+    if (!hasDeviceCredential(cfg)) {
         console.error("还没登录,先跑 u1s1 login");
         process.exit(1);
     }
@@ -70,7 +71,9 @@ export async function usage() {
             const label = ((PKG_LABEL[p.kind] ?? p.kind) + (p.count > 1 ? ` ×${p.count}` : "")).padEnd(5, "　");
             const per = daily ? "/天" : "";
             console.log(`  ${label} 还剩 ${fmtTokensCn(p.remaining)} / ${fmtTokensCn(total)}${per}  ${bar(ratio)}`);
-            const scopeNote = p.scope === "free" ? "仅默认模型和搜索 · 0 点恢复" : "全模型可用";
+            const scopeNote = p.kind === "invite"
+                ? "仅限 u1s1 客户端使用 · 全模型可用"
+                : p.scope === "free" ? "仅默认模型和搜索 · 0 点恢复" : "全模型可用";
             console.log(`             ${scopeNote} · ${p.expires_at ? `${p.expires_at.slice(0, 10)} 到期` : "永不过期"}`);
         }
         if (me.bonus_balance_usd > 0) {
@@ -86,7 +89,7 @@ export async function usage() {
             console.log("  → 免费用量包到期了,去 https://u1s1.io/dashboard 续领:每天 3000 万 Token,一年有效");
         }
         else {
-            console.log("  免费包每天 0 点恢复;邀请朋友双方各得一次性 1 亿 Token 包 → https://u1s1.io/dashboard");
+            console.log("  免费包每天 0 点恢复;邀请礼包需受邀人手动领取,仅限 u1s1 客户端 → https://u1s1.io/dashboard");
         }
         console.log("  Token 数按默认模型单价折算,为约数;用更贵的模型时消耗更快。");
         console.log("");

package/dist/web.js

@@ -8,6 +8,7 @@ import { ensureSearchTools } from "./search-tools.js";
 import { ensureUsableShell } from "./shell-doctor.js";
 import { applyWebUiBranding, applyWebUiFrontend } from "./webui-brand.js";
 import { fetchModels, loadCustomEndpoints } from "./api.js";
+import { ensureSigningProxy } from "./device-auth.js";
 const require = createRequire(import.meta.url);
 /**
  * `u1s1 web` — 浏览器网页版。薄包装 pi-web-ui 的服务器:注入我们的 agentDir
@@ -46,14 +47,16 @@ export async function prepareWebEnv(cfg) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
     await endpointsReady;
+    const signing = await ensureSigningProxy(cfg);
+    const officialCfg = { ...cfg, baseUrl: signing.baseUrl, apiKey: signing.localKey };
     ensureBrandPrompt(await shellReady);
     // /workflow 提示词模板与 TUI 同源,web/桌面版也要有
     ensureWorkflowPromptTemplate();
-    ensureProviderModels(cfg);
+    ensureProviderModels(officialCfg);
     // pi-web-ui 靠 auth.json 判断「已配置」,否则网页会弹 pi 安装引导
     ensureAuthCredential();
     // 联网工具经 agentDir/extensions 投影,和 TUI 共用一份注册
-    writeWebToolsExtension(cfg, {
+    writeWebToolsExtension(officialCfg, {
         webSearch: webSearchEnabled,
         webFetchRender: webFetchRenderEnabled,
         imageGen: imageGenEnabled,
@@ -71,7 +74,7 @@ export async function prepareWebEnv(cfg) {
     await searchToolsReady;
     return {
         PI_CODING_AGENT_DIR: agentDir,
-        U1S1_API_KEY: cfg.apiKey,
+        U1S1_API_KEY: officialCfg.apiKey,
         U1S1_TOOLS_VIA_EXTENSION: "1",
         PI_WEB_DATA_DIR: dataDir,
         // 自定义端点的密钥经环境变量传给 web 子进程(models.json 里只有 $VAR 引用)

package/package.json

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