u1s1-cli 0.3.0 → 0.5.0

package/dist/index.js

@@ -1,12 +1,11 @@
 #!/usr/bin/env node
 import { spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { createRequire } from "node:module";
 import { printConsoleBanner } from "./brand.js";
 import { agentDir, loadConfig, MODELS, persistPreferredModel, PROVIDER_ID, resolvePreferredModel, } from "./config.js";
 import { applyBrandUi } from "./style.js";
-import { DEFAULT_THEME_SETTING, ensureBrandThemes } from "./themes.js";
 const require = createRequire(import.meta.url);
 const VERSION = require("../package.json").version;
 const BRAND_APPEND = `## u1s1
@@ -39,19 +38,31 @@ function ensureDefaultSettings() {
         }
     }
     let changed = false;
-    if (!("hideThinkingBlock" in settings)) {
-        settings.hideThinkingBlock = true;
-        changed = true;
+    // Pi default is one-at-a-time (one queued message per turn). u1s1 delivers
+    // all queued messages together so burst typing isn't split across turns.
+    // Only fill in missing keys so an explicit /settings choice still sticks.
+    for (const key of ["steeringMode", "followUpMode"]) {
+        if (!(key in settings)) {
+            settings[key] = "all";
+            changed = true;
+        }
     }
-    // Default / leftover Pi themes → u1s1 Claude-like pair. Custom names stay put.
-    const theme = settings.theme;
-    if (theme === undefined || theme === "dark" || theme === "light") {
-        settings.theme = DEFAULT_THEME_SETTING;
+    // ≤0.4.0 shipped branded themes and forced them as default; the files are
+    // gone now, so a settings.json still pointing at them must fall back to
+    // pi's default theme.
+    if (typeof settings.theme === "string" && settings.theme.includes("u1s1-")) {
+        delete settings.theme;
         changed = true;
     }
     if (changed)
         writeFileSync(p, JSON.stringify(settings, null, 2) + "\n");
 }
+/** ≤0.4.0 wrote u1s1-dark/u1s1-light into the pi themes dir; remove them. */
+function cleanupBrandThemes() {
+    for (const name of ["u1s1-dark", "u1s1-light"]) {
+        rmSync(join(agentDir, "themes", `${name}.json`), { force: true });
+    }
+}
 /**
  * tmux 默认不转发键盘修饰键,会把 Shift+Enter 当成普通回车发出去,消息没写完就被发送。
  * 只开 extended-keys 不够:默认 terminal-features 里 xterm* 没有 extkeys,tmux 根本不会
@@ -93,7 +104,7 @@ function ensureTmuxKeyboardProtocol() {
     run(["bind-key", "-n", "C-Enter", "send-keys", "-l", "\x1b[13;5u"]);
 }
 async function runAgent(cfg, args) {
-    ensureBrandThemes();
+    cleanupBrandThemes();
     ensureBrandPrompt();
     ensureDefaultSettings();
     ensureTmuxKeyboardProtocol();
@@ -206,6 +217,11 @@ async function run() {
         await update();
         return;
     }
+    if (cmd === "import") {
+        const { importCommand } = await import("./import/index.js");
+        await importCommand(args.slice(1));
+        return;
+    }
     const { ensureAuth } = await import("./login.js");
     const cfg = await ensureAuth();
     await runAgent(cfg, args);

package/dist/login.js

@@ -1,7 +1,10 @@
+import { createRequire } from "node:module";
 import { createInterface } from "node:readline/promises";
 import { fetchMe } from "./api.js";
+import { DASHBOARD_URL, printConsoleBanner } from "./brand.js";
 import { loadConfig, saveConfig } from "./config.js";
-const DASHBOARD_URL = "https://u1s1.io/dashboard";
+const require = createRequire(import.meta.url);
+const VERSION = require("../package.json").version;
 function tryOpenBrowser(url) {
     import("node:child_process")
         .then(({ spawn }) => {
@@ -14,8 +17,8 @@ export async function login(keyArg) {
     const cfg = loadConfig();
     let key = keyArg?.trim();
     if (!key) {
-        console.log("");
-        console.log("  u1s1 需要一把 API Key(免费):");
+        printConsoleBanner(VERSION);
+        console.log("  需要一把 API Key(免费):");
         console.log(`  1. 打开 ${DASHBOARD_URL} 注册/登录(30 秒,送 $10 额度)`);
         console.log("  2. 复制你的 API Key,粘贴到下面");
         console.log("");

package/dist/style.js

@@ -1,299 +1,21 @@
-import { homedir } from "node:os";
 import { basename } from "node:path";
-import { createBashTool, createEditTool, createFindTool, createGrepTool, createLsTool, createReadTool, createWriteTool, } from "@earendil-works/pi-coding-agent";
+import { truncateToWidth } from "@earendil-works/pi-tui";
 import { renderBrandHeader } from "./brand.js";
-function row(text) {
-    return {
-        render() {
-            return text.split("\n");
-        },
-        invalidate() { },
-    };
-}
-function shortPath(path) {
-    if (typeof path !== "string" || !path)
-        return "";
-    const home = homedir();
-    if (path === home)
-        return "~";
-    if (path.startsWith(`${home}/`) || path.startsWith(`${home}\\`)) {
-        return `~${path.slice(home.length)}`;
-    }
-    const cwd = process.cwd();
-    if (path === cwd)
-        return ".";
-    if (path.startsWith(`${cwd}/`) || path.startsWith(`${cwd}\\`)) {
-        return path.slice(cwd.length + 1);
-    }
-    return path;
-}
-function asString(value) {
-    return typeof value === "string" ? value : "";
-}
-function clip(text, max = 72) {
-    if (text.length <= max)
-        return text;
-    return `${text.slice(0, max - 1)}…`;
-}
-function callLine(theme, name, detail) {
-    let text = `${theme.fg("accent", "⏺")} ${theme.bold(theme.fg("toolTitle", name))}`;
-    if (detail)
-        text += ` ${theme.fg("muted", clip(detail))}`;
-    return text;
-}
-function resultLine(theme, text, color = "dim") {
-    return `  ${theme.fg("dim", "⎿")}  ${theme.fg(color, text)}`;
-}
-function indentOutput(theme, output, limit = 20) {
-    const all = output.split("\n");
-    const shown = all.slice(0, limit);
-    let text = shown.map((line) => `     ${theme.fg("dim", line)}`).join("\n");
-    if (all.length > limit) {
-        text += `\n     ${theme.fg("muted", `… ${all.length - limit} 行`)}`;
-    }
-    return text;
-}
-const toolCache = new Map();
-function createBuiltInTools(cwd) {
-    return {
-        read: createReadTool(cwd),
-        bash: createBashTool(cwd),
-        edit: createEditTool(cwd),
-        write: createWriteTool(cwd),
-        find: createFindTool(cwd),
-        grep: createGrepTool(cwd),
-        ls: createLsTool(cwd),
-    };
-}
-function toolsFor(cwd) {
-    let cached = toolCache.get(cwd);
-    if (!cached) {
-        cached = createBuiltInTools(cwd);
-        toolCache.set(cwd, cached);
-    }
-    return cached;
-}
 /**
- * Claude Code-like chrome: brand header, pulsing dot, one-line tool rows.
- * All of this is Pi's public extension API — no node_modules patch.
+ * Brand chrome is just the startup hero + window title; everything else
+ * (tool rows, thinking blocks, spinner) stays Pi's default UI.
  */
 export function applyBrandUi(pi, version) {
     pi.on("session_start", async (_event, ctx) => {
         if (ctx.mode !== "tui")
             return;
         ctx.ui.setHeader((_tui, theme) => ({
-            render() {
-                return renderBrandHeader(theme, version, process.cwd());
+            render(width) {
+                // pi-tui crashes on lines wider than the terminal, so truncate defensively.
+                return renderBrandHeader(theme, version, process.cwd(), width).map((line) => truncateToWidth(line, width));
             },
             invalidate() { },
         }));
-        const theme = ctx.ui.theme;
-        ctx.ui.setWorkingMessage("思考中");
-        ctx.ui.setWorkingIndicator({
-            frames: [
-                theme.fg("dim", "·"),
-                theme.fg("muted", "•"),
-                theme.fg("accent", "●"),
-                theme.fg("muted", "•"),
-            ],
-            intervalMs: 140,
-        });
-        ctx.ui.setHiddenThinkingLabel("思考中");
         ctx.ui.setTitle(`u1s1 — ${basename(process.cwd())}`);
     });
-    const cwd = process.cwd();
-    const originals = toolsFor(cwd);
-    pi.registerTool({
-        name: "read",
-        label: "read",
-        description: originals.read.description,
-        parameters: originals.read.parameters,
-        renderShell: "self",
-        async execute(toolCallId, params, signal, onUpdate, ctx) {
-            return toolsFor(ctx.cwd).read.execute(toolCallId, params, signal, onUpdate);
-        },
-        renderCall(args, theme) {
-            return row(callLine(theme, "Read", shortPath(args.path)));
-        },
-        renderResult(result, { expanded, isPartial }, theme) {
-            if (isPartial)
-                return row(resultLine(theme, "读取中…", "warning"));
-            const content = result.content[0];
-            if (content?.type === "image")
-                return row(resultLine(theme, "图片", "success"));
-            if (content?.type !== "text")
-                return row(resultLine(theme, "无内容", "error"));
-            const details = result.details;
-            const count = content.text.split("\n").length;
-            let text = resultLine(theme, `${count} 行`, "success");
-            if (details?.truncation?.truncated)
-                text += theme.fg("warning", " · 已截断");
-            if (expanded)
-                text += `\n${indentOutput(theme, content.text)}`;
-            return row(text);
-        },
-    });
-    pi.registerTool({
-        name: "bash",
-        label: "bash",
-        description: originals.bash.description,
-        parameters: originals.bash.parameters,
-        renderShell: "self",
-        async execute(toolCallId, params, signal, onUpdate, ctx) {
-            return toolsFor(ctx.cwd).bash.execute(toolCallId, params, signal, onUpdate);
-        },
-        renderCall(args, theme) {
-            return row(callLine(theme, "Bash", asString(args.command)));
-        },
-        renderResult(result, { expanded, isPartial }, theme) {
-            if (isPartial)
-                return row(resultLine(theme, "执行中…", "warning"));
-            const content = result.content[0];
-            const output = content?.type === "text" ? content.text : "";
-            const exitMatch = output.match(/exit code: (\d+)/);
-            const exitCode = exitMatch ? Number(exitMatch[1]) : null;
-            const details = result.details;
-            const ok = exitCode === 0 || exitCode === null;
-            let text = resultLine(theme, ok ? "完成" : `退出码 ${exitCode}`, ok ? "success" : "error");
-            if (details?.truncation?.truncated)
-                text += theme.fg("warning", " · 已截断");
-            if (expanded && output)
-                text += `\n${indentOutput(theme, output)}`;
-            return row(text);
-        },
-    });
-    pi.registerTool({
-        name: "edit",
-        label: "edit",
-        description: originals.edit.description,
-        parameters: originals.edit.parameters,
-        renderShell: "self",
-        async execute(toolCallId, params, signal, onUpdate, ctx) {
-            return toolsFor(ctx.cwd).edit.execute(toolCallId, params, signal, onUpdate);
-        },
-        renderCall(args, theme) {
-            return row(callLine(theme, "Edit", shortPath(args.path)));
-        },
-        renderResult(result, { expanded, isPartial }, theme) {
-            if (isPartial)
-                return row(resultLine(theme, "修改中…", "warning"));
-            const content = result.content[0];
-            if (content?.type === "text" && content.text.startsWith("Error")) {
-                return row(resultLine(theme, content.text.split("\n")[0] ?? "失败", "error"));
-            }
-            const details = result.details;
-            if (!details?.diff)
-                return row(resultLine(theme, "已写入", "success"));
-            let additions = 0;
-            let removals = 0;
-            for (const line of details.diff.split("\n")) {
-                if (line.startsWith("+") && !line.startsWith("+++"))
-                    additions++;
-                if (line.startsWith("-") && !line.startsWith("---"))
-                    removals++;
-            }
-            let text = resultLine(theme, `+${additions} / -${removals}`, "success");
-            if (expanded)
-                text += `\n${indentOutput(theme, details.diff, 30)}`;
-            return row(text);
-        },
-    });
-    pi.registerTool({
-        name: "write",
-        label: "write",
-        description: originals.write.description,
-        parameters: originals.write.parameters,
-        renderShell: "self",
-        async execute(toolCallId, params, signal, onUpdate, ctx) {
-            return toolsFor(ctx.cwd).write.execute(toolCallId, params, signal, onUpdate);
-        },
-        renderCall(args, theme) {
-            const count = asString(args.content).split("\n").length;
-            const detail = `${shortPath(args.path)}${count ? ` (${count} 行)` : ""}`;
-            return row(callLine(theme, "Write", detail));
-        },
-        renderResult(result, { isPartial }, theme) {
-            if (isPartial)
-                return row(resultLine(theme, "写入中…", "warning"));
-            const content = result.content[0];
-            if (content?.type === "text" && content.text.startsWith("Error")) {
-                return row(resultLine(theme, content.text.split("\n")[0] ?? "失败", "error"));
-            }
-            return row(resultLine(theme, "已写入", "success"));
-        },
-    });
-    pi.registerTool({
-        name: "grep",
-        label: "grep",
-        description: originals.grep.description,
-        parameters: originals.grep.parameters,
-        renderShell: "self",
-        async execute(toolCallId, params, signal, onUpdate, ctx) {
-            return toolsFor(ctx.cwd).grep.execute(toolCallId, params, signal, onUpdate);
-        },
-        renderCall(args, theme) {
-            const where = shortPath(args.path);
-            const detail = where ? `${asString(args.pattern)}  ${where}` : asString(args.pattern);
-            return row(callLine(theme, "Grep", detail));
-        },
-        renderResult(result, { expanded, isPartial }, theme) {
-            if (isPartial)
-                return row(resultLine(theme, "搜索中…", "warning"));
-            const content = result.content[0];
-            const output = content?.type === "text" ? content.text : "";
-            const hits = output ? output.split("\n").filter(Boolean).length : 0;
-            let text = resultLine(theme, hits ? `${hits} 处` : "无匹配", hits ? "success" : "dim");
-            if (expanded && output)
-                text += `\n${indentOutput(theme, output)}`;
-            return row(text);
-        },
-    });
-    pi.registerTool({
-        name: "find",
-        label: "find",
-        description: originals.find.description,
-        parameters: originals.find.parameters,
-        renderShell: "self",
-        async execute(toolCallId, params, signal, onUpdate, ctx) {
-            return toolsFor(ctx.cwd).find.execute(toolCallId, params, signal, onUpdate);
-        },
-        renderCall(args, theme) {
-            return row(callLine(theme, "Find", asString(args.pattern)));
-        },
-        renderResult(result, { expanded, isPartial }, theme) {
-            if (isPartial)
-                return row(resultLine(theme, "查找中…", "warning"));
-            const content = result.content[0];
-            const output = content?.type === "text" ? content.text : "";
-            const hits = output ? output.split("\n").filter(Boolean).length : 0;
-            let text = resultLine(theme, hits ? `${hits} 个文件` : "没找到", hits ? "success" : "dim");
-            if (expanded && output)
-                text += `\n${indentOutput(theme, output)}`;
-            return row(text);
-        },
-    });
-    pi.registerTool({
-        name: "ls",
-        label: "ls",
-        description: originals.ls.description,
-        parameters: originals.ls.parameters,
-        renderShell: "self",
-        async execute(toolCallId, params, signal, onUpdate, ctx) {
-            return toolsFor(ctx.cwd).ls.execute(toolCallId, params, signal, onUpdate);
-        },
-        renderCall(args, theme) {
-            return row(callLine(theme, "List", shortPath(args.path) || "."));
-        },
-        renderResult(result, { expanded, isPartial }, theme) {
-            if (isPartial)
-                return row(resultLine(theme, "列出中…", "warning"));
-            const content = result.content[0];
-            const output = content?.type === "text" ? content.text : "";
-            const hits = output ? output.split("\n").filter(Boolean).length : 0;
-            let text = resultLine(theme, `${hits} 项`, "success");
-            if (expanded && output)
-                text += `\n${indentOutput(theme, output)}`;
-            return row(text);
-        },
-    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "0.3.0",
+  "version": "0.5.0",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {
@@ -28,11 +28,12 @@
   "license": "MIT",
   "homepage": "https://u1s1.io",
   "dependencies": {
-    "@earendil-works/pi-coding-agent": "0.84.2"
+    "@earendil-works/pi-coding-agent": "0.84.2",
+    "@earendil-works/pi-tui": "0.84.2"
   },
   "devDependencies": {
-    "typescript": "^5.9.2",
+    "@types/node": "^22.15.0",
     "tsx": "^4.20.0",
-    "@types/node": "^22.15.0"
+    "typescript": "^5.9.2"
   }
 }

package/dist/themes.js

@@ -1,175 +0,0 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { join } from "node:path";
-import { agentDir } from "./config.js";
-/**
- * Claude Code-like: warm terracotta accent, no gray message/tool boxes,
- * text sits on the terminal background instead of Codex-style cards.
- */
-export const DARK_THEME = {
-    name: "u1s1-dark",
-    vars: {
-        orange: "#d97757",
-        orangeSoft: "#e8a87c",
-        text: "#e8e4db",
-        muted: "#9a9488",
-        dim: "#6b665e",
-        green: "#8fbc8f",
-        red: "#e07a7a",
-        yellow: "#d4a574",
-        blue: "#89b4c4",
-        selectedBg: "#3a342e",
-    },
-    colors: {
-        accent: "orange",
-        border: "orangeSoft",
-        borderAccent: "orange",
-        borderMuted: "dim",
-        success: "green",
-        error: "red",
-        warning: "yellow",
-        muted: "muted",
-        dim: "dim",
-        text: "text",
-        thinkingText: "muted",
-        selectedBg: "selectedBg",
-        scrollbarThumb: "selectedBg",
-        searchMatchBg: "selectedBg",
-        searchMatchText: "text",
-        userMessageBg: "",
-        userMessageText: "text",
-        customMessageBg: "",
-        customMessageText: "text",
-        customMessageLabel: "orangeSoft",
-        toolPendingBg: "",
-        toolSuccessBg: "",
-        toolErrorBg: "",
-        toolTitle: "text",
-        toolOutput: "muted",
-        mdHeading: "orangeSoft",
-        mdLink: "blue",
-        mdLinkUrl: "dim",
-        mdCode: "orangeSoft",
-        mdCodeBlock: "text",
-        mdCodeBlockBorder: "dim",
-        mdQuote: "muted",
-        mdQuoteBorder: "orange",
-        mdHr: "dim",
-        mdListBullet: "orange",
-        toolDiffAdded: "green",
-        toolDiffRemoved: "red",
-        toolDiffContext: "muted",
-        syntaxComment: "muted",
-        syntaxKeyword: "orangeSoft",
-        syntaxFunction: "orange",
-        syntaxVariable: "text",
-        syntaxString: "green",
-        syntaxNumber: "yellow",
-        syntaxType: "blue",
-        syntaxOperator: "muted",
-        syntaxPunctuation: "dim",
-        thinkingOff: "dim",
-        thinkingMinimal: "muted",
-        thinkingLow: "blue",
-        thinkingMedium: "orangeSoft",
-        thinkingHigh: "orange",
-        thinkingXhigh: "yellow",
-        thinkingMax: "red",
-        bashMode: "green",
-    },
-    export: {
-        pageBg: "#1c1917",
-        cardBg: "#292524",
-        infoBg: "#3d3429",
-    },
-};
-export const LIGHT_THEME = {
-    name: "u1s1-light",
-    vars: {
-        orange: "#c45c38",
-        orangeSoft: "#b86a45",
-        text: "#2c2825",
-        muted: "#6f6a63",
-        dim: "#9a9488",
-        green: "#3d7a4a",
-        red: "#c45c5c",
-        yellow: "#9a6b2f",
-        blue: "#3d6f8a",
-        selectedBg: "#efe8e0",
-    },
-    colors: {
-        accent: "orange",
-        border: "orangeSoft",
-        borderAccent: "orange",
-        borderMuted: "dim",
-        success: "green",
-        error: "red",
-        warning: "yellow",
-        muted: "muted",
-        dim: "dim",
-        text: "text",
-        thinkingText: "muted",
-        selectedBg: "selectedBg",
-        scrollbarThumb: "selectedBg",
-        searchMatchBg: "selectedBg",
-        searchMatchText: "text",
-        userMessageBg: "",
-        userMessageText: "text",
-        customMessageBg: "",
-        customMessageText: "text",
-        customMessageLabel: "orangeSoft",
-        toolPendingBg: "",
-        toolSuccessBg: "",
-        toolErrorBg: "",
-        toolTitle: "text",
-        toolOutput: "muted",
-        mdHeading: "orange",
-        mdLink: "blue",
-        mdLinkUrl: "dim",
-        mdCode: "orangeSoft",
-        mdCodeBlock: "text",
-        mdCodeBlockBorder: "dim",
-        mdQuote: "muted",
-        mdQuoteBorder: "orange",
-        mdHr: "dim",
-        mdListBullet: "orange",
-        toolDiffAdded: "green",
-        toolDiffRemoved: "red",
-        toolDiffContext: "muted",
-        syntaxComment: "muted",
-        syntaxKeyword: "orange",
-        syntaxFunction: "orangeSoft",
-        syntaxVariable: "text",
-        syntaxString: "green",
-        syntaxNumber: "yellow",
-        syntaxType: "blue",
-        syntaxOperator: "muted",
-        syntaxPunctuation: "dim",
-        thinkingOff: "dim",
-        thinkingMinimal: "muted",
-        thinkingLow: "blue",
-        thinkingMedium: "orangeSoft",
-        thinkingHigh: "orange",
-        thinkingXhigh: "yellow",
-        thinkingMax: "red",
-        bashMode: "green",
-    },
-    export: {
-        pageBg: "#faf7f2",
-        cardBg: "#ffffff",
-        infoBg: "#fff4e8",
-    },
-};
-const THEMES = [DARK_THEME, LIGHT_THEME];
-export const DEFAULT_THEME_SETTING = "u1s1-light/u1s1-dark";
-/** Keep ~/.u1s1/agent/themes in sync so Pi picks them up as normal theme files. */
-export function ensureBrandThemes() {
-    const dir = join(agentDir, "themes");
-    mkdirSync(dir, { recursive: true });
-    for (const theme of THEMES) {
-        const path = join(dir, `${theme.name}.json`);
-        const body = `${JSON.stringify(theme, null, 2)}\n`;
-        if (!existsSync(path) || readFileSync(path, "utf8") !== body) {
-            writeFileSync(path, body);
-        }
-    }
-}