u1s1-cli 1.11.2 → 1.11.6

package/dist/config.d.ts

@@ -172,6 +172,8 @@ export declare const agentSettingsFile: string;
 export interface AgentSettings {
     showStartupBanner?: boolean;
     autoUpdate?: boolean;
+    /** HTTP proxy applied to all startup and kernel network requests. */
+    httpProxy?: string;
     /** false 时关闭客户端事件上报(见 telemetry.ts;环境变量 U1S1_TELEMETRY=0 同效) */
     telemetry?: boolean;
     /** pi 自己的 compaction 设置块;u1s1 额外认 maxContextTokens(自动压缩预算,0 = 关) */

package/dist/import/write.js

@@ -48,6 +48,7 @@ export function writeConvertedSession(converted, destCwd) {
                         type: "toolCall",
                         id: block.id,
                         name: block.name,
+                        // 导入的参数本来就是从会话 JSON 解析出来的,一定是 JSON 值
                         arguments: block.arguments,
                     };
                 }),

package/dist/index.js

@@ -17,6 +17,19 @@ import { createGatewayTelemetry } from "./telemetry.js";
 const PACKAGE_NAME = "u1s1-cli";
 /** 启动时检测到的可自动安装的新版;TUI 退出后才装(见 installPendingUpdate)。 */
 let pendingUpdate;
+/**
+ * Configure the same undici dispatcher used by the embedded kernel before any
+ * CLI startup request runs. The kernel keeps this helper in an internal file,
+ * so resolve it relative to its public entry instead of relying on an
+ * unsupported package subpath export.
+ */
+async function configureStartupHttp() {
+    const piEntry = import.meta.resolve("@earendil-works/pi-coding-agent");
+    const dispatcherUrl = new URL("./core/http-dispatcher.js", piEntry).href;
+    const dispatcher = await import(dispatcherUrl);
+    dispatcher.applyHttpProxySettings(readSettings().httpProxy);
+    dispatcher.configureHttpDispatcher();
+}
 /**
  * 启动时自动检查 npm 最新版:autoUpdate 开着就记下退出后安装,关着也在启动横幅的
  * 版本号后面提示一句(u1s1 vX.Y.Z 后跟升级状态,见 setUpdateNotice)。
@@ -679,6 +692,10 @@ async function run() {
     const args = process.argv.slice(2);
     const cmd = args[0];
     const rest = args.slice(1);
+    // Must precede ensureAuth/login, fetchModels, and every command that can
+    // issue network requests. No proxy configured means direct connections via
+    // EnvHttpProxyAgent, preserving the existing fallback behavior.
+    await configureStartupHttp();
     if (cmd === "--version" || cmd === "-v") {
         console.log(`u1s1 v${VERSION}`);
         return;

package/dist/update.d.ts

@@ -5,6 +5,8 @@ export declare function detectPackageManager(): string;
 /** Fetch the latest published version from npm registry. */
 export declare function getLatestVersion(): Promise<string | undefined>;
 export declare function compareVersions(a: string, b: string): number;
+/** 生成 Windows 更新启动器:优先使用 PowerShell 7,没有时回退 Windows PowerShell。 */
+export declare function buildWindowsUpdateLauncherScript(): string;
 /** 从固定发布源拉一个文本文件:强制 https、拒绝重定向、限长。 */
 export declare function fetchReleaseText(name: string, maxBytes: number, timeoutMs?: number): Promise<string>;
 /** 在 sha256sum 格式的清单里找某个文件的哈希("<hex>  <name>" 或 "<hex> *<name>")。 */

package/dist/update.js

@@ -69,6 +69,17 @@ export function compareVersions(a, b) {
 const RELEASE_ORIGIN = "https://u1s1.io";
 const INSTALL_SCRIPT_NAME = "install.sh";
 const MAX_SUMS_BYTES = 64 * 1024;
+/** 生成 Windows 更新启动器:优先使用 PowerShell 7,没有时回退 Windows PowerShell。 */
+export function buildWindowsUpdateLauncherScript() {
+    return [
+        "$inner = '-NoProfile -ExecutionPolicy Bypass -NoExit -File \"' + $PSScriptRoot + '\\update.ps1\"'",
+        "$ps = (Get-Command pwsh -ErrorAction SilentlyContinue).Source",
+        "if (-not $ps) { $ps = (Get-Command powershell -ErrorAction SilentlyContinue).Source }",
+        "if (-not $ps) { throw '找不到可用的 PowerShell' }",
+        "Start-Process -FilePath $ps -ArgumentList $inner",
+        "",
+    ].join("\n");
+}
 /** 从固定发布源拉一个文本文件:强制 https、拒绝重定向、限长。 */
 export async function fetchReleaseText(name, maxBytes, timeoutMs = 30_000) {
     const url = new URL(`/releases/${name}`, RELEASE_ORIGIN);
@@ -135,8 +146,7 @@ async function portableSelfUpdate(latest) {
         // 拼字符串,没有引号二次解析问题。
         const dir = mkdtempSync(join(tmpdir(), "u1s1-update-"));
         writeFileSync(join(dir, "update.ps1"), "irm https://u1s1.io/releases/install.ps1 | iex\n");
-        writeFileSync(join(dir, "launch.ps1"), "$inner = '-NoProfile -ExecutionPolicy Bypass -NoExit -File \"' + $PSScriptRoot + '\\update.ps1\"'\n" +
-            "Start-Process powershell -ArgumentList $inner\n");
+        writeFileSync(join(dir, "launch.ps1"), buildWindowsUpdateLauncherScript());
         const res = spawnSync("powershell.exe", ["-NoProfile", "-ExecutionPolicy", "Bypass", "-File", join(dir, "launch.ps1")], { stdio: "ignore", windowsHide: true, timeout: 30_000 });
         if (res.error || res.status !== 0) {
             console.error("无法拉起更新窗口。请手动在 PowerShell 里运行:");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "1.11.2",
+  "version": "1.11.6",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {
@@ -42,8 +42,8 @@
   "license": "MIT",
   "homepage": "https://u1s1.io",
   "dependencies": {
-    "@earendil-works/pi-coding-agent": "0.84.4",
-    "@earendil-works/pi-tui": "0.84.4",
+    "@earendil-works/pi-coding-agent": "0.87.1",
+    "@earendil-works/pi-tui": "0.87.1",
     "typebox": "1.3.7"
   },
   "devDependencies": {

package/scripts/patch-pi.js

@@ -64,15 +64,10 @@ const COMPACT_UI_REPLACEMENTS = [
     '|| (c.type === "thinking" && c.thinking.trim())',
     '|| (c.type === "thinking" && !this.hideThinkingBlock && c.thinking.trim())',
   ],
-  // Skip an empty collapsed-thinking label instead of rendering an ANSI-only row.
+  // Skip a hidden thinking run with an empty label entirely: no ANSI-only row, no trailing spacer.
   [
-    '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 === "")) {',
+    "const hidden = this.thinkingVisibilityOverrides.get(runIndex) ?? this.hideThinkingBlock;",
+    'const hidden = this.thinkingVisibilityOverrides.get(runIndex) ?? this.hideThinkingBlock;\nif (hidden && this.hiddenThinkingLabel === "") { continue; }',
   ],
 ];
 
@@ -86,6 +81,8 @@ const SLASH_COMMANDS_REPLACEMENTS = [
   ['{ name: "export", description: "Export session (HTML default, or specify path: .html/.jsonl)" },', '{ name: "export", description: "导出会话(默认 HTML,也可指定 .html/.jsonl 路径)" },'],
   ['{ name: "import", description: "Import and resume a session from a JSONL file" },', '{ name: "import", description: "从 JSONL 文件导入并继续会话" },'],
   ['{ name: "share", description: "Share session as a secret GitHub gist" },', '{ name: "share", description: "把会话分享为 GitHub 私密 gist" },'],
+  // /bug 会把诊断信息上传给 Pi 上游开发者,u1s1 用户的问题应走 /feedback 到我们这边,从候选列表里去掉
+  ['{ name: "bug", description: "Report a bug to the Pi developers", argumentHint: "<description>" },', ''],
   ['{ name: "copy", description: "Copy last agent message to clipboard" },', '{ name: "copy", description: "复制上一条回复到剪贴板" },'],
   ['{ name: "name", description: "Set session display name" },', '{ name: "name", description: "给当前会话起个名字" },'],
   ['{ name: "session", description: "Show session info and stats" },', '{ name: "session", description: "查看会话信息与统计" },'],
@@ -174,7 +171,7 @@ const HOTKEYS_REPLACEMENTS = [
   ["| Toggle tool output expansion |", "| 展开 / 收起工具输出 |"],
   ["| Toggle thinking block visibility |", "| 显示 / 隐藏思考过程 |"],
   ["| Edit message in external editor |", "| 用外部编辑器写消息 |"],
-  ["| Copy last assistant message |", "| 复制最近一条回复 |"],
+  ["| Copy selection or last assistant message |", "| 复制选中内容或最近一条回复 |"],
   ["| Queue follow-up message |", "| 把消息排到当前回复之后 |"],
   ["| Restore queued messages |", "| 取回排队中的消息 |"],
   ["| Paste image or text from clipboard |", "| 从剪贴板粘贴图片或文本 |"],
@@ -282,7 +279,7 @@ const ASSISTANT_TEXT_REPLACEMENTS = [
   ['theme.fg("error", `Error: ${errorMsg}`)', 'theme.fg("error", `出错:${errorMsg}`)'],
 ];
 const WORKING_TEXT_REPLACEMENTS = [
-  ['defaultWorkingMessage = "Working...";', 'defaultWorkingMessage = "思考中…";'],
+  ['defaultWorkingMessage = "Working";', 'defaultWorkingMessage = "思考中…";'],
   ['defaultHiddenThinkingLabel = "Thinking...";', 'defaultHiddenThinkingLabel = "思考中…";'],
 ];
 // 脚注提示(↑↓ navigate · enter select · esc cancel …)在十几个组件里各写各的,
@@ -295,8 +292,7 @@ const KEY_HINT_REPLACEMENTS = [
   { from: 'theme.fg("muted", ` ${description}`)', to: 'theme.fg("muted", ` ${u1s1Hint(description)}`)', expected: 2 },
 ];
 const MODEL_SELECTOR_REPLACEMENTS = [
-  // 两处 modelText(有/无两空格缩进)同一规则覆盖;测试的空白折叠匹配不认双空格
-  { from: '${item.id}`;', to: '${item.model.name || item.id}`;', expected: 2 },
+  ['const modelText = isSelected ? theme.fg("accent", item.id) : item.id;', 'const modelText = isSelected ? theme.fg("accent", item.model.name || item.id) : (item.model.name || item.id);'],
   ['Model Name: ${selected.model.name}`)', '模型 ID: ${selected.model.id}`)'],
   ['No matching models")', '没有匹配的模型")'],
   ['theme.fg("muted", " · default")', 'theme.fg("muted", " · 默认")'],
@@ -320,7 +316,7 @@ const SETTINGS_REPLACEMENTS = [
   ['always: "Always trust",', 'always: "始终信任",'],
   ['never: "Never trust",', 'never: "从不信任",'],
   ['new SelectSubmenu("Theme", "Select a theme, or choose Automatic to follow terminal appearance."', 'new SelectSubmenu("主题", "选择一个主题,或选「自动」跟随终端明暗。"'],
-  ['label: "Automatic",', 'label: "自动",'],
+  ['label: "  Automatic",', 'label: "  自动",'],
   ['description: "Use separate themes for light and dark terminal appearance",', 'description: "终端明暗各用一套主题",'],
   ['theme.fg("accent", "Automatic Theme")', 'theme.fg("accent", "自动主题")'],
   ['theme.fg("muted", "Choose themes for terminal light and dark appearance.")', 'theme.fg("muted", "分别为终端的浅色/深色外观选主题。")'],
@@ -341,6 +337,8 @@ const SETTINGS_REPLACEMENTS = [
   ['description: `${followUpKey} queues follow-up messages until agent stops. \'one-at-a-time\': deliver one, wait for response. \'all\': deliver all at once.`,', 'description: `${followUpKey} 把追问排队到本轮结束再发。one-at-a-time:发一条等回复;all:一次全发。`,'],
   ['label: "Transport",', 'label: "传输方式",'],
   ['description: "Preferred transport for providers that support multiple transports",', 'description: "支持多种传输方式的渠道优先用哪种",'],
+  ['label: "Cache warming",', 'label: "缓存预热",'],
+  ['description: "off; streaming while the agent runs; idle also between runs while continuation stays profitable",', 'description: "off:不预热;streaming:回复进行中保温;idle:两轮之间只要续聊划算也保温",'],
   ['label: "HTTP idle timeout",', 'label: "HTTP 空闲超时",'],
   ['description: "Maximum idle gap while waiting for HTTP headers or body chunks. Disable for local models that pause longer than five minutes.",', 'description: "等待响应头或数据块的最长空闲间隔;本地模型停顿超过五分钟可关闭。",'],
   ['label: "Hide thinking",', 'label: "隐藏思考过程",'],
@@ -348,7 +346,7 @@ const SETTINGS_REPLACEMENTS = [
   ['label: "Mermaid diagrams",', 'label: "Mermaid 图表",'],
   ['description: "Render Mermaid code blocks as Unicode diagrams",', 'description: "把 Mermaid 代码块渲染成字符图",'],
   ['label: "Cache miss notices",', 'label: "缓存未命中提示",'],
-  ['description: "Show transcript notices for significant prompt-cache misses and compaction costs",', 'description: "提示明显的提示词缓存未命中与压缩开销",'],
+  ['description: "Show transcript notices for cache costs and provider recovery diagnostics",', 'description: "提示缓存开销与渠道恢复诊断",'],
   ['label: "Collapse changelog",', 'label: "折叠更新日志",'],
   ['description: "Show condensed changelog after updates",', 'description: "更新后只显示精简的更新日志",'],
   ['label: "Quiet startup",', 'label: "安静启动",'],
@@ -369,7 +367,7 @@ const SETTINGS_REPLACEMENTS = [
   ['label: "No models available",', 'label: "没有可用模型",'],
   ['description: "Log in to a provider or configure an API key first",', 'description: "请先登录",'],
   ['description: "Select default thinking level for this model",', 'description: "选择这个模型的默认推理强度",'],
-  ['label: "(clear override)",', 'label: "(清除覆盖)",'],
+  ['label: "  (clear override)",', 'label: "  (清除覆盖)",'],
   ['description: `Revert to global default (${config.thinkingLevel})`,', 'description: `恢复为全局默认(${config.thinkingLevel})`,'],
   ['label: "TUI mode",', 'label: "界面模式",'],
   ['description: "Interface layout; fullscreen mode is experimental",', 'description: "界面布局;全屏模式为实验功能",'],
@@ -383,9 +381,19 @@ const SETTINGS_REPLACEMENTS = [
   ['description: "Color theme for the interface",', 'description: "界面配色主题",'],
 ];
 
+// /bug 入口改指向 u1s1 的 /feedback(dist/modes/interactive/interactive-mode.js):
+// 手动输入 /bug、启动时的上次崩溃提示、崩溃退出说明、报错后的一次性提示,都不再把用户引到 Pi 上游。
+const BUG_REPORT_REPLACEMENTS = [
+  ["await this.handleBugCommand(hint ? hint : undefined);", 'this.showStatus("反馈问题请用 /feedback(会附带诊断信息建工单)");'],
+  ["this.showWarning(`${APP_NAME} crashed on ${when} (${crash.message}). Run /bug to report it; the crash details are attached automatically.`);", "this.showWarning(`u1s1 上次异常退出(${when}:${crash.message})。反复出现请用 /feedback 反馈,并写上发生时间。`);"],
+  ["return `To report this crash: ${resume} run /bug. The crash details are attached automatically.`;", 'return "u1s1 异常退出了。反复出现请运行 u1s1 feedback 反馈。";'],
+  ["`If this looks like a ${APP_NAME} bug, /bug sends a report to the developers.`", '"如果这看起来是 u1s1 自身的问题,可以用 /feedback 反馈。"'],
+];
+
 const TUI_TEXT_TARGETS = [
   [["modes", "interactive", "components", "assistant-message.js"], ASSISTANT_TEXT_REPLACEMENTS, "回复状态文案"],
   [["modes", "interactive", "interactive-mode.js"], WORKING_TEXT_REPLACEMENTS, "工作中提示"],
+  [["modes", "interactive", "interactive-mode.js"], BUG_REPORT_REPLACEMENTS, "/bug 入口"],
   [["modes", "interactive", "components", "keybinding-hints.js"], KEY_HINT_REPLACEMENTS, "按键脚注"],
   [["modes", "interactive", "components", "model-selector.js"], MODEL_SELECTOR_REPLACEMENTS, "模型选择器"],
   [["modes", "interactive", "components", "settings-selector.js"], SETTINGS_REPLACEMENTS, "设置菜单"],