sidekick-chat 0.2.4 → 0.2.6

package/src/quota.mjs

@@ -1,98 +1,98 @@
-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. Requests are made only by the usage command. */
-export function createQuotaReader(settings, { api = new SidekickApi(settings), agentsApi } = {}) {
-  const values = {};
-  const ctl = new AbortController();
-  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 }; }
-      }));
-      return quotaRows(values);
-    })().finally(() => { pending = null; });
-    return pending;
-  }
-  return {
-    refresh,
-    stop() { stopped = true; ctl.abort(); },
-  };
-}
+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. Requests are made only by the usage command. */
+export function createQuotaReader(settings, { api = new SidekickApi(settings), agentsApi } = {}) {
+  const values = {};
+  const ctl = new AbortController();
+  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 }; }
+      }));
+      return quotaRows(values);
+    })().finally(() => { pending = null; });
+    return pending;
+  }
+  return {
+    refresh,
+    stop() { stopped = true; ctl.abort(); },
+  };
+}

package/src/tui.mjs

@@ -1,90 +1,100 @@
-import { Container, Editor, Markdown, ProcessTerminal, Text, TuiMainScreen } from '@earendil-works/pi-tui';
-import { paint, formatMessage } from './format.mjs';
-
-export function markdownTheme(color) {
-  const style = (code) => (text) => paint(color, code, text);
-  return Object.fromEntries(Object.entries({
-    heading: 'bold', link: 'cyan', linkUrl: 'gray', code: 'yellow',
-    codeBlock: 'yellow', codeBlockBorder: 'gray', quote: 'gray', quoteBorder: 'gray',
-    hr: 'gray', listBullet: 'cyan', bold: 'bold', italic: 'dim',
-    strikethrough: 'dim', underline: 'cyan',
-  }).map(([name, code]) => [name, style(code)]));
-}
-
-/** Pi's renderer owns every screen write, including the editor and busy status. */
-export function createChatUI({ color, onSubmit, onQuit, onInput, 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 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(editor);
-  tui.addChild(new Text(paint(color, 'gray', 'Enter 发送 · Shift+Enter 换行 · ↑ 历史 · /help · Ctrl+C 退出'), 1, 0));
-  tui.setFocus(editor);
-  tui.addInputListener((data) => {
-    // 任何一个按键都算「人在终端前面」:调用方据此决定要不要把新消息标成已读。
-    onInput?.(data);
-    if (data === '\u0003' || data === '\u0004' && !editor.getText()) {
-      onQuit();
-      return { consume: true };
-    }
-  });
-  editor.onSubmit = (text) => {
-    if (!text.trim()) return;
-    editor.addToHistory(text);
-    editor.setText('');
-    onSubmit(text.trim());
-    tui.requestRender();
-  };
-  return {
-    start: () => tui.start(),
-    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'
-        ? new Text(String(message.text ?? ''), 2, 0)
-        : new Markdown(String(message.text ?? ''), 2, 0, markdownTheme(color)));
-      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(); },
-    typing(on) { status.setText(on ? paint(color, 'gray', '… 正在输入') : ''); tui.requestRender(); },
-    clear() { transcript.clear(); drafts.clear(); live.clear(); tui.requestRender(true); },
-  };
-}
+import { Container, Editor, Markdown, ProcessTerminal, Text, TuiMainScreen, matchesKey } from '@earendil-works/pi-tui';
+import { paint, formatMessage } from './format.mjs';
+
+export function markdownTheme(color) {
+  const style = (code) => (text) => paint(color, code, text);
+  return Object.fromEntries(Object.entries({
+    heading: 'bold', link: 'cyan', linkUrl: 'gray', code: 'yellow',
+    codeBlock: 'yellow', codeBlockBorder: 'gray', quote: 'gray', quoteBorder: 'gray',
+    hr: 'gray', listBullet: 'cyan', bold: 'bold', italic: 'dim',
+    strikethrough: 'dim', underline: 'cyan',
+  }).map(([name, code]) => [name, style(code)]));
+}
+
+/** Pi's renderer owns every screen write, including the editor and busy status. */
+export function createChatUI({ color, onSubmit, onQuit, onInput, onPasteImage, hasImages = () => false, 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 activity = new Text('', 1, 0);
+  const status = 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(activity);
+  tui.addChild(status);
+  tui.addChild(editor);
+  const attachments = new Text('', 1, 0);
+  tui.addChild(attachments);
+  tui.addChild(new Text(paint(color, 'gray', 'Enter 发送 · Ctrl+V 图片 · /paste · /image 路径 · /help · Ctrl+C 退出'), 1, 0));
+  tui.setFocus(editor);
+  tui.addInputListener((data) => {
+    // 任何一个按键都算「人在终端前面」:调用方据此决定要不要把新消息标成已读。
+    onInput?.(data);
+    if (matchesKey(data, 'ctrl+v') && onPasteImage) {
+      onPasteImage();
+      return { consume: true };
+    }
+    if (data === '\u0003' || data === '\u0004' && !editor.getText()) {
+      onQuit();
+      return { consume: true };
+    }
+  });
+  editor.onSubmit = (text) => {
+    if (!text.trim() && !hasImages()) return;
+    editor.addToHistory(text);
+    editor.setText('');
+    onSubmit(text.trim());
+    tui.requestRender();
+  };
+  return {
+    start: () => tui.start(),
+    stop: () => tui.stop(),
+    attachments(count) { attachments.setText(count ? `待发送图片 ${count}/4 · Enter 发送 · /drop 清除` : ''); tui.requestRender(); },
+    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'
+        ? new Text(String(message.text ?? ''), 2, 0)
+        : new Markdown(String(message.text ?? ''), 2, 0, markdownTheme(color)));
+      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(); },
+    activity(text) { activity.setText(paint(color, 'gray', text)); tui.requestRender(); },
+    typing(on) { status.setText(on ? paint(color, 'gray', '… 正在输入') : ''); tui.requestRender(); },
+    clear() { transcript.clear(); drafts.clear(); live.clear(); tui.requestRender(true); },
+  };
+}