u1s1-cli 0.11.0 → 0.12.0

package/dist/agent-setup.d.ts

@@ -1,4 +1,4 @@
-import { type CliConfig } from "./config.js";
+import { type CliConfig, type CustomEndpoint, type ModelDef } from "./config.js";
 /** pi auto-appends <agentDir>/APPEND_SYSTEM.md to its system prompt — our branding hook. */
 export declare function ensureBrandPrompt(): void;
 /** Defaults that don't overwrite values the user already set. */
@@ -29,4 +29,22 @@ export declare function writeWebToolsExtension(cfg: CliConfig, webSearchEnabled:
  * 其他 provider 的凭据原样保留;文件损坏时不动它,交给 SDK 自己报错。
  */
 export declare function ensureAuthCredential(): void;
+/** pi provider 条目里的模型形状(models.json 与 registerProvider 共用)。 */
+export declare function toProviderModels(models: ModelDef[]): {
+    id: string;
+    name: string;
+    reasoning: boolean;
+    input: ("text" | "image")[];
+    cost: ModelDef["cost"];
+    contextWindow: number;
+    maxTokens: number;
+}[];
+/**
+ * 自定义端点 → pi provider 条目。密钥走环境变量引用(启动器已 set,见
+ * applyEndpointKeyEnv),文件里不落明文;没配密钥的端点(本机 Ollama 等)
+ * 直接不写 apiKey 字段。
+ */
+export declare function endpointProviderEntry(ep: CustomEndpoint): Record<string, unknown>;
+/** 把各端点密钥放进环境(TUI 直接 process.env;web 传给子进程)。 */
+export declare function endpointKeyEnv(): Record<string, string>;
 export declare function ensureProviderModels(cfg: CliConfig): void;

package/dist/agent-setup.js

@@ -1,6 +1,6 @@
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
-import { agentDir, MODELS, PROVIDER_ID, VERSION } from "./config.js";
+import { agentDir, CUSTOM_ENDPOINTS, ENDPOINT_ID_RE, endpointKeyEnvName, MODELS, PROVIDER_ID, VERSION, } from "./config.js";
 const BRAND_APPEND = `## u1s1
 
 你是 u1s1(有一说一) —— 说人话的 AI 编程搭子,一个面向编程新手的中文 AI 编程助手。用户很可能不熟悉编程术语:
@@ -133,6 +133,43 @@ export function ensureAuthCredential() {
     root[PROVIDER_ID] = { type: "api_key", key: "$U1S1_API_KEY" };
     writeFileSync(p, JSON.stringify(root, null, 2) + "\n", { mode: 0o600 });
 }
+/** pi provider 条目里的模型形状(models.json 与 registerProvider 共用)。 */
+export function toProviderModels(models) {
+    return models.map((m) => ({
+        id: m.id,
+        name: m.name,
+        reasoning: m.reasoning,
+        input: ["text"],
+        cost: m.cost,
+        contextWindow: m.contextWindow,
+        maxTokens: m.maxTokens,
+    }));
+}
+/**
+ * 自定义端点 → pi provider 条目。密钥走环境变量引用(启动器已 set,见
+ * applyEndpointKeyEnv),文件里不落明文;没配密钥的端点(本机 Ollama 等)
+ * 直接不写 apiKey 字段。
+ */
+export function endpointProviderEntry(ep) {
+    const entry = {
+        name: ep.name,
+        baseUrl: ep.baseUrl,
+        api: ep.api,
+        models: toProviderModels(ep.models),
+    };
+    if (ep.apiKey)
+        entry["apiKey"] = `$${endpointKeyEnvName(ep.id)}`;
+    return entry;
+}
+/** 把各端点密钥放进环境(TUI 直接 process.env;web 传给子进程)。 */
+export function endpointKeyEnv() {
+    const env = {};
+    for (const ep of CUSTOM_ENDPOINTS) {
+        if (ep.apiKey)
+            env[endpointKeyEnvName(ep.id)] = ep.apiKey;
+    }
+    return env;
+}
 export function ensureProviderModels(cfg) {
     mkdirSync(agentDir, { recursive: true });
     const p = join(agentDir, "models.json");
@@ -155,16 +192,18 @@ export function ensureProviderModels(cfg) {
         apiKey: "$U1S1_API_KEY",
         // 网关按这个头识别客户端版本;不带头的旧版会在会话首轮被追加升级提示
         headers: { "x-u1s1-version": VERSION },
-        models: MODELS.map((m) => ({
-            id: m.id,
-            name: m.name,
-            reasoning: m.reasoning,
-            input: ["text"],
-            cost: m.cost,
-            contextWindow: m.contextWindow,
-            maxTokens: m.maxTokens,
-        })),
+        models: toProviderModels(MODELS),
     };
+    // 自定义端点:先清掉我们此前写入、如今已删除的条目(键形状 ep+32hex,
+    // 用户手工加的其他 provider 不受影响),再写当前列表
+    for (const key of Object.keys(providers)) {
+        if (ENDPOINT_ID_RE.test(key) && !CUSTOM_ENDPOINTS.some((e) => e.id === key)) {
+            delete providers[key];
+        }
+    }
+    for (const ep of CUSTOM_ENDPOINTS) {
+        providers[ep.id] = endpointProviderEntry(ep);
+    }
     root["providers"] = providers;
     writeFileSync(p, JSON.stringify(root, null, 2) + "\n");
 }

package/dist/api.d.ts

@@ -36,6 +36,30 @@ export interface ModelsResponse {
     features: ApiFeatures;
 }
 export declare function fetchModels(cfg: CliConfig): Promise<ModelsResponse>;
+export interface ApiEndpoint {
+    id: string;
+    name: string;
+    base_url: string;
+    api: string;
+    api_key: string | null;
+    models: {
+        id: string;
+        name?: string;
+        reasoning?: boolean;
+        context_window?: number;
+        max_tokens?: number;
+    }[];
+}
+/**
+ * 拉取用户在云端配置的自定义模型端点(dashboard「自定义模型端点」卡片)。
+ * 老网关没有这个路由(GET 落到静态资产 404),调用方失败时回退本地缓存。
+ */
+export declare function fetchUserEndpoints(cfg: CliConfig): Promise<ApiEndpoint[]>;
+/**
+ * 拉取云端配置的自定义端点并装载进 CUSTOM_ENDPOINTS;失败(离线/老网关)回退
+ * 上次缓存,保证本地端点断网时依旧可用。成功时刷新缓存(~/.u1s1/endpoints.json)。
+ */
+export declare function loadCustomEndpoints(cfg: CliConfig): Promise<void>;
 export interface SearchResult {
     title: string;
     url: string;

package/dist/api.js

@@ -1,4 +1,4 @@
-import { VERSION } from "./config.js";
+import { apiEndpointToCustom, loadEndpointsCache, saveEndpointsCache, setCustomEndpoints, VERSION, } from "./config.js";
 /** 网关按 x-u1s1-version 识别客户端版本(旧版 CLI 不带,提示升级)。 */
 function authHeaders(apiKey) {
     return { authorization: `Bearer ${apiKey}`, "x-u1s1-version": VERSION };
@@ -20,6 +20,39 @@ export async function fetchModels(cfg) {
     const body = (await resp.json());
     return { models: body.data, features: body.features ?? {} };
 }
+/**
+ * 拉取用户在云端配置的自定义模型端点(dashboard「自定义模型端点」卡片)。
+ * 老网关没有这个路由(GET 落到静态资产 404),调用方失败时回退本地缓存。
+ */
+export async function fetchUserEndpoints(cfg) {
+    let resp;
+    try {
+        resp = await fetch(`${cfg.baseUrl}/endpoints`, {
+            headers: authHeaders(cfg.apiKey),
+        });
+    }
+    catch {
+        throw new Error(`连不上 ${cfg.baseUrl}`);
+    }
+    if (!resp.ok)
+        throw new Error(`服务端返回 ${resp.status}`);
+    const body = (await resp.json());
+    return Array.isArray(body.endpoints) ? body.endpoints : [];
+}
+/**
+ * 拉取云端配置的自定义端点并装载进 CUSTOM_ENDPOINTS;失败(离线/老网关)回退
+ * 上次缓存,保证本地端点断网时依旧可用。成功时刷新缓存(~/.u1s1/endpoints.json)。
+ */
+export async function loadCustomEndpoints(cfg) {
+    try {
+        const endpoints = (await fetchUserEndpoints(cfg)).map(apiEndpointToCustom);
+        setCustomEndpoints(endpoints);
+        saveEndpointsCache(endpoints);
+    }
+    catch {
+        setCustomEndpoints(loadEndpointsCache());
+    }
+}
 /** 联网搜索走网关代理（上游 key 只在服务端）。maxResults 不传时由服务端决定默认值。 */
 export async function searchWeb(cfg, query, maxResults, signal) {
     if (!cfg.apiKey)

package/dist/config.d.ts

@@ -45,11 +45,61 @@ export declare const MODELS: ModelDef[];
 export declare function setModelsFromApi(apiModels: ModelDef[]): void;
 export declare const DEFAULT_MODEL_ID: string;
 export declare function resolveModel(nameOrAlias: string): ModelDef | undefined;
+/** provider 注册键就是云端的端点 id(ep+uuid);models.json 清理旧条目按此形状识别。 */
+export declare const ENDPOINT_ID_RE: RegExp;
+export interface CustomEndpoint {
+    /** 云端端点 id,同时作为 pi provider 的注册键 */
+    id: string;
+    name: string;
+    baseUrl: string;
+    /** pi 协议类型:openai-completions / anthropic-messages */
+    api: string;
+    apiKey?: string;
+    models: ModelDef[];
+}
+export declare const CUSTOM_ENDPOINTS: CustomEndpoint[];
+export declare function setCustomEndpoints(endpoints: CustomEndpoint[]): void;
+/** 端点密钥不写进 models.json,走这个环境变量引用(pi 读取时解析)。 */
+export declare function endpointKeyEnvName(endpointId: string): string;
+/** 服务端 /v1/endpoints 的一条记录 → CustomEndpoint(补默认值、生成别名)。 */
+export declare function apiEndpointToCustom(e: {
+    id: string;
+    name: string;
+    base_url: string;
+    api: string;
+    api_key: string | null;
+    models: {
+        id: string;
+        name?: string;
+        reasoning?: boolean;
+        context_window?: number;
+        max_tokens?: number;
+    }[];
+}): CustomEndpoint;
+/** 模型引用 = provider 注册键 + 模型 id;provider 是 u1s1 或某个端点 id。 */
+export interface ModelRef {
+    provider: string;
+    id: string;
+}
+export interface ResolvedModel extends ModelRef {
+    /** 展示用:u1s1 或端点名 */
+    providerName: string;
+    model: ModelDef;
+}
+/** ref 指向的模型仍然存在吗(服务端下架/端点删除后失效)。 */
+export declare function refValid(ref: ModelRef): boolean;
+/**
+ * 按名字/别名找模型,支持三种写法:模型 id、别名、`端点名:模型id`。
+ * u1s1 官方模型优先,再按端点顺序找,重名取先命中。
+ */
+export declare function findModel(query: string): ResolvedModel | undefined;
 export interface CliConfig {
     apiKey?: string;
     baseUrl: string;
-    /** preferred model id; must be one of MODELS */
+    /** preferred model id (within modelProvider) */
     model?: string;
+    /** preferred model 所属 provider;缺省 = u1s1(老配置兼容) */
+    modelProvider?: string;
 }
 export declare const u1s1Dir: string;
 /** pi keeps auth/models/settings/sessions under this dir — isolated from any real pi install. */
@@ -63,15 +113,18 @@ export interface AgentSettings {
 /** Read u1s1 agent settings (settings.json). Returns empty object if missing or invalid. */
 export declare function readSettings(): AgentSettings;
 /** Model last chosen in-session via /model (pi writes this). */
-export declare function readAgentDefaultModel(): string | undefined;
+export declare function readAgentDefaultModel(): ModelRef | undefined;
 /** Keep pi's settings.json in sync so /model and `u1s1 model` share one default. */
-export declare function writeAgentDefaultModel(modelId: string): void;
+export declare function writeAgentDefaultModel(provider: string, modelId: string): void;
 /**
  * After this fix both stores stay in sync. If they still disagree (old installs),
  * prefer the in-session /model value — that's the one users thought they had set.
+ * 校验依赖 CUSTOM_ENDPOINTS,须在 setCustomEndpoints 之后调用才认得端点模型。
  */
-export declare function resolvePreferredModel(configModel: string | undefined): string;
+export declare function resolvePreferredModel(cfg: Pick<CliConfig, "model" | "modelProvider">): ModelRef;
 export declare function loadConfig(): CliConfig;
 export declare function saveConfig(cfg: CliConfig): void;
 /** Persist the user's preferred model to both stores. */
-export declare function persistPreferredModel(cfg: CliConfig, modelId: string): CliConfig;
+export declare function persistPreferredModel(cfg: CliConfig, provider: string, modelId: string): CliConfig;
+export declare function saveEndpointsCache(endpoints: CustomEndpoint[]): void;
+export declare function loadEndpointsCache(): CustomEndpoint[];

package/dist/config.js

@@ -81,6 +81,71 @@ export function resolveModel(nameOrAlias) {
     const q = nameOrAlias.trim().toLowerCase();
     return MODELS.find((m) => m.id.toLowerCase() === q || m.aliases.includes(q));
 }
+// ---- 用户自定义端点(云端 dashboard 配置,启动时经 /v1/endpoints 拉取)----
+/** provider 注册键就是云端的端点 id(ep+uuid);models.json 清理旧条目按此形状识别。 */
+export const ENDPOINT_ID_RE = /^ep[0-9a-f]{32}$/;
+export const CUSTOM_ENDPOINTS = [];
+export function setCustomEndpoints(endpoints) {
+    CUSTOM_ENDPOINTS.length = 0;
+    CUSTOM_ENDPOINTS.push(...endpoints);
+}
+/** 端点密钥不写进 models.json,走这个环境变量引用(pi 读取时解析)。 */
+export function endpointKeyEnvName(endpointId) {
+    return `U1S1_EP_KEY_${endpointId}`;
+}
+/** 服务端 /v1/endpoints 的一条记录 → CustomEndpoint(补默认值、生成别名)。 */
+export function apiEndpointToCustom(e) {
+    return {
+        id: e.id,
+        name: e.name,
+        baseUrl: e.base_url,
+        api: e.api,
+        apiKey: e.api_key ?? undefined,
+        models: e.models.map((m) => ({
+            id: m.id,
+            name: m.name || m.id,
+            aliases: defaultAliases(m.id),
+            reasoning: !!m.reasoning,
+            contextWindow: m.context_window ?? 128_000,
+            maxTokens: m.max_tokens ?? 16_384,
+            // 自有端点不经网关计费,价格未知,展示按 0 处理
+            cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+            note: "",
+        })),
+    };
+}
+/** ref 指向的模型仍然存在吗(服务端下架/端点删除后失效)。 */
+export function refValid(ref) {
+    if (ref.provider === PROVIDER_ID)
+        return MODELS.some((m) => m.id === ref.id);
+    const ep = CUSTOM_ENDPOINTS.find((e) => e.id === ref.provider);
+    return !!ep && ep.models.some((m) => m.id === ref.id);
+}
+/**
+ * 按名字/别名找模型,支持三种写法:模型 id、别名、`端点名:模型id`。
+ * u1s1 官方模型优先,再按端点顺序找,重名取先命中。
+ */
+export function findModel(query) {
+    const q = query.trim();
+    const colon = q.indexOf(":");
+    if (colon > 0) {
+        const epName = q.slice(0, colon).toLowerCase();
+        const rest = q.slice(colon + 1).trim().toLowerCase();
+        const ep = CUSTOM_ENDPOINTS.find((e) => e.name.toLowerCase() === epName);
+        const m = ep?.models.find((x) => x.id.toLowerCase() === rest || x.aliases.includes(rest));
+        return ep && m ? { provider: ep.id, providerName: ep.name, id: m.id, model: m } : undefined;
+    }
+    const builtin = resolveModel(q);
+    if (builtin)
+        return { provider: PROVIDER_ID, providerName: "u1s1", id: builtin.id, model: builtin };
+    const lower = q.toLowerCase();
+    for (const ep of CUSTOM_ENDPOINTS) {
+        const m = ep.models.find((x) => x.id.toLowerCase() === lower || x.aliases.includes(lower));
+        if (m)
+            return { provider: ep.id, providerName: ep.name, id: m.id, model: m };
+    }
+    return undefined;
+}
 export const u1s1Dir = join(homedir(), ".u1s1");
 const configFile = join(u1s1Dir, "config.json");
 /** pi keeps auth/models/settings/sessions under this dir — isolated from any real pi install. */
@@ -105,35 +170,49 @@ export function readAgentDefaultModel() {
     const settings = readJsonFile(agentSettingsFile);
     if (!settings)
         return undefined;
-    if (settings["defaultProvider"] !== PROVIDER_ID)
-        return undefined;
+    const provider = settings["defaultProvider"];
     const id = settings["defaultModel"];
-    return typeof id === "string" && resolveModel(id) ? id : undefined;
+    if (typeof provider !== "string" || typeof id !== "string")
+        return undefined;
+    if (provider !== PROVIDER_ID && !ENDPOINT_ID_RE.test(provider))
+        return undefined;
+    const ref = { provider, id };
+    return refValid(ref) ? ref : undefined;
 }
 /** Keep pi's settings.json in sync so /model and `u1s1 model` share one default. */
-export function writeAgentDefaultModel(modelId) {
+export function writeAgentDefaultModel(provider, modelId) {
     mkdirSync(agentDir, { recursive: true });
     const settings = readJsonFile(agentSettingsFile) ?? {};
-    if (settings["defaultProvider"] === PROVIDER_ID && settings["defaultModel"] === modelId)
+    if (settings["defaultProvider"] === provider && settings["defaultModel"] === modelId)
         return;
-    settings["defaultProvider"] = PROVIDER_ID;
+    settings["defaultProvider"] = provider;
     settings["defaultModel"] = modelId;
     writeFileSync(agentSettingsFile, JSON.stringify(settings, null, 2) + "\n");
 }
 /**
  * After this fix both stores stay in sync. If they still disagree (old installs),
  * prefer the in-session /model value — that's the one users thought they had set.
+ * 校验依赖 CUSTOM_ENDPOINTS,须在 setCustomEndpoints 之后调用才认得端点模型。
  */
-export function resolvePreferredModel(configModel) {
-    const agentModel = readAgentDefaultModel();
-    return agentModel ?? configModel ?? DEFAULT_MODEL_ID;
+export function resolvePreferredModel(cfg) {
+    const agentRef = readAgentDefaultModel();
+    if (agentRef)
+        return agentRef;
+    if (cfg.model) {
+        const ref = { provider: cfg.modelProvider ?? PROVIDER_ID, id: cfg.model };
+        if (refValid(ref))
+            return ref;
+    }
+    return { provider: PROVIDER_ID, id: DEFAULT_MODEL_ID };
 }
 export function loadConfig() {
     const file = (readJsonFile(configFile) ?? {});
     return {
         apiKey: process.env["U1S1_API_KEY"] || file.apiKey,
         baseUrl: process.env["U1S1_BASE_URL"] || file.baseUrl || DEFAULT_BASE_URL,
-        model: file.model && resolveModel(file.model) ? file.model : undefined,
+        // 有效性不在这里裁决:端点列表可能还没拉回来,交给 resolvePreferredModel
+        model: file.model,
+        modelProvider: typeof file.modelProvider === "string" ? file.modelProvider : undefined,
     };
 }
 export function saveConfig(cfg) {
@@ -142,9 +221,20 @@ export function saveConfig(cfg) {
     chmodSync(configFile, 0o600);
 }
 /** Persist the user's preferred model to both stores. */
-export function persistPreferredModel(cfg, modelId) {
-    const next = { ...cfg, model: modelId };
+export function persistPreferredModel(cfg, provider, modelId) {
+    const next = { ...cfg, model: modelId, modelProvider: provider };
     saveConfig(next);
-    writeAgentDefaultModel(modelId);
+    writeAgentDefaultModel(provider, modelId);
     return next;
 }
+// ---- 端点本地缓存:离线/网关不可达时沿用上次拉到的配置(含密钥,0600)----
+const endpointsCacheFile = join(u1s1Dir, "endpoints.json");
+export function saveEndpointsCache(endpoints) {
+    mkdirSync(u1s1Dir, { recursive: true, mode: 0o700 });
+    writeFileSync(endpointsCacheFile, JSON.stringify(endpoints, null, 2) + "\n");
+    chmodSync(endpointsCacheFile, 0o600);
+}
+export function loadEndpointsCache() {
+    const raw = readJsonFile(endpointsCacheFile);
+    return Array.isArray(raw) ? raw : [];
+}

package/dist/import/write.js

@@ -1,7 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
-import { agentDir, loadConfig, PROVIDER_ID, resolvePreferredModel } from "../config.js";
+import { agentDir, loadConfig, resolvePreferredModel } from "../config.js";
 const EMPTY_USAGE = {
     input: 0,
     output: 0,
@@ -73,7 +73,8 @@ export function writeConvertedSession(converted, destCwd) {
     if (title)
         sm.appendSessionInfo(title);
     // Resume should keep using u1s1 models, not the original Claude/Codex id.
-    sm.appendModelChange(PROVIDER_ID, resolvePreferredModel(loadConfig().model));
+    const pref = resolvePreferredModel(loadConfig());
+    sm.appendModelChange(pref.provider, pref.id);
     const dest = sm.getSessionFile();
     if (!dest)
         throw new Error("会话写盘失败");

package/dist/index.js

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process";
 import { writeFileSync } from "node:fs";
-import { cleanupBrandThemes, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, writeWebToolsExtension, } from "./agent-setup.js";
+import { cleanupBrandThemes, endpointKeyEnv, endpointProviderEntry, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, toProviderModels, writeWebToolsExtension, } from "./agent-setup.js";
 import { printConsoleBanner } from "./brand.js";
-import { agentDir, apiModelToDef, isPortableInstall, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readSettings, resolvePreferredModel, setModelsFromApi, VERSION, } from "./config.js";
+import { agentDir, apiModelToDef, CUSTOM_ENDPOINTS, isPortableInstall, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, readSettings, refValid, resolvePreferredModel, setModelsFromApi, VERSION, } from "./config.js";
+import { ensureSearchTools } from "./search-tools.js";
 import { applyBrandUi, setUpdateNotice } from "./style.js";
 import { offerStarterTemplates } from "./templates.js";
-import { fetchModels } from "./api.js";
+import { fetchModels, loadCustomEndpoints } from "./api.js";
 const PACKAGE_NAME = "u1s1-cli";
 /**
  * 启动时自动检查 npm 最新版:autoUpdate 开着就静默安装,关着也在启动横幅的
@@ -117,9 +118,14 @@ async function runAgent(cfg, args) {
     cleanupBrandThemes();
     ensureBrandPrompt();
     ensureDefaultSettings();
+    // 预 seed fd/rg(国内直连 GitHub 不通,pi 自己下不动);与取模型列表并行,
+    // 但必须在进 pi 之前就位,否则 pi 会自己去 GitHub 下载
+    const searchToolsReady = ensureSearchTools(cfg);
     // Fetch model list from server; fall back to built-in MODELS on error.
     // 服务端没开搜索(或老网关没有 features 字段)时不注册 web_search,模型就不会白调
+    // 自定义端点与模型列表并行拉取,失败各自兜底(内置列表 / 本地缓存)
     let webSearchEnabled = true;
+    const endpointsReady = loadCustomEndpoints(cfg);
     try {
         const { models, features } = await fetchModels(cfg);
         setModelsFromApi(models.map(apiModelToDef));
@@ -128,6 +134,7 @@ async function runAgent(cfg, args) {
     catch (e) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
+    await endpointsReady;
     ensureProviderModels(cfg);
     // 联网工具经 agentDir/extensions 投影,TUI 和 u1s1 web 共用一份注册
     writeWebToolsExtension(cfg, webSearchEnabled);
@@ -136,8 +143,11 @@ async function runAgent(cfg, args) {
     process.env["PI_CODING_AGENT_DIR"] = agentDir;
     process.env["U1S1_API_KEY"] = cfg.apiKey;
     process.env["U1S1_TOOLS_VIA_EXTENSION"] = "1";
+    // 自定义端点的密钥走环境变量引用(models.json 里只有 $VAR,不落明文)
+    Object.assign(process.env, endpointKeyEnv());
     // hide pi's own "Run pi update" banner; users should run `u1s1 update` instead
     process.env["PI_SKIP_VERSION_CHECK"] = "1";
+    await searchToolsReady;
     const { CustomEditor, main } = await import("@earendil-works/pi-coding-agent");
     // 网页终端(如 Taikula)把 Shift+Enter 发成 ESC+CR(\x1b\r)。pi 在没开 Kitty
     // 协议时把它当成 Alt+Enter:空闲就直接发送,忙碌才排队。先改成 CSI-u 的
@@ -192,25 +202,20 @@ async function runAgent(cfg, args) {
                     baseUrl: cfg.baseUrl,
                     api: "openai-completions",
                     apiKey: "$U1S1_API_KEY",
-                    models: MODELS.map((m) => ({
-                        id: m.id,
-                        name: m.name,
-                        reasoning: m.reasoning,
-                        input: ["text"],
-                        cost: m.cost,
-                        contextWindow: m.contextWindow,
-                        maxTokens: m.maxTokens,
-                    })),
+                    models: toProviderModels(MODELS),
                 });
+                // 用户在云端配置的自定义端点,一个端点一个 provider,/model 里即可切换
+                for (const ep of CUSTOM_ENDPOINTS) {
+                    pi.registerProvider(ep.id, endpointProviderEntry(ep));
+                }
                 // /model and Ctrl+P already write pi settings; also keep ~/.u1s1/config.json in sync
                 pi.on("model_select", (event) => {
                     if (event.source === "restore")
                         return;
-                    if (event.model.provider !== PROVIDER_ID)
-                        return;
-                    if (!MODELS.some((m) => m.id === event.model.id))
+                    const ref = { provider: event.model.provider, id: event.model.id };
+                    if (!refValid(ref))
                         return;
-                    persistPreferredModel(loadConfig(), event.model.id);
+                    persistPreferredModel(loadConfig(), ref.provider, ref.id);
                 });
                 pi.on("session_start", (_event, ctx) => {
                     const previous = ctx.ui.getEditorComponent();
@@ -228,10 +233,11 @@ async function runAgent(cfg, args) {
         },
     ];
     const hasModelArg = args.some((a) => a === "--model" || a.startsWith("--model=") || a === "--provider");
-    const defaultModel = resolvePreferredModel(cfg.model);
-    if (cfg.model !== defaultModel)
-        persistPreferredModel(cfg, defaultModel);
-    const finalArgs = hasModelArg ? args : ["--model", `${PROVIDER_ID}/${defaultModel}`, ...args];
+    const pref = resolvePreferredModel(cfg);
+    if (cfg.model !== pref.id || (cfg.modelProvider ?? PROVIDER_ID) !== pref.provider) {
+        persistPreferredModel(cfg, pref.provider, pref.id);
+    }
+    const finalArgs = hasModelArg ? args : ["--model", `${pref.provider}/${pref.id}`, ...args];
     await main(finalArgs, { extensionFactories: extension });
 }
 async function run() {

package/dist/model.js

@@ -1,11 +1,14 @@
-import { loadConfig, MODELS, persistPreferredModel, resolveModel, resolvePreferredModel } from "./config.js";
+import { loadCustomEndpoints } from "./api.js";
+import { CUSTOM_ENDPOINTS, findModel, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, resolvePreferredModel, } from "./config.js";
 export async function modelCommand(nameOrAlias) {
     const cfg = loadConfig();
-    const current = resolvePreferredModel(cfg.model);
+    // 云端可能刚改过端点配置;拉一次(失败回退本地缓存),再解析当前默认
+    await loadCustomEndpoints(cfg);
+    const current = resolvePreferredModel(cfg);
     if (!nameOrAlias) {
         console.log("");
         for (const m of MODELS) {
-            const mark = m.id === current ? "●" : " ";
+            const mark = current.provider === PROVIDER_ID && m.id === current.id ? "●" : " ";
             console.log(`  ${mark} ${m.aliases[0].padEnd(10)} ${m.name}`);
             if (m.note) {
                 console.log(`               ${m.note} · $${m.cost.input}/$${m.cost.output} 每百万 token`);
@@ -14,16 +17,37 @@ export async function modelCommand(nameOrAlias) {
                 console.log(`               $${m.cost.input}/$${m.cost.output} 每百万 token`);
             }
         }
+        for (const ep of CUSTOM_ENDPOINTS) {
+            console.log("");
+            console.log(`  ─ 自定义端点 ${ep.name}(${ep.baseUrl},走本地直连不计费)`);
+            for (const m of ep.models) {
+                const mark = current.provider === ep.id && m.id === current.id ? "●" : " ";
+                console.log(`  ${mark} ${m.id.padEnd(10)} ${m.name === m.id ? "" : m.name}`);
+            }
+        }
         console.log("");
         console.log("  切换:u1s1 model grok / u1s1 model deepseek(对话里 /model 同样会记住)");
+        if (CUSTOM_ENDPOINTS.length) {
+            console.log("  端点模型重名时可加限定:u1s1 model 端点名:模型id");
+        }
+        else {
+            console.log("  想接自己的 API(含本机 Ollama)?去 https://u1s1.io/dashboard 配「自定义模型端点」");
+        }
         console.log("");
         return;
     }
-    const m = resolveModel(nameOrAlias);
+    const m = findModel(nameOrAlias);
     if (!m) {
-        console.error(`  没有叫「${nameOrAlias}」的模型,可选:${MODELS.map((x) => x.aliases[0]).join(" / ")}`);
+        const custom = CUSTOM_ENDPOINTS.flatMap((e) => e.models.map((x) => x.id));
+        const all = [...MODELS.map((x) => x.aliases[0]), ...custom];
+        console.error(`  没有叫「${nameOrAlias}」的模型,可选:${all.join(" / ")}`);
         process.exit(1);
     }
-    persistPreferredModel(cfg, m.id);
-    console.log(`  ✓ 默认模型已切到 ${m.name}(${m.note})`);
+    persistPreferredModel(cfg, m.provider, m.id);
+    if (m.provider === PROVIDER_ID) {
+        console.log(`  ✓ 默认模型已切到 ${m.model.name}${m.model.note ? `(${m.model.note})` : ""}`);
+    }
+    else {
+        console.log(`  ✓ 默认模型已切到 ${m.model.name}(自定义端点 ${m.providerName},本地直连不计费)`);
+    }
 }

package/dist/search-tools.d.ts

@@ -0,0 +1,3 @@
+import { type CliConfig } from "./config.js";
+/** 缺哪个装哪个;都在(本地目录或 PATH)则秒退。失败只提示,不阻塞启动。 */
+export declare function ensureSearchTools(cfg: Pick<CliConfig, "baseUrl">): Promise<void>;

package/dist/search-tools.js

@@ -0,0 +1,153 @@
+import { spawnSync } from "node:child_process";
+import { chmodSync, createWriteStream, existsSync, mkdirSync, readdirSync, renameSync, rmSync } from "node:fs";
+import { arch, platform } from "node:os";
+import { join } from "node:path";
+import { Readable } from "node:stream";
+import { pipeline } from "node:stream/promises";
+import { agentDir } from "./config.js";
+/**
+ * 预 seed pi 的搜索组件(fd / ripgrep)到 ~/.u1s1/agent/bin。
+ *
+ * pi 首启发现缺 fd/rg 会从 GitHub 现下,国内直连基本不通:启动时连弹
+ * "Failed to download ... fetch failed",更糟的是 grep/find 工具运行时直接
+ * 报错,没有降级路径。这里在进 pi 之前从自家网关(/tools/<asset>,CF 边缘
+ * 代理 GitHub release,见 gateway/src/index.ts)把二进制放进 pi 的探测目录
+ * (探测顺序:agentDir/bin → PATH);探到本地文件后 pi 不再碰 GitHub。
+ * 任何失败都不阻塞启动——pi 自己的 GitHub 下载仍是兜底(有代理的用户能通)。
+ *
+ * 版本钉死而不是查 latest:免去对 GitHub API 的依赖,且 fd 10.4+ 不再发
+ * x86_64 macOS 产物,统一钉 10.3.0(与 pi 对 darwin-x64 的钉版一致)。
+ */
+const TOOLS = [
+    { bin: "fd", version: "10.3.0", pathNames: ["fd", "fdfind"], asset: fdAsset },
+    { bin: "rg", version: "15.2.0", pathNames: ["rg"], asset: rgAsset },
+];
+const binDir = join(agentDir, "bin");
+const DOWNLOAD_TIMEOUT_MS = 60_000;
+function archStr() {
+    const a = arch();
+    return a === "arm64" ? "aarch64" : a === "x64" ? "x86_64" : null;
+}
+function fdAsset(version) {
+    const a = archStr();
+    if (!a)
+        return null;
+    const p = platform();
+    if (p === "darwin")
+        return `fd-v${version}-${a}-apple-darwin.tar.gz`;
+    if (p === "linux")
+        return `fd-v${version}-${a}-unknown-linux-gnu.tar.gz`;
+    if (p === "win32")
+        return `fd-v${version}-${a}-pc-windows-msvc.zip`;
+    return null;
+}
+function rgAsset(version) {
+    const a = archStr();
+    if (!a)
+        return null;
+    const p = platform();
+    if (p === "darwin")
+        return `ripgrep-${version}-${a}-apple-darwin.tar.gz`;
+    // linux 上 arm64 用 gnu、x64 用 musl:与 pi 的资产选择保持一致
+    if (p === "linux") {
+        return a === "aarch64"
+            ? `ripgrep-${version}-aarch64-unknown-linux-gnu.tar.gz`
+            : `ripgrep-${version}-x86_64-unknown-linux-musl.tar.gz`;
+    }
+    if (p === "win32")
+        return `ripgrep-${version}-${a}-pc-windows-msvc.zip`;
+    return null;
+}
+/** 与 pi 的 commandExists 同语义:能 spawn 就算在 PATH 里(fd 也认 Debian 名 fdfind)。 */
+function inPath(names) {
+    return names.some((name) => {
+        const r = spawnSync(name, ["--version"], { stdio: "pipe" });
+        return r.error === undefined || r.error === null;
+    });
+}
+function run(command, cmdArgs) {
+    const r = spawnSync(command, cmdArgs, { stdio: "pipe" });
+    return !r.error && r.status === 0;
+}
+function extract(archive, dir) {
+    if (archive.endsWith(".zip")) {
+        // 只有 win32 会拿到 zip。System32 的 tar 是 bsdtar,认 zip;Git Bash 的
+        // GNU tar 不认——优先绝对路径,失败再退 powershell Expand-Archive。
+        const sysRoot = process.env["SystemRoot"] ?? process.env["WINDIR"];
+        const sysTar = sysRoot ? join(sysRoot, "System32", "tar.exe") : "tar.exe";
+        if (run(existsSync(sysTar) ? sysTar : "tar.exe", ["xf", archive, "-C", dir]))
+            return true;
+        return run("powershell.exe", [
+            "-NoLogo", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command",
+            "& { param($a,$d) $ErrorActionPreference='Stop'; Expand-Archive -LiteralPath $a -DestinationPath $d -Force }",
+            archive, dir,
+        ]);
+    }
+    return run("tar", ["xzf", archive, "-C", dir]);
+}
+/** 资产里的二进制可能嵌在版本号目录下(fd 是,rg 也是),递归找。 */
+function findBinary(root, name) {
+    const stack = [root];
+    while (stack.length > 0) {
+        const dir = stack.pop();
+        for (const entry of readdirSync(dir, { withFileTypes: true })) {
+            const full = join(dir, entry.name);
+            if (entry.isFile() && entry.name === name)
+                return full;
+            if (entry.isDirectory())
+                stack.push(full);
+        }
+    }
+    return null;
+}
+async function install(tool, baseUrl, binName) {
+    const asset = tool.asset(tool.version);
+    if (!asset)
+        throw new Error(`不支持的平台 ${platform()}/${arch()}`);
+    mkdirSync(binDir, { recursive: true });
+    const res = await fetch(new URL(`/tools/${asset}`, baseUrl), {
+        signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS),
+    });
+    if (!res.ok || !res.body)
+        throw new Error(`HTTP ${res.status}`);
+    const archive = join(binDir, asset);
+    // fd/rg 并行安装,解压目录按工具名+pid 隔离,避免互踩
+    const extractDir = join(binDir, `preseed_${tool.bin}_${process.pid}`);
+    try {
+        await pipeline(Readable.fromWeb(res.body), createWriteStream(archive));
+        mkdirSync(extractDir, { recursive: true });
+        if (!extract(archive, extractDir))
+            throw new Error(`解压失败 ${asset}`);
+        const found = findBinary(extractDir, binName);
+        if (!found)
+            throw new Error(`包内没有 ${binName}`);
+        renameSync(found, join(binDir, binName));
+        if (platform() !== "win32")
+            chmodSync(join(binDir, binName), 0o755);
+    }
+    finally {
+        rmSync(archive, { force: true });
+        rmSync(extractDir, { recursive: true, force: true });
+    }
+}
+/** 缺哪个装哪个;都在(本地目录或 PATH)则秒退。失败只提示,不阻塞启动。 */
+export async function ensureSearchTools(cfg) {
+    try {
+        const ext = platform() === "win32" ? ".exe" : "";
+        const missing = TOOLS.filter((t) => !existsSync(join(binDir, t.bin + ext)) && !inPath(t.pathNames));
+        if (missing.length === 0)
+            return;
+        console.log(`  正在安装搜索组件(${missing.map((t) => t.bin).join("/")})…`);
+        const results = await Promise.allSettled(missing.map((t) => install(t, cfg.baseUrl, t.bin + ext)));
+        for (let i = 0; i < results.length; i++) {
+            const r = results[i];
+            if (r.status === "rejected") {
+                const msg = r.reason instanceof Error ? r.reason.message : String(r.reason);
+                console.error(`  ${missing[i].bin} 安装失败(${msg}),稍后将尝试 GitHub 直连`);
+            }
+        }
+    }
+    catch {
+        // 预 seed 只是加速,任何意外都不该挡住启动
+    }
+}

package/dist/web.js

@@ -2,10 +2,11 @@ import { spawn, spawnSync } from "node:child_process";
 import { mkdirSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join } from "node:path";
-import { cleanupBrandThemes, ensureAuthCredential, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, writeWebToolsExtension, } from "./agent-setup.js";
+import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureDefaultSettings, ensureProviderModels, writeWebToolsExtension, } from "./agent-setup.js";
 import { agentDir, apiModelToDef, resolvePreferredModel, setModelsFromApi, u1s1Dir, writeAgentDefaultModel, } from "./config.js";
+import { ensureSearchTools } from "./search-tools.js";
 import { applyWebUiBranding, applyWebUiFrontend } from "./webui-brand.js";
-import { fetchModels } from "./api.js";
+import { fetchModels, loadCustomEndpoints } from "./api.js";
 const require = createRequire(import.meta.url);
 /**
  * `u1s1 web` — 浏览器网页版。薄包装 pi-web-ui 的服务器:注入我们的 agentDir
@@ -21,9 +22,13 @@ export async function prepareWebEnv(cfg) {
     cleanupBrandThemes();
     ensureBrandPrompt();
     ensureDefaultSettings();
+    // 网页版/App 的 agent 会话同样依赖 fd/rg(同一个 agentDir);与取模型列表并行
+    const searchToolsReady = ensureSearchTools(cfg);
     // Fetch model list from server; fall back to built-in MODELS on error.
     // 服务端没开搜索(或老网关没有 features 字段)时不注册 web_search
+    // 自定义端点与模型列表并行拉取,失败各自兜底(内置列表 / 本地缓存)
     let webSearchEnabled = true;
+    const endpointsReady = loadCustomEndpoints(cfg);
     try {
         const { models, features } = await fetchModels(cfg);
         setModelsFromApi(models.map(apiModelToDef));
@@ -32,6 +37,7 @@ export async function prepareWebEnv(cfg) {
     catch (e) {
         console.error("  获取模型列表失败,使用内置列表:", e.message);
     }
+    await endpointsReady;
     ensureProviderModels(cfg);
     // pi-web-ui 靠 auth.json 判断「已配置」,否则网页会弹 pi 安装引导
     ensureAuthCredential();
@@ -39,14 +45,18 @@ export async function prepareWebEnv(cfg) {
     writeWebToolsExtension(cfg, webSearchEnabled);
     // 网页版新会话从 settings.json 的 defaultModel 取模型(TUI 是每次传 --model),
     // 确保它有值;resolvePreferredModel 优先尊重已有的 in-session 选择,不会回退覆盖。
-    writeAgentDefaultModel(resolvePreferredModel(cfg.model));
+    const pref = resolvePreferredModel(cfg);
+    writeAgentDefaultModel(pref.provider, pref.id);
     const dataDir = join(u1s1Dir, "web");
     mkdirSync(dataDir, { recursive: true });
+    await searchToolsReady;
     return {
         PI_CODING_AGENT_DIR: agentDir,
         U1S1_API_KEY: cfg.apiKey,
         U1S1_TOOLS_VIA_EXTENSION: "1",
         PI_WEB_DATA_DIR: dataDir,
+        // 自定义端点的密钥经环境变量传给 web 子进程(models.json 里只有 $VAR 引用)
+        ...endpointKeyEnv(),
     };
 }
 export async function webCommand(cfg, args) {

package/package.json

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