u1s1-cli 1.2.5 → 1.2.7

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.7",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {

package/scripts/patch-pi.js

@@ -1,14 +1,15 @@
 /**
- * postinstall 补丁：给 @earendil-works/pi-coding-agent 打「精简 UI」补丁。
+ * Apply u1s1 runtime patches to pi during postinstall.
  *
- * 为什么存在：仓库里用 pnpm patch（patches/*.patch）对开发态生效，但终端用户
- * 是 `npm i -g u1s1-cli` 装的，npm 不认 pnpm 的补丁机制。这个脚本在用户安装后
- * 对 node_modules 里的 pi 做同样的字符串替换，保证空行修复对所有安装方式生效。
+ * The repository applies patches/*.patch through pnpm for development, while
+ * global `npm i -g u1s1-cli` installations do not understand pnpm patches.
+ * This script applies the same compact-UI and Windows TUI fixes to installed
+ * dependencies so both installation paths behave identically.
  *
- * 特性：
- * - 纯 Node 实现，不依赖 patch(1)，Windows 可跑
- * - 幂等：已打过（含 pnpm patch 打过）直接跳过
- * - 永不让安装失败：任何异常只提示，exit 0
+ * Properties:
+ * - Pure Node implementation with no patch(1) dependency, including Windows
+ * - Idempotent across pnpm-patched and previously patched installations
+ * - Never fails installation; mismatches only emit a notice and exit 0
  */
 
 import { readFileSync, writeFileSync, existsSync } from "node:fs";
@@ -18,17 +19,17 @@ import { createRequire } from "node:module";
 
 const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), "..");
 
-// npm 会把依赖提升到上层 node_modules（全局安装尤其如此），
-// 所以用模块解析算法定位 pi，而不是拼固定相对路径
-function findPiDir() {
+// npm may hoist dependencies above the package, especially for global installs.
+// Resolve packages through Node first, then walk upward as a fallback.
+function findPackageDir(packageName) {
   try {
     const req = createRequire(join(pkgRoot, "package.json"));
-    return dirname(req.resolve("@earendil-works/pi-coding-agent/package.json"));
+    return dirname(req.resolve(`${packageName}/package.json`));
   } catch {
-    // 兜底：从包根逐级向上找
+    const [scope, name] = packageName.split("/");
     let dir = pkgRoot;
     while (true) {
-      const candidate = join(dir, "node_modules", "@earendil-works", "pi-coding-agent");
+      const candidate = join(dir, "node_modules", scope, name);
       if (existsSync(candidate)) return candidate;
       const parent = dirname(dir);
       if (parent === dir) return null;
@@ -37,67 +38,115 @@ function findPiDir() {
   }
 }
 
-const piDir = findPiDir();
-const target = piDir
-  ? join(piDir, "dist", "modes", "interactive", "components", "assistant-message.js")
-  : null;
-
-// 每条 [原文, 替换后]；与 patches/@earendil-works__pi-coding-agent@0.84.2.patch 等效
-const REPLACEMENTS = [
-  // 隐藏的思考块不算「可见内容」（消息开头不再加空行）
+// Each tuple is [original, replacement], matching the pnpm coding-agent patch.
+const COMPACT_UI_REPLACEMENTS = [
+  // Hidden thinking does not count as visible content.
   [
     '|| (c.type === "thinking" && c.thinking.trim())',
     '|| (c.type === "thinking" && !this.hideThinkingBlock && c.thinking.trim())',
   ],
-  // 折叠标签为空字符串时完全跳过（ANSI 包着的空串仍会画出一整行空白）
+  // Skip an empty collapsed-thinking label instead of rendering an ANSI-only row.
   [
     'this.contentContainer.addChild(new Text(theme.italic(theme.fg("thinkingText", this.hiddenThinkingLabel)), this.outputPad, 0));',
     'if (this.hiddenThinkingLabel !== "") { this.contentContainer.addChild(new Text(theme.italic(theme.fg("thinkingText", this.hiddenThinkingLabel)), this.outputPad, 0)); }',
   ],
-  // 思考块完全隐形时，不再加它后面的间隔空行
+  // Do not add spacing after a fully hidden thinking block.
   [
     "if (hasVisibleContentAfter) {",
     'if (hasVisibleContentAfter && !(this.hideThinkingBlock && this.hiddenThinkingLabel === "")) {',
   ],
 ];
 
-try {
+function patchCompactUi() {
+  const piDir = findPackageDir("@earendil-works/pi-coding-agent");
+  const target = piDir
+    ? join(piDir, "dist", "modes", "interactive", "components", "assistant-message.js")
+    : null;
   if (!target) {
     console.log("[u1s1] 提示: 未找到 @earendil-works/pi-coding-agent，精简 UI 空行补丁未应用（不影响使用）");
-    process.exit(0);
+    return;
   }
-  let text;
   try {
-    text = readFileSync(target, "utf8");
+    let text = readFileSync(target, "utf8");
+    if (text.includes("!this.hideThinkingBlock && c.thinking.trim()")) return;
+
+    let applied = 0;
+    for (const [from, to] of COMPACT_UI_REPLACEMENTS) {
+      if (text.includes(to)) {
+        applied++;
+        continue;
+      }
+      if (!text.includes(from)) continue;
+      text = text.split(from).join(to);
+      applied++;
+    }
+
+    if (applied < COMPACT_UI_REPLACEMENTS.length) {
+      console.log(
+        `[u1s1] 提示: pi 版本可能已更新，精简 UI 空行补丁只应用了 ${applied}/${COMPACT_UI_REPLACEMENTS.length} 处（不影响使用）`,
+      );
+    }
+    writeFileSync(target, text);
   } catch {
-    // 找不到 pi 就静默退出（不该发生：postinstall 在依赖装完后跑）
-    process.exit(0);
+    return;
   }
+}
 
-  if (text.includes("!this.hideThinkingBlock && c.thinking.trim()")) {
-    // 已打过（pnpm patch 或上次运行），幂等跳过
-    process.exit(0);
+function patchMainScreenAutowrap() {
+  const tuiDir = findPackageDir("@earendil-works/pi-tui");
+  const target = tuiDir ? join(tuiDir, "dist", "tui-main-screen.js") : null;
+  if (!target) {
+    console.log("[u1s1] 提示: 未找到 @earendil-works/pi-tui，Windows 重绘补丁未应用（不影响安装）");
+    return;
   }
+  try {
+    let text = readFileSync(target, "utf8");
+    if (text.includes('const DISABLE_AUTOWRAP = "\\x1b[?7l";')) return;
 
-  let applied = 0;
-  for (const [from, to] of REPLACEMENTS) {
-    if (text.includes(to)) {
-      applied++;
-      continue;
+    const rules = [
+      {
+        from: 'const KITTY_SEQUENCE_PREFIX = "\\x1b_G";',
+        to: `const KITTY_SEQUENCE_PREFIX = "\\x1b_G";
+// Windows ConPTY eagerly wraps full-width lines, which desynchronizes cursor-row tracking.
+const DISABLE_AUTOWRAP = "\\x1b[?7l";
+const ENABLE_AUTOWRAP = "\\x1b[?7h";`,
+        expected: 1,
+      },
+      {
+        from: 'let buffer = "\\x1b[?2026h";',
+        to: 'let buffer = "\\x1b[?2026h" + DISABLE_AUTOWRAP;',
+        expected: 3,
+      },
+      {
+        from: 'buffer += "\\x1b[?2026l";',
+        to: 'buffer += ENABLE_AUTOWRAP + "\\x1b[?2026l";',
+        expected: 3,
+      },
+    ];
+    let applied = 0;
+    let expected = 0;
+    for (const rule of rules) {
+      expected += rule.expected;
+      const occurrences = text.split(rule.from).length - 1;
+      if (occurrences !== rule.expected) continue;
+      text = text.split(rule.from).join(rule.to);
+      applied += occurrences;
     }
-    if (!text.includes(from)) continue;
-    text = text.split(from).join(to);
-    applied++;
-  }
 
-  if (applied < REPLACEMENTS.length) {
-    console.log(
-      `[u1s1] 提示: pi 版本可能已更新，精简 UI 空行补丁只应用了 ${applied}/${REPLACEMENTS.length} 处（不影响使用）`,
-    );
+    if (applied !== expected) {
+      console.log(`[u1s1] 提示: pi-tui 版本可能已更新，Windows 重绘补丁只应用了 ${applied}/${expected} 处（不影响安装）`);
+      return;
+    }
+    writeFileSync(target, text);
+  } catch {
+    return;
   }
+}
 
-  writeFileSync(target, text);
+try {
+  patchCompactUi();
+  patchMainScreenAutowrap();
 } catch (err) {
-  console.log(`[u1s1] 提示: 精简 UI 空行补丁未生效（${err?.message ?? err}），不影响使用`);
+  console.log(`[u1s1] 提示: pi 运行时补丁未生效（${err?.message ?? err}），不影响安装`);
 }
 process.exit(0);

package/scripts/render-regression.mjs

@@ -12,7 +12,7 @@
  * 运行：node scripts/render-regression.mjs（prepublishOnly 会自动跑）
  */
 
-import { Container, Spacer, Text } from "@earendil-works/pi-tui";
+import { Container, Spacer, Text, TuiMainScreen } from "@earendil-works/pi-tui";
 import { existsSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -48,6 +48,12 @@ function check(name, actual, expected) {
   console.log(`${ok ? "✓" : "✗"} ${name}: ${actual} 行（期望 ${expected}）`);
 }
 
+function checkTrue(name, actual) {
+  const ok = actual === true;
+  if (!ok) failed++;
+  console.log(`${ok ? "✓" : "✗"} ${name}`);
+}
+
 // 与 u1s1-compact-ui 扩展一致的隐藏渲染器
 function hiddenToolDef(orig) {
   return {
@@ -123,9 +129,57 @@ function mkMsg(thinking, text) {
 }
 check("完整一轮对话", chat3.render(80).length, 6);
 
+// ---- 4. Regular-screen frames guard full-width lines against ConPTY eager autowrap ----
+class RecordingTerminal {
+  columns = 40;
+  rows = 10;
+  kittyProtocolActive = false;
+  writes = [];
+  start() {}
+  stop() {}
+  async drainInput() {}
+  write(data) {
+    this.writes.push(data);
+  }
+  moveBy() {}
+  hideCursor() {}
+  showCursor() {}
+  clearLine() {}
+  clearFromCursor() {}
+  clearScreen() {}
+  setTitle() {}
+  setProgress() {}
+}
+
+const terminal = new RecordingTerminal();
+const tui = new TuiMainScreen(terminal);
+const fullWidthComponent = {
+  lines: ["─".repeat(40), "editor line", "─".repeat(40)],
+  render() {
+    return this.lines;
+  },
+  invalidate() {},
+};
+tui.addChild(fullWidthComponent);
+tui.renderNow();
+const initialFrame = terminal.writes.join("");
+checkTrue("Windows 首次绘制关闭并恢复 autowrap", initialFrame.includes("\x1b[?2026h\x1b[?7l") && initialFrame.includes("\x1b[?7h\x1b[?2026l"));
+
+terminal.writes = [];
+fullWidthComponent.lines[1] = "editor line changed";
+tui.renderNow();
+const incrementalFrame = terminal.writes.join("");
+checkTrue("Windows 增量绘制关闭并恢复 autowrap", incrementalFrame.includes("\x1b[?2026h\x1b[?7l") && incrementalFrame.includes("\x1b[?7h\x1b[?2026l"));
+
+terminal.writes = [];
+fullWidthComponent.lines = fullWidthComponent.lines.slice(0, 2);
+tui.renderNow();
+const deletionFrame = terminal.writes.join("");
+checkTrue("Windows 删除行绘制关闭并恢复 autowrap", deletionFrame.includes("\x1b[?2026h\x1b[?7l") && deletionFrame.includes("\x1b[?7h\x1b[?2026l"));
+
 if (failed > 0) {
   console.error(`\n渲染回归测试失败：${failed} 项。多半是 pi 升级后补丁没跟上，或扩展渲染被改动。`);
-  console.error("对照 patches/@earendil-works__pi-coding-agent*.patch 和 agent-setup.ts 里的 writeCompactUiExtension 检查。");
+  console.error("对照 patches/@earendil-works__pi-*.patch、patch-pi.js 和 agent-setup.ts 里的 writeCompactUiExtension 检查。");
   process.exit(1);
 }
 console.log("\n渲染回归测试全部通过 ✓");