u1s1-cli-cn 1.18.0 → 1.19.0

package/dist/agents/models-list.js

@@ -0,0 +1,297 @@
+/**
+ * `u1s1 agents models [--json] [--offline]`:给外部前端(Hearth 等)列出每个客户端能用的模型,
+ * 带显示名;`id` 就是该客户端 `--model` / `-m` 要的值。
+ *
+ * 契约(docs/custom-endpoints-all-clients-plan-2026-11-13.md §3):
+ *   { loggedIn, clients: { pi?: ClientModels, claude?: ClientModels, codex?: ClientModels } }
+ *   - 未登录:{ loggedIn: false, clients: {} },退出码 0;绝不发起设备登录、不开浏览器、不联网。
+ *   - 输出只含 id / name / source / endpoint / default / enabled,不带任何密钥、地址、token。
+ *   - claude / codex 没有本站的 agent-config 缓存时不出现在 clients 里(调用方按「不知道」处理)。
+ *
+ * 数据来源(都按当前站点隔离):
+ *   pi     官方模型:/v1/models(短超时)→ <agentDir>/models.json 里上次写的 u1s1 provider → 内置兜底列表;
+ *          自定义端点:/v1/endpoints(短超时,成功时刷新 endpoints.json,与启动 Pi 同一做法)→ endpoints.json。
+ *   claude / codex:只读 ~/.u1s1/agents/<agent>/agent-config.json(拉新配置要起签名代理、拿客户端证明,
+ *          不适合做成秒回的列表命令;启动对应客户端时会刷新缓存)。
+ * --offline:只读缓存,不联网、不写任何文件。
+ */
+import { readFileSync } from "node:fs";
+import { join } from "node:path";
+import { agentDir, apiEndpointToCustom, apiModelToDef, ENDPOINT_ID_RE, loadConfig, MODELS, PROVIDER_ID, readRawConfigFile, resolvePreferredModel, saveEndpointsCache, setCustomEndpoints, setModelsFromApi, u1s1Dir, VERSION, } from "../config.js";
+import { authorizedFetch, hasDeviceCredential } from "../device-auth.js";
+import { tr } from "../i18n.js";
+import { parseAgentConfig, readConfigCache } from "./agent-config.js";
+import { customModelId, routableEndpoint } from "./custom-models.js";
+import { chooseAgentModel, readAgentPrefs } from "./prefs.js";
+const GATEWAY_AGENT = {
+    claude: "claude-code",
+    codex: "codex",
+};
+// ---------------------------------------------------------------- pure builders
+/** Pi 的 --model 写法:provider/model(和 `u1s1 pi --list-models` 两列拼起来一致)。 */
+export function piModelId(provider, modelId) {
+    return `${provider}/${modelId}`;
+}
+/**
+ * 自定义端点的模型 → 列表条目。idFor 决定该客户端认的 id:Pi 是 provider/model;
+ * Claude Code / Codex 接上本地路由后(A2)按各自的写法传进来。
+ */
+export function customModelEntries(endpoints, idFor) {
+    const out = [];
+    for (const ep of endpoints) {
+        for (const m of ep.models) {
+            out.push({ id: idFor(ep, m), name: m.name || m.id, source: "custom", endpoint: ep.name });
+        }
+    }
+    return out;
+}
+export function piClientModels(official, endpoints, preferred) {
+    return {
+        default: piModelId(preferred.provider, preferred.id),
+        models: [
+            ...official.map((m) => ({ id: piModelId(PROVIDER_ID, m.id), name: m.name || m.id, source: "u1s1" })),
+            ...customModelEntries(endpoints, (ep, m) => piModelId(ep.id, m.id)),
+        ],
+    };
+}
+/**
+ * Claude Code / Codex:网关阵容(agent-config 缓存)+ 自定义端点的模型(只收本地路由转得了的
+ * openai-completions 端点,id = ep…/<模型>,见 custom-models.ts)。default 是启动时真正会用的模型:
+ * 用户在 u1s1 config 里选的(网关模型或自定义模型)还在就是它,否则网关默认——与 launch.ts 同一判断。
+ */
+export function gatewayClientModels(config, preferredModel, endpoints = []) {
+    const custom = customModelEntries(endpoints.filter(routableEndpoint), (ep, m) => customModelId(ep.id, m.id));
+    const lineup = { ...config, models: [...config.models, ...custom.map((m) => ({ id: m.id, name: m.name }))] };
+    return {
+        default: chooseAgentModel(lineup, preferredModel).model,
+        enabled: config.enabled,
+        models: [
+            ...config.models.map((m) => ({ id: m.id, name: m.name || m.id, source: "u1s1" })),
+            ...custom,
+        ],
+    };
+}
+// ---------------------------------------------------------------- caches (read-only)
+function readJson(path) {
+    try {
+        return JSON.parse(readFileSync(path, "utf8"));
+    }
+    catch {
+        return undefined;
+    }
+}
+function isRecord(v) {
+    return typeof v === "object" && v !== null && !Array.isArray(v);
+}
+/** 与 config.ts 的端点缓存同一个文件(这里只读) */
+function endpointsCacheFile() {
+    return join(u1s1Dir, "endpoints.json");
+}
+/** Pi 启动时把 u1s1 provider 的 baseUrl 写成本机签名代理(127.0.0.1 的随机端口)或站点地址。 */
+function sameSiteProviderBaseUrl(value, baseUrl) {
+    if (typeof value !== "string")
+        return false;
+    if (value === baseUrl)
+        return true;
+    try {
+        const host = new URL(value).hostname;
+        return host === "127.0.0.1" || host === "localhost" || host === "[::1]";
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 上次启动 Pi 时写进 <agentDir>/models.json 的 u1s1 provider。那里的 baseUrl 通常是本机签名代理,
+ * 认不出站点;只排除明确指向别的站点的条目(换站后第一次启动 Pi 之前,离线时可能列出上一站的名字)。
+ * 那里的 name 拼了「 · 提示」(见 toProviderModels),这里去掉,只留显示名。
+ */
+export function officialModelsFromProviderFile(path, baseUrl) {
+    const root = readJson(path);
+    const providers = isRecord(root) ? root["providers"] : undefined;
+    const entry = isRecord(providers) ? providers[PROVIDER_ID] : undefined;
+    if (!isRecord(entry) || !sameSiteProviderBaseUrl(entry["baseUrl"], baseUrl) || !Array.isArray(entry["models"]))
+        return undefined;
+    const models = [];
+    for (const m of entry["models"]) {
+        if (!isRecord(m) || typeof m["id"] !== "string" || !m["id"])
+            continue;
+        const raw = typeof m["name"] === "string" ? m["name"] : "";
+        const sep = raw.indexOf(" · ");
+        const name = (sep > 0 ? raw.slice(0, sep) : raw).trim() || m["id"];
+        models.push({
+            id: m["id"],
+            name,
+            aliases: [],
+            reasoning: m["reasoning"] === true,
+            vision: false,
+            contextWindow: 0,
+            maxTokens: 0,
+            cost: null,
+            note: "",
+        });
+    }
+    return models.length ? models : undefined;
+}
+/** endpoints.json 只取列表要用的字段,形状不对的条目跳过。 */
+export function endpointsFromCache(raw) {
+    if (!Array.isArray(raw))
+        return [];
+    const out = [];
+    for (const e of raw) {
+        if (!isRecord(e) || typeof e["id"] !== "string" || !ENDPOINT_ID_RE.test(e["id"]) || !Array.isArray(e["models"]))
+            continue;
+        const models = [];
+        for (const m of e["models"]) {
+            if (!isRecord(m) || typeof m["id"] !== "string" || !m["id"])
+                continue;
+            models.push({
+                id: m["id"],
+                name: typeof m["name"] === "string" && m["name"] ? m["name"] : m["id"],
+                aliases: [],
+                reasoning: m["reasoning"] === true,
+                vision: m["vision"] === true,
+                contextWindow: 0,
+                maxTokens: 0,
+                cost: null,
+                note: "",
+            });
+        }
+        // api 不是密钥,留着让 Claude Code / Codex 的列表只收本地路由转得了的端点;baseUrl / apiKey 不读
+        const api = typeof e["api"] === "string" ? e["api"] : "";
+        out.push({ id: e["id"], name: typeof e["name"] === "string" ? e["name"] : e["id"], baseUrl: "", api, models });
+    }
+    return out;
+}
+export function cachedAgentConfig(cacheFile, site, agent) {
+    const cached = readConfigCache(cacheFile, site);
+    return cached ? parseAgentConfig(cached.body, agent) : undefined;
+}
+export const LIVE_REFRESH_TIMEOUT_MS = 2_500;
+/**
+ * 并行拉 /v1/models 与 /v1/endpoints,整体不超过 timeoutMs;到点一起中止,
+ * 任何失败(断网、401、5xx、格式不对)都只是让对应字段缺席,调用方退回缓存。
+ */
+export async function fetchLiveCatalog(get, timeoutMs = LIVE_REFRESH_TIMEOUT_MS) {
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(), timeoutMs);
+    const json = async (path) => {
+        try {
+            const res = await get(path, ctrl.signal);
+            if (!res.ok)
+                return undefined;
+            const text = await res.text();
+            if (text.length > 2 * 1024 * 1024)
+                return undefined;
+            const body = JSON.parse(text);
+            return isRecord(body) ? body : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    };
+    try {
+        const [models, endpoints] = await Promise.all([json("/models"), json("/endpoints")]);
+        return {
+            ...(Array.isArray(models?.["data"]) && models["data"].length ? { models: models["data"] } : {}),
+            ...(Array.isArray(endpoints?.["endpoints"]) ? { endpoints: endpoints["endpoints"] } : {}),
+        };
+    }
+    finally {
+        clearTimeout(timer);
+        ctrl.abort();
+    }
+}
+export async function buildModelsListing(deps = {}) {
+    const cfg = loadConfig();
+    // 未登录:到此为止。不联网、不触发设备登录
+    if (!hasDeviceCredential(cfg))
+        return { loggedIn: false, clients: {} };
+    let live = {};
+    if (!deps.offline) {
+        const fetchLive = deps.fetchLive ?? (() => fetchLiveCatalog((path, signal) => authorizedFetch(cfg, `${cfg.baseUrl}${path}`, { headers: { "x-u1s1-version": VERSION }, signal })));
+        live = await fetchLive().catch(() => ({}));
+    }
+    // 官方模型
+    if (live.models) {
+        setModelsFromApi(live.models.map(apiModelToDef));
+    }
+    else {
+        const cached = officialModelsFromProviderFile(join(agentDir, "models.json"), cfg.baseUrl);
+        if (cached)
+            setModelsFromApi(cached);
+    }
+    // 自定义端点(成功拉到时刷新缓存,与启动 Pi 的 loadCustomEndpoints 同一做法;--offline 不写)
+    let endpoints;
+    if (live.endpoints) {
+        try {
+            endpoints = live.endpoints.map(apiEndpointToCustom);
+            if (!deps.offline) {
+                try {
+                    saveEndpointsCache(endpoints);
+                }
+                catch { /* 缓存写不进去不影响列表 */ }
+            }
+        }
+        catch {
+            endpoints = endpointsFromCache(readJson(endpointsCacheFile()));
+        }
+    }
+    else {
+        endpoints = endpointsFromCache(readJson(endpointsCacheFile()));
+    }
+    setCustomEndpoints(endpoints);
+    const clients = {
+        pi: piClientModels(MODELS, endpoints, resolvePreferredModel(cfg)),
+    };
+    const site = new URL(cfg.baseUrl).origin;
+    const raw = readRawConfigFile();
+    for (const client of ["claude", "codex"]) {
+        const config = cachedAgentConfig(join(u1s1Dir, "agents", client, "agent-config.json"), site, GATEWAY_AGENT[client]);
+        if (config)
+            clients[client] = gatewayClientModels(config, readAgentPrefs(client, raw).model, endpoints);
+    }
+    return { loggedIn: true, clients };
+}
+/** 人看的表。 */
+export function formatModelsTable(listing) {
+    if (!listing.loggedIn)
+        return [tr("还没有登录,先运行 u1s1 login。", "Not signed in yet. Run u1s1 login first.")];
+    const lines = [];
+    for (const client of ["pi", "claude", "codex"]) {
+        const c = listing.clients[client];
+        lines.push("");
+        if (!c) {
+            lines.push(`${client}  ${tr("(还没有模型列表,启动一次 u1s1 " + client + " 后可见)", "(no model list yet; start u1s1 " + client + " once to load it)")}`);
+            continue;
+        }
+        lines.push(c.enabled === false ? `${client}  ${tr("(暂未开放)", "(not available)")}` : client);
+        const width = Math.max(0, ...c.models.map((m) => m.id.length));
+        for (const m of c.models) {
+            const mark = m.id === c.default ? "●" : " ";
+            const tag = m.source === "custom" ? `  [${m.endpoint ?? tr("自定义", "custom")}]` : "";
+            lines.push(`  ${mark} ${m.id.padEnd(width)}  ${m.name}${tag}`);
+        }
+        if (c.models.length === 0)
+            lines.push(`    ${tr("(没有可用模型)", "(no models)")}`);
+    }
+    lines.push("");
+    lines.push(tr("● = 默认模型。启动时用 --model 传左列的 id。", "● = default model. Pass the left-hand id with --model."));
+    return lines;
+}
+export async function modelsCommand(args, deps = {}) {
+    const json = args.includes("--json");
+    const offline = deps.offline ?? args.includes("--offline");
+    const unknown = args.filter((a) => a !== "--json" && a !== "--offline");
+    if (unknown.length) {
+        console.error(tr("用法: u1s1 agents models [--json] [--offline]", "Usage: u1s1 agents models [--json] [--offline]"));
+        return 1;
+    }
+    const listing = await buildModelsListing({ ...deps, offline });
+    if (json)
+        process.stdout.write(JSON.stringify(listing) + "\n");
+    else
+        for (const line of formatModelsTable(listing))
+            console.log(line);
+    return 0;
+}

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;