u1s1-cli 1.14.6 → 1.15.1

package/dist/config.js

@@ -259,8 +259,11 @@ export function findModel(query) {
     }
     return undefined;
 }
+export function isDefaultAgent(value) {
+    return value === "pi" || value === "claude" || value === "codex";
+}
 export const u1s1Dir = join(homedir(), ".u1s1");
-const configFile = join(u1s1Dir, "config.json");
+export const configFile = join(u1s1Dir, "config.json");
 /** pi keeps auth/models/settings/sessions under this dir — isolated from any real pi install. */
 export const agentDir = join(u1s1Dir, "agent");
 export const agentSettingsFile = join(agentDir, "settings.json");
@@ -368,6 +371,7 @@ export function configFromFile(file, env = process.env, currentCnApiBase = SITES
         model: file.model,
         modelProvider: typeof file.modelProvider === "string" ? file.modelProvider : undefined,
         email: typeof file.email === "string" && file.email ? file.email : undefined,
+        ...(isDefaultAgent(file.defaultAgent) ? { defaultAgent: file.defaultAgent } : {}),
     };
 }
 /**
@@ -442,6 +446,36 @@ export function saveConfig(cfg) {
     resetLang();
 }
 /** Persist the user's preferred model to both stores. */
+/**
+ * 只改 config.json 里的 defaultAgent 一个键,其余原样保留(还没登录、文件不存在时也能写)。
+ * 不经 saveConfig:那会把默认 baseUrl 等生效值一并写死进文件。
+ */
+export function saveDefaultAgent(agent) {
+    updateRawConfigFile((file) => {
+        if (agent === undefined)
+            delete file["defaultAgent"];
+        else
+            file["defaultAgent"] = agent;
+    });
+}
+/**
+ * 只改 config.json 里 mutate 碰到的键,其余原样保留(不经 saveConfig,理由同 saveDefaultAgent)。
+ * 文件在但读不出来时不覆盖(里面可能有登录凭据),抛错让用户先修好。
+ */
+export function updateRawConfigFile(mutate) {
+    const raw = readJsonFile(configFile);
+    if (existsSync(configFile) && (!raw || typeof raw !== "object" || Array.isArray(raw))) {
+        throw new Error(tr(`${configFile} 格式不正确,没有改动它。`, `${configFile} is malformed; it was left unchanged.`));
+    }
+    const file = { ...raw };
+    mutate(file);
+    writePrivateFile(configFile, JSON.stringify(file, null, 2) + "\n");
+}
+/** config.json 的原始内容(不叠加环境变量);不存在或解析失败为 undefined。 */
+export function readRawConfigFile() {
+    const raw = readJsonFile(configFile);
+    return raw && typeof raw === "object" && !Array.isArray(raw) ? raw : undefined;
+}
 export function persistPreferredModel(cfg, provider, modelId) {
     const next = { ...cfg, model: modelId, modelProvider: provider };
     saveConfig(next);

package/dist/device-auth.d.ts

@@ -50,8 +50,44 @@ interface SigningProxy {
     localKey: string;
     token: string;
     client: ClientSurface;
+    agent?: LaunchedAgent;
     attestation: AttestationHolder;
 }
+/**
+ * Which client the launcher started behind this proxy. Sent as `x-u1s1-agent` /
+ * `x-u1s1-agent-version` so the Gateway knows which request shape to check
+ * (workers/gateway/src/launcher-agents.ts). The headers carry no authority of
+ * their own: the Gateway still requires the DPoP proof and a valid attestation.
+ */
+export interface LaunchedAgent {
+    name: "pi" | "claude-code" | "codex";
+    /** The client's own version (e.g. Claude Code `2.1.322`), not the CLI's. */
+    version?: string;
+}
+export declare const AGENT_HEADER = "x-u1s1-agent";
+export declare const AGENT_VERSION_HEADER = "x-u1s1-agent-version";
+/**
+ * With a declared agent the proxy owns both headers: whatever the child sent is
+ * replaced (or dropped when no version is declared). Without one the request
+ * passes through exactly as before this option existed.
+ */
+export declare function applyAgentHeaders(headers: Headers, agent: LaunchedAgent | undefined): void;
+/**
+ * Errors the proxy produces itself (wrong local token, path outside /v1, body too large) are final:
+ * retrying cannot fix them. Codex retries 401/403/413 like transient failures (five times) and then
+ * shows the raw JSON, so for a declared `codex` child they become 400 with `error.code:
+ * "invalid_prompt"`, which Codex reports once and displays as `error.message`. Other clients keep
+ * the original status codes.
+ */
+export declare function localFinalError(agent: LaunchedAgent | undefined, status: number, message: string): {
+    status: number;
+    body: {
+        error: {
+            message: string;
+            code?: string;
+        };
+    };
+};
 /** 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";
@@ -62,4 +98,4 @@ export declare function onGatewayFetchFailure(listener: ((failure: GatewayFetchF
  * 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, attestationSource?: ClientAttestationSource): Promise<SigningProxy>;
+export declare function ensureSigningProxy(cfg: CliConfig, fallbackClient?: ClientSurface, attestationSource?: ClientAttestationSource, agent?: LaunchedAgent): Promise<SigningProxy>;

package/dist/device-auth.js

@@ -130,6 +130,37 @@ export async function readSigningProxyRequestBody(request, maxBytes = SIGNING_PR
     }
     return chunks.length ? Buffer.concat(chunks, total) : undefined;
 }
+export const AGENT_HEADER = "x-u1s1-agent";
+export const AGENT_VERSION_HEADER = "x-u1s1-agent-version";
+function sameAgent(a, b) {
+    return a?.name === b?.name && a?.version === b?.version;
+}
+/**
+ * With a declared agent the proxy owns both headers: whatever the child sent is
+ * replaced (or dropped when no version is declared). Without one the request
+ * passes through exactly as before this option existed.
+ */
+export function applyAgentHeaders(headers, agent) {
+    if (!agent)
+        return;
+    headers.set(AGENT_HEADER, agent.name);
+    if (agent.version)
+        headers.set(AGENT_VERSION_HEADER, agent.version);
+    else
+        headers.delete(AGENT_VERSION_HEADER);
+}
+/**
+ * Errors the proxy produces itself (wrong local token, path outside /v1, body too large) are final:
+ * retrying cannot fix them. Codex retries 401/403/413 like transient failures (five times) and then
+ * shows the raw JSON, so for a declared `codex` child they become 400 with `error.code:
+ * "invalid_prompt"`, which Codex reports once and displays as `error.message`. Other clients keep
+ * the original status codes.
+ */
+export function localFinalError(agent, status, message) {
+    if (agent?.name === "codex")
+        return { status: 400, body: { error: { message, code: "invalid_prompt" } } };
+    return { status, body: { error: { message } } };
+}
 // 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;
@@ -222,12 +253,12 @@ export function onGatewayFetchFailure(listener) {
  * 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", attestationSource) {
+export async function ensureSigningProxy(cfg, fallbackClient = "terminal", attestationSource, agent) {
     if (!hasDeviceCredential(cfg))
         throw new Error(tr("当前安装需要重新登录，以创建设备凭证", "Please sign in again to create a device credential for this install."));
     const client = clientSurface(fallbackClient);
     const current = signingProxy;
-    if (current && current.token === cfg.deviceToken && current.client === client) {
+    if (current && current.token === cfg.deviceToken && current.client === client && sameAgent(current.agent, agent)) {
         updateAttestationHolder(current.attestation, attestationSource);
         return current;
     }
@@ -235,19 +266,22 @@ export async function ensureSigningProxy(cfg, fallbackClient = "terminal", attes
     updateAttestationHolder(attestation, attestationSource);
     const localKey = `local-${randomBytes(32).toString("hex")}`;
     const upstreamOrigin = new URL(cfg.baseUrl).origin;
+    const localError = (res, status, message) => {
+        const final = localFinalError(agent, status, message);
+        res.writeHead(final.status, { "content-type": "application/json" });
+        res.end(JSON.stringify(final.body));
+    };
     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" } }));
+                localError(res, 401, "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/*" } }));
+                localError(res, 403, "signing proxy only serves /v1/*");
                 return;
             }
             const upstreamAbort = new AbortController();
@@ -266,6 +300,7 @@ export async function ensureSigningProxy(cfg, fallbackClient = "terminal", attes
                 outboundHeaders.set("x-u1s1-client", client);
                 outboundHeaders.set("x-u1s1-version", VERSION);
                 outboundHeaders.set("x-u1s1-platform", `${process.platform}-${process.arch}`);
+                applyAgentHeaders(outboundHeaders, agent);
                 await attachAttestationHeader(attestation, outboundHeaders);
                 // 中国站主域建连失败时 authorizedFetch 会换到大陆加速入口,和启动时的请求共用选路状态
                 const upstream = await authorizedFetch(cfg, new URL(pathAndQuery, upstreamOrigin).toString(), {
@@ -288,8 +323,7 @@ export async function ensureSigningProxy(cfg, fallbackClient = "terminal", attes
         catch (error) {
             if (error instanceof SigningProxyRequestTooLargeError && !res.destroyed) {
                 req.resume();
-                res.writeHead(413, { "content-type": "application/json" });
-                res.end(JSON.stringify({ error: { message: "local signing proxy request body is too large" } }));
+                localError(res, 413, "local signing proxy request body is too large");
                 return;
             }
             if (res.destroyed)
@@ -322,6 +356,7 @@ export async function ensureSigningProxy(cfg, fallbackClient = "terminal", attes
         localKey,
         token: cfg.deviceToken,
         client,
+        ...(agent ? { agent: { ...agent } } : {}),
         attestation,
     };
     return signingProxy;

package/dist/embed.d.ts

@@ -11,3 +11,16 @@ export { applyWebUiBranding } from "./webui-brand.js";
 export { DASHBOARD_URL } from "./brand.js";
 export { SITES, siteForBaseUrl, siteLinks, type Site, type SiteId, type SiteLinks } from "./site.js";
 export { hasNudge, markNudge, readNudges, type NudgeKey } from "./nudges.js";
+export { ensureAgentRuntime, RuntimeInstallError, RuntimePlanError, type DownloadInfo, type EnsureRuntimeOptions, type EnsuredRuntime, type InstallHooks, type RuntimeBrake, type SkippedRuntime, } from "./agents/runtime.js";
+export { agentLaunchEnv, claudeLaunchArgs, claudePaths, type ClaudeLaunchInput } from "./agents/claude.js";
+export { codexLaunchArgs, codexLaunchEnv, codexPaths, writeCodexConfig, type CodexLaunchInput, type CodexPaths, } from "./agents/codex.js";
+export { loadAgentConfig, loadPublicAgentRuntime, type AgentConfig, type AgentConfigResult, type PublicAgentRuntimeResult, } from "./agents/agent-config.js";
+export { bestInstallTarget, checkBrake, compareVersions, dailyUpdateCheck, downloadSize, fetchLatestVersion, fetchPackageMeta, findNpm, findOnPath, installedVersions, isManagedAgent, MANAGED_AGENTS, managedBinPath, NO_BRAKE, normalizeVersion, npmRegistryFor, planRuntime, platformPackageRef, probeVersion, readRuntimeState, runtimeSpec, type BrakeVerdict, type FoundRuntime, type ManagedAgent, type NpmCommand, type PackageMeta, type RuntimePlan, type RuntimeState, } from "./agents/runtime.js";
+export { AGENT_PROFILES, agentsRoot, CLAUDE_TERMS_URL, CODEX_LICENSE_URL, notOpenText, overMaxTestedText, runtimeErrorText, type LaunchPaths, } from "./agents/launch.js";
+export { launchPaths } from "./agents/status.js";
+export { parseAgentConfig, readConfigCache, type AgentModel, type GatewayAgentName } from "./agents/agent-config.js";
+export { chooseAgentModel, isModelId, readAgentPrefs, saveAgentPrefs, type AgentPrefs } from "./agents/prefs.js";
+export { CONFIG_KEYS, isConfigKey, readConfigValue, writeConfigValue, type ConfigKey, type ConfigValue, } from "./config-command.js";
+export { isDefaultAgent, readRawConfigFile, saveDefaultAgent, type DefaultAgent } from "./config.js";
+export { isExistingUser } from "./launcher.js";
+export { gatewayFetch } from "./gateway-route.js";

package/dist/embed.js

@@ -11,3 +11,18 @@ export { applyWebUiBranding } from "./webui-brand.js";
 export { DASHBOARD_URL } from "./brand.js";
 export { SITES, siteForBaseUrl, siteLinks } from "./site.js";
 export { hasNudge, markNudge, readNudges } from "./nudges.js";
+// 启动器:桌面端复用同一套运行时下载/更新/刹车与子进程注入逻辑
+export { ensureAgentRuntime, RuntimeInstallError, RuntimePlanError, } from "./agents/runtime.js";
+export { agentLaunchEnv, claudeLaunchArgs, claudePaths } from "./agents/claude.js";
+export { codexLaunchArgs, codexLaunchEnv, codexPaths, writeCodexConfig, } from "./agents/codex.js";
+export { loadAgentConfig, loadPublicAgentRuntime, } from "./agents/agent-config.js";
+// 启动器(桌面端服务层):状态、刹车、偏好与 `u1s1 config` 读写都走 CLI 的同一份实现
+export { bestInstallTarget, checkBrake, compareVersions, dailyUpdateCheck, downloadSize, fetchLatestVersion, fetchPackageMeta, findNpm, findOnPath, installedVersions, isManagedAgent, MANAGED_AGENTS, managedBinPath, NO_BRAKE, normalizeVersion, npmRegistryFor, planRuntime, platformPackageRef, probeVersion, readRuntimeState, runtimeSpec, } from "./agents/runtime.js";
+export { AGENT_PROFILES, agentsRoot, CLAUDE_TERMS_URL, CODEX_LICENSE_URL, notOpenText, overMaxTestedText, runtimeErrorText, } from "./agents/launch.js";
+export { launchPaths } from "./agents/status.js";
+export { parseAgentConfig, readConfigCache } from "./agents/agent-config.js";
+export { chooseAgentModel, isModelId, readAgentPrefs, saveAgentPrefs } from "./agents/prefs.js";
+export { CONFIG_KEYS, isConfigKey, readConfigValue, writeConfigValue, } from "./config-command.js";
+export { isDefaultAgent, readRawConfigFile, saveDefaultAgent } from "./config.js";
+export { isExistingUser } from "./launcher.js";
+export { gatewayFetch } from "./gateway-route.js";