From 2847c8b9b2693ea22b3ea391880f55e9041cbc4d Mon Sep 17 00:00:00 2001 From: Cecic <1518585189@qq.com> Date: Fri, 31 Jul 2026 15:48:36 +0800 Subject: [PATCH 1/2] feat(theme): adopt Macchiato-inspired Hermes colors --- README.en.md | 2 +- README.md | 2 +- docs/PLAN2_PROGRESS.md | 2 +- packages/themes/ccu-hermes/theme.json | 50 +++++++++++++++------------ test/content-sync.test.mjs | 2 +- test/theme.test.mjs | 35 +++++++++++++++++++ 6 files changed, 66 insertions(+), 27 deletions(-) diff --git a/README.en.md b/README.en.md index 2673c8c..bda6ded 100644 --- a/README.en.md +++ b/README.en.md @@ -212,7 +212,7 @@ Automation checks upstream stable Releases every six hours. A CCU-only update do | Reference locale | Simplified Chinese (`zh-CN`) | | FTL coverage | 1,396 actively used message keys | | Fallback | Built-in English per message | -| Customization | Fresh installs enable the Hermes color status line by default; upgrades preserve existing choices | +| Customization | Fresh installs enable the Macchiato-colored Hermes status line by default; upgrades preserve existing choices | ## Contributing diff --git a/README.md b/README.md index 37431aa..2164ede 100644 --- a/README.md +++ b/README.md @@ -214,7 +214,7 @@ node src/cli.mjs language validate ` | 参考语言包 | 简体中文 `zh-CN` | | FTL 覆盖 | 1,396 个实际使用的消息键 | | 回退机制 | 按消息回退到内置英文 | -| 个性化 | 全新安装默认启用 Hermes 彩色状态栏;已有选择在升级时保留 | +| 个性化 | 全新安装默认启用 Macchiato 配色的 Hermes 状态栏;已有选择在升级时保留 | Mac 和 Linux也许以后会做,主要是我手上没有Mac diff --git a/docs/PLAN2_PROGRESS.md b/docs/PLAN2_PROGRESS.md index 0a79337..9dc41e4 100644 --- a/docs/PLAN2_PROGRESS.md +++ b/docs/PLAN2_PROGRESS.md @@ -61,7 +61,7 @@ - `/model`、Tips、命令列表和二级界面的调用点已进入 fork 分支;仅修改既有 FTL 文案时仍无需重新编译 Codex。 - 自包含安装已实现:CCU ZIP 内置 fork manifest/资产、安装/卸载脚本、FTL、模板、主题和管理器。 - 状态栏 `ContextTokens` 已从 session 累计令牌改为 `last_token_usage.tokens_in_context_window()`;`11.6M/353K` 回归为 `42.7K/353K`,百分比仍为 9%。 -- `ccu.hermes` 四段式彩色状态栏在全新安装时默认启用;交互安装可输入 `n` 关闭,升级和重装保留已有选择。启用后自动备份并写入 `[tui].status_line`,禁用或卸载时安全恢复,用户后续修改不会被覆盖。 +- `ccu.hermes` 四段式彩色状态栏在全新安装时默认启用;前景强调色采用 Macchiato 风格的玫红、薰衣草、青绿、橙色与金色,不改终端背景或界面结构。交互安装可输入 `n` 关闭,升级和重装保留已有选择。启用后自动备份并写入 `[tui].status_line`,禁用或卸载时安全恢复,用户后续修改不会被覆盖。 ## 已完成验证 diff --git a/packages/themes/ccu-hermes/theme.json b/packages/themes/ccu-hermes/theme.json index 35962b3..b87d42b 100644 --- a/packages/themes/ccu-hermes/theme.json +++ b/packages/themes/ccu-hermes/theme.json @@ -3,7 +3,7 @@ "type": "theme", "id": "ccu.hermes", "displayName": "Hermes 风格", - "version": "0.1.0", + "version": "0.2.0", "statusLine": { "separator": " │ ", "progressWidth": 10, @@ -32,33 +32,37 @@ "🌈" ], "palette": [ - "#F5E0DC", - "#F2CDCD", - "#F5C2E7", - "#FAB387", - "#F9E2AF", - "#A6E3A1", - "#94E2D5", - "#89DCEB", - "#74C7EC", - "#CBA6F7" + "#F4DBD6", + "#F0C6C6", + "#F5BDE6", + "#C6A0F6", + "#ED8796", + "#EE99A0", + "#F5A97F", + "#EED49F", + "#A6DA95", + "#8BD5CA", + "#91D7E3", + "#7DC4E4", + "#8AADF4", + "#B7BDF8" ], "modelReasoningStyle": "bracketed", "colors": { - "model": "#94E2D5", - "usage": "#89DCEB", - "progress": "#A6E3A1", - "time": "#F9E2AF", - "quota": "#F5C2E7", - "separator": "#CBA6F7" + "model": "#ED8796", + "usage": "#C6A0F6", + "progress": "#8BD5CA", + "time": "#F5A97F", + "quota": "#EED49F", + "separator": "#B7BDF8" } }, "welcome": { - "title": "#94E2D5", - "version": "#F5E0DC", - "label": "#CBA6F7", - "model": "#F2CDCD", - "path": "#A6E3A1", - "permissions": "#FAB387" + "title": "#F5BDE6", + "version": "#CAD3F5", + "label": "#ED8796", + "model": "#B7BDF8", + "path": "#8BD5CA", + "permissions": "#ED8796" } } diff --git a/test/content-sync.test.mjs b/test/content-sync.test.mjs index 5fafcbe..354e732 100644 --- a/test/content-sync.test.mjs +++ b/test/content-sync.test.mjs @@ -56,7 +56,7 @@ test("content sync migrates the legacy zh-Hans preference and preserves the them assert.equal(theme.statusLine.separator, " │ "); assert.equal(theme.statusLine.modelReasoningStyle, "bracketed"); assert.equal(theme.statusLine.modelEmojis.length, 20); - assert.equal(theme.statusLine.palette.length, 10); + assert.equal(theme.statusLine.palette.length, 14); const quotaExample = JSON.parse( await readFile(join(installRoot, "quota.example.json"), "utf8") ); diff --git a/test/theme.test.mjs b/test/theme.test.mjs index 2e63fb6..182cd19 100644 --- a/test/theme.test.mjs +++ b/test/theme.test.mjs @@ -1,4 +1,5 @@ import assert from "node:assert/strict"; +import { readFile } from "node:fs/promises"; import test from "node:test"; import { validateThemePack } from "../src/theme/validate.mjs"; @@ -61,3 +62,37 @@ test("theme validator rejects unknown model reasoning formats", () => { /modelReasoningStyle must be spaced or bracketed/ ); }); + +test("bundled Hermes theme uses the Macchiato-inspired color roles", async () => { + const source = JSON.parse( + await readFile( + new URL("../packages/themes/ccu-hermes/theme.json", import.meta.url), + "utf8" + ) + ); + const validated = validateThemePack(source); + + assert.equal(validated.version, "0.2.0"); + assert.deepEqual(validated.statusLine.colors, { + model: "#ed8796", + usage: "#c6a0f6", + progress: "#8bd5ca", + time: "#f5a97f", + quota: "#eed49f", + separator: "#b7bdf8" + }); + assert.deepEqual(validated.welcome, { + title: "#f5bde6", + version: "#cad3f5", + label: "#ed8796", + model: "#b7bdf8", + path: "#8bd5ca", + permissions: "#ed8796" + }); + assert.deepEqual(validated.statusLine.palette.slice(0, 4), [ + "#f4dbd6", + "#f0c6c6", + "#f5bde6", + "#c6a0f6" + ]); +}); From cb60aeb57ba4da3478218ef4dcb2ab7063668da7 Mon Sep 17 00:00:00 2001 From: Cecic <1518585189@qq.com> Date: Fri, 31 Jul 2026 15:48:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E5=87=86=E5=A4=87=20CCU=20v0.1.10?= =?UTF-8?q?=20Macchiato=20=E9=85=8D=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.en.md | 4 ++-- README.md | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- scripts/package-release.ps1 | 2 +- src/version.mjs | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.en.md b/README.en.md index bda6ded..c575340 100644 --- a/README.en.md +++ b/README.en.md @@ -196,7 +196,7 @@ node src/cli.mjs language validate ` | Channel | Current example | Updated when | | --- | --- | --- | -| CCU | `v0.1.9` | Installer, manager, content, or documentation changes | +| CCU | `v0.1.10` | Installer, manager, content, or documentation changes | | CCU-I18N fork | `0.144.6-ccu.i18n.2` | Codex source or the i18n interface changes | | OpenAI Codex | `0.144.6` | A new official stable version is released | @@ -207,7 +207,7 @@ Automation checks upstream stable Releases every six hours. A CCU-only update do | Item | Status | | --- | --- | | Supported platform | Windows x64 | -| CCU | `v0.1.9` | +| CCU | `v0.1.10` | | CCU-I18N | `0.144.6-ccu.i18n.2` | | Reference locale | Simplified Chinese (`zh-CN`) | | FTL coverage | 1,396 actively used message keys | diff --git a/README.md b/README.md index 2164ede..00ac92e 100644 --- a/README.md +++ b/README.md @@ -198,7 +198,7 @@ node src/cli.mjs language validate ` | 通道 | 当前版本示例 | 更新条件 | | --- | --- | --- | -| CCU | `v0.1.9` | 安装器、管理器、内容包或文档发生变化 | +| CCU | `v0.1.10` | 安装器、管理器、内容包或文档发生变化 | | CCU-I18N fork | `0.144.6-ccu.i18n.2` | Codex 源码或 i18n 接口发生变化 | | OpenAI Codex | `0.144.6` | 官方发布新的稳定版本 | @@ -209,7 +209,7 @@ node src/cli.mjs language validate ` | 项目 | 状态 | | --- | --- | | 支持平台 | Windows x64 | -| CCU | `v0.1.9` | +| CCU | `v0.1.10` | | CCU-I18N | `0.144.6-ccu.i18n.2` | | 参考语言包 | 简体中文 `zh-CN` | | FTL 覆盖 | 1,396 个实际使用的消息键 | diff --git a/package-lock.json b/package-lock.json index dc23a2d..30b2ed4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "codex-cli-ultra", - "version": "0.1.9", + "version": "0.1.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "codex-cli-ultra", - "version": "0.1.9", + "version": "0.1.10", "dependencies": { "@fluent/bundle": "0.19.1", "@fluent/syntax": "0.19.0", diff --git a/package.json b/package.json index 2de0423..5c065d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "codex-cli-ultra", - "version": "0.1.9", + "version": "0.1.10", "private": true, "type": "module", "packageManager": "npm@11.12.1", diff --git a/scripts/package-release.ps1 b/scripts/package-release.ps1 index 5545f16..c2f9711 100644 --- a/scripts/package-release.ps1 +++ b/scripts/package-release.ps1 @@ -1,6 +1,6 @@ [CmdletBinding()] param( - [string]$Version = '0.1.9', + [string]$Version = '0.1.10', [string]$MinimumManagerVersion = '0.1.5', [string]$OutputDirectory = $(Join-Path (Split-Path -Parent $PSScriptRoot) 'artifacts'), [string]$ForkReleaseDir = $env:CCU_FORK_RELEASE_DIR diff --git a/src/version.mjs b/src/version.mjs index 7e71cd5..ac6cb9a 100644 --- a/src/version.mjs +++ b/src/version.mjs @@ -1 +1 @@ -export const CCU_VERSION = "0.1.9"; +export const CCU_VERSION = "0.1.10";