codexmate 0.0.25 → 0.0.27

package/package.json

@@ -1,74 +1,74 @@
-{
-  "name": "codexmate",
-  "version": "0.0.25",
-  "description": "Codex/Claude Code/OpenClaw 配置、会话与任务编排 CLI + Web 工具",
-  "main": "cli.js",
-  "bin": {
-    "codexmate": "./cli.js"
-  },
-  "files": [
-    "cli.js",
-    "cli/",
-    "plugins/",
-    "web-ui.html",
-    "lib/",
-    "web-ui/",
-    "doc/",
-    "README.md",
-    "README.zh.md",
-    "LICENSE"
-  ],
-  "exports": {
-    ".": "./cli.js",
-    "./lib/*": "./lib/*.js",
-    "./web-ui/*": "./web-ui/*",
-    "./res/*": "./web-ui/res/*"
-  },
-  "scripts": {
-    "dev": "node cli.js run",
-    "start": "node cli.js",
-    "reset": "node tools/dev/reset-main.js",
-    "release:npm": "node tools/release/publish-npm.js",
-    "docs:dev": "node ./node_modules/vitepress/dist/node/cli.js dev site",
-    "docs:build": "node ./node_modules/vitepress/dist/node/cli.js build site",
-    "docs:preview": "node ./node_modules/vitepress/dist/node/cli.js preview site",
-    "ci:install": "node tools/ci/run-check.js install",
-    "ci:lint": "node tools/ci/run-check.js lint",
-    "ci:test": "node tools/ci/run-check.js test",
-    "lint": "node tools/dev/lint.js",
-    "test": "npm run test:unit && npm run test:e2e",
-    "test:ci": "node tools/ci/run-check.js all",
-    "test:unit": "node tests/unit/run.mjs",
-    "test:e2e": "node tests/e2e/run.js",
-    "pretest": "node tools/ci/ensure-test-deps.js"
-  },
-  "dependencies": {
-    "@iarna/toml": "^2.2.5",
-    "json5": "^2.2.3",
-    "yauzl": "^3.2.1",
-    "zip-lib": "^1.2.1"
-  },
-  "engines": {
-    "node": ">=14"
-  },
-  "keywords": [
-    "codex",
-    "claude",
-    "claude-code",
-    "openclaw",
-    "config",
-    "session",
-    "task-orchestration",
-    "workflow",
-    "web-ui",
-    "provider",
-    "ai",
-    "llm",
-    "cli"
-  ],
-  "author": "ymkiux",
-  "license": "Apache-2.0",
-  "devDependencies": {
-    "vitepress": "^1.6.4"
-  }
-}
+{
+  "name": "codexmate",
+  "version": "0.0.27",
+  "description": "Codex/Claude Code/OpenClaw 配置、会话与任务编排 CLI + Web 工具",
+  "main": "cli.js",
+  "bin": {
+    "codexmate": "./cli.js"
+  },
+  "files": [
+    "cli.js",
+    "cli/",
+    "plugins/",
+    "web-ui.html",
+    "lib/",
+    "web-ui/",
+    "doc/",
+    "README.md",
+    "README.zh.md",
+    "LICENSE"
+  ],
+  "exports": {
+    ".": "./cli.js",
+    "./lib/*": "./lib/*.js",
+    "./web-ui/*": "./web-ui/*",
+    "./res/*": "./web-ui/res/*"
+  },
+  "scripts": {
+    "dev": "node cli.js run",
+    "start": "node cli.js",
+    "reset": "node tools/dev/reset-main.js",
+    "release:npm": "node tools/release/publish-npm.js",
+    "docs:dev": "node ./node_modules/vitepress/dist/node/cli.js dev site",
+    "docs:build": "node ./node_modules/vitepress/dist/node/cli.js build site",
+    "docs:preview": "node ./node_modules/vitepress/dist/node/cli.js preview site",
+    "ci:install": "node tools/ci/run-check.js install",
+    "ci:lint": "node tools/ci/run-check.js lint",
+    "ci:test": "node tools/ci/run-check.js test",
+    "lint": "node tools/dev/lint.js",
+    "test": "npm run test:unit && npm run test:e2e",
+    "test:ci": "node tools/ci/run-check.js all",
+    "test:unit": "node tests/unit/run.mjs",
+    "test:e2e": "node tests/e2e/run.js",
+    "pretest": "node tools/ci/ensure-test-deps.js"
+  },
+  "dependencies": {
+    "@iarna/toml": "^2.2.5",
+    "json5": "^2.2.3",
+    "yauzl": "^3.2.1",
+    "zip-lib": "^1.2.1"
+  },
+  "engines": {
+    "node": ">=14"
+  },
+  "keywords": [
+    "codex",
+    "claude",
+    "claude-code",
+    "openclaw",
+    "config",
+    "session",
+    "task-orchestration",
+    "workflow",
+    "web-ui",
+    "provider",
+    "ai",
+    "llm",
+    "cli"
+  ],
+  "author": "ymkiux",
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "vitepress": "^1.6.4"
+  }
+}

package/web-ui/app.js

@@ -112,7 +112,6 @@ document.addEventListener('DOMContentLoaded', () => {
                 _pendingCodexApplyOptions: null,
                 agentsContent: '',
                 agentsPath: '',
-                agentsPath: '',
                 agentsExists: false,
                 agentsLineEnding: '\n',
                 agentsLoading: false,
@@ -158,8 +157,10 @@ document.addEventListener('DOMContentLoaded', () => {
                     ticket: 0
                 },
                 sessionsViewMode: 'browser',
-                sessionsUsageTimeRange: '7d',
+                sessionsUsageTimeRange: (function () { try { const saved = localStorage.getItem('sessionsUsageTimeRange'); if (saved === '7d' || saved === '30d' || saved === 'all') return saved; } catch (_) {} return '7d'; })(),
                 sessionsUsageList: [],
+                sessionsUsageCompareEnabled: false,
+                sessionsUsageSelectedDayKey: '',
                 sessionsUsageLoadedOnce: false,
                 sessionsUsageLoadedLimit: 0,
                 sessionsUsageLoading: false,
@@ -172,6 +173,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 sessionQuery: '',
                 sessionRoleFilter: 'all',
                 sessionTimePreset: 'all',
+                sessionSortMode: 'time',
                 sessionResumeWithYolo: true,
                 sessionPathOptions: [],
                 sessionPathOptionsLoading: false,
@@ -194,6 +196,7 @@ document.addEventListener('DOMContentLoaded', () => {
                     gemini: 0
                 },
                 sessionExporting: {},
+                sessionConverting: {},
                 sessionCloning: {},
                 sessionDeleting: {},
                 activeSession: null,
@@ -261,6 +264,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 newModelName: '',
                 currentClaudeConfig: '',
                 currentClaudeModel: '',
+                claudeCustomModelDraft: '',
                 editingConfig: { name: '', apiKey: '', baseUrl: '', model: '' },
                 claudeConfigs: {
                     '智谱GLM': {
@@ -358,6 +362,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 sessionTrashRestoring: {},
                 sessionTrashPurging: {},
                 sessionTrashClearing: false,
+                sessionTrashRetentionDays: 30,
                 claudeImportLoading: false,
                 codexImportLoading: false,
                 codexAuthProfiles: [],
@@ -474,6 +479,7 @@ document.addEventListener('DOMContentLoaded', () => {
             this.restoreSessionPinnedMap();
             this.shareCommandPrefix = this.normalizeShareCommandPrefix(localStorage.getItem('codexmateShareCommandPrefix'));
             this.sessionTrashEnabled = this.normalizeSessionTrashEnabled(localStorage.getItem('codexmateSessionTrashEnabled'));
+            this.sessionTrashRetentionDays = this.normalizeSessionTrashRetentionDays(localStorage.getItem('codexmateSessionTrashRetentionDays'));
             this.configTemplateDiffConfirmEnabled = loadConfigTemplateDiffConfirmEnabledFromStorage(localStorage);
             window.addEventListener('resize', this.onWindowResize);
             window.addEventListener('keydown', this.handleGlobalKeydown);
@@ -493,6 +499,22 @@ document.addEventListener('DOMContentLoaded', () => {
                     console.error('加载 Claude 配置失败:', e);
                 }
             }
+            {
+                const savedCurrentClaudeConfig = localStorage.getItem('currentClaudeConfig');
+                if (savedCurrentClaudeConfig && this.claudeConfigs[savedCurrentClaudeConfig]) {
+                    this.currentClaudeConfig = savedCurrentClaudeConfig;
+                }
+            }
+            if (!this.currentClaudeConfig) {
+                const claudeConfigNames = Object.keys(this.claudeConfigs || {});
+                if (claudeConfigNames.length > 0) {
+                    this.currentClaudeConfig = claudeConfigNames[0];
+                }
+            }
+            if (this.currentClaudeConfig && !this.currentClaudeModel) {
+                const initialClaudeConfig = this.claudeConfigs[this.currentClaudeConfig];
+                this.currentClaudeModel = initialClaudeConfig && initialClaudeConfig.model ? initialClaudeConfig.model : '';
+            }
             const normalizeOpenclawConfigs = (configs) => {
                 const source = configs && typeof configs === 'object' && !Array.isArray(configs)
                     ? configs

package/web-ui/logic.session-convert.mjs

@@ -0,0 +1,70 @@
+function stripLeadingSystemMessage(messages) {
+    if (!Array.isArray(messages) || messages.length < 2) return messages;
+    const first = messages[0];
+    if (!first || first.role !== 'system') return messages;
+    return messages.slice(1);
+}
+
+function toIsoTimestamp(value, fallback) {
+    const text = typeof value === 'string' ? value.trim() : '';
+    if (text) return text;
+    return typeof fallback === 'string' ? fallback : '';
+}
+
+export function normalizeSessionConvertSource(value) {
+    const normalized = typeof value === 'string' ? value.trim().toLowerCase() : '';
+    if (normalized === 'codex' || normalized === 'claude') return normalized;
+    return '';
+}
+
+export function getConvertTargetSource(source) {
+    return source === 'codex' ? 'claude' : (source === 'claude' ? 'codex' : '');
+}
+
+export function buildConvertedSessionJsonl(target, payload) {
+    const now = Date.now();
+    const baseTime = new Date(now).toISOString();
+    const sessionId = typeof payload.sessionId === 'string' ? payload.sessionId : '';
+    const cwd = typeof payload.cwd === 'string' ? payload.cwd : '';
+    const rawMessages = Array.isArray(payload.messages) ? payload.messages : [];
+    const messages = stripLeadingSystemMessage(rawMessages);
+    const lines = [];
+
+    if (target === 'codex') {
+        lines.push(JSON.stringify({ type: 'session_meta', timestamp: baseTime, payload: { id: sessionId, cwd } }));
+        for (let i = 0; i < messages.length; i += 1) {
+            const message = messages[i];
+            if (!message) continue;
+            const role = message.role === 'user' || message.role === 'assistant' || message.role === 'system'
+                ? message.role
+                : 'assistant';
+            const text = typeof message.text === 'string' ? message.text : '';
+            if (!text) continue;
+            lines.push(JSON.stringify({
+                type: 'response_item',
+                timestamp: toIsoTimestamp(message.timestamp, new Date(now + i).toISOString()),
+                payload: { type: 'message', role, content: text }
+            }));
+        }
+        return `${lines.join('\n')}\n`;
+    }
+
+    for (let i = 0; i < messages.length; i += 1) {
+        const message = messages[i];
+        if (!message) continue;
+        const role = message.role === 'user' || message.role === 'assistant' || message.role === 'system'
+            ? message.role
+            : 'assistant';
+        const text = typeof message.text === 'string' ? message.text : '';
+        if (!text) continue;
+        lines.push(JSON.stringify({
+            type: role,
+            timestamp: toIsoTimestamp(message.timestamp, new Date(now + i).toISOString()),
+            sessionId,
+            cwd,
+            message: { content: text }
+        }));
+    }
+    return `${lines.join('\n')}\n`;
+}
+

package/web-ui/logic.sessions.mjs

@@ -206,6 +206,157 @@ function formatUtcDayKey(value) {
     return `${stamp.getUTCFullYear()}-${String(stamp.getUTCMonth() + 1).padStart(2, '0')}-${String(stamp.getUTCDate()).padStart(2, '0')}`;
 }
 
+export function buildUsageHeatmap(sessions = [], options = {}) {
+    const list = Array.isArray(sessions) ? sessions : [];
+    const normalized = [];
+    for (const session of list) {
+        if (!session || typeof session !== 'object') continue;
+        const source = normalizeSessionSource(session.source, '');
+        if (source !== 'codex' && source !== 'claude') continue;
+        const updatedAtMs = Date.parse(session.updatedAt || '');
+        if (!Number.isFinite(updatedAtMs)) continue;
+        normalized.push({
+            updatedAtMs,
+            messageCount: Number.isFinite(Number(session.messageCount))
+                ? Math.max(0, Math.floor(Number(session.messageCount)))
+                : 0,
+            tokenTotal: readSessionTotalTokens(session)
+        });
+    }
+
+    const range = normalizeUsageRange(options.range);
+    const now = Number.isFinite(Number(options.now)) ? Number(options.now) : Date.now();
+    const dayMs = 24 * 60 * 60 * 1000;
+    const todayStart = toUtcDayStartMs(now);
+    let startDay = todayStart;
+    let endDay = todayStart;
+    if (range === 'all') {
+        const dayStarts = normalized.map((item) => toUtcDayStartMs(item.updatedAtMs)).filter((value) => Number.isFinite(value));
+        if (dayStarts.length) {
+            startDay = Math.min(...dayStarts);
+            endDay = Math.max(...dayStarts);
+        }
+    } else {
+        const rangeDays = range === '30d' ? 30 : 7;
+        endDay = todayStart;
+        startDay = todayStart - ((rangeDays - 1) * dayMs);
+    }
+
+    const startDow = new Date(startDay).getUTCDay();
+    const startShift = (startDow + 6) % 7;
+    const alignedStart = startDay - (startShift * dayMs);
+    const endDow = new Date(endDay).getUTCDay();
+    const endShift = (6 - ((endDow + 6) % 7));
+    const alignedEnd = endDay + (endShift * dayMs);
+    const totalDays = Math.floor((alignedEnd - alignedStart) / dayMs) + 1;
+    const weekCount = Math.max(1, Math.ceil(totalDays / 7));
+
+    const byDay = new Map();
+    for (const item of normalized) {
+        const dayKey = formatUtcDayKey(item.updatedAtMs);
+        const existing = byDay.get(dayKey) || { sessionCount: 0, messageCount: 0, tokenTotal: 0 };
+        existing.sessionCount += 1;
+        existing.messageCount += item.messageCount;
+        existing.tokenTotal += item.tokenTotal;
+        byDay.set(dayKey, existing);
+    }
+
+    const weeks = Array.from({ length: weekCount }, (_, idx) => ({
+        key: `w-${idx}`,
+        weekIndex: idx,
+        days: Array.from({ length: 7 }, () => null)
+    }));
+
+    let maxSessionCount = 0;
+    for (let dayIndex = 0; dayIndex < totalDays; dayIndex += 1) {
+        const dateMs = alignedStart + (dayIndex * dayMs);
+        const dateKey = formatUtcDayKey(dateMs);
+        const isInRange = dateMs >= startDay && dateMs <= endDay;
+        const weekIndex = Math.floor(dayIndex / 7);
+        const dow = new Date(dateMs).getUTCDay();
+        const rowIndex = (dow + 6) % 7;
+        const totals = isInRange ? (byDay.get(dateKey) || { sessionCount: 0, messageCount: 0, tokenTotal: 0 }) : null;
+        const sessionCount = totals ? totals.sessionCount : 0;
+        if (isInRange) {
+            maxSessionCount = Math.max(maxSessionCount, sessionCount);
+        }
+        weeks[weekIndex].days[rowIndex] = {
+            dateKey,
+            dateMs,
+            isInRange,
+            sessionCount,
+            messageCount: totals ? totals.messageCount : 0,
+            tokenTotal: totals ? totals.tokenTotal : 0
+        };
+    }
+
+    return {
+        range,
+        startDay,
+        endDay,
+        alignedStart,
+        alignedEnd,
+        maxSessionCount,
+        weeks
+    };
+}
+
+export function buildUsageHourlyHeatmap(sessions = [], options = {}) {
+    const list = Array.isArray(sessions) ? sessions : [];
+    const range = normalizeUsageRange(options.range);
+    const now = Number.isFinite(Number(options.now)) ? Number(options.now) : Date.now();
+    const dayMs = 24 * 60 * 60 * 1000;
+    const todayStart = toUtcDayStartMs(now);
+
+    const normalized = [];
+    for (const session of list) {
+        if (!session || typeof session !== 'object') continue;
+        const source = normalizeSessionSource(session.source, '');
+        if (source !== 'codex' && source !== 'claude') continue;
+        const updatedAtMs = Date.parse(session.updatedAt || '');
+        if (!Number.isFinite(updatedAtMs)) continue;
+        const dayStart = toUtcDayStartMs(updatedAtMs);
+        if (range !== 'all') {
+            const rangeDays = range === '30d' ? 30 : 7;
+            const rangeStart = todayStart - ((rangeDays - 1) * dayMs);
+            if (dayStart < rangeStart || dayStart > todayStart) continue;
+        }
+        const stamp = new Date(updatedAtMs);
+        const weekday = (stamp.getUTCDay() + 6) % 7;
+        const hour = stamp.getUTCHours();
+        const messageCount = Number.isFinite(Number(session.messageCount))
+            ? Math.max(0, Math.floor(Number(session.messageCount)))
+            : 0;
+        const tokenTotal = readSessionTotalTokens(session);
+        normalized.push({ weekday, hour, messageCount, tokenTotal });
+    }
+
+    const grid = Array.from({ length: 7 }, () =>
+        Array.from({ length: 24 }, () => ({ sessionCount: 0, messageCount: 0, tokenTotal: 0 }))
+    );
+    for (const item of normalized) {
+        const cell = grid[item.weekday][item.hour];
+        cell.sessionCount += 1;
+        cell.messageCount += item.messageCount;
+        cell.tokenTotal += item.tokenTotal;
+    }
+
+    let maxSessionCount = 0;
+    for (let day = 0; day < 7; day += 1) {
+        for (let hour = 0; hour < 24; hour += 1) {
+            maxSessionCount = Math.max(maxSessionCount, grid[day][hour].sessionCount);
+        }
+    }
+
+    return {
+        range,
+        grid,
+        maxSessionCount: Math.max(1, maxSessionCount),
+        weekdayKeys: [0, 1, 2, 3, 4, 5, 6],
+        hourLabels: Array.from({ length: 24 }, (_, index) => String(index).padStart(2, '0'))
+    };
+}
+
 function buildUsageBuckets(normalizedSessions, options = {}) {
     const range = normalizeUsageRange(options.range);
     const now = Number.isFinite(Number(options.now)) ? Number(options.now) : Date.now();

package/web-ui/modules/app.computed.dashboard.mjs

@@ -40,7 +40,50 @@ export function createDashboardComputed() {
             return list;
         },
         installTargetCards() {
-            const targets = Array.isArray(this.installStatusTargets) ? this.installStatusTargets : [];
+            const targets = Array.isArray(this.installStatusTargets) && this.installStatusTargets.length
+                ? this.installStatusTargets
+                : [
+                    {
+                        id: 'claude',
+                        name: 'Claude Code CLI',
+                        packageName: '@anthropic-ai/claude-code',
+                        installed: false,
+                        bin: 'claude',
+                        version: '',
+                        commandPath: '',
+                        error: ''
+                    },
+                    {
+                        id: 'codebuddy',
+                        name: 'CodeBuddy Code',
+                        packageName: '@tencent-ai/codebuddy-code',
+                        installed: false,
+                        bin: 'codebuddy',
+                        version: '',
+                        commandPath: '',
+                        error: ''
+                    },
+                    {
+                        id: 'gemini',
+                        name: 'Gemini CLI',
+                        packageName: '@google/gemini-cli',
+                        installed: false,
+                        bin: 'gemini',
+                        version: '',
+                        commandPath: '',
+                        error: ''
+                    },
+                    {
+                        id: 'codex',
+                        name: 'Codex CLI',
+                        packageName: '@openai/codex',
+                        installed: false,
+                        bin: 'codex',
+                        version: '',
+                        commandPath: '',
+                        error: ''
+                    }
+                ];
             const action = this.normalizeInstallAction(this.installCommandAction);
             return targets.map((target) => {
                 const id = target && typeof target.id === 'string' ? target.id : '';