u1s1-cli-cn 1.18.0 → 1.20.0

package/dist/agents/runtime.d.ts

@@ -32,7 +32,7 @@ export declare const allowedByBrake: (v: string, brake: RuntimeBrake) => boolean
  * latest 超过 max_tested 时自然退到 max_tested(它是测过的版本,必然已发布)。
  */
 export declare function bestInstallTarget(candidates: Array<string | undefined>, brake: RuntimeBrake): string | undefined;
-export type ManagedAgent = "claude" | "codex";
+export type ManagedAgent = "claude" | "codex" | "dsh";
 export declare const MANAGED_AGENTS: readonly ManagedAgent[];
 export declare function isManagedAgent(value: unknown): value is ManagedAgent;
 /** 平台二进制所在的 npm 包:装进 node_modules 的目录名,以及它在 npm 源上的名字和版本。 */
@@ -60,6 +60,16 @@ export interface AgentRuntimeSpec {
     platformPackage: (version: string, platform: NodeJS.Platform, arch: string, musl: boolean) => PlatformPackageRef | undefined;
     /** 可执行文件在 node_modules 下的相对路径(posix 写法);不支持的系统/架构返回 undefined */
     binInNodeModules: (platform: NodeJS.Platform, arch: string, musl: boolean) => string | undefined;
+    /**
+     * 入口是 JS 文件、要用不低于这个版本的 Node 运行(dsh:engines.node >=24.9.0)。探测版本、npm 的
+     * postinstall 和启动都用调用方给的那个 node(EnsureRuntimeOptions.node);没给就当跑不起来。
+     */
+    minNode?: string;
+    /** 没有单独的平台包、npm 元数据量不出整棵依赖树时,首次下载前提示的大致大小(字节) */
+    sizeHint?: {
+        downloadBytes: number;
+        unpackedBytes: number;
+    };
 }
 /**
  * 官方包的 bin 就是 `bin/claude.exe`(各平台同名):postinstall 把对应平台的原生二进制
@@ -74,6 +84,15 @@ export declare const CLAUDE_RUNTIME: AgentRuntimeSpec;
  * 让它提示用 npm 升级;更新由启动器管,不需要)。原生二进制按自己所在目录找 rg 等附带文件。
  */
 export declare const CODEX_RUNTIME: AgentRuntimeSpec;
+/** dsh 实测过的版本;网关刹车没给 max_tested_version(老网关、老缓存)时也不越过它(dsh.ts)。 */
+export declare const DSH_TESTED_VERSION = "0.2.2-rc.1";
+/**
+ * DeepSeek Harness:`@deepseek-ai/dsh`(MIT)是纯 JS 包,bin 是 `lib/bin.js`,依赖树里的原生模块
+ * (node-pty 等)带各平台预编译文件,由 npm 的 postinstall 处理。没有单独的平台包,校验时
+ * 主包同时充当「平台包」。engines.node >=24.9.0:便携包自带的 Node 22 跑不了,由 node-runtime.ts
+ * 找/下载 Node 24。0.2.2-rc.1 实测:下载约 290 MB,装好约 920 MB。
+ */
+export declare const DSH_RUNTIME: AgentRuntimeSpec;
 export declare function runtimeSpec(agent: ManagedAgent): AgentRuntimeSpec;
 export interface RuntimePaths {
     /** ~/.u1s1/agents/<agent> */
@@ -121,7 +140,7 @@ export declare function findOnPath(command: string, opts: {
  * 跑 `<bin> --version` 取版本。环境里去掉密钥、关掉自动更新;配置目录(CLAUDE_CONFIG_DIR /
  * CODEX_HOME)指到启动器自己的目录,免得探测用户自己装的客户端时碰到用户的 ~/.claude、~/.codex。
  */
-export declare function probeVersion(bin: string, configDir?: string, spec?: AgentRuntimeSpec): string | undefined;
+export declare function probeVersion(bin: string, configDir?: string, spec?: AgentRuntimeSpec, node?: string): string | undefined;
 /** 版本高于 max_tested、这次没用上的那份客户端(给用户解释为什么换版本 / 另装一份)。 */
 export interface SkippedRuntime extends FoundRuntime {
     maxTestedVersion: string;
@@ -274,6 +293,8 @@ export interface InstallOptions {
     retryDelayMs?: number;
     /** 校验时跑 --version 用的隔离配置目录(CLAUDE_CONFIG_DIR / CODEX_HOME) */
     probeConfigDir?: string;
+    /** spec.minNode 时运行入口、npm 及其 postinstall 用的 Node */
+    node?: string;
 }
 /**
  * 装一个确切版本:npm install 到暂存目录 → 校验(锁文件里的 integrity 与 registry 元数据一致、
@@ -329,6 +350,8 @@ export interface EnsureRuntimeOptions {
     install?: (opts: InstallOptions) => Promise<FoundRuntime>;
     /** 见 PlanInput.autoUpdate;缺省开 */
     autoUpdate?: boolean;
+    /** spec.minNode 的客户端(dsh)用来探测、安装的 Node(node-runtime.ts 找好的) */
+    node?: string;
 }
 export interface EnsuredRuntime extends FoundRuntime {
     /** pin 的版本被刹车挡住、已忽略 */
@@ -347,7 +370,7 @@ export declare class RuntimePlanError extends Error {
     }>);
 }
 /**
- * 找到(必要时下载或更新)可用的客户端运行时。CLI(`u1s1 claude` / `u1s1 codex`)与桌面端共用。
+ * 找到(必要时下载或更新)可用的客户端运行时。CLI(`u1s1 claude` / `u1s1 codex` / `u1s1 dsh`)与桌面端共用。
  * 失败抛 RuntimePlanError(刹车/版本问题)或 RuntimeInstallError(下载问题)。
  */
 export declare function ensureAgentRuntime(agent: ManagedAgent, opts: EnsureRuntimeOptions): Promise<EnsuredRuntime>;

package/dist/agents/runtime.js

@@ -5,7 +5,8 @@
  * 用户确认后才下载;不打进我们的包、不改二进制、不动它自带的登录方式。
  * 安装交给 npm(`npm install --prefix`),上游调整包结构(平台二进制、postinstall)由 npm 处理。
  *
- * 目录布局(以 claude 为例;codex 同理,可执行文件在平台包里,见 CODEX_RUNTIME):
+ * 目录布局(以 claude 为例;codex 同理,可执行文件在平台包里,见 CODEX_RUNTIME;dsh 的入口是 JS 文件,
+ * 由 Node ≥24.9 运行,见 DSH_RUNTIME 与 node-runtime.ts):
  *   ~/.u1s1/agents/claude/runtime/<版本>/node_modules/@anthropic-ai/claude-code/bin/claude.exe
  *   ~/.u1s1/agents/claude/state.json     当前版本、pin、每日检查时间、待更新版本
  *   ~/.u1s1/agents/claude/config/        CLAUDE_CONFIG_DIR(见 claude.ts;codex 是 home/,见 codex.ts)
@@ -128,9 +129,9 @@ export function bestInstallTarget(candidates, brake) {
     }
     return best;
 }
-export const MANAGED_AGENTS = ["claude", "codex"];
+export const MANAGED_AGENTS = ["claude", "codex", "dsh"];
 export function isManagedAgent(value) {
-    return value === "claude" || value === "codex";
+    return value === "claude" || value === "codex" || value === "dsh";
 }
 function npmOs(platform) {
     return platform === "win32" ? "win32" : platform === "darwin" ? "darwin" : platform === "linux" ? "linux" : undefined;
@@ -192,11 +193,37 @@ export const CODEX_RUNTIME = {
         return `@openai/codex-${os}-${arch}/vendor/${triple}/bin/${os === "win32" ? "codex.exe" : "codex"}`;
     },
 };
+/** dsh 实测过的版本;网关刹车没给 max_tested_version(老网关、老缓存)时也不越过它(dsh.ts)。 */
+export const DSH_TESTED_VERSION = "0.2.2-rc.1";
+/**
+ * DeepSeek Harness:`@deepseek-ai/dsh`(MIT)是纯 JS 包,bin 是 `lib/bin.js`,依赖树里的原生模块
+ * (node-pty 等)带各平台预编译文件,由 npm 的 postinstall 处理。没有单独的平台包,校验时
+ * 主包同时充当「平台包」。engines.node >=24.9.0:便携包自带的 Node 22 跑不了,由 node-runtime.ts
+ * 找/下载 Node 24。0.2.2-rc.1 实测:下载约 290 MB,装好约 920 MB。
+ */
+export const DSH_RUNTIME = {
+    agent: "dsh",
+    npmPackage: "@deepseek-ai/dsh",
+    command: "dsh",
+    binEnv: "U1S1_DSH_BIN",
+    configDirEnv: "DSH_HOME",
+    probeEnv: { DSH_TELEMETRY_DISABLED: "1" },
+    platformPackage: (version, platform, arch) => {
+        if (!npmOs(platform) || (arch !== "x64" && arch !== "arm64"))
+            return undefined;
+        return { dir: "@deepseek-ai/dsh", name: "@deepseek-ai/dsh", version };
+    },
+    binInNodeModules: (platform, arch) => npmOs(platform) && (arch === "x64" || arch === "arm64") ? "@deepseek-ai/dsh/lib/bin.js" : undefined,
+    minNode: "24.9.0",
+    sizeHint: { downloadBytes: 290 * 1024 * 1024, unpackedBytes: 920 * 1024 * 1024 },
+};
 export function runtimeSpec(agent) {
     if (agent === "claude")
         return CLAUDE_RUNTIME;
     if (agent === "codex")
         return CODEX_RUNTIME;
+    if (agent === "dsh")
+        return DSH_RUNTIME;
     throw new Error(`unknown agent runtime: ${String(agent)}`);
 }
 export function runtimePaths(agentsRoot, agent) {
@@ -296,7 +323,7 @@ function isFile(p) {
  * 跑 `<bin> --version` 取版本。环境里去掉密钥、关掉自动更新;配置目录(CLAUDE_CONFIG_DIR /
  * CODEX_HOME)指到启动器自己的目录,免得探测用户自己装的客户端时碰到用户的 ~/.claude、~/.codex。
  */
-export function probeVersion(bin, configDir, spec = CLAUDE_RUNTIME) {
+export function probeVersion(bin, configDir, spec = CLAUDE_RUNTIME, node) {
     const env = stripSecretEnv(process.env);
     for (const [key, value] of Object.entries(spec.probeEnv))
         env[key] = value;
@@ -304,8 +331,12 @@ export function probeVersion(bin, configDir, spec = CLAUDE_RUNTIME) {
         env[spec.configDirEnv] = configDir;
     else
         delete env[spec.configDirEnv];
+    // JS 入口(dsh):用调用方给的 Node 跑;没给就不试(系统 node 可能太旧,报出来的错不是版本号)
+    if (spec.minNode && !node)
+        return undefined;
+    const [command, args] = spec.minNode ? [node, [bin, "--version"]] : [bin, ["--version"]];
     try {
-        const r = spawnSync(bin, ["--version"], { env, encoding: "utf8", timeout: 20_000, windowsHide: true });
+        const r = spawnSync(command, args, { env, encoding: "utf8", timeout: 20_000, windowsHide: true });
         if (r.status !== 0)
             return undefined;
         return versionFromOutput(`${r.stdout ?? ""}`);
@@ -548,7 +579,7 @@ export async function installRuntime(opts) {
         fetchPackageMeta(registry, spec.npmPackage, version),
         fetchPackageMeta(registry, plat.name, plat.version),
     ]);
-    const downloadBytes = await downloadSize(platMeta?.tarball);
+    const downloadBytes = spec.sizeHint?.downloadBytes ?? await downloadSize(platMeta?.tarball);
     if (opts.needsConsent) {
         const ok = hooks.consent
             ? await hooks.consent({
@@ -557,17 +588,20 @@ export async function installRuntime(opts) {
                 version,
                 registry,
                 downloadBytes,
-                unpackedBytes: platMeta?.unpackedSize !== undefined
+                unpackedBytes: spec.sizeHint?.unpackedBytes ?? (platMeta?.unpackedSize !== undefined
                     ? platMeta.unpackedSize + (mainMeta?.unpackedSize ?? 0)
-                    : undefined,
+                    : undefined),
             })
             : false;
         if (!ok)
             throw new RuntimeInstallError("declined", hooks.text.declined());
     }
-    const npm = opts.npm ?? findNpm({ execPath: process.execPath, platform: process.platform, env: process.env });
-    if (!npm)
+    const found = opts.npm ?? findNpm({ execPath: process.execPath, platform: process.platform, env: process.env });
+    if (!found)
         throw new RuntimeInstallError("no_npm", hooks.text.noNpm());
+    // JS 入口的客户端:npm 本身和 postinstall 都用那个够新的 Node 跑(npm 按运行它的 Node 核对 engines)
+    const scriptNode = spec.minNode ? opts.node : undefined;
+    const npm = scriptNode && found.command === process.execPath ? { ...found, command: scriptNode } : found;
     mkdirSync(paths.runtimeDir, { recursive: true, mode: 0o700 });
     const maxAttempts = opts.maxAttempts ?? 3;
     const retryDelayMs = opts.retryDelayMs ?? 3_000;
@@ -584,6 +618,7 @@ export async function installRuntime(opts) {
                 registry,
                 progress: hooks.progress,
                 totalBytes: downloadBytes,
+                node: scriptNode,
             });
             lastOutput = result.output;
             if (result.code !== 0) {
@@ -604,7 +639,7 @@ export async function installRuntime(opts) {
                 platVersion: plat.version,
                 mainMeta,
                 platMeta,
-                probe: (bin) => probeVersion(bin, opts.probeConfigDir, spec),
+                probe: (bin) => probeVersion(bin, opts.probeConfigDir, spec, opts.node),
             });
             if (problem) {
                 rmSync(staging, { recursive: true, force: true });
@@ -724,7 +759,7 @@ export function npmEnv(base, execPath, platform = process.platform) {
 function runNpmInstall(npm, o) {
     return new Promise((resolve) => {
         const child = spawn(npm.command, [...npm.prefixArgs, ...npmInstallArgs(o)], {
-            env: npmEnv(process.env, process.execPath),
+            env: npmEnv(process.env, o.node ?? process.execPath),
             stdio: ["ignore", "pipe", "pipe"],
             windowsHide: true,
         });
@@ -813,7 +848,7 @@ export class RuntimePlanError extends Error {
     }
 }
 /**
- * 找到(必要时下载或更新)可用的客户端运行时。CLI(`u1s1 claude` / `u1s1 codex`)与桌面端共用。
+ * 找到(必要时下载或更新)可用的客户端运行时。CLI(`u1s1 claude` / `u1s1 codex` / `u1s1 dsh`)与桌面端共用。
  * 失败抛 RuntimePlanError(刹车/版本问题)或 RuntimeInstallError(下载问题)。
  */
 export async function ensureAgentRuntime(agent, opts) {
@@ -821,7 +856,7 @@ export async function ensureAgentRuntime(agent, opts) {
     const paths = runtimePaths(opts.agentsRoot, agent);
     const env = opts.env ?? process.env;
     const registry = npmRegistryFor(opts.site, env);
-    const probe = (bin) => probeVersion(bin, opts.probeConfigDir, spec);
+    const probe = (bin) => probeVersion(bin, opts.probeConfigDir, spec, opts.node);
     const state = readRuntimeState(paths);
     let latestMemo;
     const plan = await planRuntime({
@@ -867,6 +902,7 @@ export async function ensureAgentRuntime(agent, opts) {
             needsConsent: plan.needsConsent,
             hooks: opts.hooks,
             probeConfigDir: opts.probeConfigDir,
+            node: opts.node,
         });
         return { ...installed, ...extra };
     }

package/dist/agents/status.d.ts

@@ -10,6 +10,10 @@ export interface InstallCommandDeps {
     fetchPublicRuntime?: (url: URL) => Promise<Response>;
     ensure?: typeof ensureAgentRuntime;
     checkLatest?: typeof dailyUpdateCheck;
+    /** dsh 的 Node;测试注入 */
+    ensureNode?: () => Promise<{
+        bin: string;
+    } | undefined>;
 }
 /**
  * `u1s1 agents install claude|codex`:找到或下载原版,不启动。与 `u1s1 claude` / `u1s1 codex` 走同一套

package/dist/agents/status.js

@@ -12,10 +12,14 @@ import { siteOf } from "../site.js";
 import { loadPublicAgentRuntime, parseAgentConfig, readConfigCache } from "./agent-config.js";
 import { claudePaths } from "./claude.js";
 import { codexPaths } from "./codex.js";
-import { AGENT_PROFILES, agentsRoot, cliInstallHooks, notOpenText, printRuntimeFailure, printRuntimeNotes, } from "./launch.js";
+import { dshPaths } from "./dsh.js";
+import { AGENT_PROFILES, agentsRoot, cliInstallHooks, effectiveBrake, ensureDshNode, notOpenText, printRuntimeFailure, printRuntimeNotes, } from "./launch.js";
+import { findNode } from "./node-runtime.js";
 import { readAgentPrefs } from "./prefs.js";
-import { bestInstallTarget, checkBrake, compareVersions, dailyUpdateCheck, ensureAgentRuntime, fetchLatestVersion, findOnPath, installedVersions, MANAGED_AGENTS, NO_BRAKE, normalizeVersion, npmRegistryFor, probeVersion, readRuntimeState, runtimeSpec, updateRuntimeState, } from "./runtime.js";
+import { bestInstallTarget, checkBrake, compareVersions, DSH_TESTED_VERSION, dailyUpdateCheck, ensureAgentRuntime, fetchLatestVersion, findOnPath, installedVersions, MANAGED_AGENTS, NO_BRAKE, normalizeVersion, npmRegistryFor, probeVersion, readRuntimeState, runtimeSpec, updateRuntimeState, } from "./runtime.js";
 export function launchPaths(agent) {
+    if (agent === "dsh")
+        return dshPaths();
     return agent === "codex" ? codexPaths() : claudePaths();
 }
 function cachedConfig(agent) {
@@ -24,7 +28,18 @@ function cachedConfig(agent) {
     return cached ? parseAgentConfig(cached.body, AGENT_PROFILES[agent].gatewayAgent) : undefined;
 }
 function cachedBrake(agent) {
-    return cachedConfig(agent)?.runtime ?? NO_BRAKE;
+    return effectiveBrake(agent, cachedConfig(agent)?.runtime ?? NO_BRAKE);
+}
+/** 探测 dsh 这类 JS 入口的客户端时用的 Node:只找、不下载;找不到就不探测。 */
+function probeNode(agent) {
+    if (!runtimeSpec(agent).minNode)
+        return undefined;
+    try {
+        return findNode(agentsRoot())?.bin;
+    }
+    catch {
+        return undefined;
+    }
 }
 function verdictText(v, brake) {
     if (v === "blocked")
@@ -49,7 +64,8 @@ async function managedAgentLines(agent) {
     const site = siteOf(cfg);
     const spec = runtimeSpec(agent);
     const cached = cachedConfig(agent);
-    const brake = cached?.runtime ?? NO_BRAKE;
+    const brake = effectiveBrake(agent, cached?.runtime ?? NO_BRAKE);
+    const node = probeNode(agent);
     const paths = launchPaths(agent);
     const state = readRuntimeState(paths);
     const installed = installedVersions(paths, spec);
@@ -59,7 +75,7 @@ async function managedAgentLines(agent) {
     // 探测用户自己的命令时把配置目录指到启动器自己的目录(CODEX_HOME 指向不存在的目录时 Codex 会报错)
     if (envBin || pathBin)
         mkdirSync(paths.configDir, { recursive: true, mode: 0o700 });
-    const pathVersion = pathBin ? probeVersion(pathBin, paths.configDir, spec) : undefined;
+    const pathVersion = pathBin ? probeVersion(pathBin, paths.configDir, spec, node) : undefined;
     const latest = await fetchLatestVersion(npmRegistryFor(site.id), spec.npmPackage);
     const autoUpdate = readAgentPrefs(agent).autoUpdate;
     const lines = [];
@@ -67,7 +83,7 @@ async function managedAgentLines(agent) {
         lines.push(tr(`暂不可用:${cached.disabledReason ?? notOpenText()}`, `Not available: ${cached.disabledReason ?? notOpenText()}`));
     }
     if (envBin) {
-        const v = probeVersion(envBin, paths.configDir, spec);
+        const v = probeVersion(envBin, paths.configDir, spec, node);
         lines.push(tr(`使用 ${spec.binEnv} 指定的 ${envBin}(${v ?? "无法运行"})`, `Using ${envBin} from ${spec.binEnv} (${v ?? "doesn't run"})`));
         if (v && checkBrake(v, brake) === "above_max_tested") {
             lines.push(tr(`它${verdictText("above_max_tested", brake)},运行时改用 u1s1 管理的版本`, `It's ${verdictText("above_max_tested", brake)}; u1s1 ${agent} uses a u1s1-managed copy instead`));
@@ -116,7 +132,7 @@ async function managedAgentLines(agent) {
     }
     return lines;
 }
-const PIN_EXAMPLE = { claude: "2.1.322", codex: "0.167.2" };
+const PIN_EXAMPLE = { claude: "2.1.322", codex: "0.167.2", dsh: DSH_TESTED_VERSION };
 export async function pinCommand(raw, agent = "claude") {
     const version = normalizeVersion(raw);
     if (!version) {
@@ -196,6 +212,7 @@ export async function installCommand(deps = {}, agent = "claude") {
             return got;
         brake = got;
     }
+    brake = effectiveBrake(agent, brake);
     const paths = launchPaths(agent);
     const spec = runtimeSpec(agent);
     mkdirSync(paths.configDir, { recursive: true, mode: 0o700 });
@@ -210,6 +227,13 @@ export async function installCommand(deps = {}, agent = "claude") {
             force: true,
         }).catch(() => undefined);
     }
+    // dsh:先准备够新的 Node(没有就征得同意后下载)
+    let node;
+    if (spec.minNode) {
+        node = (deps.ensureNode ? await deps.ensureNode() : await ensureDshNode(site.id))?.bin;
+        if (!node)
+            return 1;
+    }
     let runtime;
     try {
         runtime = await (deps.ensure ?? ensureAgentRuntime)(agent, {
@@ -218,6 +242,7 @@ export async function installCommand(deps = {}, agent = "claude") {
             agentsRoot: agentsRoot(),
             hooks: cliInstallHooks(agent),
             probeConfigDir: paths.configDir,
+            node,
         });
     }
     catch (e) {

package/dist/api.d.ts

@@ -91,6 +91,8 @@ export interface ApiEndpoint {
         vision?: boolean;
         context_window?: number;
         max_tokens?: number;
+        /** 推理参数格式(openai | deepseek);老服务端不下发,按 openai。见 config.ts CUSTOM_THINKING_FORMATS。 */
+        thinking_format?: string;
     }[];
 }
 /**

package/dist/chat-protocol/anthropic.d.ts

@@ -0,0 +1,29 @@
+import { type JsonRecord } from "./json.ts";
+import { type ReasoningFields } from "./thinking.ts";
+export declare const MESSAGES_PATH = "/v1/messages";
+/** Chat usage (any OpenAI-compatible shape) → Anthropic usage. */
+export type AnthropicUsage = (usage: unknown) => JsonRecord;
+/**
+ * Plain Chat Completions usage → Anthropic usage: cache reads
+ * (`prompt_tokens_details.cached_tokens`, or DeepSeek's
+ * `prompt_cache_hit_tokens`) are reported beside `input_tokens`, not in it.
+ */
+export declare function chatUsageToAnthropic(value: unknown): JsonRecord;
+/** Anthropic error body: `{type: "error", error: {type, message}}`. */
+export declare function anthropicErrorBody(status: number, message: string): JsonRecord;
+/**
+ * Anthropic Messages request → Chat Completions body. `thinking` and
+ * `output_config.effort` become whatever `reasoningFields` returns for the
+ * requested level (thinking.ts); `metadata` is dropped on purpose.
+ */
+export declare function anthropicRequestToChat(body: JsonRecord, reasoningFields: ReasoningFields): JsonRecord;
+export declare function chatCompletionToAnthropic(value: unknown, requestedModel: string, usage?: AnthropicUsage): JsonRecord;
+/** OpenAI chat.completion.chunk SSE → Anthropic Messages SSE event sequence. */
+export declare function chatSseToAnthropic(requestedModel: string, usage?: AnthropicUsage): TransformStream<Uint8Array, Uint8Array>;
+export declare function anthropicErrorType(status: number): string;
+/**
+ * Anthropic SDKs retry 408/409/429/5xx unless the server sends
+ * `x-should-retry: false`. Quota and policy refusals are final: without the
+ * header the client would hammer the gateway with retries.
+ */
+export declare function anthropicShouldRetry(status: number, code: unknown): boolean;