u1s1-cli 0.2.0 → 0.4.0

package/dist/index.js

@@ -1,8 +1,12 @@
 #!/usr/bin/env node
+import { spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { createRequire } from "node:module";
-import { agentDir, DEFAULT_MODEL_ID, loadConfig, MODELS, PROVIDER_ID } from "./config.js";
+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
@@ -21,16 +25,113 @@ function ensureBrandPrompt() {
         writeFileSync(p, BRAND_APPEND);
     }
 }
+/** Defaults that don't overwrite values the user already set. */
+function ensureDefaultSettings() {
+    mkdirSync(agentDir, { recursive: true });
+    const p = join(agentDir, "settings.json");
+    let settings = {};
+    if (existsSync(p)) {
+        try {
+            settings = JSON.parse(readFileSync(p, "utf8"));
+        }
+        catch {
+            return;
+        }
+    }
+    let changed = false;
+    if (!("hideThinkingBlock" in settings)) {
+        settings.hideThinkingBlock = true;
+        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;
+        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;
+        }
+    }
+    if (changed)
+        writeFileSync(p, JSON.stringify(settings, null, 2) + "\n");
+}
+/**
+ * tmux 默认不转发键盘修饰键,会把 Shift+Enter 当成普通回车发出去,消息没写完就被发送。
+ * 只开 extended-keys 不够:默认 terminal-features 里 xterm* 没有 extkeys,tmux 根本不会
+ * 向外层终端要 modifyOtherKeys,S-Enter 绑定也就永远触发不了。
+ * 启动时自动做这些事(运行时生效,不写用户 tmux.conf;失败则静默忽略,仍可用 Ctrl+J 换行):
+ * 1. 开启 extended-keys,并给当前终端补上 extkeys;
+ * 2. tmux 3.5+ 再切到 csi-u(3.4 及以下没有这个选项,忽略即可);
+ * 3. 兜底把 S-Enter / C-Enter 原样转成 pi 认得的 CSI-u 序列。
+ */
+function ensureTmuxKeyboardProtocol() {
+    if (!process.env.TMUX)
+        return;
+    const run = (args) => spawnSync("tmux", args, { timeout: 1500, encoding: "utf8" });
+    if (run(["-V"]).status !== 0)
+        return; // tmux 不可用(如沙箱)则跳过
+    // 当前会话 + 全局默认都开,避免只改 -g 时已有会话仍是 off
+    run(["set-option", "-g", "extended-keys", "on"]);
+    run(["set-option", "extended-keys", "on"]);
+    // 3.5+; 3.4 会失败,忽略
+    run(["set-option", "-g", "extended-keys-format", "csi-u"]);
+    run(["set-option", "extended-keys-format", "csi-u"]);
+    const features = run(["show", "-gv", "terminal-features"]);
+    if (features.status === 0 && !/\bextkeys\b/.test(features.stdout ?? "")) {
+        run(["set-option", "-ga", "terminal-features", "xterm*:extkeys"]);
+    }
+    // 已挂上的客户端不会自动重读 terminal-features;直接往当前客户端 tty
+    // 发 modifyOtherKeys,让外层终端立刻开始区分 Shift+Enter。
+    const tty = run(["display-message", "-p", "#{client_tty}"]).stdout?.trim();
+    if (tty) {
+        try {
+            writeFileSync(tty, "\x1b[>4;2m");
+        }
+        catch {
+            // 没权限或不是 tty 就忽略
+        }
+    }
+    // -l: 按字面量发送,避免 send-keys 把转义序列拆成一串普通按键
+    run(["bind-key", "-n", "S-Enter", "send-keys", "-l", "\x1b[13;2u"]);
+    run(["bind-key", "-n", "C-Enter", "send-keys", "-l", "\x1b[13;5u"]);
+}
 async function runAgent(cfg, args) {
+    ensureBrandThemes();
     ensureBrandPrompt();
+    ensureDefaultSettings();
+    ensureTmuxKeyboardProtocol();
     // 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"] = cfg.apiKey;
-    const { main } = await import("@earendil-works/pi-coding-agent");
+    // hide pi's own "Run pi update" banner; users should run `u1s1 update` instead
+    process.env["PI_SKIP_VERSION_CHECK"] = "1";
+    const { CustomEditor, main } = await import("@earendil-works/pi-coding-agent");
+    // 网页终端(如 Taikula)把 Shift+Enter 发成 ESC+CR(\x1b\r)。pi 在没开 Kitty
+    // 协议时把它当成 Alt+Enter:空闲就直接发送,忙碌才排队。先改成 CSI-u 的
+    // Shift+Enter,输入框就会换行,真·Alt+Enter(\x1b[13;3u)不受影响。
+    class ShiftEnterEditor extends CustomEditor {
+        handleInput(data) {
+            super.handleInput(data === "\x1b\r" ? "\x1b[13;2u" : data);
+        }
+    }
     const extension = [
         {
             name: "u1s1",
             factory: (pi) => {
+                applyBrandUi(pi, VERSION);
+                // pi 内置只有 /quit；补一个更常见的 /exit，方便新手退出
+                pi.registerCommand("exit", {
+                    description: "退出 u1s1",
+                    handler: async (_args, ctx) => {
+                        ctx.shutdown();
+                    },
+                });
                 pi.registerProvider(PROVIDER_ID, {
                     name: "u1s1",
                     baseUrl: cfg.baseUrl,
@@ -46,11 +147,35 @@ async function runAgent(cfg, args) {
                         maxTokens: m.maxTokens,
                     })),
                 });
+                // /model and Ctrl+P already write pi settings; also keep ~/.u1s1/config.json in sync
+                pi.on("model_select", (event) => {
+                    if (event.source === "restore")
+                        return;
+                    if (event.model.provider !== PROVIDER_ID)
+                        return;
+                    if (!MODELS.some((m) => m.id === event.model.id))
+                        return;
+                    persistPreferredModel(loadConfig(), event.model.id);
+                });
+                pi.on("session_start", (_event, ctx) => {
+                    const previous = ctx.ui.getEditorComponent();
+                    ctx.ui.setEditorComponent((tui, theme, keybindings) => {
+                        if (previous) {
+                            const inner = previous(tui, theme, keybindings);
+                            const orig = inner.handleInput.bind(inner);
+                            inner.handleInput = (data) => orig(data === "\x1b\r" ? "\x1b[13;2u" : data);
+                            return inner;
+                        }
+                        return new ShiftEnterEditor(tui, theme, keybindings);
+                    });
+                });
             },
         },
     ];
     const hasModelArg = args.some((a) => a === "--model" || a.startsWith("--model=") || a === "--provider");
-    const defaultModel = cfg.model ?? DEFAULT_MODEL_ID;
+    const defaultModel = resolvePreferredModel(cfg.model);
+    if (cfg.model !== defaultModel)
+        persistPreferredModel(cfg, defaultModel);
     const finalArgs = hasModelArg ? args : ["--model", `${PROVIDER_ID}/${defaultModel}`, ...args];
     await main(finalArgs, { extensionFactories: extension });
 }
@@ -61,6 +186,9 @@ async function run() {
         console.log(`u1s1 v${VERSION}`);
         return;
     }
+    if (cmd === "--help" || cmd === "-h") {
+        printConsoleBanner(VERSION);
+    }
     if (cmd === "login") {
         const { login } = await import("./login.js");
         await login(args[1]);
@@ -82,6 +210,16 @@ async function run() {
         console.log("已退出登录。");
         return;
     }
+    if (cmd === "update") {
+        const { update } = await import("./update.js");
+        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,9 +17,9 @@ export async function login(keyArg) {
     const cfg = loadConfig();
     let key = keyArg?.trim();
     if (!key) {
-        console.log("");
-        console.log("  u1s1 需要一把 API Key(免费):");
-        console.log(`  1. 打开 ${DASHBOARD_URL} 注册/登录(30 秒,送每月 $2 额度)`);
+        printConsoleBanner(VERSION);
+        console.log("  需要一把 API Key(免费):");
+        console.log(`  1. 打开 ${DASHBOARD_URL} 注册/登录(30 秒,送 $10 额度)`);
         console.log("  2. 复制你的 API Key,粘贴到下面");
         console.log("");
         tryOpenBrowser(DASHBOARD_URL);
@@ -34,7 +37,7 @@ export async function login(keyArg) {
         process.exit(1);
     });
     saveConfig(next);
-    console.log(`  ✓ 登录成功${me.email ? `(${me.email})` : ""},本月还剩 $${me.remaining_usd} 额度。`);
+    console.log(`  ✓ 登录成功${me.email ? `(${me.email})` : ""},还剩 $${me.remaining_usd} 额度。`);
     return next;
 }
 /** Returns a config that definitely has an apiKey, prompting the user if needed. */

package/dist/model.js

@@ -1,7 +1,7 @@
-import { DEFAULT_MODEL_ID, loadConfig, MODELS, resolveModel, saveConfig } from "./config.js";
+import { loadConfig, MODELS, persistPreferredModel, resolveModel, resolvePreferredModel } from "./config.js";
 export async function modelCommand(nameOrAlias) {
     const cfg = loadConfig();
-    const current = cfg.model ?? DEFAULT_MODEL_ID;
+    const current = resolvePreferredModel(cfg.model);
     if (!nameOrAlias) {
         console.log("");
         for (const m of MODELS) {
@@ -10,7 +10,7 @@ export async function modelCommand(nameOrAlias) {
             console.log(`               ${m.note} · $${m.cost.input}/$${m.cost.output} 每百万 token`);
         }
         console.log("");
-        console.log("  切换:u1s1 model grok / u1s1 model deepseek(也可在对话里用 /model 临时切)");
+        console.log("  切换:u1s1 model grok / u1s1 model deepseek(对话里 /model 同样会记住)");
         console.log("");
         return;
     }
@@ -19,6 +19,6 @@ export async function modelCommand(nameOrAlias) {
         console.error(`  没有叫「${nameOrAlias}」的模型,可选:${MODELS.map((x) => x.aliases[0]).join(" / ")}`);
         process.exit(1);
     }
-    saveConfig({ ...cfg, model: m.id });
+    persistPreferredModel(cfg, m.id);
     console.log(`  ✓ 默认模型已切到 ${m.name}(${m.note})`);
 }

package/dist/style.js

@@ -0,0 +1,21 @@
+import { basename } from "node:path";
+import { truncateToWidth } from "@earendil-works/pi-tui";
+import { renderBrandHeader } from "./brand.js";
+/**
+ * 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(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() { },
+        }));
+        ctx.ui.setTitle(`u1s1 — ${basename(process.cwd())}`);
+    });
+}

package/dist/themes.js

@@ -0,0 +1,177 @@
+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",
+        userMsgBg: "#34312c",
+    },
+    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: "userMsgBg",
+        userMessageText: "text",
+        customMessageBg: "userMsgBg",
+        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",
+        userMsgBg: "#e8e4dc",
+    },
+    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: "userMsgBg",
+        userMessageText: "text",
+        customMessageBg: "userMsgBg",
+        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);
+        }
+    }
+}

package/dist/update.js

@@ -0,0 +1,69 @@
+import { execSync } from "node:child_process";
+import { createRequire } from "node:module";
+const require = createRequire(import.meta.url);
+const VERSION = require("../package.json").version;
+const PACKAGE_NAME = "u1s1-cli";
+/** Detect the package manager that installed u1s1. */
+function detectPackageManager() {
+    // Check common global install locations for clues
+    const userAgent = process.env.npm_config_user_agent ?? "";
+    if (userAgent.startsWith("pnpm"))
+        return "pnpm";
+    if (userAgent.startsWith("yarn"))
+        return "yarn";
+    if (userAgent.startsWith("bun"))
+        return "bun";
+    return "npm";
+}
+/** Fetch the latest published version from npm registry. */
+async function getLatestVersion() {
+    const url = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
+    try {
+        const res = await fetch(url, {
+            headers: { Accept: "application/json" },
+            signal: AbortSignal.timeout(10_000),
+        });
+        if (!res.ok)
+            return undefined;
+        const body = (await res.json());
+        return body.version;
+    }
+    catch {
+        return undefined;
+    }
+}
+function compareVersions(a, b) {
+    const pa = a.split(".").map(Number);
+    const pb = b.split(".").map(Number);
+    for (let i = 0; i < 3; i++) {
+        const diff = (pa[i] ?? 0) - (pb[i] ?? 0);
+        if (diff !== 0)
+            return diff;
+    }
+    return 0;
+}
+export async function update() {
+    console.log("正在检查更新…");
+    const latest = await getLatestVersion();
+    if (!latest) {
+        console.error("无法获取最新版本。请检查网络连接后重试。");
+        process.exit(1);
+    }
+    if (compareVersions(latest, VERSION) <= 0) {
+        console.log(`当前 v${VERSION} 已是最新版本 ✓`);
+        return;
+    }
+    const pm = detectPackageManager();
+    console.log(`发现新版本 v${latest} (当前 v${VERSION})`);
+    console.log(`正在用 ${pm} 更新 ${PACKAGE_NAME}…`);
+    try {
+        const installCmd = pm === "npm" ? `npm install -g ${PACKAGE_NAME}@latest` : `${pm} add -g ${PACKAGE_NAME}@latest`;
+        execSync(installCmd, { stdio: "inherit" });
+        console.log(`\n✅ 已更新到 v${latest}，重启 u1s1 后生效。`);
+    }
+    catch {
+        console.error("\n自动更新失败。请手动运行:");
+        console.error(`  ${pm === "npm" ? "npm install -g" : `${pm} add -g`} ${PACKAGE_NAME}@latest`);
+        process.exit(1);
+    }
+}

package/dist/usage.js

@@ -14,14 +14,14 @@ export async function usage() {
         console.error(e.message);
         process.exit(1);
     });
-    const total = me.monthly_free_usd + me.bonus_balance_usd;
-    const remainRatio = total > 0 ? me.remaining_usd / total : 0;
+    const remain = me.remaining_usd;
+    const spent = me.mtd_usd;
+    const denom = remain + spent;
+    const remainRatio = denom > 0 ? remain / denom : 0;
     console.log("");
     console.log(`  账号     ${me.email ?? "(未绑定邮箱)"}`);
-    console.log(`  本月已用 $${me.mtd_usd}`);
-    console.log(`  剩余额度 $${me.remaining_usd}  ${bar(remainRatio)}`);
-    if (me.bonus_balance_usd > 0)
-        console.log(`  其中加量 $${me.bonus_balance_usd}(邀请所得,不过期)`);
+    console.log(`  本月已用 $${spent}`);
+    console.log(`  剩余额度 $${remain}  ${bar(remainRatio)}`);
     console.log("");
     console.log("  邀请朋友双方各得加量 → https://u1s1.io/dashboard");
     console.log("");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {
@@ -15,7 +15,8 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsx src/index.ts",
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "prepublishOnly": "npm run build"
   },
   "keywords": [
     "ai",
@@ -27,11 +28,12 @@
   "license": "MIT",
   "homepage": "https://u1s1.io",
   "dependencies": {
-    "@earendil-works/pi-coding-agent": "0.84.1"
+    "@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"
   }
 }