u1s1-cli-cn 1.18.0 → 1.20.0

package/dist/agents/dsh.js

@@ -0,0 +1,243 @@
+/**
+ * `u1s1 dsh`:以子进程启动 DeepSeek Harness(npm `@deepseek-ai/dsh`,MIT,开发者预览),经本机签名代理
+ * 用设备凭证访问网关。dsh 没有终端界面:不带子命令时进网页界面(`dsh web`)。
+ *
+ * 注入(对着 dsh 0.2.2-rc.1 的 `--dump-config` / `--dump-config-schema` 与实跑核对过):
+ *   DSH_HOME=~/.u1s1/agents/dsh                 profiles、会话、凭据都在这里,与用户自己的 ~/.dsh 互不影响
+ *   --patch ~/.u1s1/agents/dsh/u1s1.patch.yml   在 profile 各层之后再叠一层(见 renderDshPatch):
+ *       llm-pi-ai 的 provider `u1s1`(api: openai-completions,baseURL 读 U1S1_DSH_BASE_URL,
+ *       apiKeyEnv: U1S1_LOCAL_KEY,模型表来自 /v1/agents/dsh/config);默认模型、会话标题模型落在它上面;
+ *       关掉 DeepSeek 官方账号、官方 API Key 通道、官方网页搜索、遥测上报;注入 u1s1 工具服务(MCP)
+ *   U1S1_DSH_BASE_URL=http://127.0.0.1:<端口>/v1   签名代理;端口每次随机,patch 里用 !!js 读,文件内容不随端口变
+ *   U1S1_LOCAL_KEY=<本地 token>                  provider 的 apiKeyEnv 读它,发 Authorization: Bearer
+ *   DSH_TELEMETRY_DISABLED=1                     dsh 自己的遥测总开关
+ *   NO_PROXY / no_proxy 补上 127.0.0.1、localhost
+ *
+ * 真实凭证(设备令牌、设备私钥)只留在启动器进程里;本地 token 只对本进程的签名代理有效,进程退出即作废,
+ * 不写进任何文件。不改 dsh 的任何文件。
+ */
+import { join } from "node:path";
+import { writePrivateFile } from "../config.js";
+import { lang } from "../i18n.js";
+import { MCP_ENV_NAMES, MCP_SERVER_NAME, MCP_TRACE_ENV, mcpInjectionDisabled, mcpLaunchEnv, mcpServerCommand, } from "../mcp-server.js";
+import { stripSecretEnv } from "../secret-env.js";
+import { withLoopbackNoProxy } from "./codex.js";
+import { AGENT_PROFILES, agentsRoot, prepareAgentLaunch, runPreparedAgent } from "./launch.js";
+import { runtimePaths } from "./runtime.js";
+/** patch 里我们的 provider 名(dsh 的路由名:小写加连字符)。 */
+export const DSH_PROVIDER_ID = "u1s1";
+/** provider 的 apiKeyEnv:子进程环境里放本地 token 的变量名。 */
+export const DSH_KEY_ENV = "U1S1_LOCAL_KEY";
+/** 签名代理地址(带 /v1),patch 里用 `!!js process.env.U1S1_DSH_BASE_URL` 读。 */
+export const DSH_BASE_URL_ENV = "U1S1_DSH_BASE_URL";
+export function dshPaths(root = agentsRoot()) {
+    const base = runtimePaths(root, "dsh");
+    return {
+        ...base,
+        configDir: base.root,
+        patchFile: join(base.root, "u1s1.patch.yml"),
+        configCache: join(base.root, "agent-config.json"),
+    };
+}
+/**
+ * 子进程环境里要去掉的变量(依据 dsh 0.2.2-rc.1 的默认配置树):
+ *   - DSH_HOME(我们自己设);
+ *   - DEEPSEEK_API_KEY:官方 API Key 通道和官方网页搜索读它,有了就会绕开 u1s1 直连官方;
+ *   - 遥测/产品分析的地址与模式(DSH_TELEMETRY_MODE、DSH_TELEMETRY_OTLP_URL、DSH_PRODUCT_ANALYTICS_OTLP_URL、
+ *     DSH_CLIENT_VERSION),以及换搜索/抓取提供方的 DSH_WEB_SEARCH_PROVIDER、DSH_WEB_FETCH_PROVIDER;
+ *   - 我们自己的变量:关掉 MCP 注入时也不留用户环境里的旧值。
+ * DSH_PERMISSION_MODE(用户自己选的沙箱模式)保留。
+ */
+export const DSH_ENV_DROP = [
+    "DSH_HOME",
+    "DEEPSEEK_API_KEY",
+    "DSH_TELEMETRY_MODE",
+    "DSH_TELEMETRY_OTLP_URL",
+    "DSH_PRODUCT_ANALYTICS_OTLP_URL",
+    "DSH_CLIENT_VERSION",
+    "DSH_WEB_SEARCH_PROVIDER",
+    "DSH_WEB_FETCH_PROVIDER",
+    DSH_KEY_ENV,
+    DSH_BASE_URL_ENV,
+    ...MCP_ENV_NAMES.filter((name) => name !== "U1S1_LANG"),
+];
+export function dshLaunchEnv(input) {
+    if (!/^http:\/\/127\.0\.0\.1:\d+\/v1$/.test(input.proxyBaseUrl)) {
+        throw new Error(`proxy base URL must be the local signing proxy: ${input.proxyBaseUrl}`);
+    }
+    const env = stripSecretEnv(input.baseEnv);
+    for (const key of DSH_ENV_DROP)
+        delete env[key];
+    env["DSH_HOME"] = input.home;
+    env["DSH_TELEMETRY_DISABLED"] = "1";
+    env[DSH_KEY_ENV] = input.localToken;
+    env[DSH_BASE_URL_ENV] = input.proxyBaseUrl;
+    if (input.mcp)
+        Object.assign(env, input.mcp);
+    const noProxy = withLoopbackNoProxy([env["NO_PROXY"], env["no_proxy"]].filter(Boolean).join(","));
+    env["NO_PROXY"] = noProxy;
+    env["no_proxy"] = noProxy;
+    return env;
+}
+// ---------------------------------------------------------------- args
+/** dsh 启动器自己的、不需要 profile 的选项:原样交给它,不加 patch。 */
+const LAUNCHER_ONLY_FLAGS = new Set(["-h", "--help", "-V", "--version"]);
+/**
+ * 用户参数 → dsh 参数。dsh 的语法是 `dsh [--profile] <名字> [启动器选项] [应用参数]`,`--patch` 是启动器选项,
+ * 要紧跟在 profile 名后面(第一个它不认识的参数起就是应用参数)。
+ *   (无参数)           → web --patch <文件>
+ *   --no-open --port 1 → web --patch <文件> --no-open --port 1(以选项开头:默认进网页界面)
+ *   headless "任务"     → headless --patch <文件> "任务"
+ *   --profile web …    → --profile web --patch <文件> …
+ *   --help / --version → 原样(dsh 自己的帮助和版本)
+ *   plugin …           → 原样(插件管理,不启动 profile)
+ * 用户自己再传的 --patch 排在我们的后面,后叠的为准。
+ */
+export function dshLaunchArgs(patchFile, userArgs) {
+    const [first, ...rest] = userArgs;
+    if (first === undefined)
+        return ["web", "--patch", patchFile];
+    if (first === "plugin" || LAUNCHER_ONLY_FLAGS.has(first))
+        return [...userArgs];
+    if (first === "--profile") {
+        if (rest.length === 0)
+            return [...userArgs];
+        return ["--profile", rest[0], "--patch", patchFile, ...rest.slice(1)];
+    }
+    if (first.startsWith("--profile="))
+        return [first, "--patch", patchFile, ...rest];
+    if (first.startsWith("-"))
+        return ["web", "--patch", patchFile, ...userArgs];
+    return [first, "--patch", patchFile, ...rest];
+}
+// ---------------------------------------------------------------- patch
+/** provider 模型条目里我们认的字段(dsh llm-pi-ai 的 providers.*.models[]);其余丢掉。 */
+const MODEL_KEYS = ["id", "name", "contextWindow", "maxTokens", "input", "reasoningEfforts", "compat"];
+function isRecord(v) {
+    return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+/**
+ * 网关 settings.models(dsh-config.ts 下发的 dsh 原生形状)→ provider 模型表。没有 settings(老网关)时
+ * 退回 models 阵容里的 id、名字、窗口。
+ */
+export function dshProviderModels(config) {
+    const raw = config.settings?.["models"];
+    if (Array.isArray(raw)) {
+        const out = [];
+        for (const m of raw) {
+            if (!isRecord(m) || typeof m["id"] !== "string" || !m["id"])
+                continue;
+            const entry = {};
+            for (const key of MODEL_KEYS)
+                if (m[key] !== undefined)
+                    entry[key] = m[key];
+            out.push(entry);
+        }
+        if (out.length)
+            return out;
+    }
+    return config.models.map((m) => ({ id: m.id, name: m.name, ...(m.contextWindow ? { contextWindow: m.contextWindow } : {}) }));
+}
+/** YAML 标量:JSON 字符串字面量也是合法的 YAML 双引号标量;对象/数组用 JSON 流式写法。 */
+const y = (value) => JSON.stringify(value);
+/**
+ * 生成 --patch 文件。dsh 的 patch 是顶层数组:按 id 覆盖条目(config 整段替换、不深合并),`insert` 追加新条目。
+ * 文件里没有端点和凭证:baseURL 与 MCP 服务的变量都用 `!!js process.env.…` 在 dsh 进程里读。
+ */
+export function renderDshPatch(input) {
+    const lines = [
+        "# u1s1: generated by `u1s1 dsh` on every launch; edits here are overwritten.",
+        "# Your own overrides go in profiles/<profile>/cordis.patch.yml or cordis.patch.yml in this directory.",
+        "",
+        "# u1s1 provider: the local signing proxy started by u1s1 (address and one-time token come from the environment)",
+        "- id: llm-pi-ai",
+        "  config:",
+        "    providers:",
+        `      ${DSH_PROVIDER_ID}:`,
+        `        displayName: ${y("u1s1")}`,
+        `        api: ${y("openai-completions")}`,
+        `        baseURL: !!js process.env.${DSH_BASE_URL_ENV}`,
+        `        apiKeyEnv: ${y(DSH_KEY_ENV)}`,
+        "        models:",
+        ...input.models.map((m) => `          - ${y(m)}`),
+        "",
+        "# default model on the u1s1 provider",
+        "- id: agent-default-model",
+        "  config:",
+        `    provider: ${y(DSH_PROVIDER_ID)}`,
+        `    model: ${y(input.model)}`,
+        "",
+        "# session titles: the small model on the u1s1 provider (other values are dsh 0.2.2-rc.1 defaults)",
+        "- id: session-title-llm",
+        "  config:",
+        "    targetWords: 5",
+        "    targetCjkCharacters: 10",
+        "    maxInputBytes: 4096",
+        "    maxOutputTokens: 4096",
+        "    timeoutMs: 60000",
+        `    provider: ${y(DSH_PROVIDER_ID)}`,
+        `    model: ${y(input.smallModel ?? input.model)}`,
+        "",
+        "# no direct traffic to the vendor's own services: account sign-in, API-key model route, web search, telemetry",
+        ...[
+            "deepseek-account",
+            "account-controller",
+            "ui-settings-account",
+            "llm-deepseek",
+            "llm-deepseek-account",
+            "web-search-deepseek",
+            "web-deepseek-api",
+            "session-telemetry-otel",
+            "desktop-product-telemetry",
+            "product-analytics",
+        ].flatMap((id) => [`- id: ${id}`, "  disabled: true"]),
+        "- id: web",
+        "  config:",
+        "    searchProvider: null",
+        `    fetchProvider: ${y("http")}`,
+    ];
+    if (input.mcp) {
+        lines.push("", "# u1s1 tools (web search, page fetch, image generation) over MCP, through the same signing proxy", "- insert:", `    - id: ${y(`mcp-${MCP_SERVER_NAME}`)}`, `      name: ${y("@deepseek-ai/dsh-mcp-client")}`, "      config:", `        serverName: ${y(MCP_SERVER_NAME)}`, `        transport: ${y("stdio")}`, `        command: ${y(input.mcp.command)}`, `        args: ${y(input.mcp.args)}`, "        env:", ...input.mcp.envVars.map((name) => `          ${name}: !!js process.env.${name}`));
+    }
+    return lines.join("\n") + "\n";
+}
+/** MCP 服务:同一个 node、同一份 CLI;env 里只列变量名,值由 dsh 从自己的环境转过去。 */
+export function dshMcpServer(command = mcpServerCommand(), env = process.env) {
+    const envVars = [...MCP_ENV_NAMES];
+    if (env[MCP_TRACE_ENV])
+        envVars.push(MCP_TRACE_ENV);
+    return { ...command, envVars };
+}
+export function writeDshPatch(paths, input) {
+    writePrivateFile(paths.patchFile, renderDshPatch(input));
+}
+// ---------------------------------------------------------------- run
+/**
+ * `u1s1 dsh [参数…]`。返回子进程的退出码(启动前就失败返回 1)。
+ * 是否可用完全由网关配置的 enabled 决定(prepareAgentLaunch)。
+ */
+export async function runDsh(userArgs) {
+    const paths = dshPaths();
+    const prepared = await prepareAgentLaunch(AGENT_PROFILES.dsh, paths);
+    if (typeof prepared === "number")
+        return prepared;
+    const models = dshProviderModels(prepared.config);
+    const model = prepared.model ?? prepared.config.defaultModel ?? models[0]?.["id"];
+    if (typeof model !== "string") {
+        console.error("No model is available for DeepSeek Harness right now.");
+        return 1;
+    }
+    const mcp = mcpInjectionDisabled()
+        ? undefined
+        : mcpLaunchEnv({ proxyBaseUrl: prepared.proxy.baseUrl, localToken: prepared.proxy.localKey, features: prepared.features, lang: lang() });
+    writeDshPatch(paths, { models, model, smallModel: prepared.config.smallModel, mcp: mcp ? dshMcpServer() : null });
+    const env = dshLaunchEnv({
+        baseEnv: process.env,
+        localToken: prepared.proxy.localKey,
+        proxyBaseUrl: prepared.proxy.baseUrl,
+        home: paths.configDir,
+        mcp,
+    });
+    const args = dshLaunchArgs(paths.patchFile, userArgs);
+    return runPreparedAgent({ agent: "dsh", paths, prepared, args, env, userArgs });
+}

package/dist/agents/launch.d.ts

@@ -1,5 +1,5 @@
 /**
- * 官方原版客户端(`u1s1 claude` / `u1s1 codex`)共用的启动流程与文案:
+ * 官方原版客户端(`u1s1 claude` / `u1s1 codex` / `u1s1 dsh`)共用的启动流程与文案:
  * 登录 → 经签名代理拉网关配置(开关、刹车、阵容)→ 找到/下载原版 → 起声明了客户端的签名代理 →
  * 由各客户端模块写配置、拼环境 → 子进程继承终端 → 透传退出码;顺带每天查一次新版。
  *
@@ -9,13 +9,15 @@ import { spawn } from "node:child_process";
 import { type ApiFeatures } from "../api.js";
 import { type SiteId } from "../site.js";
 import { type AgentConfig, type GatewayAgentName } from "./agent-config.js";
+import { type AgentCustomModel } from "./custom-models.js";
+import { type FoundNode, type NodeDownloadInfo } from "./node-runtime.js";
 import { RuntimePlanError, type DownloadInfo, type EnsuredRuntime, type InstallHooks, type ManagedAgent, type RuntimePaths, type SkippedRuntime } from "./runtime.js";
 export declare function agentsRoot(): string;
 export interface AgentProfile {
     /** 子命令名,也是 ~/.u1s1/agents 下的目录名 */
     agent: ManagedAgent;
     /** 网关里的客户端名(/v1/agents/:agent/config、x-u1s1-agent) */
-    gatewayAgent: Extract<GatewayAgentName, "claude-code" | "codex">;
+    gatewayAgent: Extract<GatewayAgentName, "claude-code" | "codex" | "dsh">;
     /** 产品名(只作事实陈述,如「官方 Claude Code」) */
     product: string;
     /** 下载前提示里的许可/条款一行 */
@@ -25,6 +27,7 @@ export interface AgentProfile {
 }
 export declare const CLAUDE_TERMS_URL = "https://code.claude.com/docs/en/legal-and-compliance";
 export declare const CODEX_LICENSE_URL = "https://github.com/openai/codex/blob/main/LICENSE";
+export declare const DSH_LICENSE_URL = "https://www.npmjs.com/package/@deepseek-ai/dsh";
 export declare const AGENT_PROFILES: Record<ManagedAgent, AgentProfile>;
 /**
  * 请求本机签名代理(http://127.0.0.1:<端口>)专用:直连,不走用户的 HTTP(S)_PROXY。
@@ -44,8 +47,18 @@ export declare function loopbackFetch(url: string, init: RequestInit): Promise<R
 export declare function spawnAgent(bin: string, args: readonly string[], env: NodeJS.ProcessEnv, deps?: {
     spawn?: typeof spawn;
     proc?: Pick<NodeJS.Process, "on" | "off">;
+}, opts?: {
+    /**
+     * 也转发 SIGINT。只在没有终端时用(dsh 被别的程序拉起、对启动器进程发 SIGINT):那时没有终端
+     * 把 Ctrl+C 同时发给子进程,不转发子进程就收不到。有终端时照旧不转发,免得收到两次。
+     */
+    forwardInterrupt?: boolean;
 }): Promise<number>;
 export declare function consentLines(info: DownloadInfo): string[];
+/** dsh 要的 Node 24:下载前的说明(与客户端本身的下载分开问,两样都要用户点头)。 */
+export declare function nodeConsentLines(info: NodeDownloadInfo): string[];
+/** dsh 用的 Node:找不到就征得同意后下载(与 u1s1 agents install dsh 共用)。失败已向用户说明,返回 undefined。 */
+export declare function ensureDshNode(site: SiteId): Promise<FoundNode | undefined>;
 export declare function cliInstallHooks(agent?: ManagedAgent): InstallHooks;
 /** 已有的某份客户端高于 max_tested、这次不用它。 */
 export declare function overMaxTestedText(s: SkippedRuntime, agent?: ManagedAgent): string;
@@ -76,7 +89,16 @@ export interface PreparedLaunch {
     site: SiteId;
     /** /v1/models 的能力开关(搜索、云端渲染、生图);没拉到时为 undefined。MCP 工具服务按它决定提供哪些工具 */
     features: ApiFeatures | undefined;
+    /** 账号里的自定义端点模型(id = ep…/<模型>):接在客户端模型阵容后面,请求由签名代理在本机直连端点 */
+    customModels: AgentCustomModel[];
+    /** 入口是 JS 文件的客户端(dsh)用来运行它的 Node;其余为 undefined */
+    node?: FoundNode;
 }
+/**
+ * 网关刹车;dsh 没有 max_tested_version(老网关、老缓存)时也不越过实测过的版本——它每天发预发布版,
+ * npm 的 latest 随时会变成没测过的版本。
+ */
+export declare function effectiveBrake(agent: ManagedAgent, brake: AgentConfig["runtime"]): AgentConfig["runtime"];
 /**
  * 子进程启动前的公共部分。返回 number = 启动前就失败的退出码(已向用户说明)。
  * 是否可用完全由网关配置的 enabled 决定:停用时显示 disabled_reason,不下载、不启动。

package/dist/agents/launch.js

@@ -1,5 +1,5 @@
 /**
- * 官方原版客户端(`u1s1 claude` / `u1s1 codex`)共用的启动流程与文案:
+ * 官方原版客户端(`u1s1 claude` / `u1s1 codex` / `u1s1 dsh`)共用的启动流程与文案:
  * 登录 → 经签名代理拉网关配置(开关、刹车、阵容)→ 找到/下载原版 → 起声明了客户端的签名代理 →
  * 由各客户端模块写配置、拼环境 → 子进程继承终端 → 透传退出码;顺带每天查一次新版。
  *
@@ -11,19 +11,22 @@ import { constants as osConstants } from "node:os";
 import { join } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { Agent, fetch as undiciFetch } from "undici";
-import { AccessDeniedError, AuthError, fetchModels } from "../api.js";
-import { u1s1Dir } from "../config.js";
+import { AccessDeniedError, AuthError, fetchModels, loadCustomEndpoints } from "../api.js";
+import { CUSTOM_ENDPOINTS, u1s1Dir } from "../config.js";
 import { ensureSigningProxy } from "../device-auth.js";
 import { tr } from "../i18n.js";
 import { siteLinks, siteOf } from "../site.js";
 import { loadAgentConfig } from "./agent-config.js";
+import { agentCustomModels } from "./custom-models.js";
 import { readAgentPrefs, resolveLaunchModel } from "./prefs.js";
-import { dailyUpdateCheck, ensureAgentRuntime, fetchLatestVersion, npmRegistryFor, RuntimeInstallError, RuntimePlanError, runtimeSpec, } from "./runtime.js";
+import { cleanNodeStaging, DSH_MIN_NODE, ensureNode, NodeRuntimeError } from "./node-runtime.js";
+import { dailyUpdateCheck, DSH_TESTED_VERSION, ensureAgentRuntime, fetchLatestVersion, npmRegistryFor, RuntimeInstallError, RuntimePlanError, runtimeSpec, } from "./runtime.js";
 export function agentsRoot() {
     return join(u1s1Dir, "agents");
 }
 export const CLAUDE_TERMS_URL = "https://code.claude.com/docs/en/legal-and-compliance";
 export const CODEX_LICENSE_URL = "https://github.com/openai/codex/blob/main/LICENSE";
+export const DSH_LICENSE_URL = "https://www.npmjs.com/package/@deepseek-ai/dsh";
 export const AGENT_PROFILES = {
     claude: {
         agent: "claude",
@@ -39,6 +42,13 @@ export const AGENT_PROFILES = {
         termsLine: () => tr(`    Codex CLI 以 Apache-2.0 许可发布:${CODEX_LICENSE_URL}`, `    Codex CLI is released under the Apache-2.0 license: ${CODEX_LICENSE_URL}`),
         locationLine: () => tr("    位置:~/.u1s1/agents/codex(不影响你自己装的版本和 ~/.codex)", "    Location: ~/.u1s1/agents/codex (your own install and ~/.codex are left alone)"),
     },
+    dsh: {
+        agent: "dsh",
+        gatewayAgent: "dsh",
+        product: "DeepSeek Harness",
+        termsLine: () => tr(`    DeepSeek Harness 以 MIT 许可发布(开发者预览版):${DSH_LICENSE_URL}`, `    DeepSeek Harness is released under the MIT license (developer preview): ${DSH_LICENSE_URL}`),
+        locationLine: () => tr("    位置:~/.u1s1/agents/dsh(不影响你自己装的版本和 ~/.dsh)", "    Location: ~/.u1s1/agents/dsh (your own install and ~/.dsh are left alone)"),
+    },
 };
 // ---------------------------------------------------------------- loopback
 let loopbackAgent;
@@ -65,18 +75,20 @@ export function loopbackFetch(url, init) {
  * SIGTERM / SIGHUP 通常只发给启动器(kill、关窗口),转发给子进程。
  * 签名代理的监听是 unref 的:必须等子进程退出后再返回。
  */
-export function spawnAgent(bin, args, env, deps = {}) {
+export function spawnAgent(bin, args, env, deps = {}, opts = {}) {
     const proc = deps.proc ?? process;
     const child = (deps.spawn ?? spawn)(bin, [...args], { env, stdio: "inherit" });
     const swallow = () => { };
     const forwarders = new Map();
-    for (const sig of ["SIGTERM", "SIGHUP"]) {
+    const forwarded = opts.forwardInterrupt ? ["SIGTERM", "SIGHUP", "SIGINT"] : ["SIGTERM", "SIGHUP"];
+    for (const sig of forwarded) {
         forwarders.set(sig, () => {
             if (child.exitCode === null && child.signalCode === null)
                 child.kill(sig);
         });
     }
-    const ignored = process.platform === "win32" ? ["SIGINT"] : ["SIGINT", "SIGQUIT"];
+    const swallowed = process.platform === "win32" ? ["SIGINT"] : ["SIGINT", "SIGQUIT"];
+    const ignored = swallowed.filter((sig) => !forwarders.has(sig));
     for (const sig of ignored)
         proc.on(sig, swallow);
     for (const [sig, fn] of forwarders)
@@ -134,14 +146,27 @@ export function consentLines(info) {
         profile.termsLine(),
     ];
 }
+/** dsh 要的 Node 24:下载前的说明(与客户端本身的下载分开问,两样都要用户点头)。 */
+export function nodeConsentLines(info) {
+    return [
+        "",
+        tr(`  DeepSeek Harness 需要 Node.js ${DSH_MIN_NODE} 或更新版本,这台机器上没有。需要先下载官方 Node.js ${info.version}(长期支持版):`, `  DeepSeek Harness needs Node.js ${DSH_MIN_NODE} or newer, which this machine doesn't have. The official Node.js ${info.version} (LTS) needs to be downloaded first:`),
+        tr(`    来源:${info.url}`, `    Source: ${info.url}`),
+        tr(`    大小:下载约 ${mb(info.downloadBytes ?? 0)} MB,按官方 SHA-256 校验;只留 node 可执行文件,约 120 MB`, `    Size: about ${mb(info.downloadBytes ?? 0)} MB to download, checked against the official SHA-256; only the node binary is kept (about 120 MB)`),
+        tr("    位置:~/.u1s1/agents/node(只给 u1s1 dsh 用,不改你的 PATH 和已装的 Node)", "    Location: ~/.u1s1/agents/node (used only by u1s1 dsh; your PATH and existing Node installs are left alone)"),
+    ];
+}
 async function askConsent(info) {
-    for (const line of consentLines(info))
+    return askYesNo(consentLines(info), info.agent);
+}
+async function askYesNo(lines, agent) {
+    for (const line of lines)
         console.error(line);
     const preset = process.env["U1S1_AGENT_INSTALL"]?.trim().toLowerCase();
     if (preset === "yes" || preset === "y" || preset === "1")
         return true;
     if (!process.stdin.isTTY) {
-        console.error(tr(`  当前没有可交互的终端。请在终端里运行一次 u1s1 ${info.agent} 确认下载,或设置 U1S1_AGENT_INSTALL=yes。`, `  No interactive terminal. Run u1s1 ${info.agent} in a terminal once to confirm, or set U1S1_AGENT_INSTALL=yes.`));
+        console.error(tr(`  当前没有可交互的终端。请在终端里运行一次 u1s1 ${agent} 确认下载,或设置 U1S1_AGENT_INSTALL=yes。`, `  No interactive terminal. Run u1s1 ${agent} in a terminal once to confirm, or set U1S1_AGENT_INSTALL=yes.`));
         return false;
     }
     const rl = createInterface({ input: process.stdin, output: process.stderr });
@@ -153,6 +178,34 @@ async function askConsent(info) {
         rl.close();
     }
 }
+/** dsh 用的 Node:找不到就征得同意后下载(与 u1s1 agents install dsh 共用)。失败已向用户说明,返回 undefined。 */
+export async function ensureDshNode(site) {
+    cleanNodeStaging(agentsRoot());
+    try {
+        return await ensureNode({
+            agentsRoot: agentsRoot(),
+            site,
+            consent: (info) => askYesNo(nodeConsentLines(info), "dsh"),
+            log: (line) => console.error(line),
+            text: {
+                declined: () => tr("已取消下载。", "Download cancelled."),
+                unsupported: () => tr(`这台机器的系统/架构(${process.platform}-${process.arch})没有官方 Node.js 24。`, `There's no official Node.js 24 build for this system (${process.platform}-${process.arch}).`),
+                downloadFailed: (d) => tr(`Node.js 下载失败(${d}),检查一下网络后再试。`, `The Node.js download failed (${d}). Check your network and try again.`),
+                verifyFailed: (d) => tr(`下载的 Node.js 没通过校验(${d}),已丢弃。`, `The Node.js download failed verification (${d}) and was discarded.`),
+                downloading: (v) => tr(`  正在下载 Node.js ${v} …`, `  Downloading Node.js ${v}…`),
+                installed: (v) => tr(`  已安装 Node.js ${v}`, `  Installed Node.js ${v}`),
+            },
+        });
+    }
+    catch (e) {
+        if (!(e instanceof NodeRuntimeError))
+            throw e;
+        console.error(e.code === "env_unusable"
+            ? tr(`${e.message}:DeepSeek Harness 需要 Node.js ${DSH_MIN_NODE} 或更新版本。`, `${e.message}: DeepSeek Harness needs Node.js ${DSH_MIN_NODE} or newer.`)
+            : e.message);
+        return undefined;
+    }
+}
 export function cliInstallHooks(agent = "claude") {
     let progressShown = false;
     const endProgress = () => {
@@ -264,6 +317,15 @@ function attestationSource(cfg, models) {
         },
     };
 }
+/**
+ * 网关刹车;dsh 没有 max_tested_version(老网关、老缓存)时也不越过实测过的版本——它每天发预发布版,
+ * npm 的 latest 随时会变成没测过的版本。
+ */
+export function effectiveBrake(agent, brake) {
+    if (agent !== "dsh" || brake.maxTestedVersion)
+        return brake;
+    return { ...brake, maxTestedVersion: DSH_TESTED_VERSION };
+}
 /**
  * 子进程启动前的公共部分。返回 number = 启动前就失败的退出码(已向用户说明)。
  * 是否可用完全由网关配置的 enabled 决定:停用时显示 disabled_reason,不下载、不启动。
@@ -319,21 +381,39 @@ export async function prepareAgentLaunch(profile, paths) {
         return 1;
     }
     const config = result.config;
+    // 自定义端点:拉不到时用上次的缓存(与启动 Pi 同一做法)
+    await loadCustomEndpoints(cfg).catch(() => undefined);
+    // dsh 发 /v1/chat/completions,签名代理的自定义端点路由只转 /v1/messages、/v1/responses:不接自定义模型
+    const customModels = profile.agent === "dsh" ? [] : agentCustomModels(CUSTOM_ENDPOINTS);
     const prefs = readAgentPrefs(profile.agent);
-    const model = resolveLaunchModel(profile.agent, config, {
+    // 用户在 u1s1 config 里选的模型可以是自定义模型
+    const lineup = {
+        ...config,
+        models: [...config.models, ...customModels.map((c) => ({ id: c.id, name: c.model.name, contextWindow: c.model.contextWindow }))],
+    };
+    const model = resolveLaunchModel(profile.agent, lineup, {
         prefs,
         notify: (missing, fallback) => console.error(modelMissingText(profile.agent, missing, fallback)),
     });
     mkdirSync(paths.configDir, { recursive: true, mode: 0o700 });
+    // 入口是 JS 文件的客户端先准备好够新的 Node(dsh 要 ≥24.9,便携包只带 22)
+    let node;
+    if (runtimeSpec(profile.agent).minNode) {
+        node = await ensureDshNode(site.id);
+        if (!node)
+            return 1;
+    }
+    const brake = effectiveBrake(profile.agent, config.runtime);
     let runtime;
     try {
         runtime = await ensureAgentRuntime(profile.agent, {
-            brake: config.runtime,
+            brake,
             site: site.id,
             agentsRoot: agentsRoot(),
             hooks: cliInstallHooks(profile.agent),
             probeConfigDir: paths.configDir,
             autoUpdate: prefs.autoUpdate,
+            node: node?.bin,
         });
     }
     catch (e) {
@@ -343,8 +423,21 @@ export async function prepareAgentLaunch(profile, paths) {
     }
     printRuntimeNotes(runtime, profile.agent);
     // 子进程用的代理:带上客户端名与版本,网关据此核对请求形状
-    const proxy = await ensureSigningProxy(cfg, "terminal", attestation, { name: profile.gatewayAgent, version: runtime.version });
-    return { config, model, autoUpdate: prefs.autoUpdate, runtime, proxy, site: site.id, features: models?.features };
+    // 自定义模型的请求在这个代理里本机直连端点(custom-endpoint-proxy.ts),不经网关
+    const proxy = await ensureSigningProxy(cfg, "terminal", attestation, { name: profile.gatewayAgent, version: runtime.version }, {
+        endpoints: [...CUSTOM_ENDPOINTS],
+    });
+    return {
+        config: { ...config, runtime: brake },
+        model,
+        autoUpdate: prefs.autoUpdate,
+        runtime,
+        proxy,
+        site: site.id,
+        features: models?.features,
+        customModels,
+        ...(node ? { node } : {}),
+    };
 }
 /** 用户在 u1s1 config 里选的模型不在当前阵容里(只提示一次,见 prefs.ts)。 */
 export function modelMissingText(agent, missing, fallback) {
@@ -367,6 +460,8 @@ const SESSION_LAYOUT = {
 /** configDir 下这次运行(since 之后)写过的最新会话的 id。 */
 export function latestSessionId(agent, configDir, since) {
     const layout = SESSION_LAYOUT[agent];
+    if (!layout)
+        return undefined;
     let best;
     const walk = (dir, depth) => {
         let names;
@@ -403,7 +498,8 @@ export function latestSessionId(agent, configDir, since) {
  * 我们也不加。
  */
 export function wantsResumeHint(agent, userArgs, interactive) {
-    if (!interactive)
+    // dsh 没有终端界面(会话在网页里续),不补提示
+    if (!interactive || agent === "dsh")
         return false;
     if (agent === "codex")
         return !["exec", "e", "review", "login", "logout", "mcp", "mcp-server", "app-server", "completion", "apply", "a", "cloud", "sandbox", "debug", "features"].includes(userArgs[0] ?? "")
@@ -431,7 +527,11 @@ export async function runPreparedAgent(input) {
         }).catch(() => undefined)
         : Promise.resolve(undefined);
     const startedAt = Date.now();
-    const code = await spawnAgent(prepared.runtime.bin, input.args, input.env);
+    // JS 入口(dsh):用准备好的 Node 跑;没有终端时 SIGINT 也转发(被别的程序拉起时靠它停下)
+    const [command, args] = prepared.node
+        ? [prepared.node.bin, [prepared.runtime.bin, ...input.args]]
+        : [prepared.runtime.bin, [...input.args]];
+    const code = await spawnAgent(command, args, input.env, {}, { forwardInterrupt: !!prepared.node && !process.stdin.isTTY });
     if (code === 0 && input.paths.configDir && input.userArgs
         && wantsResumeHint(input.agent, input.userArgs, !!process.stdin.isTTY && !!process.stdout.isTTY)) {
         // 文件时间的精度与时钟差:往前放 2 秒

package/dist/agents/models-list.d.ts

@@ -0,0 +1,65 @@
+import type { ApiEndpoint, ApiModel } from "../api.js";
+import { type CustomEndpoint, type ModelDef, type ModelRef } from "../config.js";
+import { type AgentConfig, type GatewayAgentName } from "./agent-config.js";
+export type ModelsClient = "pi" | "claude" | "codex";
+export interface ModelEntry {
+    /** 该客户端 --model 要的值 */
+    id: string;
+    /** 显示名;拿不到时等于 id */
+    name: string;
+    source: "u1s1" | "custom";
+    /** source = custom 时:端点名(后台填的) */
+    endpoint?: string;
+}
+export interface ClientModels {
+    default: string | null;
+    /** 网关是否开放这个客户端(Pi 恒开放,不带这个字段) */
+    enabled?: boolean;
+    models: ModelEntry[];
+}
+export interface ModelsListing {
+    loggedIn: boolean;
+    clients: Partial<Record<ModelsClient, ClientModels>>;
+}
+/** Pi 的 --model 写法:provider/model(和 `u1s1 pi --list-models` 两列拼起来一致)。 */
+export declare function piModelId(provider: string, modelId: string): string;
+/**
+ * 自定义端点的模型 → 列表条目。idFor 决定该客户端认的 id:Pi 是 provider/model;
+ * Claude Code / Codex 接上本地路由后(A2)按各自的写法传进来。
+ */
+export declare function customModelEntries(endpoints: readonly CustomEndpoint[], idFor: (endpoint: CustomEndpoint, model: ModelDef) => string): ModelEntry[];
+export declare function piClientModels(official: readonly ModelDef[], endpoints: readonly CustomEndpoint[], preferred: ModelRef): ClientModels;
+/**
+ * Claude Code / Codex:网关阵容(agent-config 缓存)+ 自定义端点的模型(只收本地路由转得了的
+ * openai-completions 端点,id = ep…/<模型>,见 custom-models.ts)。default 是启动时真正会用的模型:
+ * 用户在 u1s1 config 里选的(网关模型或自定义模型)还在就是它,否则网关默认——与 launch.ts 同一判断。
+ */
+export declare function gatewayClientModels(config: AgentConfig, preferredModel: string | undefined, endpoints?: readonly CustomEndpoint[]): ClientModels;
+/**
+ * 上次启动 Pi 时写进 <agentDir>/models.json 的 u1s1 provider。那里的 baseUrl 通常是本机签名代理,
+ * 认不出站点;只排除明确指向别的站点的条目(换站后第一次启动 Pi 之前,离线时可能列出上一站的名字)。
+ * 那里的 name 拼了「 · 提示」(见 toProviderModels),这里去掉,只留显示名。
+ */
+export declare function officialModelsFromProviderFile(path: string, baseUrl: string): ModelDef[] | undefined;
+/** endpoints.json 只取列表要用的字段,形状不对的条目跳过。 */
+export declare function endpointsFromCache(raw: unknown): CustomEndpoint[];
+export declare function cachedAgentConfig(cacheFile: string, site: string, agent: GatewayAgentName): AgentConfig | undefined;
+export interface LiveCatalog {
+    models?: ApiModel[];
+    endpoints?: ApiEndpoint[];
+}
+export declare const LIVE_REFRESH_TIMEOUT_MS = 2500;
+/**
+ * 并行拉 /v1/models 与 /v1/endpoints,整体不超过 timeoutMs;到点一起中止,
+ * 任何失败(断网、401、5xx、格式不对)都只是让对应字段缺席,调用方退回缓存。
+ */
+export declare function fetchLiveCatalog(get: (path: "/models" | "/endpoints", signal: AbortSignal) => Promise<Response>, timeoutMs?: number): Promise<LiveCatalog>;
+export interface ModelsCommandDeps {
+    offline?: boolean;
+    /** 测试注入;默认经 authorizedFetch 请求当前站点 */
+    fetchLive?: () => Promise<LiveCatalog>;
+}
+export declare function buildModelsListing(deps?: ModelsCommandDeps): Promise<ModelsListing>;
+/** 人看的表。 */
+export declare function formatModelsTable(listing: ModelsListing): string[];
+export declare function modelsCommand(args: readonly string[], deps?: ModelsCommandDeps): Promise<number>;