u1s1-cli 1.2.5 → 1.2.6

package/dist/agent-setup.d.ts

@@ -89,4 +89,10 @@ export declare function ensureWorkflowPromptTemplate(): void;
 export declare function scrubForeignProviderEnv(): void;
 /** 把各端点密钥放进环境(TUI 直接 process.env;web 传给子进程)。 */
 export declare function endpointKeyEnv(): Record<string, string>;
-export declare function ensureProviderModels(cfg: CliConfig): void;
+export interface ProviderModelsFileOptions {
+    /** Destination for the composed provider config. Defaults to the shared agent models file. */
+    outputPath?: string;
+    /** Existing config to preserve. Defaults to outputPath. */
+    sourcePath?: string;
+}
+export declare function ensureProviderModels(cfg: CliConfig, options?: ProviderModelsFileOptions): void;

package/dist/agent-setup.js

@@ -206,10 +206,10 @@ export function writeWebToolsExtension(cfg, features) {
     mkdirSync(dir, { recursive: true });
     const toolsUrl = new URL("./tools.js", import.meta.url).href;
     const searchLine = features.webSearch
-        ? `  pi.registerTool(tools.createSearchTool({ baseUrl: ${JSON.stringify(cfg.baseUrl)}, apiKey: process.env.U1S1_API_KEY }));\n`
+        ? `  pi.registerTool(tools.createSearchTool({ baseUrl, apiKey: process.env.U1S1_API_KEY }));\n`
         : "";
     const imageLine = features.imageGen
-        ? `  pi.registerTool(tools.createImageTool({ baseUrl: ${JSON.stringify(cfg.baseUrl)}, apiKey: process.env.U1S1_API_KEY }));\n`
+        ? `  pi.registerTool(tools.createImageTool({ baseUrl, apiKey: process.env.U1S1_API_KEY }));\n`
         : "";
     // spawn_subagent / run_workflow 只给主会话注册;子 agent 环境里跳过,杜绝孙 agent 递归 spawn
     const subagentBlock = `  if (process.env.U1S1_IN_SUBAGENT !== "1") {\n` +
@@ -227,9 +227,10 @@ export function writeWebToolsExtension(cfg, features) {
     writeFileSync(join(dir, "u1s1-tools.js"), `// 由 u1s1 每次启动自动生成,请勿手改\n` +
         `export default async function (pi) {\n` +
         `  if (process.env.U1S1_TOOLS_VIA_EXTENSION !== "1") return;\n` +
+        `  const baseUrl = process.env.U1S1_SIGNING_PROXY_URL || ${JSON.stringify(cfg.baseUrl)};\n` +
         `  const tools = await import(${JSON.stringify(toolsUrl)});\n` +
         searchLine +
-        `  pi.registerTool(tools.createFetchTool({ baseUrl: ${JSON.stringify(cfg.baseUrl)}, apiKey: process.env.U1S1_API_KEY, renderFallback: ${features.webFetchRender} }));\n` +
+        `  pi.registerTool(tools.createFetchTool({ baseUrl, apiKey: process.env.U1S1_API_KEY, renderFallback: ${features.webFetchRender} }));\n` +
         imageLine +
         subagentBlock +
         `}\n`);
@@ -528,13 +529,14 @@ export function endpointKeyEnv() {
     }
     return env;
 }
-export function ensureProviderModels(cfg) {
-    mkdirSync(agentDir, { recursive: true });
-    const p = join(agentDir, "models.json");
+export function ensureProviderModels(cfg, options = {}) {
+    const outputPath = options.outputPath ?? join(agentDir, "models.json");
+    const sourcePath = options.sourcePath ?? outputPath;
+    mkdirSync(dirname(outputPath), { recursive: true });
     let root = {};
-    if (existsSync(p)) {
+    if (existsSync(sourcePath)) {
         try {
-            root = JSON.parse(readFileSync(p, "utf8"));
+            root = JSON.parse(readFileSync(sourcePath, "utf8"));
         }
         catch {
             root = {};
@@ -563,5 +565,5 @@ export function ensureProviderModels(cfg) {
         providers[ep.id] = endpointProviderEntry(ep);
     }
     root["providers"] = providers;
-    writeFileSync(p, JSON.stringify(root, null, 2) + "\n");
+    writeFileSync(outputPath, JSON.stringify(root, null, 2) + "\n", { mode: 0o600 });
 }

package/dist/embed.d.ts

@@ -6,6 +6,6 @@
 export { agentDir, loadConfig, saveConfig, u1s1Dir, VERSION, type CliConfig, } from "./config.js";
 export { fetchMe, fetchModels } from "./api.js";
 export { apiOrigin, pollDeviceLogin, startDeviceLogin, type DeviceStart } from "./login.js";
-export { prepareWebEnv } from "./web.js";
+export { prepareWebEnv, refreshWebModels } from "./web.js";
 export { applyWebUiBranding } from "./webui-brand.js";
 export { DASHBOARD_URL } from "./brand.js";

package/dist/embed.js

@@ -6,6 +6,6 @@
 export { agentDir, loadConfig, saveConfig, u1s1Dir, VERSION, } from "./config.js";
 export { fetchMe, fetchModels } from "./api.js";
 export { apiOrigin, pollDeviceLogin, startDeviceLogin } from "./login.js";
-export { prepareWebEnv } from "./web.js";
+export { prepareWebEnv, refreshWebModels } from "./web.js";
 export { applyWebUiBranding } from "./webui-brand.js";
 export { DASHBOARD_URL } from "./brand.js";

package/dist/index.js

@@ -212,6 +212,7 @@ async function runAgent(cfg, args) {
     // must be set before pi reads them (getAgentDir() reads at call time, env at import is fine too)
     process.env["PI_CODING_AGENT_DIR"] = agentDir;
     process.env["U1S1_API_KEY"] = officialCfg.apiKey;
+    process.env["U1S1_SIGNING_PROXY_URL"] = officialCfg.baseUrl;
     process.env["U1S1_TOOLS_VIA_EXTENSION"] = "1";
     // 自定义端点的密钥走环境变量引用(models.json 里只有 $VAR,不落明文)
     Object.assign(process.env, endpointKeyEnv());

package/dist/web.d.ts

@@ -1,4 +1,10 @@
 import { type CliConfig } from "./config.js";
+/**
+ * Refresh the web/Desktop process-local model snapshot while preserving user
+ * providers from the shared agent config. The u1s1 provider always remains
+ * pinned to this process's signing proxy.
+ */
+export declare function refreshWebModels(): string | undefined;
 /**
  * Desktop App 启动 agent server 前的公共准备:品牌 prompt、模型列表、
  * auth.json 凭据、联网工具扩展、默认模型,并返回子进程需要的环境变量。

package/dist/web.js

@@ -1,4 +1,5 @@
-import { mkdirSync } from "node:fs";
+import { mkdirSync, mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { cleanupBrandThemes, endpointKeyEnv, ensureAuthCredential, ensureBrandPrompt, ensureWorkflowPromptTemplate, ensureDefaultSettings, ensureProviderModels, scrubForeignProviderEnv, writeAttributionExtension, writeWebToolsExtension, } from "./agent-setup.js";
 import { agentDir, apiModelToDef, MODELS, resolvePreferredModel, setModelsFromApi, u1s1Dir, writeAgentDefaultModel, } from "./config.js";
@@ -6,6 +7,33 @@ import { ensureSearchTools } from "./search-tools.js";
 import { ensureUsableShell } from "./shell-doctor.js";
 import { fetchModels, loadCustomEndpoints } from "./api.js";
 import { ensureSigningProxy } from "./device-auth.js";
+let webModelsDir;
+let webOfficialCfg;
+function processModelsPath() {
+    if (!webModelsDir) {
+        webModelsDir = mkdtempSync(join(tmpdir(), "u1s1-web-"));
+        process.once("exit", () => {
+            if (webModelsDir)
+                rmSync(webModelsDir, { recursive: true, force: true });
+        });
+    }
+    return join(webModelsDir, "models.json");
+}
+/**
+ * Refresh the web/Desktop process-local model snapshot while preserving user
+ * providers from the shared agent config. The u1s1 provider always remains
+ * pinned to this process's signing proxy.
+ */
+export function refreshWebModels() {
+    if (!webOfficialCfg)
+        return undefined;
+    const outputPath = processModelsPath();
+    ensureProviderModels(webOfficialCfg, {
+        outputPath,
+        sourcePath: join(agentDir, "models.json"),
+    });
+    return outputPath;
+}
 /**
  * Desktop App 启动 agent server 前的公共准备:品牌 prompt、模型列表、
  * auth.json 凭据、联网工具扩展、默认模型,并返回子进程需要的环境变量。
@@ -41,10 +69,11 @@ export async function prepareWebEnv(cfg) {
     ensureDefaultSettings(MODELS);
     const signing = await ensureSigningProxy(cfg, "desktop");
     const officialCfg = { ...cfg, baseUrl: signing.baseUrl, apiKey: signing.localKey };
+    webOfficialCfg = officialCfg;
+    const modelsPath = refreshWebModels();
     ensureBrandPrompt(await shellReady);
     // /workflow 提示词模板与 TUI 同源,Desktop App 也要有
     ensureWorkflowPromptTemplate();
-    ensureProviderModels(officialCfg);
     // pi-web-ui 靠 auth.json 判断「已配置」,否则网页会弹 pi 安装引导
     ensureAuthCredential();
     // 联网工具经 agentDir/extensions 投影,和 TUI 共用一份注册
@@ -67,6 +96,8 @@ export async function prepareWebEnv(cfg) {
     return {
         PI_CODING_AGENT_DIR: agentDir,
         U1S1_API_KEY: officialCfg.apiKey,
+        U1S1_MODELS_PATH: modelsPath,
+        U1S1_SIGNING_PROXY_URL: officialCfg.baseUrl,
         U1S1_TOOLS_VIA_EXTENSION: "1",
         PI_WEB_DATA_DIR: dataDir,
         // 自定义端点的密钥经环境变量传给 App 子进程(models.json 里只有 $VAR 引用)

package/package.json

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