sidekick-chat 0.2.0 → 0.2.2

package/README.md

@@ -30,6 +30,10 @@ npm i -g sidekick-chat     # 或者装到全局,命令就是 sidekick
 node cli/bin/sidekick.mjs
 ```
 
+0.2.2 起，输入框上方 HUD 显示 OpenCode、Codex、Claude WSL 和 Claude Docker 的剩余额度，每分钟刷新。显示采样时间，刷新失败保留旧值并标注；无数据时显示未知。`/quota` 可立即刷新并查看本地日期时间标注的重置时间，纯文本交互也支持。额度沿用 App 的接口，凭据只用于访问同一服务器；不需要在 CLI 配置模型 API key。
+
+0.2.1 起，交互界面实时显示服务器的流式回复草稿，支持生成中的 Markdown；正式消息到达后替换草稿，不重复显示。切换会话、断线、清屏或服务端撤回会清除临时草稿。草稿不落盘，重连只补正式消息。`--plain`、管道、一次性 `ask` 和 `--json` 只输出正式消息。
+
 需要 Node 22.19 以上。交互界面使用与 Pi agent 相同的 `@earendil-works/pi-tui`，支持 Markdown、中文换行、多行粘贴、输入历史和窗口缩放。
 
 Enter 发送，Shift+Enter 换行（终端需支持；也可用 Ctrl+J），↑/↓ 翻输入历史。回复和忙碌状态更新时保留输入草稿与光标。
@@ -71,6 +75,7 @@ sidekick --device 家里的电脑 "…"   # 换一个署名(默认「终端」)
 | `/to <序号\|名字>` | 切换会话 |
 | `/history [n]` | 重印最近 n 条,默认 20 |
 | `/who` | 名册:谁在线、谁在忙 |
+| `/quota` | 刷新额度，查看剩余比例、采样和重置时间 |
 | `/clear` | 清屏 |
 | `/quit` | 退出(也可以 Ctrl-C) |
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sidekick-chat",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Sidekick 终端客户端:在终端里和秘书对话",
   "type": "module",
   "license": "PolyForm-Noncommercial-1.0.0",

package/src/api.mjs

@@ -61,7 +61,7 @@ export class SidekickApi {
     throw last;
   }
 
-  async request(method, path, body) {
+  async request(method, path, body, { signal } = {}) {
     return this.attempt(async (base) => {
       const url = `${base}/${path.replace(/^\/+/, '')}`;
       let res;
@@ -70,9 +70,10 @@ export class SidekickApi {
           method,
           headers: this.headers,
           body: body === undefined ? undefined : JSON.stringify(body),
-          signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
+          signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(REQUEST_TIMEOUT_MS)]) : AbortSignal.timeout(REQUEST_TIMEOUT_MS),
         });
       } catch (err) {
+        if (signal?.aborted) throw signal.reason;
         throw new NetworkError(networkHint(url, err));
       }
       const data = await res.json().catch(() => ({}));

package/src/main.mjs

@@ -28,6 +28,7 @@ import {
   plainMessage,
 } from './format.mjs';
 import { ask, askPassword } from './prompt.mjs';
+import { createQuotaMonitor, formatQuota } from './quota.mjs';
 
 const PACKAGE_VERSION = (() => {
   try {
@@ -276,6 +277,7 @@ async function startChat(flags) {
   let closed = false;
   let ui = null;
   let streamTask = Promise.resolve();
+  const quotas = createQuotaMonitor(settings, (rows) => ui?.quota(rows));
 
   const out = (text) => {
     if (ui) ui.out(text);
@@ -323,7 +325,10 @@ async function startChat(flags) {
   function applyState(next) {
     if (!next) return;
     state = next;
-    if (!convOf(convId)) convId = pickConv(state, '');
+    if (!convOf(convId)) {
+      ui?.clearDrafts();
+      convId = pickConv(state, '');
+    }
   }
 
   function onMessage(m) {
@@ -348,6 +353,7 @@ async function startChat(flags) {
       device: settings.device,
       signal: ctl.signal,
       onStatus: (kind) => {
+        if (kind === 'closed' || kind === 'error') ui?.clearDrafts();
         // 只在「连着的时候断了」和「重新接上」各说一句,退避重试期间不刷屏。
         if (kind === 'open') {
           if (everConnected) out(paint(color, 'green', '已重新连上'));
@@ -360,6 +366,11 @@ async function startChat(flags) {
       onEvent(event, payload) {
         if (event === 'hello' || event === 'state') applyState(payload.state ?? payload);
         else if (event === 'message') onMessage(payload);
+        else if (event === 'draft' && ui) {
+          // End frames have no conversation; remove only the matching sender/id.
+          if (payload.end || payload.conv === convId) ui.draft(payload, { bots: state.bots, color });
+          else ui.draft({ ...payload, end: true }, { bots: state.bots, color });
+        }
         else if (event === 'busy') typing(Boolean(payload.busy));
       },
     })
@@ -370,6 +381,7 @@ async function startChat(flags) {
     });
 
   function switchConv(next) {
+    ui?.clearDrafts();
     convId = next;
     const cfg = { ...readConfig(), url: settings.url, conv: convId, device: settings.device };
     writeConfig(cfg);
@@ -389,6 +401,7 @@ async function startChat(flags) {
           '/to <序号|名字>  切换会话',
           '/history [n]     重印最近 n 条(默认 20)',
           '/who             名册和连接状态',
+          '/quota           刷新额度，查看剩余比例和重置时间',
           '/clear           清屏',
           '/quit            退出(也可以 Ctrl-C)',
           '直接输入文字就是发给当前会话。',
@@ -427,6 +440,9 @@ async function startChat(flags) {
             .join('\n'),
         );
         return;
+      case 'quota':
+        out(formatQuota(await quotas.refresh(), { detail: true }));
+        return;
       case 'clear':
         if (ui) ui.clear();
         else out('(清屏已跳过:纯文本模式下不动终端)');
@@ -463,6 +479,7 @@ async function startChat(flags) {
 
   if (ui) {
     ui.start();
+    quotas.start();
   } else {
     rl = createInterface({ input: process.stdin, output: process.stdout, terminal: false });
     rl.on('line', (line) => {
@@ -481,6 +498,7 @@ async function startChat(flags) {
     if (closed) return;
     closed = true;
     typing(false);
+    quotas.stop();
     ui?.stop();
     ctl.abort();
     try {

package/src/quota.mjs

@@ -0,0 +1,107 @@
+import { SidekickApi } from './api.mjs';
+
+/** Same host and credentials as chat; proxy prefix or the standard direct port. */
+export function ccwebBase(base) {
+  if (!base) return '';
+  const url = new URL(base);
+  const path = url.pathname.replace(/\/+$/, '');
+  if (path.endsWith('/chat')) url.pathname = path.slice(0, -5) + '/ccweb';
+  else if (!path && url.port === '18792') url.port = '18794';
+  else throw new Error('无法推导 ccweb 地址');
+  url.search = '';
+  url.hash = '';
+  return url.toString().replace(/\/+$/, '');
+}
+
+const percentage = (value) => typeof value === 'number' && Number.isFinite(value)
+  ? Math.round(Math.max(0, Math.min(100, value))) : null;
+const timestamp = (value) => {
+  const time = typeof value === 'number' ? value : Date.parse(value);
+  return Number.isFinite(time) && time > 0 ? time : null;
+};
+const usedWindows = (windows) => (Array.isArray(windows) ? windows : []).map((w) => ({
+  label: w.label || w.id || '?',
+  left: percentage(typeof w.percent === 'number' ? 100 - w.percent : null),
+  resetsAt: timestamp(w.resetsAt),
+}));
+
+export function quotaRows(values, now = Date.now()) {
+  const { opencode, codex, claude } = values;
+  const row = (label, value, windows, at, note = '') => ({
+    label, windows, at: timestamp(at),
+    stale: Boolean(value?.failed || value?.data?.stale || timestamp(at) && now - timestamp(at) > 10 * 60_000),
+    note: value?.failed ? (value.data ? '刷新失败，保留旧值' : '暂不可用') : note,
+  });
+  const oc = opencode?.data;
+  const cx = codex?.data;
+  const rows = [
+    row('OpenCode', opencode, usedWindows(oc?.windows), oc?.sampledAt, oc?.stale ? '缓存' : ''),
+    row('Codex', codex, usedWindows(cx?.windows), cx?.sampledAt, cx?.loggedIn === false ? '未登录' : ''),
+  ];
+  const agents = (Array.isArray(claude?.data?.agents) ? claude.data.agents : []).filter((a) => a.engine === 'claude-code');
+  // Keep both requested channels visible even before their first report.
+  for (const name of ['WSL', 'Docker']) if (!agents.some((a) => a.name === name)) agents.push({ name });
+  for (const agent of agents) {
+    rows.push(row(`Claude ${agent.name}`, claude,
+      (Array.isArray(agent.usage?.windows) ? agent.usage.windows : []).map((w) => ({
+        label: w.label || w.key || '?', left: percentage(w.leftPct), resetsAt: timestamp(w.resetsAt),
+      })), agent.usage?.updatedAt, agent.online === false ? '离线' : ''));
+  }
+  return rows;
+}
+
+const localTime = (at) => {
+  const d = new Date(at);
+  const pad = (n) => String(n).padStart(2, '0');
+  return `${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
+};
+
+export function formatQuota(rows, { detail = false } = {}) {
+  return rows.map((r) => {
+    const windows = r.windows.map((w) => `${w.label} ${w.left === null ? '?' : w.left + '%'}${detail && w.resetsAt ? `（${localTime(w.resetsAt)} 重置）` : ''}`).join(' / ');
+    const notes = [r.note, r.stale ? '旧数据' : '', r.at ? `${localTime(r.at)} 采样` : '尚无采样'].filter(Boolean);
+    return `${r.label} 剩余 ${windows || '未知'} · ${notes.join(' · ')}`;
+  }).join('\n');
+}
+
+/** Independent failures preserve each source's last good snapshot. No overlapping polls. */
+export function createQuotaMonitor(settings, onUpdate, { api = new SidekickApi(settings), agentsApi, interval = 60_000 } = {}) {
+  const values = {};
+  const ctl = new AbortController();
+  let timer;
+  let pending;
+  let stopped = false;
+  let ccApi = agentsApi;
+  const sources = {
+    opencode: () => api.request('GET', 'v1/opencode/quota', undefined, { signal: ctl.signal }),
+    codex: () => api.request('GET', 'v1/codex/status', undefined, { signal: ctl.signal }),
+    claude: () => {
+      ccApi ??= new SidekickApi({ ...settings, url: ccwebBase(settings.url), alt: ccwebBase(settings.alt) });
+      return ccApi.request('GET', 'v1/agents', undefined, { signal: ctl.signal });
+    },
+  };
+  function refresh() {
+    if (stopped) return Promise.resolve(quotaRows(values));
+    if (pending) return pending;
+    pending = (async () => {
+      await Promise.allSettled(Object.entries(sources).map(async ([key, fetch]) => {
+        try { values[key] = { data: await fetch(), failed: false }; }
+        catch { values[key] = { ...values[key], failed: true }; }
+        if (!stopped) onUpdate(quotaRows(values));
+      }));
+      return quotaRows(values);
+    })().finally(() => { pending = null; });
+    return pending;
+  }
+  return {
+    refresh,
+    start() {
+      if (timer || stopped) return;
+      onUpdate(quotaRows(values));
+      void refresh();
+      timer = setInterval(() => { void refresh(); }, interval);
+      timer.unref?.();
+    },
+    stop() { stopped = true; clearInterval(timer); ctl.abort(); },
+  };
+}

package/src/tui.mjs

@@ -1,5 +1,6 @@
 import { Container, Editor, Markdown, ProcessTerminal, Text, TuiMainScreen } from '@earendil-works/pi-tui';
 import { paint, formatMessage } from './format.mjs';
+import { formatQuota } from './quota.mjs';
 
 export function markdownTheme(color) {
   const style = (code) => (text) => paint(color, code, text);
@@ -15,14 +16,25 @@ export function markdownTheme(color) {
 export function createChatUI({ color, onSubmit, onQuit, terminal = new ProcessTerminal() }) {
   const tui = new TuiMainScreen(terminal);
   const transcript = new Container();
+  const live = new Container();
+  const drafts = new Map();
+  const draftKey = (frame) => `${frame.from}:${frame.id}`;
+  const dropDraft = (key) => {
+    const draft = drafts.get(key);
+    if (draft) live.removeChild(draft.container);
+    drafts.delete(key);
+  };
   const status = new Text('', 1, 0);
+  const hud = new Text('', 1, 0);
   const identity = (text) => text;
   const editor = new Editor(tui, {
     borderColor: (text) => paint(color, 'gray', text),
     selectList: Object.fromEntries(['selectedPrefix', 'selectedText', 'description', 'scrollInfo', 'noMatch'].map((key) => [key, identity])),
   });
   tui.addChild(transcript);
+  tui.addChild(live);
   tui.addChild(status);
+  tui.addChild(hud);
   tui.addChild(editor);
   tui.addChild(new Text(paint(color, 'gray', 'Enter 发送 · Shift+Enter 换行 · ↑ 历史 · /help · Ctrl+C 退出'), 1, 0));
   tui.setFocus(editor);
@@ -44,6 +56,7 @@ export function createChatUI({ color, onSubmit, onQuit, terminal = new ProcessTe
     stop: () => tui.stop(),
     out(text) { transcript.addChild(new Text(text, 1, 0)); tui.requestRender(); },
     message(message, options) {
+      if (message.draft) dropDraft(draftKey({ from: message.from, id: message.draft }));
       const header = formatMessage({ ...message, text: '', images: [] }, options).trimEnd();
       transcript.addChild(new Text(`\n${header}`, 1, 0));
       transcript.addChild(message.from === 'user'
@@ -52,7 +65,28 @@ export function createChatUI({ color, onSubmit, onQuit, terminal = new ProcessTe
       for (const name of message.images ?? []) transcript.addChild(new Text(`[图片] ${options.imageUrl?.(name) || name}`, 2, 0));
       tui.requestRender();
     },
+    draft(frame, options) {
+      if (!frame?.id || !frame.from) return;
+      const key = draftKey(frame);
+      if (frame.end) dropDraft(key);
+      else if (typeof frame.text === 'string') {
+        let draft = drafts.get(key);
+        if (!draft) {
+          const container = new Container();
+          const header = formatMessage({ from: frame.from, ts: Date.now(), text: '' }, options).trimEnd();
+          container.addChild(new Text(`\n${header} · 正在生成`, 1, 0));
+          const body = new Markdown(frame.text, 2, 0, markdownTheme(color));
+          container.addChild(body);
+          draft = { container, body };
+          drafts.set(key, draft);
+          live.addChild(container);
+        } else draft.body.setText(frame.text);
+      }
+      tui.requestRender();
+    },
+    clearDrafts() { drafts.clear(); live.clear(); tui.requestRender(); },
+    quota(rows) { hud.setText(paint(color, 'gray', formatQuota(rows))); tui.requestRender(); },
     typing(on) { status.setText(on ? paint(color, 'gray', '… 正在输入') : ''); tui.requestRender(); },
-    clear() { transcript.clear(); tui.requestRender(true); },
+    clear() { transcript.clear(); drafts.clear(); live.clear(); tui.requestRender(true); },
   };
 }