u1s1-cli 0.4.0 → 0.5.1

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,16 +38,6 @@ function ensureDefaultSettings() {
         }
     }
     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.
@@ -58,9 +47,26 @@ function ensureDefaultSettings() {
             changed = true;
         }
     }
+    if (!("hideThinkingBlock" in settings)) {
+        settings["hideThinkingBlock"] = true;
+        changed = true;
+    }
+    // ≤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 根本不会
@@ -102,7 +108,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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u1s1-cli",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "u1s1 — 有一说一,最省心的 AI 编程搭子。终端里用中文说需求,AI 帮你读文件、改代码、跑命令。",
   "type": "module",
   "bin": {

package/dist/themes.js

@@ -1,177 +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",
-        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);
-        }
-    }
-}