u1s1-cli-cn 1.19.0 → 1.20.1

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/config-command.d.ts

@@ -1,4 +1,4 @@
-declare const CLIENTS: readonly ["claude", "codex"];
+declare const CLIENTS: readonly ["claude", "codex", "dsh"];
 type Client = (typeof CLIENTS)[number];
 export type ConfigKey = "default-client" | "pi.model" | `${Client}.model` | `${Client}.auto-update` | `${Client}.pin`;
 export declare const CONFIG_KEYS: readonly ConfigKey[];

package/dist/config-command.js

@@ -9,14 +9,16 @@
  *   u1s1 config unset <键>            恢复默认
  *
  * 键:
- *   default-client        pi | claude | codex             同 u1s1 use
+ *   default-client        pi | claude | codex | dsh       同 u1s1 use
  *   pi.model              模型 id 或别名                  同 u1s1 model <模型>
  *   claude.model          模型 id                          u1s1 claude 的默认模型(--settings 的 model)
  *   codex.model           模型 id                          u1s1 codex 的默认模型(config.toml 的 model)
+ *   dsh.model             模型 id                          u1s1 dsh 的默认模型(--patch 里 agent-default-model)
  *   claude.auto-update    on | off                         每天查新、下次启动前更新;缺省 on
  *   codex.auto-update     on | off
  *   claude.pin            版本号                           同 u1s1 agents pin / unpin
  *   codex.pin             版本号
+ *   dsh.auto-update / dsh.pin                             同上
  *
  * 客户端的模型只按网关上次下发的阵容(启动配置缓存)核对:还没启动过、没有缓存时照收,启动时再核对,
  * 不在阵容里就退回默认模型并提示一次(prefs.ts)。
@@ -25,23 +27,26 @@ import { existsSync } from "node:fs";
 import { createInterface } from "node:readline/promises";
 import { agentSettingsFile, isDefaultAgent, loadConfig, readRawConfigFile, saveDefaultAgent, } from "./config.js";
 import { tr } from "./i18n.js";
-const CLIENTS = ["claude", "codex"];
+const CLIENTS = ["claude", "codex", "dsh"];
 export const CONFIG_KEYS = [
     "default-client",
     "pi.model",
     "claude.model",
     "codex.model",
+    "dsh.model",
     "claude.auto-update",
     "codex.auto-update",
+    "dsh.auto-update",
     "claude.pin",
     "codex.pin",
+    "dsh.pin",
 ];
 export function isConfigKey(value) {
     return typeof value === "string" && CONFIG_KEYS.includes(value);
 }
 function clientOf(key) {
     const prefix = key.split(".")[0];
-    return prefix === "claude" || prefix === "codex" ? prefix : undefined;
+    return CLIENTS.includes(prefix ?? "") ? prefix : undefined;
 }
 function describe(key) {
     const client = clientOf(key);
@@ -100,7 +105,8 @@ async function cachedLineup(client) {
     // 自定义端点的模型(ep…/<模型>)也能选:按上次拉到的端点缓存核对,不联网
     const { agentCustomModels } = await import("./agents/custom-models.js");
     const { loadEndpointsCache } = await import("./config.js");
-    const custom = agentCustomModels(loadEndpointsCache()).map((c) => c.id);
+    // dsh 走 /v1/chat/completions,本地路由只转 /v1/messages、/v1/responses:不列自定义模型
+    const custom = client === "dsh" ? [] : agentCustomModels(loadEndpointsCache()).map((c) => c.id);
     return { ids: [...config.models.map((m) => m.id), ...custom], defaultModel: config.defaultModel };
 }
 function parseSwitch(value) {
@@ -121,7 +127,7 @@ export async function writeConfigValue(key, value) {
             return 0;
         }
         if (!isDefaultAgent(value)) {
-            console.error(tr("default-client 只能是 pi、claude 或 codex。", "default-client must be pi, claude or codex."));
+            console.error(tr("default-client 只能是 pi、claude、codex 或 dsh。", "default-client must be pi, claude, codex or dsh."));
             return 1;
         }
         saveDefaultAgent(value);
@@ -196,11 +202,11 @@ export function configHelpLines() {
         ["u1s1 config unset <键>", tr("恢复默认", "Restore the default")],
     ];
     const keyRows = [
-        ["default-client", "pi | claude | codex"],
+        ["default-client", "pi | claude | codex | dsh"],
         ["pi.model", tr("模型 id 或别名", "model id or alias")],
-        ["claude.model, codex.model", tr("模型 id;default = 跟随网关默认", "model id; default = gateway default")],
-        ["claude.auto-update, codex.auto-update", "on | off"],
-        ["claude.pin, codex.pin", tr("版本号", "version")],
+        ["claude.model, codex.model, dsh.model", tr("模型 id;default = 跟随网关默认", "model id; default = gateway default")],
+        ["<client>.auto-update", "on | off  (claude / codex / dsh)"],
+        ["<client>.pin", tr("版本号(claude / codex / dsh)", "version (claude / codex / dsh)")],
     ];
     const usage = rows.map(([a, b]) => `  ${tr(a, a.replace("<键>", "<key>").replace("<值>", "<value>")).padEnd(30)}${b}`);
     return [
@@ -269,7 +275,7 @@ function padDisplay(text, width) {
 async function choicesFor(key) {
     const client = clientOf(key);
     if (key === "default-client") {
-        return ["pi", "claude", "codex"].map((a) => ({ label: a, value: a }));
+        return ["pi", "claude", "codex", "dsh"].map((a) => ({ label: a, value: a }));
     }
     if (key.endsWith(".auto-update")) {
         return [

package/dist/config.d.ts

@@ -211,7 +211,7 @@ export interface CliConfig {
     /** 默认客户端(`u1s1 use`/首次选择器写入);缺省 = 存量用户,按 Pi 处理(见 launcher.ts)。 */
     defaultAgent?: DefaultAgent;
 }
-export type DefaultAgent = "pi" | "claude" | "codex";
+export type DefaultAgent = "pi" | "claude" | "codex" | "dsh";
 export declare function isDefaultAgent(value: unknown): value is DefaultAgent;
 export declare const u1s1Dir: string;
 export declare const configFile: string;

package/dist/config.js

@@ -322,7 +322,7 @@ export function findModel(query) {
     return undefined;
 }
 export function isDefaultAgent(value) {
-    return value === "pi" || value === "claude" || value === "codex";
+    return value === "pi" || value === "claude" || value === "codex" || value === "dsh";
 }
 export const u1s1Dir = join(homedir(), ".u1s1");
 export const configFile = join(u1s1Dir, "config.json");

package/dist/device-auth.d.ts

@@ -77,7 +77,7 @@ export interface CustomRoutes {
  * their own: the Gateway still requires the DPoP proof and a valid attestation.
  */
 export interface LaunchedAgent {
-    name: "pi" | "claude-code" | "codex";
+    name: "pi" | "claude-code" | "codex" | "dsh";
     /** The client's own version (e.g. Claude Code `2.1.322`), not the CLI's. */
     version?: string;
 }

package/dist/index.js

@@ -11,7 +11,7 @@ import { printConsoleBanner } from "./brand.js";
 import { activeSite, loadConfig, pinLegacySiteBaseUrl, readSettings, VERSION } from "./config.js";
 import { siteLinks, siteOf } from "./site.js";
 import { isEnglish, tr } from "./i18n.js";
-import { isLauncherWord, launcherHelpRow, runLauncher } from "./launcher.js";
+import { dshHelpRow, isLauncherWord, launcherHelpRow, runLauncher } from "./launcher.js";
 /**
  * Configure the same undici dispatcher used by the embedded kernel before any
  * CLI startup request runs. The kernel keeps this helper in an internal file,
@@ -41,6 +41,7 @@ function printHelp() {
     const rows = [
         [tr("u1s1 -p \"一句话\"", "u1s1 -p \"prompt\""), tr("不进界面直接回答(脚本里用)", "Answer once without the UI (for scripts)")],
         launcherHelpRow(),
+        dshHelpRow(),
         ["u1s1 login / logout", tr("登录 / 退出", "Sign in / sign out")],
         ["u1s1 usage", tr("查看剩余额度", "Show your remaining balance")],
         ["u1s1 model", tr("查看或切换默认模型", "Show or change the default model")],
@@ -236,7 +237,7 @@ async function run() {
         await COMMANDS[cmd](rest);
         return;
     }
-    // pi / claude / codex / use / agents / config:启动器的保留字,先于拼错检测
+    // pi / claude / codex / dsh / use / agents / config:启动器的保留字,先于拼错检测
     if (cmd && isLauncherWord(cmd)) {
         await runLauncher(args);
         return;

package/dist/launcher.d.ts

@@ -1,7 +1,7 @@
 import { type DefaultAgent } from "./config.js";
 export type AgentChoice = DefaultAgent;
 /** 启动器的保留字:不会再当 prompt 交给默认客户端。 */
-export declare const LAUNCHER_WORDS: readonly ["pi", "claude", "codex", "use", "agents", "config"];
+export declare const LAUNCHER_WORDS: readonly ["pi", "claude", "codex", "dsh", "use", "agents", "config"];
 export declare function isLauncherWord(word: string): boolean;
 export type Dispatch = {
     kind: "agent";
@@ -44,3 +44,7 @@ export declare function runLauncher(args: string[]): Promise<void>;
 export declare function parseSelection(answer: string): AgentChoice | undefined;
 /** `u1s1 --help` 里启动器那一行;use / agents / config 只在「其他命令」里报名字,各自 --help 看用法。 */
 export declare function launcherHelpRow(): [string, string];
+/**
+ * `u1s1 --help` 里 dsh 单独一行(它没有终端界面,默认进网页界面)。Hearth 按这一行判断 CLI 支不支持 `u1s1 dsh`。
+ */
+export declare function dshHelpRow(): [string, string];

package/dist/launcher.js

@@ -1,7 +1,7 @@
 /**
  * 启动器:选择器与分发。一个命令 `u1s1`,可以启动内置的 Pi,也可以启动用户机器上的官方原版客户端。
  *
- *   u1s1 pi|claude|codex [参数…] 指定客户端,后面的参数原样传给它
+ *   u1s1 pi|claude|codex|dsh [参数…] 指定客户端,后面的参数原样传给它(dsh 不带子命令时进网页界面)
  *   u1s1 [参数…]                 默认客户端;存量用户(已有配置、没有默认客户端字段)默认 Pi,
  *                                全新用户首次运行出选择器并记住
  *   u1s1 use <客户端>            改默认
@@ -9,7 +9,7 @@
  *   u1s1 agents models [--json]  各客户端可用的模型(带显示名),给 Hearth 等前端用;不登录、秒回
  *   u1s1 config [list|get|set|unset …]  用户可调的设置(默认客户端、各客户端默认模型、自动更新),见 config-command.ts
  *
- * claude / codex 是否可用完全由网关配置(/v1/agents/:agent/config 的 enabled)决定,这里不写死。
+ * claude / codex / dsh 是否可用完全由网关配置(/v1/agents/:agent/config 的 enabled)决定,这里不写死。
  *
  * 现有子命令(login、usage、model、update、deploy 等)在 index.ts 里先于这里处理,行为不变。
  */
@@ -18,7 +18,7 @@ import { createInterface } from "node:readline/promises";
 import { agentSettingsFile, isDefaultAgent, loadConfig, readRawConfigFile, saveDefaultAgent, } from "./config.js";
 import { tr } from "./i18n.js";
 /** 启动器的保留字:不会再当 prompt 交给默认客户端。 */
-export const LAUNCHER_WORDS = ["pi", "claude", "codex", "use", "agents", "config"];
+export const LAUNCHER_WORDS = ["pi", "claude", "codex", "dsh", "use", "agents", "config"];
 export function isLauncherWord(word) {
     return LAUNCHER_WORDS.includes(word);
 }
@@ -33,6 +33,7 @@ export function resolveDispatch(args, ctx) {
         case "pi":
         case "claude":
         case "codex":
+        case "dsh":
             return { kind: "agent", agent: first, args: rest, via: "explicit" };
         case "use":
             return { kind: "use", args: rest };
@@ -104,7 +105,9 @@ async function launch(agent, args) {
     }
     const code = agent === "codex"
         ? await (await import("./agents/codex.js")).runCodex(args)
-        : await (await import("./agents/claude.js")).runClaude(args);
+        : agent === "dsh"
+            ? await (await import("./agents/dsh.js")).runDsh(args)
+            : await (await import("./agents/claude.js")).runClaude(args);
     // 签名代理是 unref 的,子进程退出后不必等;直接带着子进程的退出码退出
     process.exit(code);
 }
@@ -121,6 +124,10 @@ const OPTIONS = [
         agent: "codex",
         line: () => tr("codex   官方 Codex CLI,首次使用时下载", "codex   Official Codex CLI, downloaded on first use"),
     },
+    {
+        agent: "dsh",
+        line: () => tr("dsh     DeepSeek Harness(网页界面),首次使用时下载", "dsh     DeepSeek Harness (web UI), downloaded on first use"),
+    },
 ];
 export function parseSelection(answer) {
     const a = answer.trim().toLowerCase();
@@ -152,7 +159,7 @@ async function selectAgent() {
 function useCommand(args) {
     const target = args[0];
     if (!isDefaultAgent(target)) {
-        console.error(tr("用法: u1s1 use <pi|claude|codex>", "Usage: u1s1 use <pi|claude|codex>"));
+        console.error(tr("用法: u1s1 use <pi|claude|codex|dsh>", "Usage: u1s1 use <pi|claude|codex|dsh>"));
         process.exitCode = target === undefined || target === "--help" || target === "-h" ? 0 : 1;
         return;
     }
@@ -168,10 +175,10 @@ async function agentsCommand(args) {
         return;
     }
     if (sub === "pin" || sub === "unpin") {
-        if (agent !== "claude" && agent !== "codex") {
+        if (agent !== "claude" && agent !== "codex" && agent !== "dsh") {
             console.error(sub === "pin"
-                ? tr("用法: u1s1 agents pin <claude|codex> <版本>", "Usage: u1s1 agents pin <claude|codex> <version>")
-                : tr("用法: u1s1 agents unpin <claude|codex>", "Usage: u1s1 agents unpin <claude|codex>"));
+                ? tr("用法: u1s1 agents pin <claude|codex|dsh> <版本>", "Usage: u1s1 agents pin <claude|codex|dsh> <version>")
+                : tr("用法: u1s1 agents unpin <claude|codex|dsh>", "Usage: u1s1 agents unpin <claude|codex|dsh>"));
             process.exitCode = 1;
             return;
         }
@@ -190,8 +197,8 @@ async function agentsCommand(args) {
             console.log(tr("pi 随 u1s1 一起安装,不用单独下载。", "pi ships with u1s1; nothing to download."));
             return;
         }
-        if ((agent !== "claude" && agent !== "codex") || version !== undefined) {
-            console.error(tr("用法: u1s1 agents install <claude|codex>", "Usage: u1s1 agents install <claude|codex>"));
+        if ((agent !== "claude" && agent !== "codex" && agent !== "dsh") || version !== undefined) {
+            console.error(tr("用法: u1s1 agents install <claude|codex|dsh>", "Usage: u1s1 agents install <claude|codex|dsh>"));
             process.exitCode = 1;
             return;
         }
@@ -212,7 +219,7 @@ function agentsHelpLines() {
     return [
         tr("用法:", "Usage:"),
         tr("  u1s1 agents                       查看各客户端的安装状态、版本、是否有更新", "  u1s1 agents                       Show each client's install status, version and updates"),
-        tr("  u1s1 agents install <客户端>      下载或更新到可用版本,不启动(claude / codex)", "  u1s1 agents install <client>      Download or update to a usable version without launching (claude / codex)"),
+        tr("  u1s1 agents install <客户端>      下载或更新到可用版本,不启动(claude / codex / dsh)", "  u1s1 agents install <client>      Download or update to a usable version without launching (claude / codex / dsh)"),
         tr("  u1s1 agents pin <客户端> <版本>   锁定版本(不超出允许的范围)", "  u1s1 agents pin <client> <ver>    Pin a version (within the allowed range)"),
         tr("  u1s1 agents unpin <客户端>        解除锁定,恢复自动更新", "  u1s1 agents unpin <client>        Remove the pin and resume automatic updates"),
         tr("  u1s1 agents models [--json]       列出各客户端可用的模型(带显示名);--offline 只读本地缓存", "  u1s1 agents models [--json]       List each client's models with display names; --offline reads local caches only"),
@@ -223,3 +230,12 @@ function agentsHelpLines() {
 export function launcherHelpRow() {
     return ["u1s1 pi|claude|codex", tr("用指定客户端启动,后面的参数原样传入", "Start a specific client; extra args are passed through")];
 }
+/**
+ * `u1s1 --help` 里 dsh 单独一行(它没有终端界面,默认进网页界面)。Hearth 按这一行判断 CLI 支不支持 `u1s1 dsh`。
+ */
+export function dshHelpRow() {
+    return [
+        "u1s1 dsh [web|headless]",
+        tr("启动 DeepSeek Harness;不带子命令时打开网页界面,参数原样传入", "Start DeepSeek Harness; opens its web UI by default, extra args are passed through"),
+    ];
+}

package/package.json

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