fogact 1.2.2 → 1.2.4

package/frontend/user/assets/link-2-DT5R5nGO-fogact-live.js

@@ -0,0 +1,6 @@
+import{c as e}from"./index-fogact-live.js";/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const n=e("Link2Icon",[["path",{d:"M9 17H7A5 5 0 0 1 7 7h2",key:"8i5ue5"}],["path",{d:"M15 7h2a5 5 0 1 1 0 10h-2",key:"1b9ql8"}],["line",{x1:"8",x2:"16",y1:"12",y2:"12",key:"1jonct"}]]);export{n as L};

package/frontend/user/assets/package-rUbExUEn-fogact-live.js

@@ -0,0 +1,6 @@
+import{c as a}from"./index-fogact-live.js";/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const c=a("PackageIcon",[["path",{d:"M11 21.73a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73z",key:"1a0edw"}],["path",{d:"M12 22V12",key:"d0xqtd"}],["path",{d:"m3.3 7 7.703 4.734a2 2 0 0 0 1.994 0L20.7 7",key:"yx3hmr"}],["path",{d:"m7.5 4.27 9 5.15",key:"1c824w"}]]);export{c as P};

package/frontend/user/assets/plus-CQc6C8wG-fogact-live.js

@@ -0,0 +1,11 @@
+import{c as a}from"./index-fogact-live.js";/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const s=a("LayersIcon",[["path",{d:"M12.83 2.18a2 2 0 0 0-1.66 0L2.6 6.08a1 1 0 0 0 0 1.83l8.58 3.91a2 2 0 0 0 1.66 0l8.58-3.9a1 1 0 0 0 0-1.83z",key:"zw3jo"}],["path",{d:"M2 12a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 12",key:"1wduqc"}],["path",{d:"M2 17a1 1 0 0 0 .58.91l8.6 3.91a2 2 0 0 0 1.65 0l8.58-3.9A1 1 0 0 0 22 17",key:"kqbvx6"}]]);/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const t=a("PlusIcon",[["path",{d:"M5 12h14",key:"1ays0h"}],["path",{d:"M12 5v14",key:"s699le"}]]);export{s as L,t as P};

package/frontend/user/assets/refresh-cw-Y9hCloPL-fogact-live.js

@@ -0,0 +1,6 @@
+import{c as e}from"./index-fogact-live.js";/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const t=e("RefreshCwIcon",[["path",{d:"M3 12a9 9 0 0 1 9-9 9.75 9.75 0 0 1 6.74 2.74L21 8",key:"v9h5vc"}],["path",{d:"M21 3v5h-5",key:"1q7to0"}],["path",{d:"M21 12a9 9 0 0 1-9 9 9.75 9.75 0 0 1-6.74-2.74L3 16",key:"3uifl3"}],["path",{d:"M8 16H3v5",key:"1cv678"}]]);export{t as R};

package/frontend/user/assets/useUserPageRefresh-BYZvpNR9-fogact-live.js

@@ -0,0 +1 @@
+import{u as c}from"./index-fogact-live.js";import{w as i,L as d,f as h}from"./chart-vendor-CULJE59K.js";const o=Symbol("user-page-refresh");function v(l,e={}){const n=c(),f=h(o,null);let t=0;async function a(r="custom"){var u;const s=++t;(u=e.resetBeforeLoad)==null||u.call(e,r),await l({reason:r,runId:s,isLatest:()=>s===t})}return e.reloadOnKeyChange!==!1&&i(()=>n.activeKeyId,(r,s)=>{r!==s&&a("active-key-change")}),e.reloadOnManualRefresh!==!1&&f&&i(()=>f.refreshTick.value,()=>{a("manual-refresh")}),e.immediate!==!1&&d(()=>{a("initial")}),{reload:a}}export{v as a,o as u};

package/frontend/user/assets/zap-l5zbZqrM-fogact-live.js

@@ -0,0 +1,11 @@
+import{c as a}from"./index-fogact-live.js";/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const e=a("ShieldIcon",[["path",{d:"M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z",key:"oel41y"}]]);/**
+ * @license lucide-vue-next v0.468.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const o=a("ZapIcon",[["path",{d:"M4 14a1 1 0 0 1-.78-1.63l9.9-10.2a.5.5 0 0 1 .86.46l-1.92 6.02A1 1 0 0 0 13 10h7a1 1 0 0 1 .78 1.63l-9.9 10.2a.5.5 0 0 1-.86-.46l1.92-6.02A1 1 0 0 0 11 14z",key:"1xq2db"}]]);export{e as S,o as Z};

package/frontend/user/index.html

@@ -28,7 +28,7 @@
         }
       })()
     </script>
-    <script type="module" crossorigin src="assets/index-Da98HOxL.js?v=20260619-fogact-loading-fix"></script>
+    <script type="module" crossorigin src="assets/index-fogact-live.js"></script>
     <link rel="modulepreload" crossorigin href="assets/chart-vendor-CULJE59K.js">
     <link rel="stylesheet" crossorigin href="assets/index-B8QSyYhS.css">
     <link rel="stylesheet" href="/assets/market-ui.css?v=20260619-fogact-copy2" />

package/lib/index.js

@@ -170,6 +170,28 @@ function printBanner() {
   console.log(renderMenu(0));
 }
 
+function shouldUseFixedMenuScreen(env = process.env, stdout = process.stdout) {
+  if (!stdout.isTTY) return false;
+  if (env.FOGACT_NO_FIXED_MENU === "1" || env.FOGACT_PLAIN_MENU === "1") return false;
+  return String(env.TERM || "").toLowerCase() !== "dumb";
+}
+
+function enterFixedMenuScreen(stdout = process.stdout) {
+  stdout.write("\x1b[?1049h\x1b[?25l\x1b[?7l");
+}
+
+function leaveFixedMenuScreen(stdout = process.stdout) {
+  stdout.write("\x1b[?7h\x1b[?25h\x1b[?1049l");
+}
+
+function saveMenuCursor(stdout = process.stdout) {
+  stdout.write("\x1b7\x1b[s\x1b[?25l");
+}
+
+function restoreMenuCursor(stdout = process.stdout) {
+  stdout.write("\x1b8\x1b[u\x1b[J");
+}
+
 function moveMenuCursor(cursor, direction, total) {
   return (cursor + direction + total) % total;
 }
@@ -221,6 +243,41 @@ async function runInteractiveMenu() {
   await runToolsMenu();
 }
 
+function waitForMenuReturn(message = "按回车返回菜单...") {
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    return Promise.resolve();
+  }
+
+  return new Promise((resolve) => {
+    const stdin = process.stdin;
+    const wasRaw = Boolean(stdin.isRaw);
+    let closed = false;
+
+    const cleanup = () => {
+      if (closed) return;
+      closed = true;
+      stdin.off("data", onData);
+      if (stdin.isTTY && stdin.isRaw !== wasRaw) stdin.setRawMode(wasRaw);
+      stdin.pause();
+      process.stdout.write("\n");
+      resolve();
+    };
+
+    const onData = (data) => {
+      const value = String(data);
+      if (value.includes("\u0003") || value.includes("\u001b") || value.includes("\r") || value.includes("\n")) {
+        cleanup();
+      }
+    };
+
+    process.stdout.write(`  ${message}`);
+    stdin.setEncoding("utf8");
+    stdin.setRawMode(true);
+    stdin.resume();
+    stdin.on("data", onData);
+  });
+}
+
 function selectMenuAction() {
   if (!process.stdin.isTTY || !process.stdout.isTTY) {
     printBanner();
@@ -229,24 +286,33 @@ function selectMenuAction() {
 
   return new Promise((resolve) => {
     let cursor = 0;
-    let renderedLines = 0;
+    let closed = false;
     const stdin = process.stdin;
+    const stdout = process.stdout;
+    const useFixedScreen = shouldUseFixedMenuScreen(process.env, stdout);
+    const wasRaw = Boolean(stdin.isRaw);
 
     const render = () => {
-      if (renderedLines > 0) {
-        process.stdout.write(`\x1b[${renderedLines}A`);
-        process.stdout.write("\x1b[J");
+      if (useFixedScreen) {
+        stdout.write("\x1b[H\x1b[2J");
+      } else {
+        restoreMenuCursor(stdout);
       }
-      const output = renderMenu(cursor);
-      renderedLines = output.split("\n").length;
-      process.stdout.write(output);
+      stdout.write(renderMenu(cursor));
     };
 
     const cleanup = () => {
+      if (closed) return;
+      closed = true;
       stdin.off("data", onData);
-      if (stdin.isRaw) stdin.setRawMode(false);
+      if (stdin.isTTY && stdin.isRaw !== wasRaw) stdin.setRawMode(wasRaw);
       stdin.pause();
-      process.stdout.write("\x1b[?25h\n");
+      if (useFixedScreen) {
+        leaveFixedMenuScreen(stdout);
+      } else {
+        restoreMenuCursor(stdout);
+        stdout.write("\x1b[?25h");
+      }
     };
 
     const submit = () => {
@@ -261,7 +327,7 @@ function selectMenuAction() {
     };
 
     const onData = (data) => {
-      const next = applyMenuInput(data.toString("utf8"), cursor, MENU_CHOICES.length);
+      const next = applyMenuInput(String(data), cursor, MENU_CHOICES.length);
       const cursorChanged = next.cursor !== cursor;
       cursor = next.cursor;
 
@@ -280,11 +346,16 @@ function selectMenuAction() {
       }
     };
 
-    process.stdout.write("\x1b[?25l");
-    render();
-    stdin.resume();
     stdin.setEncoding("utf8");
     stdin.setRawMode(true);
+    stdin.resume();
+
+    if (useFixedScreen) {
+      enterFixedMenuScreen(stdout);
+    } else {
+      saveMenuCursor(stdout);
+    }
+    render();
     stdin.on("data", onData);
   });
 }
@@ -299,9 +370,11 @@ async function runToolsMenu() {
         break;
       case "test":
         await runTestCommand();
+        await waitForMenuReturn();
         break;
       case "restore":
         await runRestoreCommand();
+        await waitForMenuReturn();
         break;
       default:
         console.log("");
@@ -403,10 +476,15 @@ async function runCli(argv = process.argv) {
 module.exports = {
   applyMenuInput,
   buildProgram,
+  enterFixedMenuScreen,
+  leaveFixedMenuScreen,
+  renderMenu,
+  shouldUseFixedMenuScreen,
   ensureLatestVersion,
   isNewerVersion,
   runCli,
   runInteractiveMenu,
   runToolsMenu,
   runWebServer,
+  waitForMenuReturn,
 };

package/lib/services/database.js

@@ -6,6 +6,7 @@ const path = require("path");
 const DATA_DIR = path.join(__dirname, "..", "..", "data");
 const USERS_FILE = path.join(DATA_DIR, "users.json");
 const CODES_FILE = path.join(DATA_DIR, "codes.json");
+const USAGE_FILE = path.join(DATA_DIR, "usage.json");
 
 // 确保数据目录存在
 function ensureDataDir() {
@@ -257,6 +258,51 @@ const codeDb = {
   },
 };
 
+// 用量日志数据库操作
+const usageDb = {
+  getAll() {
+    return readJsonFile(USAGE_FILE, []);
+  },
+
+  create(usageData) {
+    const items = this.getAll();
+    const now = new Date().toISOString();
+    const newItem = {
+      id: usageData.id || `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`,
+      codeId: usageData.codeId || null,
+      code: usageData.code || null,
+      service: usageData.service || "claude",
+      model: usageData.model || "unknown",
+      inputTokens: Number(usageData.inputTokens || 0),
+      outputTokens: Number(usageData.outputTokens || 0),
+      totalTokens: Number(usageData.totalTokens || 0),
+      requests: Number(usageData.requests || 1),
+      statusCode: usageData.statusCode || null,
+      success: usageData.success !== false,
+      cost: Number(usageData.cost || 0),
+      path: usageData.path || null,
+      createdAt: usageData.createdAt || now,
+    };
+    items.push(newItem);
+    writeJsonFile(USAGE_FILE, items);
+    return newItem;
+  },
+
+  getByCode(code) {
+    const value = String(code || "").trim();
+    if (!value) return [];
+    return this.getAll().filter((item) => item.code === value);
+  },
+
+  getSince(code, since) {
+    const sinceTime = since ? new Date(since).getTime() : 0;
+    return this.getByCode(code).filter((item) => {
+      const createdAt = new Date(item.createdAt || 0).getTime();
+      return Number.isFinite(createdAt) && createdAt >= sinceTime;
+    });
+  },
+};
+
 // 初始化示例数据
 function initializeSampleData() {
   ensureDataDir();
@@ -457,5 +503,6 @@ function initializeSampleData() {
 module.exports = {
   userDb,
   codeDb,
+  usageDb,
   initializeSampleData,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fogact",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "description": "FogAct activation helper for Claude Code and Codex",
   "keywords": [
     "fogact",