sidekick-chat 0.2.3 → 0.2.4

package/README.md

@@ -81,6 +81,9 @@ sidekick --device 家里的电脑 "…"   # 换一个署名(默认「终端」)
 
 其它会话来消息时只在终端里提一句,`/to` 切过去看。其它设备上聊的、手机上聊的,这里都能看到历史的最近 30 条。
 
+**已读只在“人在终端前面”的时候推进**:没过按键的终端收到新消息只把进度攒着,等你下次敲键、发消息或切会话才一起报成已读。
+这样调下来的碎片(或被遗忘的)终端窗口不会把手机上刚弹出的通知瞬间顶掉——已读是多端同步的,任一客户端一推,其他设备就撤通知。
+
 ## 环境变量
 
 参数优先于环境变量,环境变量优先于配置文件:

package/package.json

@@ -1,39 +1,39 @@
-{
-  "name": "sidekick-chat",
-  "version": "0.2.3",
-  "description": "Sidekick 终端客户端:在终端里和秘书对话",
-  "type": "module",
-  "license": "PolyForm-Noncommercial-1.0.0",
-  "engines": {
-    "node": ">=22.19.0"
-  },
-  "bin": {
-    "sidekick": "bin/sidekick.mjs"
-  },
-  "files": [
-    "bin",
-    "src",
-    "README.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "test": "node --test"
-  },
-  "keywords": [
-    "sidekick",
-    "cli",
-    "chat",
-    "assistant"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Cznorth/sidekick.git",
-    "directory": "cli"
-  },
-  "dependencies": {
-    "@earendil-works/pi-tui": "1.0.0"
-  },
-  "devDependencies": {
-    "@xterm/headless": "5.5.0"
-  }
-}
+{
+  "name": "sidekick-chat",
+  "version": "0.2.4",
+  "description": "Sidekick 终端客户端:在终端里和秘书对话",
+  "type": "module",
+  "license": "PolyForm-Noncommercial-1.0.0",
+  "engines": {
+    "node": ">=22.19.0"
+  },
+  "bin": {
+    "sidekick": "bin/sidekick.mjs"
+  },
+  "files": [
+    "bin",
+    "src",
+    "README.md",
+    "LICENSE"
+  ],
+  "scripts": {
+    "test": "node --test"
+  },
+  "keywords": [
+    "sidekick",
+    "cli",
+    "chat",
+    "assistant"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Cznorth/sidekick.git",
+    "directory": "cli"
+  },
+  "dependencies": {
+    "@earendil-works/pi-tui": "1.0.0"
+  },
+  "devDependencies": {
+    "@xterm/headless": "5.5.0"
+  }
+}

package/src/main.mjs

@@ -271,6 +271,12 @@ async function startChat(flags) {
   let convId = pickConv(state, settings.conv);
   let latest = state.latest || 0;
   let everConnected = false;
+  // 「有人在看」才推进已读:调试时终端可以一直挂在那儿,而挂着的终端不该把手机上刚弹出的通知顶掉。
+  // 有按键才算在场(120 秒内),不在场时只把进度攒在 seenSeq 里,等下次动手再一起报。
+  const PRESENT_MS = 120_000;
+  // 0 = 启动以来还没人碰过这台终端:刚起来的窗口也不算在场,只靠 printHistory 那个显式动作推一次。
+  let lastInputAt = 0;
+  let seenSeq = 0;
   const displayed = new Set();
   const ctl = new AbortController();
   let rl = null;
@@ -285,6 +291,22 @@ async function startChat(flags) {
   };
   const typing = (on) => ui?.typing(on);
 
+  /** 把「已经打到屏幕上」的最新 seq 报成已读。 */
+  function reportSeen() {
+    if (!seenSeq) return;
+    const seq = seenSeq;
+    seenSeq = 0;
+    api.read(convId, seq).catch(() => {});
+  }
+
+  /** 用户在这台终端上动了一下(敲键、发消息、切会话):算在场,并把攒着的已读补报上去。 */
+  function markPresent() {
+    lastInputAt = Date.now();
+    reportSeen();
+  }
+
+  const present = () => lastInputAt > 0 && Date.now() - lastInputAt < PRESENT_MS;
+
   const printMessage = (message) => {
     const options = { bots: state.bots, color, imageUrl: (name) => api.imageUrl(name) };
     if (ui) ui.message(message, options);
@@ -292,7 +314,8 @@ async function startChat(flags) {
   };
   if (vt) {
     const { createChatUI } = await import('./tui.mjs');
-    ui = createChatUI({ color, onSubmit: (text) => {
+    ui = createChatUI({ color, onInput: () => markPresent(), onSubmit: (text) => {
+      markPresent();
       queue.push(() => text.startsWith('/') ? handleSlash(text) : sendText(text));
       void drain();
     }, onQuit: () => shutdown(0) });
@@ -310,6 +333,8 @@ async function startChat(flags) {
       printMessage(m);
     }
     latest = Math.max(latest, body.latest || 0);
+    // 刚把这段历史打到屏幕上(启动、切会话、/history),已读位置就到这里。
+    seenSeq = 0;
     if (body.latest) api.read(convId, body.latest).catch(() => {});
     if (body.messages.length === 0) out(paint(color, 'gray', '(这里还没有消息)'));
   }
@@ -344,7 +369,10 @@ async function startChat(flags) {
       return;
     }
     printMessage(m);
-    if (typeof m.seq === 'number') api.read(convId, m.seq).catch(() => {});
+    if (typeof m.seq === 'number') {
+      if (present()) api.read(convId, m.seq).catch(() => {});
+      else seenSeq = Math.max(seenSeq, m.seq);
+    }
   }
 
   streamTask = api
@@ -382,6 +410,7 @@ async function startChat(flags) {
 
   function switchConv(next) {
     ui?.clearDrafts();
+    markPresent();
     convId = next;
     const cfg = { ...readConfig(), url: settings.url, conv: convId, device: settings.device };
     writeConfig(cfg);
@@ -485,6 +514,7 @@ async function startChat(flags) {
     rl.on('line', (line) => {
       const text = line.trim();
       if (!text) return;
+      markPresent();
       queue.push(() => (text.startsWith('/') ? handleSlash(text) : sendText(text)));
       void drain();
     });
@@ -497,6 +527,7 @@ async function startChat(flags) {
   function shutdown(code = 0) {
     if (closed) return;
     closed = true;
+    reportSeen();
     typing(false);
     quotas.stop();
     ui?.stop();

package/src/tui.mjs

@@ -12,7 +12,7 @@ export function markdownTheme(color) {
 }
 
 /** Pi's renderer owns every screen write, including the editor and busy status. */
-export function createChatUI({ color, onSubmit, onQuit, terminal = new ProcessTerminal() }) {
+export function createChatUI({ color, onSubmit, onQuit, onInput, terminal = new ProcessTerminal() }) {
   const tui = new TuiMainScreen(terminal);
   const transcript = new Container();
   const live = new Container();
@@ -36,6 +36,8 @@ export function createChatUI({ color, onSubmit, onQuit, terminal = new ProcessTe
   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 };