diff --git a/README.en.md b/README.en.md index e73c875..9fb8980 100644 --- a/README.en.md +++ b/README.en.md @@ -147,6 +147,17 @@ npm start run --no-browser > Convention: automated tests validate service and API behavior only, without opening browser pages. +### Developer helper scripts + +```bash +npm run reset +npm run reset -- 79 +``` + +- `npm run reset`: prompt for a PR number; leave it blank to return to default `origin/main` +- `npm run reset -- 79`: sync directly to the latest head snapshot of PR `#79` +- The script also handles local branch switching, workspace cleanup, untracked file cleanup, and final state validation + ## Command Reference | Command | Description | diff --git a/README.md b/README.md index 14974a4..5ef9f85 100644 --- a/README.md +++ b/README.md @@ -141,6 +141,17 @@ npm start run --no-browser > 约定：自动化测试仅验证服务与 API，不依赖打开页面。 +### 开发辅助脚本 + +```bash +npm run reset +npm run reset -- 79 +``` + +- `npm run reset`：交互输入 PR 编号；留空则回到默认 `origin/main` +- `npm run reset -- 79`：直接同步到 PR `#79` 的最新 head 快照 +- 脚本会自动完成本地分支切换、工作区清理、未跟踪文件清理与最终状态校验 + ## 命令速查 | 命令 | 说明 | diff --git a/cmd/reset-main.js b/cmd/reset-main.js index 795ec39..b6aa481 100644 --- a/cmd/reset-main.js +++ b/cmd/reset-main.js @@ -1,45 +1,193 @@ #!/usr/bin/env node /** - * Reset working tree to origin/main: - * - fetch origin/main - * - checkout main - * - hard reset to origin/main - * - clean untracked files/dirs - * - print final status + * Interactive reset workflow: + * - blank input => reset working tree to origin/main + * - PR number => fetch PR snapshot and reset local branch to that PR head + * - always discard local changes, clean untracked files/dirs, and validate + * the final branch / commit / clean-tree state * * Cross-platform: requires Node.js and git in PATH. */ const { execSync } = require('child_process'); +const readline = require('readline'); -function run(cmd) { - execSync(cmd, { stdio: 'inherit' }); +const DEFAULT_REMOTE = 'origin'; +const DEFAULT_MAIN_BRANCH = 'main'; +const DEFAULT_PR_BRANCH_PREFIX = 'pr'; + +function run(cmd, options = {}) { + const execOptions = { + stdio: 'inherit', + ...options + }; + return execSync(cmd, execOptions); +} + +function runCapture(cmd) { + return String(run(cmd, { + stdio: ['ignore', 'pipe', 'pipe'], + encoding: 'utf-8' + }) || '').trim(); +} + +function normalizePrNumberInput(value) { + const normalized = String(value ?? '').trim(); + if (!normalized) { + return ''; + } + if (!/^\d+$/.test(normalized)) { + throw new Error(`Invalid PR number: ${normalized}`); + } + return String(Number.parseInt(normalized, 10)); +} + +function buildResetPlan({ + prNumber = '', + remote = DEFAULT_REMOTE, + mainBranch = DEFAULT_MAIN_BRANCH, + prBranchPrefix = DEFAULT_PR_BRANCH_PREFIX +} = {}) { + const normalizedPrNumber = normalizePrNumberInput(prNumber); + + if (!normalizedPrNumber) { + const targetRef = `${remote}/${mainBranch}`; + return { + mode: 'main', + title: `Reset working tree to ${targetRef}`, + targetRef, + expectedBranch: mainBranch, + expectedRef: targetRef, + steps: [ + { title: `Fetch ${targetRef}`, command: `git fetch ${remote} ${mainBranch} --prune` }, + { title: 'Discard local changes', command: 'git reset --hard' }, + { title: 'Remove untracked files', command: 'git clean -fd' }, + { title: `Checkout ${mainBranch}`, command: `git checkout ${mainBranch}` }, + { title: `Reset local branch to ${targetRef}`, command: `git reset --hard ${targetRef}` }, + { title: 'Remove untracked files', command: 'git clean -fd' }, + { title: `Validate final state against ${targetRef}`, kind: 'validate' }, + { title: 'Final status', command: 'git status --short --branch' } + ], + doneMessage: `Done. Working tree synced to ${targetRef}.` + }; + } + + const localBranch = `${prBranchPrefix}-${normalizedPrNumber}`; + const snapshotRef = `refs/remotes/${remote}/${prBranchPrefix}/${normalizedPrNumber}`; + return { + mode: 'pr', + prNumber: normalizedPrNumber, + title: `Reset working tree to PR #${normalizedPrNumber}`, + targetRef: `PR #${normalizedPrNumber}`, + expectedBranch: localBranch, + expectedRef: snapshotRef, + snapshotRef, + steps: [ + { title: `Fetch PR #${normalizedPrNumber} snapshot`, command: `git fetch ${remote} pull/${normalizedPrNumber}/head:${snapshotRef} --force` }, + { title: 'Discard local changes', command: 'git reset --hard' }, + { title: 'Remove untracked files', command: 'git clean -fd' }, + { title: `Checkout ${localBranch}`, command: `git checkout -B ${localBranch} ${snapshotRef}` }, + { title: `Reset local branch to PR #${normalizedPrNumber} snapshot`, command: `git reset --hard ${snapshotRef}` }, + { title: 'Remove untracked files', command: 'git clean -fd' }, + { title: `Validate final state against PR #${normalizedPrNumber}`, kind: 'validate' }, + { title: 'Final status', command: 'git status --short --branch' } + ], + doneMessage: `Done. Working tree synced to PR #${normalizedPrNumber} on local branch ${localBranch}.` + }; } -function main() { +function validateFinalState(plan) { + const currentBranch = runCapture('git rev-parse --abbrev-ref HEAD'); + if (currentBranch !== plan.expectedBranch) { + throw new Error(`Expected current branch ${plan.expectedBranch}, got ${currentBranch || '(unknown)'}.`); + } + + const currentHead = runCapture('git rev-parse HEAD'); + const expectedHead = runCapture(`git rev-parse ${plan.expectedRef}`); + if (currentHead !== expectedHead) { + throw new Error(`Expected HEAD ${expectedHead} from ${plan.expectedRef}, got ${currentHead}.`); + } + try { - run('git rev-parse --is-inside-work-tree'); + run('git diff --quiet HEAD --', { stdio: 'ignore' }); + run('git diff --cached --quiet HEAD --', { stdio: 'ignore' }); } catch (err) { - console.error('Not inside a git repository.'); - process.exit(1); + throw new Error('Working tree is not clean after reset.'); } - console.log('[1/5] Fetch origin/main'); - run('git fetch origin main --prune'); + const untracked = runCapture('git ls-files --others --exclude-standard'); + if (untracked) { + throw new Error(`Untracked files remain after reset:\n${untracked}`); + } +} - console.log('[2/5] Checkout main'); - run('git checkout main'); +function executeResetPlan(plan) { + console.log(plan.title); + const totalSteps = plan.steps.length; + plan.steps.forEach((step, index) => { + console.log(`[${index + 1}/${totalSteps}] ${step.title}`); + if (step.kind === 'validate') { + validateFinalState(plan); + return; + } + run(step.command); + }); + console.log(plan.doneMessage); +} - console.log('[3/5] Reset local changes to origin/main'); - run('git reset --hard origin/main'); +function resolveArgPrNumber(argv = process.argv.slice(2)) { + const first = Array.isArray(argv) ? argv.find((item) => String(item ?? '').trim()) : ''; + return normalizePrNumberInput(first || ''); +} - console.log('[4/5] Remove untracked files'); - run('git clean -fd'); +function promptForPrNumber({ stdin = process.stdin, stdout = process.stdout } = {}) { + if (!stdin || !stdout || stdin.isTTY === false || stdout.isTTY === false) { + return Promise.resolve(''); + } - console.log('[5/5] Final status'); - run('git status --short --branch'); + return new Promise((resolve, reject) => { + const rl = readline.createInterface({ input: stdin, output: stdout }); + rl.question('PR 编号（留空则重置到 origin/main）: ', (answer) => { + rl.close(); + try { + resolve(normalizePrNumberInput(answer)); + } catch (err) { + reject(err); + } + }); + }); +} - console.log('Done. Working tree synced to origin/main.'); +async function main({ argv = process.argv.slice(2), stdin = process.stdin, stdout = process.stdout } = {}) { + try { + run('git rev-parse --is-inside-work-tree'); + } catch (err) { + console.error('Not inside a git repository.'); + process.exit(1); + } + + const argPrNumber = resolveArgPrNumber(argv); + const prNumber = argPrNumber || await promptForPrNumber({ stdin, stdout }); + const plan = buildResetPlan({ prNumber }); + executeResetPlan(plan); +} + +if (require.main === module) { + main().catch((err) => { + console.error(err && err.message ? err.message : err); + process.exit(1); + }); } -main(); +module.exports = { + DEFAULT_REMOTE, + DEFAULT_MAIN_BRANCH, + DEFAULT_PR_BRANCH_PREFIX, + normalizePrNumberInput, + buildResetPlan, + validateFinalState, + executeResetPlan, + resolveArgPrNumber, + promptForPrNumber, + main +}; diff --git a/tests/unit/compact-layout-ui.test.mjs b/tests/unit/compact-layout-ui.test.mjs index 75499a0..3a68a0b 100644 --- a/tests/unit/compact-layout-ui.test.mjs +++ b/tests/unit/compact-layout-ui.test.mjs @@ -2,7 +2,8 @@ import assert from 'assert'; import { readBundledWebUiCss, readProjectFile, - readBundledWebUiScript + readBundledWebUiScript, + readBundledWebUiHtml } from './helpers/web-ui-source.mjs'; test('app script includes compact layout detection and body class toggling', () => { @@ -28,9 +29,9 @@ test('styles include force-compact fallback rules for readability on touch devic assert.match(styles, /body\.force-compact\s*\{/); assert.match(styles, /body\.force-compact\s+\.app-shell\s*\{/); assert.match(styles, /body\.force-compact\s+\.status-inspector\s*\{[\s\S]*display:\s*none;/); - assert.match(styles, /body\.force-compact\s+\.top-tabs\s*\{[\s\S]*display:\s*grid\s*!important;[\s\S]*grid-template-columns:\s*repeat\(1,\s*minmax\(0,\s*1fr\)\);/); - assert.match(styles, /@media\s*\(min-width:\s*541px\)\s*\{[\s\S]*body\.force-compact\s+\.top-tabs\s*\{[\s\S]*repeat\(2,\s*minmax\(0,\s*1fr\)\);/); - assert.match(layoutShell, /@media\s*\(min-width:\s*961px\)\s*\{[\s\S]*body:not\(.force-compact\)\s+#app\s*>\s*\.top-tabs\s*\{[\s\S]*display:\s*none;/); + assert.match(styles, /body\.force-compact\s+\.top-tabs\s*\{[\s\S]*display:\s*flex\s*!important;[\s\S]*flex-wrap:\s*nowrap;[\s\S]*overflow-x:\s*auto;/); + assert.match(styles, /body\.force-compact\s+\.top-tabs::-webkit-scrollbar\s*\{[\s\S]*display:\s*none;/); + assert.match(layoutShell, /@media\s*\(min-width:\s*721px\)\s*\{[\s\S]*body:not\(.force-compact\)\s+#app\s*>\s*\.top-tabs\s*\{[\s\S]*display:\s*none;/); assert.doesNotMatch(layoutShell, /^\s*\.top-tabs\s*\{[\s\S]*display:\s*none\s*!important;/m); assert.match(styles, /body\.force-compact\s+\.card-subtitle/); const compactSubtitleBlock = styles.match(/body\.force-compact\s+\.card-subtitle\s*\{[^}]*\}/); @@ -47,10 +48,22 @@ test('styles include force-compact fallback rules for readability on touch devic test('styles keep desktop layout wide and session history readable on large screens', () => { const styles = readBundledWebUiCss(); - assert.match(styles, /\.container\s*\{[\s\S]*max-width:\s*2200px;/); + assert.match(styles, /\.container\s*\{[\s\S]*max-width:\s*none;[\s\S]*min-height:\s*100vh;/); + assert.match(styles, /\.app-shell\s*\{[\s\S]*grid-template-columns:\s*248px\s+minmax\(0,\s*1fr\);[\s\S]*min-height:\s*100vh;[\s\S]*height:\s*100vh;[\s\S]*overflow:\s*hidden;/); + assert.match(styles, /\.side-rail\s*\{[\s\S]*overflow-y:\s*auto;[\s\S]*scrollbar-width:\s*none;/); + assert.match(styles, /\.main-panel\s*\{[\s\S]*overflow-y:\s*auto;[\s\S]*height:\s*100vh;[\s\S]*scrollbar-width:\s*none;/); + assert.match(styles, /\.main-panel-topbar\s*\{[\s\S]*position:\s*sticky;[\s\S]*top:\s*0;/); + assert.match(styles, /\.side-item-meta\s*\{[\s\S]*display:\s*flex;[\s\S]*opacity:\s*1;/); + assert.match(styles, /\.brand-logo\s*\{[\s\S]*width:\s*38px;[\s\S]*height:\s*38px;/); + assert.match(styles, /\.content-wrapper\s*\{[\s\S]*max-width:\s*1280px;/); + assert.match(styles, /\.trash-item-actions\s*\{[\s\S]*grid-template-columns:\s*repeat\(2,\s*minmax\(116px,\s*116px\)\);/); + assert.match(styles, /\.trash-item-actions\s+\.btn-mini\s*\{[\s\S]*height:\s*38px;[\s\S]*min-height:\s*38px;[\s\S]*white-space:\s*nowrap;/); assert.match(styles, /\.session-layout\s*\{[\s\S]*grid-template-columns:\s*minmax\(260px,\s*360px\)\s*minmax\(0,\s*1fr\);/); assert.match(styles, /\.session-item\s*\{[\s\S]*min-height:\s*102px;/); + const html = readBundledWebUiHtml(); + assert.match(html, /class="brand-logo"\s+src="\/res\/logo\.png"/); + const titleBlock = styles.match(/\.session-item-title\s*\{[^}]*\}/); assert.ok(titleBlock, 'missing session item title style block'); assert.match(titleBlock[0], /display:\s*-webkit-box;/); diff --git a/tests/unit/config-tabs-ui.test.mjs b/tests/unit/config-tabs-ui.test.mjs index 575ad90..d45efbc 100644 --- a/tests/unit/config-tabs-ui.test.mjs +++ b/tests/unit/config-tabs-ui.test.mjs @@ -57,6 +57,8 @@ test('config template keeps expected config tabs in top and side navigation', () assert.match(html, /sessionTrashCount/); assert.match(html, /id="side-tab-market"/); assert.match(html, /id="tab-market"/); + assert.match(html, /id="side-tab-docs"/); + assert.match(html, /id="tab-docs"/); assert.match(html, /id="side-tab-usage"/); assert.match(html, /id="tab-usage"/); assert.match(html, /data-main-tab="usage"/); @@ -73,6 +75,16 @@ test('config template keeps expected config tabs in top and side navigation', () assert.match(html, /:aria-selected="mainTab === 'market'"/); assert.match(html, /id="panel-market"/); assert.match(html, /v-show="mainTab === 'market'"/); + assert.match(html, /data-main-tab="docs"/); + assert.match(html, /onMainTabPointerDown\('docs', \$event\)/); + assert.match(html, /onMainTabClick\('docs', \$event\)/); + assert.match(html, /aria-controls="panel-docs"/); + assert.match(html, /:aria-selected="mainTab === 'docs'"/); + assert.match(html, /id="panel-docs"/); + assert.match(html, /v-show="mainTab === 'docs'"/); + assert.match(html, /CLI 安装文档/); + assert.match(html, /installTargetCards/); + assert.match(html, /installTroubleshootingTips/); assert.doesNotMatch(html, /Skills<\/span>/); assert.doesNotMatch(html, /openSkillsManager\(\{ targetApp: 'codex' \}\)/); assert.match(html, /loadSkillsMarketOverview\(\{ forceRefresh: true, silent: false \}\)/); @@ -103,10 +115,12 @@ test('config template keeps expected config tabs in top and side navigation', () assert.match(html, /class="side-section" role="navigation" aria-label="配置管理"/); assert.match(html, /class="side-section" role="navigation" aria-label="会话管理"/); assert.match(html, /class="side-section" role="navigation" aria-label="技能市场"/); + assert.match(html, /class="side-section" role="navigation" aria-label="文档"/); assert.match(html, /class="side-section" role="navigation" aria-label="设置"/); assert.doesNotMatch(sideRail, /role="tablist"/); assert.doesNotMatch(sideRail, /role="tab"/); assert.match(sideRail, /id="side-tab-config-codex"[\s\S]*:aria-current="mainTab === 'config' && configMode === 'codex' \? 'page' : null"/); + assert.match(sideRail, /id="side-tab-docs"[\s\S]*:aria-current="mainTab === 'docs' \? 'page' : null"/); assert.match(sideRail, /id="side-tab-settings"[\s\S]*:aria-current="mainTab === 'settings' \? 'page' : null"/); assert.match(html, /skillsDefaultRootPath/); assert.match(html, /可直接导入/); @@ -221,7 +235,6 @@ test('config template keeps expected config tabs in top and side navigation', () assert.match(modalsBasic, /
/); for (const modalTitleId of [ 'add-provider-modal-title', - 'install-cli-modal-title', 'edit-provider-modal-title', 'add-model-modal-title', 'manage-models-modal-title', @@ -231,6 +244,8 @@ test('config template keeps expected config tabs in top and side navigation', () assert.match(modalsBasic, new RegExp(`aria-labelledby="${modalTitleId}"`)); assert.match(modalsBasic, new RegExp(`id="${modalTitleId}"`)); } + assert.doesNotMatch(modalsBasic, /install-cli-modal-title/); + assert.doesNotMatch(modalsBasic, /showInstallModal/); assert.match(modalsBasic, //); assert.match(modalsBasic, //); assert.match(modalsBasic, //); @@ -420,13 +435,13 @@ test('trash item styles stay aligned with session card layout and keep mobile us assert.match(styles, /\.session-item:focus-visible\s*\{[\s\S]*outline:\s*3px solid rgba\(201,\s*94,\s*75,\s*0\.25\);[\s\S]*outline-offset:\s*2px;/); assert.match(styles, /\.trash-item-title\s*\{[\s\S]*-webkit-line-clamp:\s*2;/); assert.match(styles, /\.trash-item-side\s*\{[\s\S]*min-width:\s*132px;/); - assert.match(styles, /\.trash-item-actions\s*\{[\s\S]*grid-template-columns:\s*repeat\(2,\s*minmax\(108px,\s*108px\)\);/); - assert.match(styles, /\.trash-item-actions \.btn-mini\s*\{[\s\S]*min-height:\s*36px;/); + assert.match(styles, /\.trash-item-actions\s*\{[\s\S]*grid-template-columns:\s*repeat\(2,\s*minmax\(116px,\s*116px\)\);/); + assert.match(styles, /\.trash-item-actions \.btn-mini\s*\{[\s\S]*height:\s*38px;[\s\S]*min-height:\s*38px;[\s\S]*white-space:\s*nowrap;/); assert.match(styles, /\.trash-item-path\s*\{[\s\S]*grid-template-columns:\s*48px\s+minmax\(0,\s*1fr\);/); assert.match(styles, /\.session-toolbar-grow\s*\{[\s\S]*grid-column:\s*1\s*\/\s*-1;/); assert.match(mobile520Block, /\.trash-item-header\s*\{[\s\S]*flex-direction:\s*column;/); assert.match(mobile520Block, /\.trash-item-actions\s*\{[\s\S]*grid-template-columns:\s*repeat\(2,\s*minmax\(0,\s*1fr\)\);/); - assert.match(mobile520Block, /\.trash-item-actions \.btn-mini\s*\{[\s\S]*min-height:\s*40px;/); + assert.match(mobile520Block, /\.trash-item-actions \.btn-mini\s*\{[\s\S]*min-height:\s*44px;/); assert.match(styles, /@media \(max-width: 540px\)\s*\{[\s\S]*\.trash-item\.session-item\s*\{[\s\S]*height:\s*auto;/); assert.match(styles, /@media \(max-width: 540px\)\s*\{[\s\S]*\.trash-item-header\s*\{[\s\S]*flex-direction:\s*column;/); assert.match(styles, /@media \(max-width: 540px\)\s*\{[\s\S]*\.trash-item-mainline\s*\{[\s\S]*flex-direction:\s*column;/); diff --git a/tests/unit/reset-main.test.mjs b/tests/unit/reset-main.test.mjs index a312951..c95a115 100644 --- a/tests/unit/reset-main.test.mjs +++ b/tests/unit/reset-main.test.mjs @@ -2,28 +2,43 @@ import assert from 'assert'; import fs from 'fs'; import path from 'path'; import { fileURLToPath } from 'url'; +import { createRequire } from 'module'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); +const require = createRequire(import.meta.url); const scriptPath = path.join(__dirname, '..', '..', 'cmd', 'reset-main.js'); const packageJsonPath = path.join(__dirname, '..', '..', 'package.json'); +const { + normalizePrNumberInput, + buildResetPlan, + resolveArgPrNumber +} = require(path.join(__dirname, '..', '..', 'cmd', 'reset-main.js')); -// Verify script exists and includes the critical git steps. -test('reset-main script contains required git steps', () => { +test('reset-main workflow plans preserve critical git steps without git pull merges', () => { assert.ok(fs.existsSync(scriptPath), 'reset-main.js should exist'); const content = fs.readFileSync(scriptPath, 'utf-8'); + assert.ok(!content.includes('git pull origin main'), 'reset-main.js should avoid git pull merges'); + + const mainPlan = buildResetPlan({ prNumber: '' }); + const prPlan = buildResetPlan({ prNumber: '79' }); + const commands = [...mainPlan.steps, ...prPlan.steps] + .map((step) => step.command) + .filter(Boolean); + const required = [ 'git fetch origin main --prune', 'git checkout main', 'git reset --hard origin/main', 'git clean -fd', - 'git status --short --branch' + 'git status --short --branch', + 'git fetch origin pull/79/head:refs/remotes/origin/pr/79 --force', + 'git checkout -B pr-79 refs/remotes/origin/pr/79' ]; for (const snippet of required) { - assert.ok(content.includes(snippet), `reset-main.js should include: ${snippet}`); + assert.ok(commands.includes(snippet), `reset workflow should include: ${snippet}`); } - assert.ok(!content.includes('git pull origin main'), 'reset-main.js should avoid git pull merges'); }); // Ensure the script is Node-executable via shebang or node command. @@ -32,6 +47,69 @@ test('reset-main script has executable header', () => { assert.ok(firstLine.startsWith('#!/usr/bin/env node'), 'script should start with node shebang'); }); +test('normalizePrNumberInput trims blank and numeric values', () => { + assert.strictEqual(normalizePrNumberInput(''), ''); + assert.strictEqual(normalizePrNumberInput(' '), ''); + assert.strictEqual(normalizePrNumberInput('79'), '79'); + assert.strictEqual(normalizePrNumberInput('0079'), '79'); +}); + +test('normalizePrNumberInput rejects non-numeric values', () => { + assert.throws(() => normalizePrNumberInput('abc'), /Invalid PR number/); + assert.throws(() => normalizePrNumberInput('79a'), /Invalid PR number/); + assert.throws(() => normalizePrNumberInput('-1'), /Invalid PR number/); +}); + +test('buildResetPlan keeps blank selection on origin/main workflow', () => { + const plan = buildResetPlan({ prNumber: '' }); + + assert.strictEqual(plan.mode, 'main'); + assert.strictEqual(plan.expectedBranch, 'main'); + assert.strictEqual(plan.expectedRef, 'origin/main'); + assert.deepStrictEqual( + plan.steps.map((step) => step.command || step.kind), + [ + 'git fetch origin main --prune', + 'git reset --hard', + 'git clean -fd', + 'git checkout main', + 'git reset --hard origin/main', + 'git clean -fd', + 'validate', + 'git status --short --branch' + ] + ); +}); + +test('buildResetPlan switches to PR snapshot workflow when PR number is provided', () => { + const plan = buildResetPlan({ prNumber: '79' }); + + assert.strictEqual(plan.mode, 'pr'); + assert.strictEqual(plan.prNumber, '79'); + assert.strictEqual(plan.expectedBranch, 'pr-79'); + assert.strictEqual(plan.expectedRef, 'refs/remotes/origin/pr/79'); + assert.deepStrictEqual( + plan.steps.map((step) => step.command || step.kind), + [ + 'git fetch origin pull/79/head:refs/remotes/origin/pr/79 --force', + 'git reset --hard', + 'git clean -fd', + 'git checkout -B pr-79 refs/remotes/origin/pr/79', + 'git reset --hard refs/remotes/origin/pr/79', + 'git clean -fd', + 'validate', + 'git status --short --branch' + ] + ); +}); + +test('resolveArgPrNumber reads the first non-empty CLI arg', () => { + assert.strictEqual(resolveArgPrNumber([]), ''); + assert.strictEqual(resolveArgPrNumber(['', ' ', '79']), '79'); + assert.strictEqual(resolveArgPrNumber(['0079']), '79'); + assert.throws(() => resolveArgPrNumber(['abc']), /Invalid PR number/); +}); + test('package.json exposes reset command for reset-main workflow', () => { const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8').replace(/^\uFEFF/u, '')); assert.strictEqual(packageJson.scripts.reset, 'node cmd/reset-main.js'); diff --git a/tests/unit/startup-claude-star-prompt.test.mjs b/tests/unit/startup-claude-star-prompt.test.mjs index df7d64b..2461c9d 100644 --- a/tests/unit/startup-claude-star-prompt.test.mjs +++ b/tests/unit/startup-claude-star-prompt.test.mjs @@ -56,7 +56,7 @@ test('maybeShowStarPrompt skips prompting when storage already contains the mark assert.strictEqual(setItemCalls, 0); }); -test('maybeShowStarPrompt prompts once and persists the marker on first success', () => { +test('maybeShowStarPrompt silently persists the marker on first success', () => { const context = createContext(); const writes = []; @@ -71,11 +71,11 @@ test('maybeShowStarPrompt prompts once and persists the marker on first success' maybeShowStarPrompt.call(context); }); - assert.deepStrictEqual(context.messages, [{ message: '欢迎到 GitHub 点 Star', level: 'info' }]); + assert.deepStrictEqual(context.messages, []); assert.deepStrictEqual(writes, [['codexmateStarPrompted', '1']]); }); -test('maybeShowStarPrompt only prompts once when persisting the marker fails', () => { +test('maybeShowStarPrompt stays silent when persisting the marker fails', () => { const context = createContext(); withLocalStorage({ @@ -89,10 +89,10 @@ test('maybeShowStarPrompt only prompts once when persisting the marker fails', ( maybeShowStarPrompt.call(context); }); - assert.deepStrictEqual(context.messages, [{ message: '欢迎到 GitHub 点 Star', level: 'info' }]); + assert.deepStrictEqual(context.messages, []); }); -test('maybeShowStarPrompt still prompts once when reading storage fails', () => { +test('maybeShowStarPrompt stays silent when reading storage fails', () => { const context = createContext(); withLocalStorage({ @@ -106,5 +106,5 @@ test('maybeShowStarPrompt still prompts once when reading storage fails', () => maybeShowStarPrompt.call(context); }); - assert.deepStrictEqual(context.messages, [{ message: '欢迎到 GitHub 点 Star', level: 'info' }]); + assert.deepStrictEqual(context.messages, []); }); diff --git a/tests/unit/web-ui-behavior-parity.test.mjs b/tests/unit/web-ui-behavior-parity.test.mjs index f05bf67..fbbd79a 100644 --- a/tests/unit/web-ui-behavior-parity.test.mjs +++ b/tests/unit/web-ui-behavior-parity.test.mjs @@ -319,10 +319,12 @@ test('captured bundled app skeleton only exposes expected data key drift versus const headDataKeys = Object.keys(headAppOptions.data()).sort(); const extraCurrentKeys = currentDataKeys.filter((key) => !headDataKeys.includes(key)).sort(); const missingCurrentKeys = headDataKeys.filter((key) => !currentDataKeys.includes(key)).sort(); - const allowedExtraCurrentKeys = []; - const allowedMissingCurrentKeys = [ + const allowedExtraCurrentKeys = parityAgainstHead ? [] : [ 'sessionsViewMode' ]; + const allowedMissingCurrentKeys = [ + 'showInstallModal' + ]; if (parityAgainstHead) { const allowedExtraKeySet = new Set(allowedExtraCurrentKeys); const allowedMissingKeySet = new Set(allowedMissingCurrentKeys); @@ -342,18 +344,24 @@ test('captured bundled app skeleton only exposes expected data key drift versus const extraCurrentMethodKeys = currentMethodKeys.filter((key) => !headMethodKeys.includes(key)).sort(); const missingCurrentMethodKeys = headMethodKeys.filter((key) => !currentMethodKeys.includes(key)).sort(); const allowedExtraCurrentMethodKeys = []; + const allowedMissingCurrentMethodKeys = [ + 'closeInstallModal', + 'openInstallModal' + ]; if (parityAgainstHead) { const allowedExtraMethodKeySet = new Set(allowedExtraCurrentMethodKeys); + const allowedMissingMethodKeySet = new Set(allowedMissingCurrentMethodKeys); const unexpectedExtraCurrentMethodKeys = extraCurrentMethodKeys.filter((key) => !allowedExtraMethodKeySet.has(key)); + const unexpectedMissingCurrentMethodKeys = missingCurrentMethodKeys.filter((key) => !allowedMissingMethodKeySet.has(key)); assert.deepStrictEqual(unexpectedExtraCurrentMethodKeys, [], `unexpected extra method keys against ${parityBaseline.ref}`); - assert.deepStrictEqual(missingCurrentMethodKeys, [], `unexpected missing method keys against ${parityBaseline.ref}`); + assert.deepStrictEqual(unexpectedMissingCurrentMethodKeys, [], `unexpected missing method keys against ${parityBaseline.ref}`); } else { assert.deepStrictEqual(extraCurrentMethodKeys, allowedExtraCurrentMethodKeys); - assert.deepStrictEqual(missingCurrentMethodKeys, []); + assert.deepStrictEqual(missingCurrentMethodKeys, allowedMissingCurrentMethodKeys); } assert.deepStrictEqual( currentMethodKeys.filter((key) => !extraCurrentMethodKeys.includes(key)).sort(), - headMethodKeys + headMethodKeys.filter((key) => !missingCurrentMethodKeys.includes(key)).sort() ); const currentComputedKeys = Object.keys(currentComputed).sort(); const headComputedKeys = Object.keys(headComputed).sort(); diff --git a/web-ui/app.js b/web-ui/app.js index bd7bcb4..e005855 100644 --- a/web-ui/app.js +++ b/web-ui/app.js @@ -63,7 +63,6 @@ document.addEventListener('DOMContentLoaded', () => { showHealthCheckDialog: false, showAgentsModal: false, showSkillsModal: false, - showInstallModal: false, showConfirmDialog: false, confirmDialogTitle: '', confirmDialogMessage: '', @@ -117,6 +116,7 @@ document.addEventListener('DOMContentLoaded', () => { skillsMarketLocalLoadedOnce: false, skillsMarketImportLoadedOnce: false, sessionPinnedMap: {}, + sessionsViewMode: 'browser', sessionsUsageTimeRange: '7d', sessionsList: [], sessionsLoadedOnce: false, diff --git a/web-ui/index.html b/web-ui/index.html index ab34327..73f2242 100644 --- a/web-ui/index.html +++ b/web-ui/index.html @@ -17,6 +17,7 @@ + diff --git a/web-ui/modules/app.methods.install.mjs b/web-ui/modules/app.methods.install.mjs index e02d3f2..b0f29b4 100644 --- a/web-ui/modules/app.methods.install.mjs +++ b/web-ui/modules/app.methods.install.mjs @@ -144,14 +144,6 @@ export function createInstallMethods() { setInstallRegistryPreset(presetName) { this.installRegistryPreset = this.normalizeInstallRegistryPreset(presetName); - }, - - openInstallModal() { - this.showInstallModal = true; - }, - - closeInstallModal() { - this.showInstallModal = false; } }; } diff --git a/web-ui/modules/app.methods.startup-claude.mjs b/web-ui/modules/app.methods.startup-claude.mjs index 703b8df..a88bc3e 100644 --- a/web-ui/modules/app.methods.startup-claude.mjs +++ b/web-ui/modules/app.methods.startup-claude.mjs @@ -388,18 +388,13 @@ export function createStartupClaudeMethods(options = {}) { maybeShowStarPrompt() { const storageKey = 'codexmateStarPrompted'; - let shown = false; try { - if (localStorage.getItem(storageKey)) { - return; + if (!localStorage.getItem(storageKey)) { + localStorage.setItem(storageKey, '1'); } - this.showMessage('欢迎到 GitHub 点 Star', 'info'); - shown = true; - localStorage.setItem(storageKey, '1'); } catch (_) { - if (!shown) { - this.showMessage('欢迎到 GitHub 点 Star', 'info'); - } + // Ignore storage failures silently. The startup UI should not show + // promotional prompts or block normal configuration work. } } }; diff --git a/web-ui/modules/config-mode.computed.mjs b/web-ui/modules/config-mode.computed.mjs index 971ba9f..ee73934 100644 --- a/web-ui/modules/config-mode.computed.mjs +++ b/web-ui/modules/config-mode.computed.mjs @@ -51,6 +51,7 @@ export function createConfigModeComputed() { if (this.mainTab === 'sessions') return '会话浏览'; if (this.mainTab === 'usage') return 'Usage'; if (this.mainTab === 'market') return '技能市场'; + if (this.mainTab === 'docs') return '文档'; if (this.mainTab === 'settings') return '设置'; return '未知'; }, diff --git a/web-ui/partials/index/layout-footer.html b/web-ui/partials/index/layout-footer.html index 10336b3..aa343b0 100644 --- a/web-ui/partials/index/layout-footer.html +++ b/web-ui/partials/index/layout-footer.html @@ -10,60 +10,4 @@
- diff --git a/web-ui/partials/index/layout-header.html b/web-ui/partials/index/layout-header.html index b9a1477..1b9c5b0 100644 --- a/web-ui/partials/index/layout-header.html +++ b/web-ui/partials/index/layout-header.html @@ -1,44 +1,4 @@
- - -
- -
- Codex Mate. -
-
- 配置中枢：管理 Codex / Claude / OpenClaw / 会话 - 本地配置中枢，统一管理 Codex / Claude Code / OpenClaw / 会话。 -
-
-
- - - - GitHub - - - SakuraByteCore - / - codexmate - - -
-
+ @click="onConfigTabClick('codex', $event)">Codex + @click="onConfigTabClick('claude', $event)">Claude + @click="onConfigTabClick('openclaw', $event)">OpenClaw + @click="onMainTabClick('sessions', $event)">会话 + @click="onMainTabClick('market', $event)">Skills + @@ -171,9 +123,9 @@ :class="['side-item', { active: isConfigModeNavActive('claude') }]" @pointerdown="onConfigTabPointerDown('claude', $event)" @click="onConfigTabClick('claude', $event)"> -
Claude Code 配置
+
Claude Code
- Base URL / Key + Claude Settings 当前 {{ currentClaudeConfig }}
@@ -185,16 +137,16 @@ :class="['side-item', { active: isConfigModeNavActive('openclaw') }]" @pointerdown="onConfigTabPointerDown('openclaw', $event)" @click="onConfigTabClick('openclaw', $event)"> -
OpenClaw 配置
+
OpenClaw
- JSON5 / Workspace + JSON5 / AGENTS 当前 {{ currentOpenclawConfig }}
+
-
-

- {{ mainTab === 'config' ? '配置中心' : (mainTab === 'sessions' ? '会话浏览' : (mainTab === 'usage' ? 'Usage' : (mainTab === 'market' ? '技能市场' : '设置'))) }} -

-

- 配置中枢：管理 Codex / Claude / OpenClaw - 本地配置中枢，统一管理 Codex / Claude Code / OpenClaw。 -

-

- 统一查看与导出 Codex / Claude 会话。 -

-

- 单独查看本地会话用量、趋势与高频路径。 -

-

- 统一管理 Codex / Claude Skills，并聚焦本地导入与分发。 -

-
+
+
+
+
{{ mainTab === 'config' ? 'Configuration' : (mainTab === 'sessions' ? 'Sessions' : (mainTab === 'usage' ? 'Usage' : (mainTab === 'market' ? 'Skills' : (mainTab === 'docs' ? 'Docs' : 'Settings')))) }}
+

{{ mainTab === 'config' ? '本地配置控制台' : (mainTab === 'sessions' ? '会话与导出' : (mainTab === 'usage' ? '本地用量与趋势' : (mainTab === 'market' ? 'Skills 安装与同步' : (mainTab === 'docs' ? 'CLI 安装与文档' : '系统与数据设置')))) }}

+

{{ mainTab === 'config' ? '管理 Codex、Claude Code 与 OpenClaw 的本地配置、模型与运行参数。' : (mainTab === 'sessions' ? '浏览、筛选、导出与整理本地会话记录。' : (mainTab === 'usage' ? '查看近 7 / 30 天的会话、消息与来源趋势。' : (mainTab === 'market' ? '整理安装目标、导入来源与分发入口。' : (mainTab === 'docs' ? '把 CLI 安装、升级、卸载命令与排障提示集中放进正文文档页，不再依赖悬浮入口或模态框。' : '管理下载、数据目录、回收站与全局行为。')))) }}

+
+
-
- - - - -
-
-
- 当前来源 - - {{ sessionFilterSource === 'all' ? '全部' : (sessionFilterSource === 'claude' ? 'Claude Code' : 'Codex') }} - -
-
- 会话数 - {{ sessionsList.length }} -
-
-
-
- 统计范围 - {{ sessionsUsageTimeRange === '30d' ? '近 30 天' : '近 7 天' }} -
-
- 总会话数 - {{ sessionUsageSummaryCards[0]?.value ?? 0 }} -
-
- 总消息数 - {{ sessionUsageSummaryCards[1]?.value ?? 0 }} -
-
-
-
- 当前目标 - {{ skillsTargetLabel }} -
-
- 本地 Skills - {{ skillsList.length }}
-
- 可导入 - {{ skillsImportList.length }} +
+
+ 包管理器 + {{ String(installPackageManager || 'npm').toUpperCase() }} +
+
+ 当前操作 + {{ installCommandAction === 'update' ? '升级' : (installCommandAction === 'uninstall' ? '卸载' : '安装') }} +
+
+ 镜像 + {{ installRegistryPreview || '官方默认' }} +
-
- 可直接导入 - {{ skillsImportConfiguredCount }} +
+ +
-
- - -
diff --git a/web-ui/partials/index/modals-basic.html b/web-ui/partials/index/modals-basic.html index 329d0e5..6c2718c 100644 --- a/web-ui/partials/index/modals-basic.html +++ b/web-ui/partials/index/modals-basic.html @@ -23,67 +23,6 @@
-
- -
-