minecodex 1.2.2 → 2.0.1

package/features/usage-meter/src/usage-meter.mjs

@@ -0,0 +1,200 @@
+// 订阅原生额度缓存；不另行轮询，也不复制账号信息到插件服务。
+const MARKER = "data-minecodex-usage-meter";
+const TIP_ID = "minecodex-usage-tooltip";
+const STYLE_ID = "minecodex-usage-style";
+let record = null;
+let client = null;
+let unsubscribe = null;
+let queued = false;
+let hoverTimer = null;
+
+function remainingWindows(data) {
+  const windows = [data?.rate_limit?.primary_window, data?.rate_limit?.secondary_window];
+  const remaining = seconds => {
+    const window = windows.find(window => window?.limit_window_seconds === seconds);
+    return typeof window?.used_percent === "number" && Number.isFinite(window.used_percent)
+      ? Math.round(Math.max(0, Math.min(100, 100 - window.used_percent))) : null;
+  };
+  const weekly = remaining(604800), fiveHour = remaining(18000);
+  return weekly == null ? null : { weekly, fiveHour, primary: fiveHour ?? weekly };
+}
+
+function nativeContext(rail) {
+  const key = Object.keys(rail).find(key => key.startsWith("__reactFiber$"));
+  let fiber = key ? rail[key] : null;
+  const result = { auth: null, client: null, router: null };
+  for (let depth = 0; fiber && depth < 200; depth++, fiber = fiber.return) {
+    const props = fiber.memoizedProps;
+    if (!props) continue;
+    for (const value of [props.auth, props.value]) {
+      if (!result.auth && value && typeof value === "object" && "authMethod" in value && "userId" in value && "accountId" in value) result.auth = value;
+    }
+    for (const value of [props.queryClient, props.client, props.value]) {
+      if (!result.client && typeof value?.getQueryCache === "function" && typeof value?.getQueryData === "function") result.client = value;
+    }
+    const router = props.router ?? props.value?.router;
+    if (!result.router && typeof router?.navigate === "function") result.router = router;
+    if (result.auth && result.client && result.router) break;
+  }
+  return result;
+}
+
+function currentWindows(context) {
+  const { auth, client } = context;
+  if (auth?.isLoading || !auth?.userId || !auth?.accountId || !["chatgpt", "chatgptAuthTokens"].includes(auth.authMethod)) return null;
+  const data = client?.getQueryData(["rate-limit-status"]);
+  // 账号与缓存必须同时一致；旧账号的最后一次响应不能留在导航栏。
+  if (!data || data.user_id !== auth.userId || data.account_id !== auth.accountId) return null;
+  return remainingWindows(data);
+}
+
+const style = document.createElement("style");
+style.id = STYLE_ID;
+style.textContent = `
+[${MARKER}] { position:relative; display:flex; align-items:center; justify-content:center; flex:none; -webkit-app-region:no-drag; }
+[${MARKER}] .mcx-usage-ring { display:block; width:24px; height:24px; overflow:visible; }
+[${MARKER}] .mcx-usage-number { position:absolute; inset:0; display:flex; align-items:center; justify-content:center; color:inherit; font-family:var(--font-sans-default); font-size:calc(var(--text-xs) * 2 / 3); line-height:1; font-weight:500; letter-spacing:0; font-variant-numeric:tabular-nums; pointer-events:none; }
+[${MARKER}] [data-window="weekly"] { color:inherit; }
+[${MARKER}] [data-window="fiveHour"] { color:var(--color-text-secondary); }
+#${TIP_ID} { position:fixed; z-index:2147483000; width:max-content; max-width:calc(100vw - 16px); pointer-events:none; user-select:none; padding:5px 12px; border:1px solid var(--color-border-tooltip); border-radius:var(--radius-2xl); background:var(--color-background-tooltip); color:var(--color-text-tooltip); box-shadow:var(--shadow-tooltip); font-family:var(--font-sans-default); font-size:var(--text-sm); line-height:18px; font-weight:var(--tooltip-compact-font-weight); letter-spacing:var(--tracking-tooltip); }
+#${TIP_ID}[hidden] { display:none; }
+#${TIP_ID} dl { display:grid; grid-template-columns:auto auto; gap:2px 16px; margin:0; }
+#${TIP_ID} dt { text-align:left; }
+#${TIP_ID} dd { margin:0; text-align:right; font-variant-numeric:tabular-nums; }
+`;
+document.head.append(style);
+
+function svgNode(name, attributes) {
+  const node = document.createElementNS("http://www.w3.org/2000/svg", name);
+  for (const [key, value] of Object.entries(attributes)) node.setAttribute(key, String(value));
+  return node;
+}
+
+function draw(windows) {
+  const svg = svgNode("svg", { viewBox: "0 0 32 32", class: "mcx-usage-ring", "aria-hidden": "true" });
+  for (const [key, radius] of [["weekly", 43 / 3], ["fiveHour", 10.5]]) {
+    if (windows[key] == null) continue;
+    const group = svgNode("g", { "data-window": key, fill: "none", stroke: "currentColor", "stroke-width": 10 / 3 });
+    group.append(svgNode("circle", { cx: 16, cy: 16, r: radius, opacity: 0.18 }));
+    if (windows[key] > 0) group.append(svgNode("circle", {
+      cx: 16, cy: 16, r: radius, pathLength: 100,
+      "stroke-dasharray": `${windows[key]} 100`, "stroke-linecap": "round", transform: "rotate(-90 16 16)",
+    }));
+    svg.append(group);
+  }
+  const number = document.createElement("span");
+  number.className = "mcx-usage-number";
+  number.textContent = String(windows.primary);
+  number.setAttribute("data-dual", String(windows.fiveHour != null));
+  number.setAttribute("data-digits", String(number.textContent.length));
+  record.button.replaceChildren(svg, number);
+  const list = document.createElement("dl");
+  const rows = windows.fiveHour == null ? [] : [["5h Limit", windows.fiveHour]];
+  rows.push(["Weekly Limit", windows.weekly]);
+  for (const [label, percent] of rows) {
+    const term = document.createElement("dt"), value = document.createElement("dd");
+    term.textContent = label;
+    value.textContent = `${percent}%`;
+    list.append(term, value);
+  }
+  record.tooltip.replaceChildren(list);
+  record.button.setAttribute("aria-label", rows.map(([label, percent]) => `${label} ${percent}%`).join(", "));
+  record.button.setAttribute("aria-description", "Open Usage settings");
+  if (!record.tooltip.hidden) positionTooltip();
+}
+
+function positionTooltip() {
+  if (!record) return;
+  const rect = record.button.getBoundingClientRect();
+  const tooltip = record.tooltip;
+  // 按物理视口定位，兼容原生 app-shell 的 CSS zoom。
+  tooltip.style.left = `${Math.max(8, Math.min(rect.right + 2, window.innerWidth - tooltip.offsetWidth - 8))}px`;
+  tooltip.style.top = `${Math.max(8, Math.min(rect.top + (rect.height - tooltip.offsetHeight) / 2, window.innerHeight - tooltip.offsetHeight - 8))}px`;
+}
+
+function showTooltip() {
+  clearTimeout(hoverTimer);
+  if (!record) return;
+  record.tooltip.hidden = false;
+  record.button.setAttribute("aria-describedby", TIP_ID);
+  positionTooltip();
+}
+function hideTooltip() {
+  clearTimeout(hoverTimer);
+  if (!record) return;
+  record.tooltip.hidden = true;
+  record.button.removeAttribute("aria-describedby");
+}
+function removeControl() {
+  hideTooltip();
+  record?.button.remove();
+  record?.tooltip.remove();
+  record = null;
+}
+
+function mount(help, rail) {
+  // 只克隆按钮的外观属性，不携带原生 Help 的菜单行为或 id。
+  const button = help.cloneNode(false);
+  for (const attribute of [...button.attributes]) {
+    if (attribute.name.startsWith("aria-") || attribute.name === "id" || attribute.name === "data-state") button.removeAttribute(attribute.name);
+  }
+  button.setAttribute(MARKER, "");
+  const tooltip = document.createElement("div");
+  tooltip.id = TIP_ID;
+  tooltip.setAttribute("role", "tooltip");
+  tooltip.hidden = true;
+  const anchor = help.parentElement.classList.contains("contents") ? help.parentElement : help;
+  anchor.after(button);
+  document.body.append(tooltip);
+  record = { button, tooltip, rail, help, signature: null };
+  button.addEventListener("pointerenter", () => { hoverTimer = setTimeout(showTooltip, 350); });
+  button.addEventListener("pointerleave", hideTooltip);
+  button.addEventListener("focus", showTooltip);
+  button.addEventListener("blur", hideTooltip);
+  button.addEventListener("keydown", event => { if (event.key === "Escape") { event.stopPropagation(); hideTooltip(); } });
+  button.addEventListener("click", () => {
+    hideTooltip();
+    const { router } = nativeContext(rail);
+    router?.navigate("/settings/usage?tab=overview", { state: router.state?.location?.state });
+  });
+}
+
+function sync() {
+  queued = false;
+  if (signal.aborted) return;
+  const rail = [...document.querySelectorAll('nav[data-app-navigation-rail="true"]')].find(rail => rail.getBoundingClientRect().width > 0);
+  const help = rail?.querySelector('button[aria-label="Help menu"],button[aria-label="帮助菜单"]');
+  const context = rail ? nativeContext(rail) : {};
+  if (client !== context.client) {
+    unsubscribe?.();
+    client = context.client;
+    unsubscribe = client?.getQueryCache().subscribe(event => {
+      if (event.query?.queryKey?.[0] === "rate-limit-status") schedule();
+    });
+  }
+  const windows = currentWindows(context);
+  if (!help || !context.router || !windows) { removeControl(); return; }
+  if (record?.help !== help || !record?.button.isConnected) { removeControl(); mount(help, rail); }
+  const signature = JSON.stringify(windows);
+  if (record.signature !== signature) { record.signature = signature; draw(windows); }
+}
+function schedule() {
+  if (queued || signal.aborted) return;
+  queued = true;
+  queueMicrotask(sync);
+}
+const observer = new MutationObserver(schedule);
+observer.observe(document.documentElement, { childList: true, subtree: true, attributes: true, attributeFilter: ["aria-label"] });
+window.addEventListener("resize", positionTooltip);
+window.addEventListener("focus", schedule);
+const cleanup = () => {
+  observer.disconnect();
+  unsubscribe?.();
+  window.removeEventListener("resize", positionTooltip);
+  window.removeEventListener("focus", schedule);
+  removeControl();
+  style.remove();
+};
+signal.addEventListener("abort", cleanup, { once: true });
+sync();
+return cleanup;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minecodex",
-  "version": "1.2.2",
+  "version": "2.0.1",
   "description": "Lightweight, local-first plugins for the Codex desktop app.",
   "license": "MIT",
   "type": "module",
@@ -23,9 +23,10 @@
     "features/model-slider/THIRD_PARTY_NOTICES.md",
     "features/model-slider/vendor",
     "features/notes/src",
-    "features/notes/web",
     "features/notes/assets",
     "features/notes/codex-feature.json",
+    "features/notes/DESIGN.md",
+    "features/notes/README.md",
     "features/images/src",
     "features/images/web",
     "features/images/codex-feature.json",
@@ -41,17 +42,28 @@
     "apps/dashboard/favicon.svg",
     "apps/dashboard/index.html",
     "apps/dashboard/styles.css",
-    "README.md"
+    "README.md",
+    "features/usage-meter/src",
+    "features/usage-meter/codex-feature.json",
+    "features/usage-meter/DESIGN.md",
+    "features/usage-meter/README.md",
+    "features/unread-inbox/src",
+    "features/unread-inbox/codex-feature.json",
+    "features/unread-inbox/DESIGN.md",
+    "features/sidebar-focus/src",
+    "features/sidebar-focus/codex-feature.json",
+    "features/sidebar-focus/DESIGN.md",
+    "features/sidebar-focus/vendor/lucide-LICENSE"
   ],
   "engines": {
     "node": ">=22.5.0"
   },
   "scripts": {
     "start": "node packages/cli/bin/mcx.mjs serve",
-    "test": "node --test packages/cli/test/*.test.mjs packages/runtime-host/test/*.test.mjs features/model-slider/test/*.test.mjs features/notes/test/*.test.mjs features/images/test/*.test.mjs features/hide-upsell-banner/test/*.test.mjs features/session-status/test/*.test.mjs apps/dashboard/test/*.test.mjs",
+    "test": "node --test packages/cli/test/*.test.mjs packages/runtime-host/test/*.test.mjs features/model-slider/test/*.test.mjs features/notes/test/*.test.mjs features/images/test/*.test.mjs features/hide-upsell-banner/test/*.test.mjs features/session-status/test/*.test.mjs features/usage-meter/test/*.test.mjs apps/dashboard/test/*.test.mjs features/unread-inbox/test/*.test.mjs features/sidebar-focus/test/*.test.mjs",
     "test:cli": "node --test packages/cli/test/*.test.mjs",
     "test:runtime": "node --test packages/runtime-host/test/*.test.mjs",
-    "check": "node --check packages/cli/bin/mcx.mjs && node --check packages/cli/src/*.mjs && node --check packages/runtime-host/src/*.mjs",
+    "check": "node scripts/check-syntax.mjs",
     "build:service": "scripts/build-service-app.zsh",
     "pack:check": "npm pack --dry-run",
     "pack:audit": "node scripts/audit-package.mjs",

package/packages/cli/src/config.mjs

@@ -2,7 +2,7 @@ import { randomBytes } from "node:crypto";
 import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
 import path from "node:path";
 
-export const FEATURE_IDS = Object.freeze(["model-slider", "notes", "images", "hide-upsell-banner", "session-status"]);
+export const FEATURE_IDS = Object.freeze(["model-slider", "notes", "images", "hide-upsell-banner", "session-status", "usage-meter", "unread-inbox", "sidebar-focus"]);
 export const DEFAULT_CONFIG = Object.freeze({
   schemaVersion: 1,
   features: Object.freeze({
@@ -11,6 +11,9 @@ export const DEFAULT_CONFIG = Object.freeze({
     images: true,
     "hide-upsell-banner": true,
     "session-status": true,
+    "usage-meter": true,
+    "unread-inbox": true,
+    "sidebar-focus": true,
   }),
 });
 

package/packages/cli/src/control-server.mjs

@@ -196,8 +196,8 @@ async function iconResponse(id, paths, response) {
   if (id === "model-slider") {
     iconPath = path.join(paths.featuresRoot, id, "assets", "ui", "sparkles.svg");
   } else if (id === "notes") {
-    iconPath = path.join(paths.featuresRoot, id, "assets", "icons", "sticky-note.svg");
-  } else if (["images", "hide-upsell-banner", "session-status"].includes(id)) {
+    iconPath = path.join(paths.featuresRoot, id, "assets", "icons", "book-open.svg");
+  } else if (["images", "hide-upsell-banner", "session-status", "usage-meter"].includes(id)) {
     const manifest = JSON.parse(await readFile(path.join(paths.featuresRoot, id, "codex-feature.json"), "utf8"));
     const viewBox = manifest.icon?.viewBox ?? "0 0 24 24";
     const svg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="${viewBox}" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">${manifest.icon.markup}</svg>`;

package/packages/runtime-host/src/codex-injection.mjs

@@ -390,12 +390,14 @@ export function createInjectionSource(features, {
           "config",
           `"use strict";\n${source}`,
         );
+        const pageConfig = feature.pageScript.config ??= {};
+        pageConfig.requestHostAction = (action, payload) => requestPageHostAction(feature.id, action, payload);
         const cleanup = installer(
           lifetime.signal,
           window,
           document,
           MutationObserver,
-          feature.pageScript.config ?? {},
+          pageConfig,
         );
         if (typeof cleanup === "function") pageScriptCleanups.push(cleanup);
       } catch (error) {
@@ -2779,9 +2781,10 @@ export function createInjectionSource(features, {
       }
       // 原生开合的临时 min-width 钉定与弹层水平居中都基于对 Measurement
       // 探针的测量；把探针文本同步为 MCX 显示标签，原生机制即可测得
-      // 真实显示宽度（含 110px 名称上限与 160px Content 上限）。
+      // 真实显示宽度。保留 React 持有的子节点，避免切模型时卸载失败。
       const measurement = trigger.querySelector('[class*="_ModelPickerTriggerMeasurement_"]');
-      if (measurement && measurement.textContent !== label) measurement.textContent = label;
+      const measurementText = measurement && firstVisibleTextNode(measurement);
+      if (measurementText && measurementText.nodeValue !== label) measurementText.nodeValue = label;
     }
 
     function ensureModelSelector() {
@@ -4525,10 +4528,36 @@ export function createInjectionSource(features, {
       }
     }
 
+    function requestPageHostAction(featureId, action, payload) {
+      if (!featureById.get(featureId)?.hostActions.has(action)) return Promise.reject(new Error("Host action is not registered"));
+      if (typeof globalThis[config.bindingName] !== "function") return Promise.reject(new Error("Host bridge is unavailable"));
+      return new Promise((resolve, reject) => {
+        const requestId = crypto.randomUUID();
+        const timer = setTimeout(() => {
+          pendingHostActions.delete(requestId);
+          reject(new Error("Host request timed out"));
+        }, 10_000);
+        pendingHostActions.set(requestId, { kind: "page-script", resolve, reject, timer });
+        try {
+          globalThis[config.bindingName](JSON.stringify({ token: config.bindingToken, featureId, requestId, action, payload }));
+        } catch (error) {
+          clearTimeout(timer);
+          pendingHostActions.delete(requestId);
+          reject(error);
+        }
+      });
+    }
+
     function resolveHostAction(requestId, response) {
       const pending = pendingHostActions.get(requestId);
       if (!pending) return false;
       pendingHostActions.delete(requestId);
+      if (pending.kind === "page-script") {
+        clearTimeout(pending.timer);
+        if (response.ok) pending.resolve(response.result);
+        else pending.reject(new Error(response.error?.message ?? "Host request failed"));
+        return true;
+      }
       const record = surfaceRecords.get(pending.recordKey);
       if (!record) return false;
       if (pending.kind === "surface-load") {
@@ -4711,6 +4740,12 @@ export function createInjectionSource(features, {
       resolveHostAction,
       dispose: () => {
         lifetime.abort();
+        for (const [id, pending] of pendingHostActions) {
+          if (pending.kind !== "page-script") continue;
+          clearTimeout(pending.timer);
+          pending.reject(new Error("Runtime disposed"));
+          pendingHostActions.delete(id);
+        }
         for (const cleanup of pageScriptCleanups.splice(0)) {
           try { cleanup(); } catch (error) {
             console.warn("[codex-personal] page-script cleanup failed", error);

package/packages/runtime-host/src/codex-runtime.mjs

@@ -47,15 +47,11 @@ export {
 } from "./codex-injection.mjs";
 
 export const SESSION_STATUS_THREAD_ID_EXPRESSION = `(() => {
-  const composer = document.querySelector('[data-codex-composer="true"][contenteditable="true"]')
-    ?? document.querySelector('[contenteditable="true"][role="textbox"]');
-  const card = composer?.closest('[data-codex-composer-root]');
-  const portal = card?.querySelector('[data-above-composer-portal]');
-  if (portal) return portal.getAttribute('data-above-composer-conversation-id');
-  if (card?.getAttribute('data-composer-placement') === 'home') return null;
-  const selected = document.querySelector('[data-app-action-sidebar-thread-selected="true"]');
-  return selected?.getAttribute('data-app-action-sidebar-thread-id')
-    ?? location.pathname + location.search + location.hash;
+  return [...new Set([...document.querySelectorAll('[data-codex-composer="true"][contenteditable="true"]')].map(composer => {
+    const card = composer.closest('[data-codex-composer-root]');
+    if (card?.getAttribute('data-composer-placement') !== 'thread') return null;
+    return card.querySelector('[data-above-composer-portal]')?.getAttribute('data-above-composer-conversation-id');
+  }).filter(Boolean))];
 })()`;
 
 export class CodexRuntime {
@@ -550,6 +546,29 @@ export class CodexRuntime {
       });
       return;
     }
+    if (feature.id === "notes" && request.action === "quick-prompts") {
+      try {
+        const { route, method = "GET", body } = request.payload ?? {};
+        const allowed = (route === "/api/state" && method === "GET")
+          || (["/api/prompts", "/api/categories", "/api/reorder"].includes(route) && method === "POST")
+          || (/^\/api\/categories\/[a-zA-Z0-9-]+$/.test(route) && ["PATCH", "DELETE"].includes(method))
+          || (/^\/api\/prompts\/[a-zA-Z0-9-]+$/.test(route) && ["PATCH", "DELETE"].includes(method))
+          || (/^\/api\/prompts\/[a-zA-Z0-9-]+\/use$/.test(route) && method === "POST");
+        const origin = pageScriptServiceOrigin(feature);
+        if (!allowed || !origin) throw new Error("Prompt request is not allowed");
+        const response = await this.fetchImpl(new URL(route, origin), {
+          method, headers: { "Content-Type": "application/json", Origin: CODEX_APP_ORIGIN },
+          body: body === undefined ? undefined : JSON.stringify(body),
+          signal: AbortSignal.timeout(8_000),
+        });
+        const result = response.status === 204 ? null : await response.json();
+        if (!response.ok) throw new Error(result?.error?.message ?? "Prompt request failed");
+        await this.resolveHostAction(client, request.requestId, { ok: true, result });
+      } catch (error) {
+        await this.resolveHostAction(client, request.requestId, { ok: false, error: { code: "PROMPT_REQUEST_FAILED", message: error.message } });
+      }
+      return;
+    }
     if (request.action === "import-generated-image") {
       await this.importGeneratedImage(feature, request.payload);
       return;
@@ -741,17 +760,19 @@ export class CodexRuntime {
             expression: SESSION_STATUS_THREAD_ID_EXPRESSION,
             returnByValue: true,
           }, { timeoutMs: 3_000 });
-          const threadId = threadIdFromLocation(response.result?.value);
-          const data = threadId ? await this.sessionStatusReader.read(threadId) : null;
-          const snapshot = data ?? (threadId ? {
-            threadId,
-            retryAfterMs: this.sessionStatusReader.retryAfterMs?.(threadId) ?? 500,
-          } : null);
-          if (this.stopping || this.clients.get(targetId) !== client) return;
-          await client.send("Runtime.evaluate", {
-            expression: `window.__minecodexSessionStatus?.update(${JSON.stringify(snapshot)}, ${revision})`,
-            returnByValue: true,
-          }, { timeoutMs: 3_000 });
+          for (const value of response.result?.value ?? []) {
+            const threadId = threadIdFromLocation(value);
+            const data = threadId ? await this.sessionStatusReader.read(threadId) : null;
+            const snapshot = data ?? (threadId ? {
+              threadId,
+              retryAfterMs: this.sessionStatusReader.retryAfterMs?.(threadId) ?? 500,
+            } : null);
+            if (this.stopping || this.clients.get(targetId) !== client) return;
+            await client.send("Runtime.evaluate", {
+              expression: `window.__minecodexSessionStatus?.update(${JSON.stringify(snapshot)}, ${revision})`,
+              returnByValue: true,
+            }, { timeoutMs: 3_000 });
+          }
         } catch (error) {
           this.logger.warn?.("Session Status update failed", error.message);
           if (this.clients.get(targetId) === client) {

package/packages/runtime-host/src/feature-registry.mjs

@@ -6,6 +6,7 @@ import path from "node:path";
 
 const MANIFEST_NAME = "codex-feature.json";
 const HOST_ACTIONS = new Set([
+  "quick-prompts",
   "insert-text",
   "attach-file",
   "open-detail-tab",

package/packages/runtime-host/src/session-status-reader.mjs

@@ -70,9 +70,7 @@ function emptyState(filePath) {
     contextWindow: null,
     firstOutputAt: null,
     pendingToolIntervals: [],
-    decodeTokens: 0,
-    decodeMs: 0,
-    speedSamples: 0,
+    speedMeasurements: [],
     ttftTotalMs: 0,
     ttftSamples: 0,
     toolMs: 0,
@@ -110,6 +108,9 @@ export function applySessionStatusEvent(state, event) {
   const payload = event?.payload ?? {};
   if (event?.type === "compacted") {
     state.compactionRecords += 1;
+    state.last = null;
+    state.firstOutputAt = null;
+    state.pendingToolIntervals = [];
     if (Number.isSafeInteger(payload.window_number) && payload.window_number >= 0) {
       state.compactionWindow = Math.max(state.compactionWindow, payload.window_number);
     }
@@ -134,12 +135,21 @@ export function applySessionStatusEvent(state, event) {
     state.baseInstructionTokens = estimatedTextTokens(payload.base_instructions?.text);
   }
   if (event?.type === "event_msg") {
-    if (payload.type === "context_compacted") state.compactionEvents += 1;
+    if (payload.type === "context_compacted") {
+      state.compactionEvents += 1;
+      state.last = null;
+      state.firstOutputAt = null;
+      state.pendingToolIntervals = [];
+    }
     if (payload.type === "task_started" && payload.turn_id) {
+      state.firstOutputAt = null;
+      state.pendingToolIntervals = [];
       state.turns.add(payload.turn_id);
       state.runningTurns.add(payload.turn_id);
     }
     if (["task_complete", "task_interrupted", "turn_aborted"].includes(payload.type)) {
+      state.firstOutputAt = null;
+      state.pendingToolIntervals = [];
       if (payload.turn_id) state.runningTurns.delete(payload.turn_id);
       else state.runningTurns.clear();
     }
@@ -158,13 +168,17 @@ export function applySessionStatusEvent(state, event) {
       if (TOOL_ITEMS.has(itemType) && Number.isFinite(start) && Number.isFinite(end)) {
         state.toolMs += Math.max(0, end - start);
         state.pendingToolIntervals.push([start, end]);
+        // 工具完成事件可能晚于用量记录落盘，补扣已记录样本中的重叠区间。
+        for (const sample of state.speedMeasurements) {
+          if (start < sample.end && end > sample.start) sample.tools.push([start, end]);
+        }
       }
     }
     if (payload.type === "token_count") {
       if (!state.hasResponseUsage && validUsage(payload.info?.total_token_usage)) {
         state.total = payload.info.total_token_usage;
       }
-      if (!state.hasResponseUsage && validUsage(payload.info?.last_token_usage)) {
+      if (validUsage(payload.info?.last_token_usage)) {
         state.last = payload.info.last_token_usage;
       }
       if (Number.isFinite(payload.info?.model_context_window)) {
@@ -174,18 +188,18 @@ export function applySessionStatusEvent(state, event) {
   }
   if (event?.type === "token_usage_record") {
     const responseId = payload.response_id;
-    if (responseId && !state.responses.has(responseId)) {
+    if (responseId && state.responses.has(responseId)) return;
+    if (responseId) {
       state.responses.add(responseId);
       const responseEnd = Date.parse(event.timestamp);
-      const elapsed = state.firstOutputAt == null ? null : responseEnd - state.firstOutputAt
-        - overlappingToolMs(state.pendingToolIntervals, state.firstOutputAt, responseEnd);
       const output = payload.usage?.output_tokens;
-      // 会话事件只给出首个可见条目的时间，故 TPS 是观测估算。
+      // 起止点来自会话事件，并非模型首末 token 时间；只能提供观测约值。
       if (Number.isFinite(output) && output > 0 && state.firstOutputAt != null
-        && Number.isFinite(elapsed) && elapsed > 0 && elapsed < 600_000) {
-        state.decodeTokens += output;
-        state.decodeMs += elapsed;
-        state.speedSamples += 1;
+        && Number.isFinite(responseEnd) && responseEnd > state.firstOutputAt) {
+        state.speedMeasurements.push({
+          start: state.firstOutputAt, end: responseEnd, output,
+          tools: state.pendingToolIntervals.slice(),
+        });
       }
     }
     state.firstOutputAt = null;
@@ -200,6 +214,16 @@ export function applySessionStatusEvent(state, event) {
 }
 
 export function sessionStatusSnapshot(state, threadId) {
+  let decodeTokens = 0;
+  let decodeMs = 0;
+  let speedSamples = 0;
+  for (const sample of state.speedMeasurements) {
+    const elapsed = sample.end - sample.start - overlappingToolMs(sample.tools, sample.start, sample.end);
+    if (elapsed <= 0 || elapsed >= 600_000) continue;
+    decodeTokens += sample.output;
+    decodeMs += elapsed;
+    speedSamples += 1;
+  }
   const total = state.total;
   const input = total?.input_tokens ?? 0;
   const cached = total?.cached_input_tokens ?? 0;
@@ -218,9 +242,9 @@ export function sessionStatusSnapshot(state, threadId) {
     uncachedInputTokens: total ? Math.max(0, input - cached - cacheWrite) : null,
     outputTokens: total?.output_tokens ?? null,
     cacheHitPercent: input > 0 ? Math.round(cached / input * 100) : null,
-    observedTps: state.decodeMs > 0 ? Math.round(state.decodeTokens / (state.decodeMs / 1000)) : null,
-    speedSamples: state.speedSamples,
-    observedModelMs: state.decodeMs,
+    observedTps: decodeMs > 0 ? Math.round(decodeTokens / (decodeMs / 1000)) : null,
+    speedSamples,
+    observedModelMs: decodeMs,
     toolMs: state.toolMs,
     averageFirstTokenMs: state.ttftSamples > 0 ? Math.round(state.ttftTotalMs / state.ttftSamples) : null,
     contextUsedTokens: contextUsed,

package/features/notes/assets/icons/circle.svg

@@ -1,15 +0,0 @@
-<!-- @license lucide-static v1.31.0 - ISC -->
-<svg
-  class="lucide lucide-circle"
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <circle cx="12" cy="12" r="10" />
-</svg>

package/features/notes/assets/icons/ellipsis.svg

@@ -1,17 +0,0 @@
-<!-- @license lucide-static v1.31.0 - ISC -->
-<svg
-  class="lucide lucide-ellipsis"
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <circle cx="12" cy="12" r="1" />
-  <circle cx="19" cy="12" r="1" />
-  <circle cx="5" cy="12" r="1" />
-</svg>

package/features/notes/assets/icons/external-link.svg

@@ -1,17 +0,0 @@
-<!-- @license lucide-static v1.31.0 - ISC -->
-<svg
-  class="lucide lucide-external-link"
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M15 3h6v6" />
-  <path d="M10 14 21 3" />
-  <path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6" />
-</svg>

package/features/notes/assets/icons/list-todo.svg

@@ -1,19 +0,0 @@
-<!-- @license lucide-static v1.31.0 - ISC -->
-<svg
-  class="lucide lucide-list-todo"
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M13 5h8" />
-  <path d="M13 12h8" />
-  <path d="M13 19h8" />
-  <path d="m3 17 2 2 4-4" />
-  <rect x="3" y="4" width="6" height="6" rx="1" />
-</svg>