sidekick-chat 0.2.5 → 0.2.7

package/README.md

@@ -17,6 +17,8 @@ Sidekick · 秘书 https://hkv4.cznorth.cn/chat
   记成明天 9:30,提前 10 分钟提醒。
 ```
 
+0.2.6 起，当前会话各 bot 的最后 LLM 调用时间和对应活动常驻显示在输入框上方，并实时更新；`/who` 查看全部 bot，`/conv` 也列出成员活动。纯文本交互在启动、切换会话及活动变化时输出。时间为调用开始时间，忙闲、消息和心跳不刷新它；没有记录时显示「尚无 LLM 活动记录」。
+
 ## 安装
 
 ```bash
@@ -40,7 +42,7 @@ Enter 发送，Shift+Enter 换行（终端需支持；也可用 Ctrl+J），↑/
 
 复制图片后按 **Ctrl+V** 或输入 **`/paste`**，图片会进入待发送区；可继续输入说明，按 Enter 一起发送。终端如果拦截 Ctrl+V（复制图片时通常不会向程序发出字符），请用 `/paste`。文字仍可用终端的 Ctrl+Shift+V / 右键粘贴。也可以 `/image "D:\图片\截图.png"` 添加文件。每条最多 4 张、每张 6 MB，支持 PNG/JPEG/GIF/WebP；`/drop` 清除待发送图片，`/send [说明]` 发送（纯文本模式用这个命令）。发送失败保留图片，切换会话前须发送或清除。
 
-Windows 使用系统剪贴板，无需另装工具；macOS 需安装 `pngpaste`，Linux 使用 `wl-clipboard`（Wayland）或 `xclip`（X11）。剪贴板读取发生在运行 CLI 的机器上，SSH 会话可改用 `/image` 读取远端文件。
+Windows 使用系统剪贴板，无需另装工具；**WSL 里直接读 Windows 的剪贴板**（经 `powershell.exe`，截图、复制的图片都在那边），`/image` 也认 `D:\图片\a.png` 这样的 Windows 路径；macOS 需安装 `pngpaste`，其他 Linux 使用 `wl-clipboard`（Wayland）或 `xclip`（X11）。剪贴板读取发生在运行 CLI 的机器上，SSH 会话可改用 `/image` 读取远端文件。
 
 老终端可用 `sidekick --plain`：不上色、不重画输入行。管道和 `TERM=dumb` 自动使用纯文本；`--no-color` / `NO_COLOR` 只关闭颜色。一次性 `ask` 和 `--json` 保持文本/JSON 输出。
 

package/package.json

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

package/src/activity.mjs

@@ -0,0 +1,17 @@
+import { dayLabel, clockTime, oneLine } from './format.mjs';
+
+export function formatActivity(bot) {
+  const at = bot?.lastActiveAt;
+  if (!Number.isFinite(at) || at <= 0 || Number.isNaN(new Date(at).getTime())) return '尚无 LLM 活动记录';
+  const seconds = String(new Date(at).getSeconds()).padStart(2, '0');
+  return `最后活跃 ${dayLabel(at)} ${clockTime(at)}:${seconds} · ${oneLine(bot.lastActivity || 'LLM 调用', 80)}`;
+}
+
+/** 旧帧不覆盖新记录;心跳、忙闲和消息都不走这里。 */
+export function applyActivity(bots, frame) {
+  const bot = bots.find(b => b.id === frame?.bot);
+  if (!bot || !Number.isFinite(frame.at) || frame.at <= 0 || frame.at < (bot.lastActiveAt || 0)) return false;
+  bot.lastActiveAt = frame.at;
+  bot.lastActivity = typeof frame.text === 'string' ? frame.text : '';
+  return true;
+}

package/src/api.mjs

@@ -106,7 +106,7 @@ export class SidekickApi {
 
   /**
    * 订阅推流,断了按退避重连,重连时带上最后的 seq 把漏掉的补齐。
-   * `onEvent(event, payload)` 收到 hello / state / message / draft / thinking / busy / read。
+   * `onEvent(event, payload)` 收到 hello / state / message / draft / thinking / busy / activity / read。
    * 返回的 promise 只在 abort 时结束。
    */
   async stream({ after = 0, device, signal, onEvent, onStatus }) {

package/src/images.mjs

@@ -1,10 +1,23 @@
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
 import { readFile, stat } from 'node:fs/promises';
+import { readFileSync } from 'node:fs';
 
 const exec = promisify(execFile);
 export const MAX_IMAGE_BYTES = 6 * 1024 * 1024;
 
+/** WSL 里跑的是 Linux 版 Node,但剪贴板在 Windows 那边:WSLg 的 Wayland 剪贴板不同步图片。 */
+export function isWsl(env = process.env) {
+  if (env.WSL_DISTRO_NAME || env.WSL_INTEROP) return true;
+  try { return /microsoft/i.test(readFileSync('/proc/sys/kernel/osrelease', 'utf8')); } catch { return false; }
+}
+
+/** WSL 里粘进来的 Windows 路径(D:\图片\a.png)换成 /mnt/d/图片/a.png。 */
+export function wslPath(path) {
+  const m = /^([A-Za-z]):[\\/](.*)$/.exec(path);
+  return m ? `/mnt/${m[1].toLowerCase()}/${m[2].replace(/\\/g, '/')}` : path;
+}
+
 export function imageUpload(bytes) {
   if (!bytes.length || bytes.length > MAX_IMAGE_BYTES) throw new Error('图片必须在 1 字节到 6 MB 之间');
   const mime = bytes.subarray(0, 8).equals(Buffer.from([137,80,78,71,13,10,26,10])) ? 'image/png'
@@ -15,32 +28,45 @@ export function imageUpload(bytes) {
   return { mime, data: bytes.toString('base64') };
 }
 
-export async function imageFile(path) {
-  const file = path.replace(/^("|')(.*)\1$/, '$2');
+export async function imageFile(path, { wsl = process.platform === 'linux' && isWsl() } = {}) {
+  const unquoted = path.replace(/^("|')(.*)\1$/, '$2');
+  const file = wsl ? wslPath(unquoted) : unquoted;
   const info = await stat(file);
   if (!info.isFile() || info.size > MAX_IMAGE_BYTES) throw new Error('请选择不超过 6 MB 的图片文件');
   return imageUpload(await readFile(file));
 }
 
 /** Read the local OS clipboard; never run clipboard text as a command. */
-export async function clipboardImage({ platform = process.platform, run = exec } = {}) {
+export async function clipboardImage({ platform = process.platform, run = exec, wsl = platform === 'linux' && isWsl(), env = process.env } = {}) {
   const options = { timeout: 10000, maxBuffer: 16 * 1024 * 1024, windowsHide: true };
+  const script = `Add-Type -AssemblyName System.Windows.Forms; Add-Type -AssemblyName System.Drawing; $img = [Windows.Forms.Clipboard]::GetImage(); if ($null -eq $img) { exit 2 }; $stream = New-Object IO.MemoryStream; try { $img.Save($stream, [Drawing.Imaging.ImageFormat]::Png); [Convert]::ToBase64String($stream.ToArray()) } finally { $stream.Dispose(); $img.Dispose() }`;
+  const windows = async () => {
+    const { stdout } = await run('powershell.exe', ['-NoProfile', '-NonInteractive', '-STA', '-EncodedCommand', Buffer.from(script, 'utf16le').toString('base64')], options);
+    return imageUpload(Buffer.from(String(stdout).trim(), 'base64'));
+  };
+  const linux = async () => {
+    const command = env.WAYLAND_DISPLAY ? 'wl-paste' : 'xclip';
+    const args = command === 'wl-paste' ? ['--type', 'image/png'] : ['-selection', 'clipboard', '-t', 'image/png', '-o'];
+    const { stdout } = await run(command, args, { ...options, encoding: 'buffer' });
+    return imageUpload(Buffer.from(stdout));
+  };
   try {
-    if (platform === 'win32') {
-      const script = `Add-Type -AssemblyName System.Windows.Forms; Add-Type -AssemblyName System.Drawing; $img = [Windows.Forms.Clipboard]::GetImage(); if ($null -eq $img) { exit 2 }; $stream = New-Object IO.MemoryStream; try { $img.Save($stream, [Drawing.Imaging.ImageFormat]::Png); [Convert]::ToBase64String($stream.ToArray()) } finally { $stream.Dispose(); $img.Dispose() }`;
-      const { stdout } = await run('powershell.exe', ['-NoProfile', '-NonInteractive', '-STA', '-EncodedCommand', Buffer.from(script, 'utf16le').toString('base64')], options);
-      return imageUpload(Buffer.from(String(stdout).trim(), 'base64'));
-    }
+    if (platform === 'win32') return await windows();
     if (platform === 'darwin') {
       const { stdout } = await run('pngpaste', ['-'], { ...options, encoding: 'buffer' });
       return imageUpload(Buffer.from(stdout));
     }
-    const command = process.env.WAYLAND_DISPLAY ? 'wl-paste' : 'xclip';
-    const args = command === 'wl-paste' ? ['--type', 'image/png'] : ['-selection', 'clipboard', '-t', 'image/png', '-o'];
-    const { stdout } = await run(command, args, { ...options, encoding: 'buffer' });
-    return imageUpload(Buffer.from(stdout));
+    if (wsl) {
+      // 先读 Windows 剪贴板(截图、复制的图都在那边);WSL 关了 interop 才退回 Linux 工具。
+      try { return await windows(); } catch (err) {
+        if (err.code !== 'ENOENT' && err.code !== 'EACCES') throw err;
+      }
+    }
+    return await linux();
   } catch (err) {
-    if (err.code === 'ENOENT') throw new Error('缺少剪贴板工具：macOS 安装 pngpaste，Linux 安装 wl-clipboard 或 xclip；也可用 /image 图片路径');
+    if (err.code === 'ENOENT') throw new Error(wsl
+      ? 'WSL 里调不到 powershell.exe(interop 可能关了),也没装 wl-clipboard / xclip;可用 /image 图片路径(Windows 路径也行)'
+      : '缺少剪贴板工具：macOS 安装 pngpaste，Linux 安装 wl-clipboard 或 xclip；也可用 /image 图片路径');
     throw new Error('无法读取剪贴板图片，请先复制图片，或用 /image 图片路径');
   }
 }

package/src/main.mjs

@@ -30,6 +30,7 @@ import {
 import { ask, askPassword } from './prompt.mjs';
 import { createQuotaReader, formatQuota } from './quota.mjs';
 import { clipboardImage, imageFile } from './images.mjs';
+import { formatActivity, applyActivity } from './activity.mjs';
 
 const PACKAGE_VERSION = (() => {
   try {
@@ -331,6 +332,13 @@ async function startChat(flags) {
     }, onQuit: () => shutdown(0) });
   }
 
+  function drawActivity() {
+    const members = convOf(convId)?.members || [];
+    const text = state.bots.filter(b => members.includes(b.id)).map(b => `${b.name}: ${formatActivity(b)}`).join('\n');
+    if (ui) ui.activity(text);
+    else if (text) out(text);
+  }
+
   async function printHistory(limit = 20) {
     const body = await api.history(convId, limit);
     let day = '';
@@ -356,6 +364,7 @@ async function startChat(flags) {
   }
   out(paint(color, 'gray', `会话:${convTitle(convId)} · /help 看命令,/conv 列会话,Ctrl-C 退出`));
   await printHistory(30);
+  drawActivity();
 
   function applyState(next) {
     if (!next) return;
@@ -364,6 +373,7 @@ async function startChat(flags) {
       ui?.clearDrafts();
       convId = pickConv(state, '');
     }
+    drawActivity();
   }
 
   function onMessage(m) {
@@ -409,6 +419,9 @@ async function startChat(flags) {
           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 === 'activity' && applyActivity(state.bots, payload)) {
+          if (convOf(convId)?.members.includes(payload.bot)) drawActivity();
+        }
         else if (event === 'busy') typing(Boolean(payload.busy));
       },
     })
@@ -423,6 +436,7 @@ async function startChat(flags) {
     ui?.clearDrafts();
     markPresent();
     convId = next;
+    drawActivity();
     const cfg = { ...readConfig(), url: settings.url, conv: convId, device: settings.device };
     writeConfig(cfg);
     out(paint(color, 'green', `→ ${convTitle(convId)}`));
@@ -476,7 +490,7 @@ async function startChat(flags) {
       case 'ls':
         out(
           state.conversations
-            .map((c, i) => formatConversation(c, i + 1, { bots: state.bots, current: convId }))
+            .map((c, i) => formatConversation(c, i + 1, { bots: state.bots, current: convId }) + '\n' + c.members.map(id => state.bots.find(b => b.id === id)).filter(Boolean).map(b => `    ${b.name}: ${formatActivity(b)}`).join('\n'))
             .join('\n') || '(还没有会话)',
         );
         return;
@@ -495,7 +509,7 @@ async function startChat(flags) {
       case 'who':
         out(
           state.bots
-            .map((b) => `${b.primary ? '*' : ' '}${b.name}(${b.id}) ${b.status}${b.busy ? ' 正在忙' : ''} — ${b.role || '无专长'}`)
+            .map((b) => `${b.primary ? '*' : ' '}${b.name}(${b.id}) ${b.status}${b.busy ? ' 正在忙' : ''} — ${b.role || '无专长'}\n    ${formatActivity(b)}`)
             .join('\n'),
         );
         return;

package/src/tui.mjs

@@ -23,6 +23,7 @@ export function createChatUI({ color, onSubmit, onQuit, onInput, onPasteImage, h
     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, {
@@ -31,6 +32,7 @@ export function createChatUI({ color, onSubmit, onQuit, onInput, onPasteImage, h
   });
   tui.addChild(transcript);
   tui.addChild(live);
+  tui.addChild(activity);
   tui.addChild(status);
   tui.addChild(editor);
   const attachments = new Text('', 1, 0);
@@ -91,6 +93,7 @@ export function createChatUI({ color, onSubmit, onQuit, onInput, onPasteImage, h
       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); },
   };