sidekick-chat 0.2.9 → 0.2.10

package/README.md

@@ -137,3 +137,5 @@ cd cli && node --test
 
 `test/fake-world.mjs` 起了个假的 chat World(实现上面五个接口),所以鉴权失败、发送、推流补收、
 `sidekick ask` 端到端这些都能脱网验证。
+
+网络断开或发送超时会保留当前消息并自动重试，确认送达后才继续后续发送；重试共用消息编号，服务端按编号去重。重试期间请勿重复输入同一句话。退出客户端会停止重试，尚未送达的消息不会跨进程保存。

package/package.json

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

package/src/api.mjs

@@ -5,6 +5,7 @@
  * `cortico_session` Cookie(和网页版同一个 `CORTICO_WEB_PASSWORD`)。接口本身见
  * packages/world-chat/src/world.ts 的 `startHub`。
  */
+import { randomUUID } from 'node:crypto';
 import { authOrigin } from './config.mjs';
 
 /** 鉴权没过:登录态失效或令牌不对,调用方据此提示重新登录。 */
@@ -13,6 +14,10 @@ export class AuthError extends Error {}
 /** 连不上(没拿到响应):只有这种错才换备用线路,4xx / 5xx 不换。 */
 export class NetworkError extends Error {}
 
+class HttpError extends Error {
+  constructor(status, message) { super(message); this.status = status; }
+}
+
 const REQUEST_TIMEOUT_MS = 20_000;
 
 export class SidekickApi {
@@ -76,9 +81,15 @@ export class SidekickApi {
         if (signal?.aborted) throw signal.reason;
         throw new NetworkError(networkHint(url, err));
       }
-      const data = await res.json().catch(() => ({}));
+      let data;
+      try { data = await res.json(); }
+      catch (err) {
+        if (signal?.aborted) throw signal.reason;
+        if (!res.ok) data = {};
+        else throw new NetworkError(networkHint(url, err));
+      }
       if (res.status === 401) throw new AuthError(data.error || '登录态已失效');
-      if (!res.ok) throw new Error(data.error || `HTTP ${res.status}`);
+      if (!res.ok) throw new HttpError(res.status, data.error || `HTTP ${res.status}`);
       return data;
     });
   }
@@ -92,8 +103,20 @@ export class SidekickApi {
     return this.request('GET', `v1/team/history?conv=${encodeURIComponent(conv)}&limit=${limit}`);
   }
 
-  send({ conv, text, device, images }) {
-    return this.request('POST', 'v1/team/send', { conv, text, device, images });
+  async send({ conv, text, device, images }, { signal, onRetry } = {}) {
+    const body = { conv, text, device, images, client_id: randomUUID() };
+    let delay = 1000;
+    for (;;) {
+      signal?.throwIfAborted();
+      try { return await this.request('POST', 'v1/team/send', body, { signal }); }
+      catch (err) {
+        if (!(err instanceof NetworkError) && !(err instanceof HttpError && [408, 502, 503, 504].includes(err.status))) throw err;
+        onRetry?.(err);
+        signal?.throwIfAborted();
+        await sleep(delay, signal);
+        delay = Math.min(delay * 2, 10000);
+      }
+    }
   }
 
   read(conv, seq) {

package/src/main.mjs

@@ -553,7 +553,17 @@ async function startChat(flags) {
 
   async function sendText(text) {
     const images = pendingImages.slice();
-    const res = await api.send({ conv: convId, text, device: settings.device, ...(images.length ? { images } : {}) });
+    let warned = false;
+    const res = await api.send({ conv: convId, text, device: settings.device, ...(images.length ? { images } : {}) }, {
+      signal: ctl.signal,
+      onRetry: () => {
+        if (!warned) out('消息尚未确认送达，已保留并自动重试，请勿重复发送（退出客户端会停止重试）。');
+        warned = true;
+      },
+    }).catch((err) => {
+      if (!closed) out(`未发送的消息：${text}`);
+      throw err;
+    });
     pendingImages = [];
     ui?.attachments(0);
     latest = Math.max(latest, res.seq);
@@ -570,6 +580,7 @@ async function startChat(flags) {
       const text = line.trim();
       if (!text) return;
       markPresent();
+      if (text === '/quit' || text === '/exit') { shutdown(0); return; }
       queue.push(() => (text.startsWith('/') ? handleSlash(text) : sendText(text)));
       void drain();
     });