@alanwalk/codex-until 0.2.1 → 0.2.2

package/README.md

@@ -15,8 +15,12 @@ npx @alanwalk/codex-until quota  # 查询一次额度
 npx @alanwalk/codex-until logs   # 查看日志
 ```
 
+`status` 输出一次当前状态面板，不显示操作菜单；未运行时只显示标题和“未启动”。
+
 面板显示剩余额度、下次重置时间和查询倒计时。上下键选择操作，左右键切换刷新间隔：`10s / 30s / 1m / 5m`，默认 `1m`。
 
+每次打开面板会主动刷新一次，返回前显示等待，不展示上次额度。已有查询会复用，限流退避期间仍按要求等待。`status` 只查看现有状态，不触发刷新。
+
 - **转入后台**：关闭面板，继续监控。也可按 `b`。
 - **停止并退出**：停止监控，保留 Codex 会话。也可按 `q` 或 `Ctrl+C`。
 
@@ -34,5 +38,7 @@ npx @alanwalk/codex-until logs   # 查看日志
 
 日志位置：
 
-- Windows：`%LOCALAPPDATA%\codex-quota-guard\monitor.log`
-- macOS / Linux：`~/.codex-until/monitor.log`
+- Windows：`%LOCALAPPDATA%/.cache/codex-until/`
+- macOS / Linux：`~/.cache/codex-until/`
+
+每次启动单独创建日志，按本地启动时间命名，例如 `codex-until-2026-10-15_16-50-30-123.log`。`logs` 查看当前监控日志；未运行时查看最近一次日志。

package/bin/cli.cjs

@@ -2,8 +2,8 @@
 const net = require('node:net');
 const path = require('node:path');
 const fs = require('node:fs');
-const { runtimePaths } = require('../platform.cjs');
-const { consoleMode } = require('./terminal.cjs');
+const { runtimePaths, latestLog } = require('../platform.cjs');
+const { consoleMode, renderPanel, monitorLines } = require('./terminal.cjs');
 const { spawn } = require('node:child_process');
 const watch = require('../watch-codex-quota.cjs');
 const { address: pipe, windows } = runtimePaths();
@@ -38,11 +38,14 @@ async function daemon() {
     socket.on('error', () => {});
     socket.once('data', data => {
       const action = data.toString().trim();
+      let requiredSequence;
+      if (action === 'refresh') requiredSequence = watch.requestRefresh();
       if (action.startsWith('interval:')) {
         try { watch.setIntervalMs(Number(action.slice('interval:'.length))); }
         catch (error) { socket.end(JSON.stringify({ error: error.message }) + '\n'); return; }
       }
-      const result = { running: action !== 'stop', pid: process.pid, logPath: watch.logPath, ...watch.polling };
+      const result = { running: action !== 'stop', pid: process.pid, logPath: watch.logPath,
+        ...watch.polling, requiredSequence };
       socket.end(JSON.stringify(result) + '\n', () => {
         if (action === 'stop') process.exit(0);
       });
@@ -101,7 +104,7 @@ Non-interactive invocations run in the background.
   start   Start polling every 60 seconds; repeated calls are safe.
           --background / -b: start directly in the background.
   stop    Stop monitoring only. Codex sessions remain running.
-  status  Print monitor status as JSON.
+  status  Show the current status panel once, without a menu.
   quota   Query quota once without enabling monitoring.
   logs    Print the last 50 log lines.
 Reset detection stops ALL local Codex processes and their children.
@@ -111,12 +114,19 @@ Restarting the monitor establishes a fresh baseline. No baseline is persisted.`)
   if (action === '--daemon') return daemon();
   if (action === 'quota') return watch.main(true);
   if (action === 'logs') {
-    if (!fs.existsSync(watch.logPath)) return console.log('No logs yet.');
-    return console.log(fs.readFileSync(watch.logPath, 'utf8').trimEnd().split('\n').slice(-50).join('\n'));
+    const current = await status();
+    const logPath = current.running ? current.logPath : latestLog(runtimePaths().logDirectory);
+    if (!logPath || !fs.existsSync(logPath)) return console.log('No logs yet.');
+    return console.log(fs.readFileSync(logPath, 'utf8').trimEnd().split('\n').slice(-50).join('\n'));
   }
   if (!['start', 'stop', 'status'].includes(action)) throw new Error(`Unknown command: ${action}. Use --help.`);
   const before = await status();
-  if (action === 'status') return console.log(JSON.stringify(before));
+  if (action === 'status') {
+    const lines = before.running ? monitorLines(before, watch.logPath) : [];
+    console.log(renderPanel({ ...before, lines, showMenu: false,
+      columns: process.stdout.columns || 80, color: Boolean(process.stdout.isTTY && !process.env.NO_COLOR) }));
+    return;
+  }
   if (action === 'stop') {
     const result = before.running ? await request('stop') : before;
     console.log(JSON.stringify({ ...result, changed: before.running }));
@@ -124,13 +134,17 @@ Restarting the monitor establishes a fresh baseline. No baseline is persisted.`)
   }
   if (before.running) {
     if (foreground) await consoleMode({ status, request, logPath: watch.logPath });
-    else console.log(JSON.stringify({ ...before, changed: false }));
+    else {
+      const refreshed = await request('refresh');
+      console.log(JSON.stringify({ ...refreshed, quota: null, changed: false }));
+    }
     return;
   }
   fs.mkdirSync(path.dirname(watch.logPath), { recursive: true });
   const output = fs.openSync(watch.logPath, 'a');
   const child = spawn(process.execPath, [__filename, '--daemon'], {
     detached: true, windowsHide: true, stdio: ['ignore', 'ignore', output],
+    env: { ...process.env, CODEX_UNTIL_LOG_PATH: watch.logPath },
   });
   fs.closeSync(output);
   child.on('error', error => { console.error(error.message); process.exitCode = 1; });

package/bin/terminal.cjs

@@ -4,13 +4,28 @@ const readline = require('node:readline');
 const intervals = [10000, 30000, 60000, 300000];
 const intervalLabels = ['10s', '30s', '1m', '5m'];
 
+function monitorLines(state, fallbackPath) {
+  // Older daemons only expose a log path; new daemons return quota directly.
+  if (state.quota !== undefined) return [];
+  const logPath = state.logPath || fallbackPath;
+  return logPath && fs.existsSync(logPath)
+    ? fs.readFileSync(logPath, 'utf8').trimEnd().split('\n').slice(-150) : [];
+}
+
 function renderPanel({ running, pid, lines, selected = 0, columns = 80, color = true,
-  now = Date.now(), intervalMs = 60000, nextQueryAt, querying, cooldownUntil }) {
+  now = Date.now(), intervalMs = 60000, nextQueryAt, querying, cooldownUntil, showMenu = true,
+  quota: snapshot, lastSuccessfulAt, lastError, minimumSequence = 0, successfulSequence = 0 }) {
   const paint = (code, text) => color ? `\x1b[${code}m${text}\x1b[0m` : text;
   const clean = text => text.replace(/\x1b\[[0-?]*[ -/]*[@-~]/g, '').replace(/[\x00-\x1f\x7f]/g, '');
   const records = lines.map(clean);
   const quota = [...records].reverse().find(line => /remaining [\d.]+%/.test(line));
-  const match = quota?.match(/^(\S+).*?remaining ([\d.]+)%, reset (\S+)/);
+  let match = quota?.match(/^(\S+).*?remaining ([\d.]+)%, reset (\S+)/);
+  if (snapshot !== undefined) {
+    const fresh = successfulSequence >= minimumSequence;
+    const window = fresh ? snapshot?.primary ?? snapshot?.secondary : null;
+    match = window ? [null, new Date(lastSuccessfulAt).toISOString(), String(100 - window.usedPercent),
+      new Date(window.resetsAt * 1000).toISOString()] : null;
+  }
   const width = Math.max(8, Math.min(28, columns - 20));
   const latestRecord = records.at(-1) || '';
   const lastAttempt = Date.parse(latestRecord.split(' ')[0]);
@@ -25,9 +40,10 @@ function renderPanel({ running, pid, lines, selected = 0, columns = 80, color =
     '', paint('36', '  ╭───────────────────────╮'),
     paint('36', '  │') + paint('1;36', '  CODEX UNTIL          ') + paint('36', '│'),
     paint('36', '  ╰───────────────────────╯'), '',
-    `  ${paint(running ? '32' : '33', running ? '● 正在监控' : '○ 监控已退出')}  ${paint('90', `PID ${pid ?? '—'}`)}`,
-    `  ${paint('36', queryStatus)}`,
+    `  ${paint(running ? '32' : '33', running ? '● 正在监控' : '○ 未启动')}${running ? '  ' + paint('90', `PID ${pid ?? '—'}`) : ''}`,
   ];
+  if (!running) return output.join('\n') + '\n';
+  output.push(`  ${paint('36', queryStatus)}`);
   if (match) {
     const remaining = Math.max(0, Math.min(100, Number(match[2])));
     const filled = Math.round(width * remaining / 100);
@@ -35,11 +51,12 @@ function renderPanel({ running, pid, lines, selected = 0, columns = 80, color =
       `  ${paint('36', '━'.repeat(filled))}${paint('90', '─'.repeat(width - filled))}`,
       `  下次重置  ${new Date(match[3]).toLocaleString('zh-CN', { hour12: false })}`);
   } else output.push('', '  剩余额度  —', '  下次重置  —',
-    paint('90', '  正在等待首次额度查询…'));
-  if (records.at(-1)?.includes('ERROR')) {
-    output.push(paint('33', '  刷新失败，以上为上次成功数据。'));
+    paint('90', '  正在等待本次额度查询…'));
+  if (lastError || records.at(-1)?.includes('ERROR')) {
+    output.push(paint('33', match ? '  刷新失败，以上为上次成功数据。' : '  本次查询失败，等待重试。'));
   }
   output.push('', paint('90', '  额度重置后，结束本机全部 Codex 会话。'), '');
+  if (!showMenu) return output.join('\n');
   const choices = intervalLabels.map((label, index) => intervals[index] === intervalMs ? `[${label}]` : label).join('  ');
   for (const [index, label] of [`刷新间隔  ‹ ${choices} ›`, '转入后台，继续监控', '停止监控并退出'].entries()) {
     output.push(index === selected ? paint('1;36', `  ❯ ${label}`) : paint('90', `    ${label}`));
@@ -49,6 +66,11 @@ function renderPanel({ running, pid, lines, selected = 0, columns = 80, color =
 }
 
 async function consoleMode({ status, request, logPath }) {
+  const initial = await request('refresh');
+  if (!Number.isFinite(initial.requiredSequence)) {
+    throw new Error('当前后台版本不支持启动时刷新，请先 stop，再重新启动。');
+  }
+  const minimumSequence = initial.requiredSequence;
   const input = process.stdin;
   const output = process.stdout;
   let selected = 0;
@@ -67,7 +89,7 @@ async function consoleMode({ status, request, logPath }) {
     const draw = () => {
       if (closing) return;
       const panel = renderPanel({ ...current, lines, selected,
-        columns: output.columns || 80, color: !process.env.NO_COLOR });
+        minimumSequence, columns: output.columns || 80, color: !process.env.NO_COLOR });
       if (panel === lastPanel) return;
       lastPanel = panel;
       output.write('\x1b[H\x1b[2J' + panel);
@@ -124,8 +146,8 @@ async function consoleMode({ status, request, logPath }) {
       if (busy || closing) return;
       busy = true;
       try {
-        if (fs.existsSync(logPath)) lines = fs.readFileSync(logPath, 'utf8').trimEnd().split('\n').slice(-150);
         current = await status();
+        lines = monitorLines(current, logPath);
         if (closing) return;
         draw();
         if (!current.running) await finish(false, '后台监控已退出，请用 logs 查看原因。');
@@ -142,4 +164,4 @@ async function consoleMode({ status, request, logPath }) {
   });
 }
 
-module.exports = { consoleMode, renderPanel };
+module.exports = { consoleMode, renderPanel, monitorLines };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alanwalk/codex-until",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Stop local Codex sessions when quota resets during monitoring.",
   "homepage": "https://github.com/alanwalk/codex-until#readme",
   "repository": {

package/platform.cjs

@@ -3,14 +3,25 @@ const os = require('node:os');
 const path = require('node:path');
 const crypto = require('node:crypto');
 
+function logFileName(startedAt = new Date()) {
+  const pad = (value, width = 2) => String(value).padStart(width, '0');
+  return `codex-until-${startedAt.getFullYear()}-${pad(startedAt.getMonth() + 1)}-${pad(startedAt.getDate())}_${pad(startedAt.getHours())}-${pad(startedAt.getMinutes())}-${pad(startedAt.getSeconds())}-${pad(startedAt.getMilliseconds(), 3)}.log`;
+}
+
+function latestLog(logDirectory) {
+  if (!fs.existsSync(logDirectory)) return null;
+  const names = fs.readdirSync(logDirectory).filter(name => /^codex-until-\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}-\d{3}\.log$/.test(name)).sort();
+  return names.length ? path.join(logDirectory, names.at(-1)) : null;
+}
+
 function runtimePaths(platform = process.platform, env = process.env, home = os.homedir()) {
   const windows = platform === 'win32';
   const key = crypto.createHash('sha256').update(home).digest('hex').slice(0, 16);
   const desktopCli = windows
     ? path.join(env.LOCALAPPDATA || '', 'Programs/OpenAI/Codex/bin/codex.exe')
     : '/Applications/Codex.app/Contents/Resources/codex';
-  const logDirectory = windows ? path.join(env.LOCALAPPDATA || home, 'codex-quota-guard')
-    : path.join(home, '.codex-until');
+  const cacheRoot = windows ? env.LOCALAPPDATA || home : home;
+  const logDirectory = path.join(cacheRoot, '.cache', 'codex-until');
   let cli = env.CODEX_QUOTA_CLI;
   if (!cli) {
     if (fs.existsSync(desktopCli)) cli = desktopCli;
@@ -20,7 +31,8 @@ function runtimePaths(platform = process.platform, env = process.env, home = os.
   return {
     windows,
     address: windows ? `\\\\.\\pipe\\codex-quota-guard-${key}` : path.join(os.tmpdir(), `codex-until-${key}.sock`),
-    logPath: path.join(logDirectory, 'monitor.log'),
+    logDirectory,
+    logPath: path.join(logDirectory, logFileName()),
     cli,
   };
 }
@@ -42,4 +54,4 @@ function codexProcessIds(processList, ownPid = process.pid) {
   return [...targets].reverse().filter(pid => pid !== ownPid && pid > 1);
 }
 
-module.exports = { runtimePaths, codexProcessIds };
+module.exports = { runtimePaths, codexProcessIds, logFileName, latestLog };

package/watch-codex-quota.cjs

@@ -4,8 +4,10 @@ const fs = require('node:fs');
 const path = require('node:path');
 const { runtimePaths, codexProcessIds } = require('./platform.cjs');
 
-const { logPath } = runtimePaths();
-const polling = { intervalMs: 60000, nextQueryAt: null, querying: false, cooldownUntil: null, failureCount: 0 };
+const logPath = process.env.CODEX_UNTIL_LOG_PATH || runtimePaths().logPath;
+const polling = { intervalMs: 60000, nextQueryAt: null, querying: false, cooldownUntil: null,
+  failureCount: 0, quota: null, lastSuccessfulAt: null, lastError: null,
+  querySequence: 0, successfulSequence: 0 };
 const quotaParams = { excludeResetCreditDetails: true };
 function quotaError(error) {
   const result = new Error(error.message || 'Quota query failed');
@@ -29,6 +31,7 @@ function retryAfterMs(error, now = Date.now()) {
 }
 
 function recordFailure(error, now = Date.now()) {
+  polling.lastError = error.message;
   polling.failureCount += 1;
   const requestedWait = retryAfterMs(error, now);
   const backoff = Math.min(1800000, 60000 * 2 ** Math.min(5, polling.failureCount - 1));
@@ -38,6 +41,7 @@ function recordFailure(error, now = Date.now()) {
 }
 
 function recordSuccess() {
+  polling.lastError = null;
   polling.failureCount = 0;
   polling.cooldownUntil = null;
 }
@@ -46,6 +50,11 @@ function queryDeadline(requested) {
   return Math.max(requested, polling.cooldownUntil || 0);
 }
 let reschedule = null;
+function requestRefresh(now = Date.now()) {
+  const requiredSequence = polling.querying ? polling.querySequence : polling.querySequence + 1;
+  if (!polling.querying && reschedule) reschedule(now);
+  return requiredSequence;
+}
 function setIntervalMs(intervalMs) {
   if (![10000, 30000, 60000, 300000].includes(intervalMs)) throw new Error('Unsupported polling interval');
   polling.intervalMs = intervalMs;
@@ -182,9 +191,13 @@ async function main(queryOnly = process.argv.includes('--once')) {
   for (;;) {
     const started = Date.now();
     polling.querying = true;
+    polling.querySequence += 1;
     polling.nextQueryAt = null;
     try {
       const current = getSnapshot(await readQuota());
+      polling.quota = current.windows;
+      polling.lastSuccessfulAt = Date.now();
+      polling.successfulSequence = polling.querySequence;
       recordSuccess();
       log(Object.entries(current.windows).map(([name, window]) =>
         `${name}: remaining ${100 - window.usedPercent}%, reset ${new Date(window.resetsAt * 1000).toISOString()}`
@@ -209,5 +222,5 @@ async function main(queryOnly = process.argv.includes('--once')) {
 }
 
 module.exports = { getSnapshot, resetReason, main, logPath, polling, setIntervalMs, waitForNextQuery,
-  quotaParams, quotaError, retryAfterMs, recordFailure, recordSuccess, queryDeadline };
+  quotaParams, quotaError, retryAfterMs, recordFailure, recordSuccess, queryDeadline, requestRefresh };
 if (require.main === module) main().catch(error => { console.error(error); process.exitCode = 1; });