u1s1-cli 1.17.0 → 1.19.0

package/README.md

@@ -1,72 +1,47 @@
-# u1s1 — 有一说一,最省心的 AI 编程搭子
+# u1s1 — an AI coding buddy in your terminal
 
-在终端里用中文说需求,AI 帮你读文件、改代码、跑命令。不用买模型、不用配 API、不用懂那些名词,默认 DeepSeek Flash **每天免费 $2**(北京时间 0 点恢复),新用户另送一次性 $10 加量。
+Describe what you need in plain words; u1s1 reads your files, edits code and runs commands. No model setup, no API keys to manage: sign in with your u1s1.dev account and start.
 
-## 三步开始
+## Install
 
-### 🚀 一键安装(推荐)
-不需要提前装任何东西,复制下面一行到终端粘贴运行:
+**One-line installer (recommended, bundles its own Node.js)**
 
-**Linux / macOS**
+macOS / Linux
 ```bash
-curl -fsSL https://u1s1app.com/releases/install.sh | bash
+curl -fsSL https://u1s1.dev/releases/install.sh | bash
 ```
 
-**Windows**
+Windows (PowerShell)
 ```powershell
-powershell -c "irm https://u1s1app.com/releases/install.ps1 | iex"
+irm https://u1s1.dev/releases/install.ps1 | iex
 ```
 
-脚本会自动帮你安装 Node.js 和 u1s1,一行搞定。
-
-### 或者,手动安装(需要 Node.js 20+)
+**Or with npm (Node.js 22.19+)**
 ```bash
 npm i -g u1s1-cli
 ```
 
-### 安装好后
+This package connects to the international site, u1s1.dev. If this computer was already set up for another site, u1s1 keeps that setup; to switch, run `u1s1 login --site global`.
+
+## Get started
 ```bash
-# 第一次运行会引导你去 u1s1app.com 注册领 Key(30 秒,不用绑卡)
+# First run walks you through signing in at u1s1.dev
 u1s1
 
-# 进到你的项目文件夹,像发微信一样说需求
-cd 我的项目
+# Then, inside your project
+cd my-project
 u1s1
 ```
 
-## 常用命令
+## Common commands
 
-| 命令 | 作用 |
+| Command | What it does |
 |---|---|
-| `u1s1` | 进入交互模式,直接开聊 |
-| `u1s1 -p "把 README 里的错别字修一下"` | 一句话模式,干完就退出 |
-| `u1s1 usage` | 看额度用了多少 |
-| `u1s1 model` | 看/切默认模型:`u1s1 model grok` 切 Grok 4.6,`u1s1 model deepseek` 切回(对话里 `/model` 同样会记住) |
-| `u1s1 update` | 升级 u1s1 到最新版 |
-| `u1s1 import` | 从 Claude Code / Codex 导入历史对话,之后 `/resume` 就能接着聊 |
-| `u1s1 login` / `u1s1 logout` | 登录 / 退出 |
-
-## 长会话自动压缩
-
-对话越长，每一轮上传的历史越多，回复会变慢、也更容易出错。u1s1 会在上下文接近 **200K token** 时自动压缩（把早期对话浓缩成摘要，最近 2 万 token 原文保留），压缩时界面有提示；`/context` 可以随时看当前占用、预算和触发点，`/compact` 可以手动压缩。
-
-这只改变压缩时机，不改变模型能力。想调整或关闭，编辑 `~/.u1s1/agent/settings.json`：
-
-```json
-{ "compaction": { "maxContextTokens": 200000 } }
-```
-
-`0` 表示不限（按模型自身窗口，如 DeepSeek Flash 的 1M）。改完重启 u1s1 生效。
-
-## 在终端粘贴图片
-
-默认模型 DeepSeek Flash 支持视觉输入，复制截图或图片后，在 u1s1 输入框按 `Ctrl+V` 即可附加图片。macOS 这里也使用 `Ctrl+V`；`Cmd+V` 由 Terminal/iTerm 接管，只适合粘贴文本，无法把剪贴板图片交给 CLI。
-
-## 有一说一
-
-- **背后模型**:默认 DeepSeek Flash(1M 上下文,每天免费 $2);难题可随时 `u1s1 model grok` 切 Grok 4.6。对话里 `/model` 也会记住,下次启动还是这个。
-- **怎么收费**:DeepSeek Flash 每天有 $2 免费用量,北京时间 0 点恢复且不累计。免费用完或切换其他模型后,按 API 实际成本从永久余额扣,不加价;新用户另送一次性 $10 加量。
-- **额度不够**:邀请朋友,你俩各得 $1 永久加量 → [u1s1app.com/dashboard](https://u1s1app.com/dashboard)
-- **内核**:基于开源的 [pi](https://pi.dev) coding agent,会话管理、斜杠命令、皮肤等能力全都有。
-
-官网:[u1s1app.com](https://u1s1app.com)
+| `u1s1` | Interactive mode |
+| `u1s1 -p "fix the typos in README"` | One-shot mode: do the task, then exit |
+| `u1s1 usage` | See how much credit you've used |
+| `u1s1 model` | Show or change the default model |
+| `u1s1 update` | Update u1s1 to the latest version |
+| `u1s1 login` / `u1s1 logout` | Sign in / sign out |
+
+Website: [u1s1.dev](https://u1s1.dev)

package/dist/agents/claude.d.ts

@@ -1,5 +1,6 @@
 import { type McpLaunchEnv } from "../mcp-server.js";
 import { type AgentConfig } from "./agent-config.js";
+import { type AgentCustomModel } from "./custom-models.js";
 import { type RuntimePaths } from "./runtime.js";
 export { agentsRoot, CLAUDE_TERMS_URL, cliInstallHooks, consentLines, notOpenText, overMaxTestedText, printRuntimeFailure, runtimeErrorText, spawnAgent, } from "./launch.js";
 export declare const CLAUDE_GATEWAY_AGENT: "claude-code";
@@ -72,7 +73,9 @@ export declare function sanitizeClaudeSettings(settings: Record<string, unknown>
  * model 用调用方选好的(用户在 u1s1 config 里定的、仍在阵容里的模型),没给时保留网关的,
  * 网关也没有就用 default_model。
  */
-export declare function claudeSettingsFromConfig(config: AgentConfig, model?: string | null): Record<string, unknown>;
+export declare function claudeSettingsFromConfig(config: AgentConfig, model?: string | null, 
+/** 自定义端点模型:接在 /model 列表后面(custom-models.ts withCustomClaudeModels) */
+customModels?: readonly AgentCustomModel[]): Record<string, unknown>;
 /** 调用方的 --settings 有问题(缺值、读不了、不是 JSON 对象);runClaude 报出来后以非 0 退出。 */
 export declare class ClaudeSettingsArgError extends Error {
     name: string;

package/dist/agents/claude.js

@@ -22,6 +22,7 @@ import { join, resolve } from "node:path";
 import { writePrivateFile } from "../config.js";
 import { lang, tr } from "../i18n.js";
 import { MCP_ENV_NAMES, MCP_SERVER_NAME, MCP_TRACE_ENV, mcpInjectionDisabled, mcpLaunchEnv, mcpServerCommand, } from "../mcp-server.js";
+import { withCustomClaudeModels } from "./custom-models.js";
 import { AGENT_PROFILES, agentsRoot, prepareAgentLaunch, runPreparedAgent, } from "./launch.js";
 import { runtimePaths } from "./runtime.js";
 import { stripSecretEnv } from "../secret-env.js";
@@ -198,13 +199,15 @@ export function sanitizeClaudeSettings(settings) {
  * model 用调用方选好的(用户在 u1s1 config 里定的、仍在阵容里的模型),没给时保留网关的,
  * 网关也没有就用 default_model。
  */
-export function claudeSettingsFromConfig(config, model) {
+export function claudeSettingsFromConfig(config, model, 
+/** 自定义端点模型:接在 /model 列表后面(custom-models.ts withCustomClaudeModels) */
+customModels = []) {
     const out = sanitizeClaudeSettings(config.settings ?? {});
     if (model)
         out["model"] = model;
     else if (out["model"] === undefined && config.defaultModel)
         out["model"] = config.defaultModel;
-    return out;
+    return withCustomClaudeModels(out, customModels, out["model"]);
 }
 // ---------------------------------------------------------------- 调用方的 --settings
 /** 调用方的 --settings 有问题(缺值、读不了、不是 JSON 对象);runClaude 报出来后以非 0 退出。 */
@@ -385,7 +388,7 @@ export async function runClaude(userArgs) {
     const mcp = mcpInjectionDisabled()
         ? undefined
         : mcpLaunchEnv({ proxyBaseUrl: prepared.proxy.baseUrl, localToken: prepared.proxy.localKey, features: prepared.features, lang: lang() });
-    const settings = claudeSettingsFromConfig(prepared.config, prepared.model);
+    const settings = claudeSettingsFromConfig(prepared.config, prepared.model, prepared.customModels);
     cleanStaleSettingsFiles(paths.root);
     const settingsFile = callerSettings.length ? processSettingsFile(paths) : paths.settingsFile;
     writeClaudeSettings(settingsFile, finalClaudeSettings(settings, callerSettings, !!mcp));

package/dist/agents/codex.d.ts

@@ -1,5 +1,6 @@
 import { type McpLaunchEnv } from "../mcp-server.js";
 import type { AgentConfig } from "./agent-config.js";
+import { type AgentCustomModel } from "./custom-models.js";
 import { type RuntimePaths } from "./runtime.js";
 export declare const CODEX_GATEWAY_AGENT: "codex";
 /** config.toml 里我们的 provider id(不能用 openai、ollama 等内置保留名)。 */
@@ -98,7 +99,9 @@ export declare function modelCatalogFromConfig(config: AgentConfig): Record<stri
  */
 export declare function writeCodexConfig(paths: CodexPaths, config: AgentConfig, now?: () => number, mcp?: CodexMcpServer | null, 
 /** 这次启动用的模型(launch.ts 按 u1s1 config 选好);undefined = 网关默认 */
-model?: string | null): string | undefined;
+model?: string | null, 
+/** 自定义端点模型:接在网关目录后面(custom-models.ts withCustomCodexCatalog) */
+customModels?: readonly AgentCustomModel[]): string | undefined;
 /** [mcp_servers.u1s1] 的内容:同一个 node、同一份 CLI;只列要转发的变量名。 */
 export declare function codexMcpServer(command?: {
     command: string;

package/dist/agents/codex.js

@@ -25,6 +25,7 @@ import { writePrivateFile } from "../config.js";
 import { lang, tr } 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 { withCustomCodexCatalog } from "./custom-models.js";
 import { AGENT_PROFILES, agentsRoot, prepareAgentLaunch, runPreparedAgent } from "./launch.js";
 import { runtimePaths } from "./runtime.js";
 export const CODEX_GATEWAY_AGENT = "codex";
@@ -334,9 +335,11 @@ export function modelCatalogFromConfig(config) {
  */
 export function writeCodexConfig(paths, config, now = Date.now, mcp = null, 
 /** 这次启动用的模型(launch.ts 按 u1s1 config 选好);undefined = 网关默认 */
-model = config.defaultModel) {
+model = config.defaultModel, 
+/** 自定义端点模型:接在网关目录后面(custom-models.ts withCustomCodexCatalog) */
+customModels = []) {
     mkdirSync(paths.configDir, { recursive: true, mode: 0o700 });
-    const catalog = modelCatalogFromConfig(config);
+    const catalog = withCustomCodexCatalog(modelCatalogFromConfig(config), customModels);
     if (catalog)
         writePrivateFile(paths.catalogFile, JSON.stringify(catalog) + "\n");
     else
@@ -382,7 +385,7 @@ export async function runCodex(userArgs) {
     const mcp = mcpInjectionDisabled()
         ? undefined
         : mcpLaunchEnv({ proxyBaseUrl: prepared.proxy.baseUrl, localToken: prepared.proxy.localKey, features: prepared.features, lang: lang() });
-    const backup = writeCodexConfig(paths, prepared.config, Date.now, mcp ? codexMcpServer() : null, prepared.model);
+    const backup = writeCodexConfig(paths, prepared.config, Date.now, mcp ? codexMcpServer() : null, prepared.model, prepared.customModels);
     if (backup) {
         console.error(tr(`  ${paths.configToml} 里有 u1s1 没法逐项改写的写法,已整份重写;原文件备份在 ${backup}。`, `  ${paths.configToml} had entries u1s1 couldn't update in place, so it was rewritten; the original is saved as ${backup}.`));
     }

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

@@ -0,0 +1,61 @@
+/**
+ * 自定义端点的模型给 Claude Code / Codex 用(规划 docs/custom-endpoints-all-clients-plan-2026-11-13.md 的 A2)。
+ *
+ * 客户端里的模型 id 是 `<端点 id>/<模型 id>`(端点 id = ep + 32 位 hex,模型 id 原样,可以再带 `/`),
+ * 与 Pi 的 `provider/model` 写法一致;本机签名代理按这个 id 认出自定义模型,在本机转成 Chat Completions
+ * 直连端点(custom-endpoint-proxy.ts),不经网关、不计费。网关模型的 id 里没有这种前缀,照旧走网关。
+ *
+ * 只收 api = openai-completions 的端点(本地路由只会转 Chat Completions)。
+ */
+import { type CustomEndpoint, type ModelDef } from "../config.js";
+/** 本地路由认的 id:`ep<32 hex>/<模型 id>`。 */
+export declare const CUSTOM_MODEL_ID_RE: RegExp;
+export declare const CUSTOM_ENDPOINT_API = "openai-completions";
+export interface AgentCustomModel {
+    /** 客户端里用的 id(--model / -m / /model 里的值) */
+    id: string;
+    endpoint: CustomEndpoint;
+    model: ModelDef;
+}
+export declare function customModelId(endpointId: string, modelId: string): string;
+/** 端点能不能给 Claude Code / Codex 用:只认 Chat Completions 协议。 */
+export declare function routableEndpoint(ep: Pick<CustomEndpoint, "id" | "api">): boolean;
+/** 某客户端(Claude Code / Codex)可用的自定义模型,端点顺序、端点内模型顺序。A1 的模型列表也用它。 */
+export declare function agentCustomModels(endpoints: readonly CustomEndpoint[]): AgentCustomModel[];
+export type CustomModelLookup = 
+/** 不是自定义模型的写法:交给网关 */
+{
+    kind: "gateway";
+}
+/** 自定义模型的写法,但端点或模型已不在(删了、改了名):本机直接报错,不发给网关 */
+ | {
+    kind: "missing";
+    endpointId: string;
+    modelId: string;
+} | {
+    kind: "custom";
+    found: AgentCustomModel;
+};
+export declare function lookupCustomModel(endpoints: readonly CustomEndpoint[], requested: unknown): CustomModelLookup;
+/**
+ * 把自定义模型接在 /model 列表(modelPicker.options)后面。Claude Code 不认识这些 id,窗口只有一个全局的
+ * CLAUDE_CODE_MAX_CONTEXT_TOKENS:启动模型是自定义模型时设成它的窗口,否则不动(不让一个小窗口的本地模型
+ * 拖低网关模型的压缩点;会话中途从网关模型换到更小窗口的自定义模型时可能超窗,由端点报错)。
+ */
+export declare function withCustomClaudeModels(settings: Record<string, unknown>, customs: readonly AgentCustomModel[], launchModel: string | null | undefined): Record<string, unknown>;
+/**
+ * Codex /model 里给自定义模型列的思考档位(本地路由按 chatReasoningFields 转成 reasoning_effort):
+ * 带思考契约的按契约(关不掉的不列 none);只标了推理的给 none/low/medium/high,默认 medium;非推理不列。
+ */
+export declare function codexCustomReasoning(model: Pick<ModelDef, "reasoning" | "thinking">): {
+    levels: string[];
+    defaultLevel: string | null;
+};
+/**
+ * 自定义模型的 model_catalog 条目。指令模板等 Codex 必填但与模型无关的字段取网关目录的第一条
+ * (网关目录每条都带同一份模板);目录为空时没有模板可用,返回 undefined(Codex 对目录外的模型用
+ * 兜底元数据,照样能用)。
+ */
+export declare function codexCatalogEntry(c: AgentCustomModel, template: Record<string, unknown>, priority: number): Record<string, unknown>;
+/** 网关的 model_catalog + 自定义模型(排在后面)。没有网关目录或目录为空时原样返回。 */
+export declare function withCustomCodexCatalog(catalog: Record<string, unknown> | undefined, customs: readonly AgentCustomModel[]): Record<string, unknown> | undefined;

package/dist/agents/custom-models.js

@@ -0,0 +1,175 @@
+/**
+ * 自定义端点的模型给 Claude Code / Codex 用(规划 docs/custom-endpoints-all-clients-plan-2026-11-13.md 的 A2)。
+ *
+ * 客户端里的模型 id 是 `<端点 id>/<模型 id>`(端点 id = ep + 32 位 hex,模型 id 原样,可以再带 `/`),
+ * 与 Pi 的 `provider/model` 写法一致;本机签名代理按这个 id 认出自定义模型,在本机转成 Chat Completions
+ * 直连端点(custom-endpoint-proxy.ts),不经网关、不计费。网关模型的 id 里没有这种前缀,照旧走网关。
+ *
+ * 只收 api = openai-completions 的端点(本地路由只会转 Chat Completions)。
+ */
+import { ENDPOINT_ID_RE } from "../config.js";
+/** 本地路由认的 id:`ep<32 hex>/<模型 id>`。 */
+export const CUSTOM_MODEL_ID_RE = /^(ep[0-9a-f]{32})\/(.+)$/;
+export const CUSTOM_ENDPOINT_API = "openai-completions";
+export function customModelId(endpointId, modelId) {
+    return `${endpointId}/${modelId}`;
+}
+/** 端点能不能给 Claude Code / Codex 用:只认 Chat Completions 协议。 */
+export function routableEndpoint(ep) {
+    return ENDPOINT_ID_RE.test(ep.id) && ep.api === CUSTOM_ENDPOINT_API;
+}
+/** 某客户端(Claude Code / Codex)可用的自定义模型,端点顺序、端点内模型顺序。A1 的模型列表也用它。 */
+export function agentCustomModels(endpoints) {
+    const out = [];
+    const seen = new Set();
+    for (const endpoint of endpoints) {
+        if (!routableEndpoint(endpoint))
+            continue;
+        for (const model of endpoint.models) {
+            const id = customModelId(endpoint.id, model.id);
+            if (!model.id || seen.has(id))
+                continue;
+            seen.add(id);
+            out.push({ id, endpoint, model });
+        }
+    }
+    return out;
+}
+export function lookupCustomModel(endpoints, requested) {
+    if (typeof requested !== "string")
+        return { kind: "gateway" };
+    const m = CUSTOM_MODEL_ID_RE.exec(requested);
+    if (!m)
+        return { kind: "gateway" };
+    const [, endpointId, modelId] = m;
+    const endpoint = endpoints.find((ep) => ep.id === endpointId && routableEndpoint(ep));
+    const model = endpoint?.models.find((x) => x.id === modelId);
+    if (!endpoint || !model)
+        return { kind: "missing", endpointId, modelId };
+    return { kind: "custom", found: { id: requested, endpoint, model } };
+}
+// ---------------------------------------------------------------- Claude Code
+function contextLabel(tokens) {
+    if (tokens >= 1_000_000)
+        return `${Math.round(tokens / 100_000) / 10}M context`;
+    return `${Math.round(tokens / 1000)}K context`;
+}
+function customDescription(c) {
+    const parts = [];
+    if (c.model.contextWindow > 0)
+        parts.push(contextLabel(c.model.contextWindow));
+    parts.push(`custom endpoint ${c.endpoint.name}`);
+    return parts.join(" - ");
+}
+function isPlainObject(value) {
+    return !!value && typeof value === "object" && !Array.isArray(value);
+}
+/**
+ * 把自定义模型接在 /model 列表(modelPicker.options)后面。Claude Code 不认识这些 id,窗口只有一个全局的
+ * CLAUDE_CODE_MAX_CONTEXT_TOKENS:启动模型是自定义模型时设成它的窗口,否则不动(不让一个小窗口的本地模型
+ * 拖低网关模型的压缩点;会话中途从网关模型换到更小窗口的自定义模型时可能超窗,由端点报错)。
+ */
+export function withCustomClaudeModels(settings, customs, launchModel) {
+    if (customs.length === 0)
+        return settings;
+    const out = { ...settings };
+    const picker = isPlainObject(out["modelPicker"]) ? { ...out["modelPicker"] } : {};
+    const options = Array.isArray(picker["options"]) ? [...picker["options"]] : [];
+    const listed = new Set(options.map((o) => (isPlainObject(o) ? o["model"] : undefined)));
+    for (const c of customs) {
+        if (listed.has(c.id))
+            continue;
+        options.push({ model: c.id, label: c.model.name || c.model.id, description: customDescription(c) });
+    }
+    picker["options"] = options;
+    out["modelPicker"] = picker;
+    const launched = customs.find((c) => c.id === launchModel);
+    if (launched && launched.model.contextWindow > 0) {
+        const env = isPlainObject(out["env"]) ? { ...out["env"] } : {};
+        env["CLAUDE_CODE_MAX_CONTEXT_TOKENS"] = String(launched.model.contextWindow);
+        out["env"] = env;
+    }
+    return out;
+}
+// ---------------------------------------------------------------- Codex
+const CODEX_EFFORT_TEXT = {
+    none: "No reasoning",
+    minimal: "Minimal reasoning",
+    low: "Fast responses with lighter reasoning",
+    medium: "Balanced speed and reasoning depth",
+    high: "Deeper reasoning for complex problems",
+    xhigh: "Extra deep reasoning",
+};
+/** u1s1 思考档位 → Codex 的 reasoning effort;max 在 Responses 里没有对应档,不列。 */
+const CODEX_EFFORT = {
+    off: "none",
+    minimal: "minimal",
+    low: "low",
+    medium: "medium",
+    high: "high",
+    xhigh: "xhigh",
+};
+/**
+ * Codex /model 里给自定义模型列的思考档位(本地路由按 chatReasoningFields 转成 reasoning_effort):
+ * 带思考契约的按契约(关不掉的不列 none);只标了推理的给 none/low/medium/high,默认 medium;非推理不列。
+ */
+export function codexCustomReasoning(model) {
+    if (!model.reasoning)
+        return { levels: [], defaultLevel: null };
+    const caps = model.thinking;
+    if (caps && caps.levels.length) {
+        const levels = caps.levels
+            .filter((level) => level !== "off" || caps.canDisable)
+            .map((level) => CODEX_EFFORT[level])
+            .filter((effort) => typeof effort === "string");
+        const preferred = CODEX_EFFORT[caps.defaultLevel];
+        const defaultLevel = preferred && levels.includes(preferred) ? preferred : levels.filter((e) => e !== "none").at(-1) ?? null;
+        return { levels, defaultLevel };
+    }
+    return { levels: ["none", "low", "medium", "high"], defaultLevel: "medium" };
+}
+/** 与网关 codex-config.ts 一致:模型行没设压缩预算时按 200K 压。 */
+const CODEX_DEFAULT_COMPACT_TOKENS = 200_000;
+/**
+ * 自定义模型的 model_catalog 条目。指令模板等 Codex 必填但与模型无关的字段取网关目录的第一条
+ * (网关目录每条都带同一份模板);目录为空时没有模板可用,返回 undefined(Codex 对目录外的模型用
+ * 兜底元数据,照样能用)。
+ */
+export function codexCatalogEntry(c, template, priority) {
+    const reasoning = codexCustomReasoning(c.model);
+    const levels = reasoning.levels;
+    const window = c.model.contextWindow > 0 ? c.model.contextWindow : undefined;
+    const entry = {
+        ...template,
+        slug: c.id,
+        display_name: c.model.name || c.model.id,
+        description: customDescription(c),
+        supported_reasoning_levels: levels.map((effort) => ({ effort, description: CODEX_EFFORT_TEXT[effort] ?? effort })),
+        priority,
+        input_modalities: c.model.vision ? ["text", "image"] : ["text"],
+    };
+    delete entry["default_reasoning_level"];
+    if (reasoning.defaultLevel)
+        entry["default_reasoning_level"] = reasoning.defaultLevel;
+    if (window) {
+        entry["context_window"] = window;
+        entry["max_context_window"] = window;
+        // 压缩点:200K 与窗口的 90% 取小(本地模型窗口常比 200K 小)
+        entry["auto_compact_token_limit"] = Math.min(CODEX_DEFAULT_COMPACT_TOKENS, Math.floor(window * 0.9));
+    }
+    return entry;
+}
+/** 网关的 model_catalog + 自定义模型(排在后面)。没有网关目录或目录为空时原样返回。 */
+export function withCustomCodexCatalog(catalog, customs) {
+    if (!catalog || customs.length === 0)
+        return catalog;
+    const models = Array.isArray(catalog["models"]) ? catalog["models"] : [];
+    const template = models.find(isPlainObject);
+    if (!template)
+        return catalog;
+    const slugs = new Set(models.map((m) => (isPlainObject(m) ? m["slug"] : undefined)));
+    const extra = customs
+        .filter((c) => !slugs.has(c.id))
+        .map((c, i) => codexCatalogEntry(c, template, models.length + i));
+    return { ...catalog, models: [...models, ...extra] };
+}

package/dist/agents/launch.d.ts

@@ -9,6 +9,7 @@ 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 { RuntimePlanError, type DownloadInfo, type EnsuredRuntime, type InstallHooks, type ManagedAgent, type RuntimePaths, type SkippedRuntime } from "./runtime.js";
 export declare function agentsRoot(): string;
 export interface AgentProfile {
@@ -76,6 +77,8 @@ export interface PreparedLaunch {
     site: SiteId;
     /** /v1/models 的能力开关(搜索、云端渲染、生图);没拉到时为 undefined。MCP 工具服务按它决定提供哪些工具 */
     features: ApiFeatures | undefined;
+    /** 账号里的自定义端点模型(id = ep…/<模型>):接在客户端模型阵容后面,请求由签名代理在本机直连端点 */
+    customModels: AgentCustomModel[];
 }
 /**
  * 子进程启动前的公共部分。返回 number = 启动前就失败的退出码(已向用户说明)。

package/dist/agents/launch.js

@@ -11,12 +11,13 @@ 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";
 export function agentsRoot() {
@@ -319,8 +320,16 @@ export async function prepareAgentLaunch(profile, paths) {
         return 1;
     }
     const config = result.config;
+    // 自定义端点:拉不到时用上次的缓存(与启动 Pi 同一做法)
+    await loadCustomEndpoints(cfg).catch(() => undefined);
+    const customModels = 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)),
     });
@@ -343,8 +352,11 @@ 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, model, autoUpdate: prefs.autoUpdate, runtime, proxy, site: site.id, features: models?.features, customModels };
 }
 /** 用户在 u1s1 config 里选的模型不在当前阵容里(只提示一次,见 prefs.ts)。 */
 export function modelMissingText(agent, missing, fallback) {

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>;