codexmate 0.0.31 → 0.0.33

package/lib/cli-sessions.js

@@ -153,20 +153,30 @@ function expandSessionQueryTokens(tokens) {
     return result;
 }
 
-function matchTokensInText(text, tokens, mode = 'and') {
+function matchTokensInText(text, tokens, mode) {
+    if (mode === void 0) { mode = "and"; }
     if (!Array.isArray(tokens) || tokens.length === 0) {
         return true;
     }
-    const haystack = String(text || '').toLowerCase();
+    var haystack = String(text || "").toLowerCase();
     if (!haystack) {
         return false;
     }
-    if (mode === 'or') {
-        return tokens.some(token => haystack.includes(token));
+    var boundaryChars = "\\s_\\-.,;:!?(){}[\\]<>/\"'`";
+    var hasCjk = function(token) { return /[⺀-鿿\u{20000}-\u{2fa1f}]/u.test(token); };
+    var matchToken = function(token) {
+        if (/^\d+$/.test(token) || hasCjk(token)) {
+            return haystack.indexOf(token) !== -1;
+        }
+        var escaped = token.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+        var pattern = new RegExp("(?:^|[" + boundaryChars + "])" + escaped + "(?:$|[" + boundaryChars + "])", "i");
+        return pattern.test(haystack);
+    };
+    if (mode === "or") {
+        return tokens.some(function(token) { return matchToken(token); });
     }
-    return tokens.every(token => haystack.includes(token));
+    return tokens.every(function(token) { return matchToken(token); });
 }
-
 function extractMessageFromRecord(record, source) {
     if (!record) {
         return null;

package/lib/win-tray.js

@@ -0,0 +1,119 @@
+'use strict';
+
+const { spawn } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+let trayProcess = null;
+let exitMarkerPath = null;
+let checkTimer = null;
+
+function startWinTray(options = {}) {
+    if (process.platform !== 'win32') return;
+
+    const name = String(options.name || 'App');
+    const port = Number(options.port) || 3000;
+    const pid = process.pid;
+    const url = `http://localhost:${port}`;
+
+    exitMarkerPath = path.join(os.tmpdir(), `codexmate-tray-exit-${pid}.marker`);
+
+    try { fs.unlinkSync(exitMarkerPath); } catch (_) { }
+
+    const script = `
+$ErrorActionPreference = 'Stop'
+Add-Type -AssemblyName System.Windows.Forms, System.Drawing
+
+$name = "${name}"
+$url = "${url}"
+$exitMarkerPath = "${exitMarkerPath.replace(/\\/g, '/')}"
+
+$form = New-Object System.Windows.Forms.Form
+$form.ShowInTaskbar = $false
+$form.WindowState = [System.Windows.Forms.FormWindowState]::Minimized
+$form.Visible = $false
+
+$icon = New-Object System.Windows.Forms.NotifyIcon
+try {
+    $bmp = New-Object System.Drawing.Bitmap 16, 16
+    $g = [System.Drawing.Graphics]::FromImage($bmp)
+    $g.Clear([System.Drawing.Color]::FromArgb(59, 130, 246))
+    $font = New-Object System.Drawing.Font "Arial", 10, [System.Drawing.FontStyle]::Bold
+    $brush = New-Object System.Drawing.SolidBrush ([System.Drawing.Color]::White)
+    $g.DrawString("C", $font, $brush, -1, -1)
+    $g.Dispose()
+    $hIcon = $bmp.GetHicon()
+    $icon.Icon = [System.Drawing.Icon]::FromHandle($hIcon)
+} catch {
+    $icon.Icon = [System.Drawing.SystemIcons]::Information
+}
+
+$icon.Text = if ($name.Length -gt 63) { $name.Substring(0, 63) } else { $name }
+$icon.Visible = $true
+
+$menu = New-Object System.Windows.Forms.ContextMenuStrip
+$openItem = $menu.Items.Add("Open")
+$openItem.add_Click({ try { [System.Diagnostics.Process]::Start($url) } catch {} })
+$menu.Items.Add("-") | Out-Null
+$exitItem = $menu.Items.Add("Exit")
+$exitItem.add_Click({
+    try { New-Item -Path $exitMarkerPath -ItemType File -Force | Out-Null } catch {}
+    $icon.Visible = $false
+    $icon.Dispose()
+    [System.Windows.Forms.Application]::Exit()
+})
+
+$icon.ContextMenuStrip = $menu
+$icon.add_DoubleClick({ try { [System.Diagnostics.Process]::Start($url) } catch {} })
+
+[System.Windows.Forms.Application]::Run($form)
+`.trim();
+
+    const scriptPath = path.join(os.tmpdir(), `codexmate-tray-${pid}.ps1`);
+    fs.writeFileSync(scriptPath, script, 'utf8');
+
+    try {
+        trayProcess = spawn('powershell.exe', [
+            '-NoProfile', '-Sta', '-WindowStyle', 'Hidden',
+            '-ExecutionPolicy', 'Bypass', '-File', scriptPath
+        ], { stdio: 'ignore', detached: true, windowsHide: true });
+        trayProcess.unref();
+        trayProcess.on('error', () => { });
+        trayProcess.on('exit', () => {
+            trayProcess = null;
+            try { fs.unlinkSync(scriptPath); } catch (_) { }
+        });
+    } catch (_) {
+        try { fs.unlinkSync(scriptPath); } catch (_) { }
+    }
+
+    checkTimer = setInterval(() => {
+        if (!exitMarkerPath) return;
+        try {
+            fs.accessSync(exitMarkerPath, fs.constants.F_OK);
+            try { fs.unlinkSync(exitMarkerPath); } catch (_) { }
+            process.exit(0);
+        } catch (_) { }
+    }, 1500);
+}
+
+function stopWinTray() {
+    if (checkTimer) { clearInterval(checkTimer); checkTimer = null; }
+    if (trayProcess) {
+        try { trayProcess.kill(); } catch (_) { }
+        trayProcess = null;
+    }
+    if (exitMarkerPath) {
+        try { fs.unlinkSync(exitMarkerPath); } catch (_) { }
+        exitMarkerPath = null;
+    }
+    if (process.platform === 'win32') {
+        try {
+            const scriptPath = path.join(os.tmpdir(), `codexmate-tray-${process.pid}.ps1`);
+            fs.unlinkSync(scriptPath);
+        } catch (_) { }
+    }
+}
+
+module.exports = { startWinTray, stopWinTray };

package/package.json

@@ -1,6 +1,6 @@
-{
+{
   "name": "codexmate",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "Codex/Claude Code/OpenClaw 配置、会话与任务编排 CLI + Web 工具",
   "main": "cli.js",
   "bin": {

package/web-ui/app.js

@@ -30,6 +30,7 @@ document.addEventListener('DOMContentLoaded', () => {
         data() {
             return {
                 lang: 'zh',
+                appVersion: '',
                 mainTab: 'dashboard',
                 configMode: 'codex',
                 currentProvider: '',
@@ -42,6 +43,7 @@ document.addEventListener('DOMContentLoaded', () => {
                 editingCodexBudgetField: '',
                 providersList: [],
                 localBridgeExcluded: [],
+                claudeLocalBridgeExcluded: [],
                 models: [],
                 codexModelsLoading: false,
                 modelsSource: 'remote',
@@ -58,10 +60,12 @@ document.addEventListener('DOMContentLoaded', () => {
                 messageType: '',
                 showAddModal: false,
                 showEditModal: false,
+                showEditProviderKey: false,
                 showModelModal: false,
                 showModelListModal: false,
                 showClaudeConfigModal: false,
                 showEditConfigModal: false,
+                showEditClaudeConfigKey: false,
                 showOpenclawConfigModal: false,
                 showConfigTemplateModal: false,
                 showAgentsModal: false,

package/web-ui/logic.sessions.mjs

@@ -424,6 +424,22 @@ export function buildUsageChartGroups(sessions = [], options = {}) {
     }
     const { range, buckets } = buildUsageBuckets(normalizedSessions, options);
     const bucketMap = new Map(buckets.map((bucket) => [bucket.key, bucket]));
+
+    // Range window: filter normalizedSessions to the selected range
+    var rangeStartMs = 0;
+    var rangeEndMs = Number.POSITIVE_INFINITY;
+    if (range !== "all" && buckets.length > 0) {
+        var firstKey = buckets[0].key;
+        var lastKey = buckets[buckets.length - 1].key;
+        rangeStartMs = Date.parse(firstKey + "T00:00:00.000Z");
+        rangeEndMs = Date.parse(lastKey + "T23:59:59.999Z");
+    }
+    var rangeFiltered = range === "all"
+        ? normalizedSessions
+        : normalizedSessions.filter(function(ns) {
+            return ns.updatedAtMs >= rangeStartMs && ns.updatedAtMs <= rangeEndMs;
+        });
+
     let codexTotal = 0;
     let claudeTotal = 0;
     let messageTotal = 0;
@@ -455,7 +471,7 @@ export function buildUsageChartGroups(sessions = [], options = {}) {
     const topSessionsByMessages = [];
     const filteredSessions = [];
 
-    for (const normalized of normalizedSessions) {
+    for (const normalized of rangeFiltered) {
         const { session, sessionIndex, source, updatedAtMs, sessionStartedAtMs, sessionEndedAtMs, bucketKey } = normalized;
         const stamp = new Date(updatedAtMs);
         const bucket = bucketMap.get(bucketKey);