u1s1-cli 0.16.3 → 0.16.5

package/dist/agent-setup.js

@@ -3,18 +3,18 @@ import { join } from "node:path";
 import { agentDir, CUSTOM_ENDPOINTS, ENDPOINT_ID_RE, endpointKeyEnvName, MODELS, PROVIDER_ID, VERSION, } from "./config.js";
 const BRAND_APPEND = `## u1s1
 
-你是 u1s1(有一说一) —— 说人话的 AI 编程搭子,一个面向编程新手的中文 AI 编程助手。用户很可能不熟悉编程术语:
-- 自我介绍或被问「你是谁」时,自称 u1s1(有一说一),不要自称 pi;只有用户明确问底层实现时才提 pi 引擎。
-- 默认用中文回复;代码、命令、报错原文保持英文。
-- 解释问题时说人话,别堆术语;必要时用一句话打比方。
-- 改动前先说明打算做什么,改完用一两句话总结改了哪里。
-- 用户描述模糊时,先猜最可能的意图并确认,不要长篇追问。
+You are u1s1 — a plain-spoken AI coding buddy for programming beginners. Most users are unfamiliar with jargon:
+- When introducing yourself or asked "who are you", say you are u1s1, never "pi"; only mention the underlying pi engine if the user explicitly asks about internals.
+- Reply in Chinese by default; keep code, commands, and verbatim error messages in English.
+- Explain problems in plain language without jargon; use a one-sentence analogy when helpful.
+- Before making changes, briefly state what you plan to do; afterwards summarize what changed in one or two sentences.
+- If the user's request is vague, assume the most likely intent and confirm it instead of asking a long list of questions.
 `;
 const EXEC_RULES = `
-## 命令执行
+## Command execution
 
-- 能用 bash 工具执行的命令,自己执行并展示输出,不要让用户手动执行。
-- 只有需要管理员权限、交互式输入(登录、装系统组件等),或必须开新终端窗口的操作,才让用户执行,并给出可直接粘贴的完整命令。
+- Run any command yourself with the bash tool and show its output; never ask the user to run it manually.
+- Only hand a command to the user when it needs admin rights, interactive input (logins, installing system components), or a new terminal window — and always give the full command ready to paste.
 `;
 /**
  * pi 的系统提示不含任何 OS/平台信息,模型只能拿 uname 之类盲探,Windows 上
@@ -23,18 +23,18 @@ const EXEC_RULES = `
  */
 function envSection(shell) {
     if (shell.status === "posix") {
-        return `\n## 运行环境\n\n- 操作系统: ${process.platform === "darwin" ? "macOS" : "Linux"}。\n`;
+        return `\n## Environment\n\n- Operating system: ${process.platform === "darwin" ? "macOS" : "Linux"}.\n`;
     }
-    const lines = ["", "## 运行环境", "", "- 操作系统: Windows。环境信息以本节为准,不要用 uname 探测。"];
+    const lines = ["", "## Environment", "", "- Operating system: Windows. Trust this section over probing; do not detect the OS with uname."];
     switch (shell.status) {
         case "bash":
-            lines.push(`- 命令通过 bash 执行(${shell.shellPath}),ls/grep/curl 等 POSIX 工具可用。`, '- 查 Windows 原生信息或调 Windows 程序,用 cmd.exe /c "..." 或 powershell.exe -NoProfile -Command "..."。', "- 默认在 Windows 本机干活;只有用户要求或任务确实需要 Linux 时才考虑 WSL。");
+            lines.push(`- Commands run through bash (${shell.shellPath}); POSIX tools like ls/grep/curl are available.`, 'To inspect native Windows state or launch Windows programs, use cmd.exe /c "..." or powershell.exe -NoProfile -Command "...".', "- Work on Windows itself by default; only consider WSL when the user asks or the task truly requires Linux.");
             break;
         case "wsl":
-            lines.push("- 注意:命令通过 WSL 的 bash 执行,实际跑在 Linux 发行版里,不是 Windows 本机。", "- 访问 Windows 文件用 /mnt/c/... 路径;调 Windows 程序用带 .exe 的名字(cmd.exe、powershell.exe)。", "- 适时提醒用户:安装 Git for Windows(PowerShell 运行 winget install --id Git.Git)并重启 u1s1,命令就能回到 Windows 本机执行。");
+            lines.push("- Note: commands run through WSL's bash, so they execute inside a Linux distro, not on Windows itself.", "- Access Windows files via /mnt/c/... paths; invoke Windows programs by their .exe names (cmd.exe, powershell.exe).", '- When appropriate, suggest the user install Git for Windows (run winget install --id Git.Git in PowerShell) and restart u1s1 so commands run natively on Windows again.');
             break;
         case "none":
-            lines.push("- 严重:当前没有可用的 bash,bash 工具执行任何命令都会立刻失败,反复重试没有意义。", "- 第一要务是引导用户修复:让用户在 PowerShell 运行 winget install --id Git.Git 安装 Git for Windows,装完重启 u1s1。", "- 修复之前只用读写文件等其他工具帮用户。");
+            lines.push("- Critical: no usable bash exists — every bash tool call will fail immediately, and retrying is pointless.", '- Top priority is guiding the user to fix it: have them run winget install --id Git.Git in PowerShell to install Git for Windows, then restart u1s1.', "- Until then, only help the user with other tools such as file read/write.");
             break;
         case "unknown":
             break;
@@ -77,6 +77,12 @@ export function ensureDefaultSettings() {
         settings["hideThinkingBlock"] = true;
         changed = true;
     }
+    // 精简 UI 配套：组件变矮（状态栏消失、思考区伸缩）时清掉残留空行，
+    // 否则增量打印会在聊天流里越攒越多幽灵空行
+    if (!("clearOnShrink" in settings)) {
+        settings["clearOnShrink"] = true;
+        changed = true;
+    }
     // 启动时是否显示品牌横幅(logo + 版本号/目录/提示)
     if (!("showStartupBanner" in settings)) {
         settings["showStartupBanner"] = true;

package/dist/index.js

@@ -8,7 +8,6 @@ import { registerLoopCommand } from "./loop.js";
 import { ensureSearchTools } from "./search-tools.js";
 import { ensureUsableShell } from "./shell-doctor.js";
 import { applyBrandUi, setUpdateNotice } from "./style.js";
-import { offerStarterTemplates } from "./templates.js";
 import { fetchModels, loadCustomEndpoints } from "./api.js";
 const PACKAGE_NAME = "u1s1-cli";
 /** 启动时检测到的可自动安装的新版;TUI 退出后才装(见 installPendingUpdate)。 */
@@ -215,7 +214,6 @@ async function runAgent(cfg, args) {
             name: "u1s1",
             factory: (pi) => {
                 applyBrandUi(pi, VERSION);
-                offerStarterTemplates(pi);
                 // /loop: 会话级定时循环执行提示词(对标 Claude Code),实现见 loop.ts
                 registerLoopCommand(pi);
                 // 会话标题:拿用户第一条正经输入的前半截当名字(像 Claude Code 那样),

package/dist/loop.js

@@ -8,8 +8,9 @@
  *   /loop 20m /review-pr 1234    循环里也能跑其他斜杠命令
  *   /loop stop                   停止当前循环
  *
- * 语义与 Claude Code 对齐:任务只活在当前会话,/clear 或退出即消失。
- * 实现核心是 pi.sendUserMessage():定时器到点就"替用户打字"发一轮,
+ * 语义与 Claude Code 对齐:任务只活在当前会话,/clear 或退出即消失;
+ * 启动时立刻跑第一轮,之后每隔一个间隔再跑。
+ * 实现核心是 pi.sendUserMessage():到点就"替用户打字"发一轮,
  * deliverAs: "followUp" 保证上一轮没跑完时排队等它结束,不硬插打断;
  * expandPromptTemplates: true 让 prompt 里的斜杠命令也能被展开执行。
  */
@@ -116,7 +117,7 @@ export function registerLoopCommand(pi) {
             stopLoop(ctx.ui);
             activePrompt = parsed.prompt;
             activeIntervalMs = parsed.intervalMs;
-            timer = setInterval(() => {
+            const fire = () => {
                 try {
                     pi.sendUserMessage(activePrompt, {
                         deliverAs: "followUp",
@@ -126,9 +127,12 @@ export function registerLoopCommand(pi) {
                 catch (e) {
                     ctx.ui.notify(`loop 执行失败: ${e instanceof Error ? e.message : String(e)}`, "error");
                 }
-            }, activeIntervalMs);
+            };
+            // 第一轮立刻跑:用户写完命令就想看到结果,不该干等一个间隔
+            fire();
+            timer = setInterval(fire, activeIntervalMs);
             ctx.ui.setStatus(STATUS_KEY, `🔁 每${formatInterval(activeIntervalMs)} · ${preview(activePrompt)}`);
-            ctx.ui.notify(`🔁 已开始:每${formatInterval(activeIntervalMs)}执行一次「${preview(activePrompt)}」`, "info");
+            ctx.ui.notify(`🔁 已开始:现在先跑第一轮,之后每${formatInterval(activeIntervalMs)}一次「${preview(activePrompt)}」`, "info");
         },
     });
 }

package/dist/tools.js

@@ -81,7 +81,7 @@ export function createSearchTool(cfg) {
         name: "web_search",
         label: "联网搜索",
         description: "Search the web for current information. Use it for anything time-sensitive or outside the codebase: library docs, error messages, latest versions, recent events. Returns a short answer plus ranked results with URLs and snippets. Follow up with web_fetch to read a promising result in full.",
-        promptSnippet: "搜索互联网获取最新信息（文档、报错、版本、时事）",
+        promptSnippet: "Search the internet for up-to-date information (docs, errors, versions, current events)",
         promptGuidelines: [
             "Use web_search when the answer depends on information newer than your knowledge or not present in the repository, instead of guessing.",
             "Prefer one focused web_search query over several near-duplicate queries; each search costs the user credits.",
@@ -160,9 +160,9 @@ export function createImageTool(cfg) {
             "Saves the result as a local image file and returns its path. " +
             "Pass local file paths or http(s) URLs in `images` to edit an image or use references (style transfer, adding elements, combining up to 10 images). " +
             "Prompts work in Chinese or English; describe content, style, composition, and any text to render.",
-        promptSnippet: "AI 生成/修改图片（文生图、改图、多图合成）",
+        promptSnippet: "AI image generation/editing (text-to-image, editing, multi-image composition)",
         promptGuidelines: [
-            "Use generate_image when the user wants a picture created or an existing image modified (logo, illustration, poster, placeholder art, 改图/换风格).",
+            "Use generate_image when the user wants a picture created or an existing image modified (logo, illustration, poster, placeholder art, style change).",
             "Each call generates one image and costs the user credits; refine the prompt first instead of regenerating repeatedly.",
             "To edit an existing image, pass its path in `images` and describe only the change in `prompt`.",
         ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "0.16.3",
+  "version": "0.16.5",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {
@@ -26,7 +26,8 @@
     "build": "tsc",
     "dev": "tsx src/index.ts",
     "typecheck": "tsc --noEmit",
-    "prepublishOnly": "npm run build",
+    "prepublishOnly": "npm run build && npm test",
+    "test": "node scripts/render-regression.mjs",
     "postinstall": "node scripts/patch-pi.js",
     "package": "bash ../../scripts/package.sh",
     "upload-release": "bash ../../scripts/upload-release.sh",

package/scripts/render-regression.mjs

@@ -0,0 +1,129 @@
+/**
+ * 渲染回归测试 —— 防止「修好的空行问题在发版后又回来」。
+ *
+ * 背景：精简 UI 依赖两处修复才能保持每轮回复只占必要的行数：
+ * 1. pi 的 AssistantMessageComponent 补丁（patches/*.patch + postinstall patch-pi.js）
+ *    —— 隐藏的思考块不算可见内容、空标签跳过、隐形思考块后不加间隔空行
+ * 2. 扩展给内置工具的 renderShell:"self" + 空 Text —— 工具行零行渲染
+ *
+ * 本脚本用 pi 真实组件模拟一轮对话并断言行数。pi 升级后补丁没跟上、
+ * 或扩展渲染被改动导致行数膨胀时，这里直接失败，挡在发布前。
+ *
+ * 运行：node scripts/render-regression.mjs（prepublishOnly 会自动跑）
+ */
+
+import { Container, Spacer, Text } from "@earendil-works/pi-tui";
+import { existsSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+
+// pi 的 exports 不暴露 package.json 和 main，直接向上找 node_modules 里的包目录
+// （npm 全局安装、pnpm workspace 都会把包放在搜索路径上的 node_modules 里）
+function findPiRoot() {
+  let dir = dirname(dirname(fileURLToPath(import.meta.url))); // packages/cli
+  while (dir !== dirname(dir)) {
+    const candidate = join(dir, "node_modules", "@earendil-works", "pi-coding-agent");
+    if (existsSync(candidate)) return candidate;
+    dir = dirname(dir);
+  }
+  throw new Error("找不到 @earendil-works/pi-coding-agent 包目录");
+}
+const piRoot = findPiRoot();
+
+const { initTheme } = await import(join(piRoot, "dist/modes/interactive/theme/theme.js"));
+const { AssistantMessageComponent } = await import(
+  join(piRoot, "dist/modes/interactive/components/assistant-message.js")
+);
+const { ToolExecutionComponent } = await import(
+  join(piRoot, "dist/modes/interactive/components/tool-execution.js")
+);
+const { createBashTool } = await import(join(piRoot, "dist/core/tools/bash.js"));
+
+initTheme("dark");
+
+let failed = 0;
+function check(name, actual, expected) {
+  const ok = actual === expected;
+  if (!ok) failed++;
+  console.log(`${ok ? "✓" : "✗"} ${name}: ${actual} 行（期望 ${expected}）`);
+}
+
+// 与 u1s1-compact-ui 扩展一致的隐藏渲染器
+function hiddenToolDef(orig) {
+  return {
+    name: "bash",
+    label: "bash",
+    description: orig.description,
+    parameters: orig.parameters,
+    renderShell: "self",
+    async execute() {},
+    renderCall() {
+      return new Text("", 0, 0);
+    },
+    renderResult(result, { expanded }, theme, context) {
+      if (context.isError) {
+        const c = result.content.find((x) => x.type === "text");
+        return new Text(theme.fg("warning", "✗ ") + theme.fg("muted", c?.text ?? "error"), 0, 0);
+      }
+      if (!expanded) return new Text("", 0, 0);
+      const c = result.content.find((x) => x.type === "text");
+      return new Text(c?.text ?? "", 0, 0);
+    },
+  };
+}
+
+// ---- 1. 助手消息（思考+正文，思考隐藏、标签为空）：只应有 间隔行+正文 = 2 行 ----
+// pi 补丁失效时这里会变成 4 行（思考块前后各多一个空行）
+const msg = {
+  role: "assistant",
+  content: [
+    { type: "thinking", thinking: "模型的一段思考" },
+    { type: "text", text: "回复正文" },
+  ],
+};
+const am = new AssistantMessageComponent(msg, true, undefined, "", 1, []);
+const chat1 = new Container();
+chat1.addChild(am);
+check("助手消息（思考+正文，思考隐藏）", chat1.render(80).length, 2);
+
+// ---- 2. 隐藏的工具行（带结果）：0 行 ----
+const origBash = createBashTool(process.cwd());
+const comp = new ToolExecutionComponent(
+  "bash",
+  "t1",
+  { command: "ls" },
+  {},
+  hiddenToolDef(origBash),
+  null,
+  process.cwd(),
+);
+comp.updateResult({ content: [{ type: "text", text: "file1\nfile2\nexit code: 0" }] });
+const chat2 = new Container();
+chat2.addChild(comp);
+check("隐藏的工具行（已完成）", chat2.render(80).length, 0);
+
+// ---- 3. 完整一轮：用户消息 + 思考正文回复 + 隐藏工具行 + 第二条回复 ----
+// 期望：间隔 + 用户 + (间隔+正文) + 0 + (间隔+正文) = 6 行
+const chat3 = new Container();
+chat3.addChild(new Spacer(1));
+chat3.addChild(new Text("用户提问", 1, 0));
+chat3.addChild(new AssistantMessageComponent(mkMsg("思考1", "我先看看。"), true, undefined, "", 1, []));
+chat3.addChild(comp);
+chat3.addChild(new AssistantMessageComponent(mkMsg("思考2", "我去查一下。"), true, undefined, "", 1, []));
+function mkMsg(thinking, text) {
+  return {
+    role: "assistant",
+    content: [
+      ...(thinking ? [{ type: "thinking", thinking }] : []),
+      { type: "text", text },
+    ],
+  };
+}
+check("完整一轮对话", chat3.render(80).length, 6);
+
+if (failed > 0) {
+  console.error(`\n渲染回归测试失败：${failed} 项。多半是 pi 升级后补丁没跟上，或扩展渲染被改动。`);
+  console.error("对照 patches/@earendil-works__pi-coding-agent*.patch 和 agent-setup.ts 里的 writeCompactUiExtension 检查。");
+  process.exit(1);
+}
+console.log("\n渲染回归测试全部通过 ✓");

package/dist/templates.d.ts

@@ -1,2 +0,0 @@
-import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-export declare function offerStarterTemplates(pi: ExtensionAPI): void;

package/dist/templates.js

@@ -1,48 +0,0 @@
-import { readdirSync } from "node:fs";
-/**
- * 空目录首跑模板(roadmap-next #3):小白第一次在空文件夹里启动 u1s1,
- * 面对空白输入框往往想不出第一句说什么。弹一个选择器给几个现成的小项目,
- * 选中后把完整提示词放进输入框——不直接替用户发送,让他看到「原来就是
- * 说这样一句话」,想改就改,回车才开跑。选「我自己说」或按 Esc 都不打扰。
- */
-const TEMPLATES = [
-    {
-        label: "🏠 个人主页——介绍我自己的网页",
-        prompt: "帮我做一个个人主页网页,介绍我自己,放上我的爱好和联系方式,风格简洁好看,手机和电脑打开都正常。做完教我怎么在浏览器里预览。",
-    },
-    {
-        label: "📅 倒数日——距离某天还有多少天",
-        prompt: "做一个倒数日网页,可以输入日期和事件名,大字显示距离那天还有多少天,设计得可爱一点。做完教我怎么在浏览器里预览。",
-    },
-    {
-        label: "🖼️ 电子相册——可以翻页的照片墙",
-        prompt: "帮我做一个电子相册网页,照片可以左右翻页,先放几张占位图,并告诉我之后怎么换成自己的照片。做完教我怎么在浏览器里预览。",
-    },
-];
-const SELF_DESCRIBE = "✍️ 不用了,我自己说";
-/** 只看可见条目:.git / .DS_Store 这类隐藏文件不算「有东西」。读不了就当非空,不打扰。 */
-function isEmptyDir(dir) {
-    try {
-        return readdirSync(dir).filter((name) => !name.startsWith(".")).length === 0;
-    }
-    catch {
-        return false;
-    }
-}
-let offered = false;
-export function offerStarterTemplates(pi) {
-    pi.on("session_start", async (_event, ctx) => {
-        // /clear 等新会话也会触发 session_start,每次启动只弹一次
-        if (ctx.mode !== "tui" || offered)
-            return;
-        if (!isEmptyDir(process.cwd()))
-            return;
-        offered = true;
-        const choice = await ctx.ui.select("这个文件夹还是空的,挑一个现成的小项目直接开跑?", [...TEMPLATES.map((t) => t.label), SELF_DESCRIBE]);
-        const t = TEMPLATES.find((x) => x.label === choice);
-        if (!t)
-            return;
-        ctx.ui.setEditorText(t.prompt);
-        ctx.ui.notify("提示词放进输入框了:想改哪句直接改,按回车开跑", "info");
-    });
-}