dsh-client-auto-continue 0.2.2 → 0.3.1

package/lib/client.js

@@ -42,7 +42,11 @@ var DEFAULT_CONFIG = {
   freshMs: 15 * 60 * 1e3,
   reconnectScanDelayMs: 5e3,
   reconnectBackoffMs: 3e3,
-  verbose: true
+  verbose: true,
+  classify: true,
+  backoffFactor: 2,
+  backoffMaxMs: 3e5,
+  notify: false
 };
 function numberOr(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : fallback;
@@ -63,12 +67,46 @@ function resolveConfig(section) {
     freshMs: numberOr(value.freshMs, DEFAULT_CONFIG.freshMs),
     reconnectScanDelayMs: numberOr(value.reconnectScanDelayMs, DEFAULT_CONFIG.reconnectScanDelayMs),
     reconnectBackoffMs: numberOr(value.reconnectBackoffMs, DEFAULT_CONFIG.reconnectBackoffMs),
-    verbose: booleanOr(value.verbose, DEFAULT_CONFIG.verbose)
+    verbose: booleanOr(value.verbose, DEFAULT_CONFIG.verbose),
+    classify: booleanOr(value.classify, DEFAULT_CONFIG.classify),
+    backoffFactor: Math.max(1, numberOr(value.backoffFactor, DEFAULT_CONFIG.backoffFactor)),
+    backoffMaxMs: numberOr(value.backoffMaxMs, DEFAULT_CONFIG.backoffMaxMs),
+    notify: booleanOr(value.notify, DEFAULT_CONFIG.notify)
   };
 }
 function isNonHumanReason(kind) {
   return kind === "error" || kind === "interrupted" || kind === "max-tokens";
 }
+function isTransientFailure(failure) {
+  const haystack = `${failure.code} ${failure.message}`.toLowerCase();
+  const status = failure.status;
+  if (status !== void 0 && (status === 401 || status === 403)) return false;
+  const permanent = /auth|unauthor|forbidden|credential|api[_-]?key|permission/i.test(haystack) || /insufficient.*(balance|quota)|billing|payment|quota.*exceeded.*(?!retry)/i.test(haystack) || /model.*not[_-]?found|unknown[_-]?model|model[_-]?not[_-]?found|not.*support.*model/i.test(haystack) || /context.*(length|limit|overflow|exceed)|token.*limit|max.*context/i.test(haystack) || /invalid[_-]?request|bad[_-]?request/i.test(haystack);
+  return !permanent;
+}
+function notify(title, body) {
+  try {
+    const N = globalThis.Notification;
+    if (typeof N === "undefined") return;
+    const permission = N.permission;
+    if (permission === "granted") {
+      new N(title, { body });
+    } else if (permission === "default") {
+      void N.requestPermission?.().then((result) => {
+        if (result === "granted") new N(title, { body });
+      }).catch(() => {
+      });
+    }
+  } catch {
+  }
+}
+function fillTemplate(template, facts, tool, turn) {
+  return template.replace(/\{code\}/g, facts?.code ?? "").replace(/\{message\}/g, facts?.message ?? "").replace(/\{status\}/g, facts?.status !== void 0 ? String(facts.status) : "").replace(/\{tool\}/g, tool ?? "").replace(/\{turn\}/g, turn !== void 0 ? String(turn) : "");
+}
+function effectiveCooldown(consecutive, base, factor, max) {
+  const multiplier = Math.pow(factor, consecutive);
+  return Math.min(Math.max(base, base * multiplier), Math.max(base, max));
+}
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -118,7 +156,10 @@ var freshState = () => ({
   pendingTimer: void 0,
   running: void 0,
   queued: 0,
-  subagent: false
+  subagent: false,
+  lastFailure: void 0,
+  lastTool: void 0,
+  lastTurn: void 0
 });
 function isOurEcho(state, event) {
   if (event.type !== "user/message") return false;
@@ -220,6 +261,10 @@ var AutoContinueRunner = class {
   onMuxFrame(frame) {
     switch (frame.type) {
       case "session/event":
+        if (frame.event.type === "tool/call") {
+          const name = frame.event.data.name;
+          if (typeof name === "string") this.state(frame.sessionId).lastTool = name;
+        }
         this.onSessionEvent(frame.sessionId, frame.event);
         break;
       case "session/queue":
@@ -246,9 +291,19 @@ var AutoContinueRunner = class {
         const reason = event.data.reason;
         if (reason.kind === "completed") {
           state.consecutive = 0;
+          state.lastFailure = void 0;
         } else if (reason.kind === "aborted") {
           state.consecutive = 0;
         } else if (reason.kind === "blocked") {
+        } else if (reason.kind === "error") {
+          const error = reason.error;
+          state.lastFailure = {
+            code: typeof error.code === "string" ? error.code : "UNKNOWN",
+            message: typeof error.message === "string" ? error.message : String(error),
+            ...typeof error.status === "number" ? { status: error.status } : {}
+          };
+          state.lastTurn = event.data.turn;
+          this.onTurnFailure(sessionId, "turn/end:error", state.lastFailure);
         } else if (isNonHumanReason(reason.kind)) {
           this.schedule(sessionId, `turn/end:${reason.kind}`);
         }
@@ -289,12 +344,35 @@ var AutoContinueRunner = class {
     }
   }
   // ---------- 调度 ----------
+  /** 回合失败入口: 先做错误分类, 永久性失败跳过并通知, 临时性失败走正常调度。 */
+  onTurnFailure(sessionId, reason, failure) {
+    const config = this.getConfig();
+    if (config.classify && !isTransientFailure(failure)) {
+      const summary = `${failure.code}${failure.status !== void 0 ? ` (HTTP ${failure.status})` : ""}`;
+      this.log(`跳过 ${sessionId}(${reason}): 永久性失败 ${summary} — ${failure.message}`);
+      if (config.notify) {
+        notify("dsh-auto-continue: 未自动继续", `${sessionId}: 永久性错误 ${summary}，需要人工处理`);
+      }
+      return;
+    }
+    this.schedule(sessionId, reason);
+  }
+  /** 本会话当前生效的冷却间隔(自适应退避)。 */
+  cooldownFor(state) {
+    const config = this.getConfig();
+    return effectiveCooldown(
+      state.consecutive,
+      config.cooldownMs,
+      config.backoffFactor,
+      config.backoffMaxMs
+    );
+  }
   schedule(sessionId, reason) {
     const state = this.state(sessionId);
     const config = this.getConfig();
     if (state.subagent) return;
     if (state.pendingTimer !== void 0) return;
-    if (Date.now() - state.lastAttemptAt < config.cooldownMs) return;
+    if (Date.now() - state.lastAttemptAt < this.cooldownFor(state)) return;
     if (state.consecutive >= config.maxConsecutive) {
       this.log(
         `跳过 ${sessionId}(${reason}): 已连续自动继续 ${state.consecutive} 次, 等待用户介入或成功回合`
@@ -337,7 +415,7 @@ var AutoContinueRunner = class {
       this.log(`跳过 ${sessionId}: 已有排队消息`);
       return;
     }
-    if (Date.now() - readLastSend(sessionId) < config.cooldownMs) {
+    if (Date.now() - readLastSend(sessionId) < this.cooldownFor(state)) {
       this.log(`跳过 ${sessionId}: 其他标签页刚发送过`);
       return;
     }
@@ -345,7 +423,7 @@ var AutoContinueRunner = class {
       this.log(`跳过 ${sessionId}: 其他标签页正在发送`);
       return;
     }
-    const text = config.continueText;
+    const text = fillTemplate(config.continueText, state.lastFailure, state.lastTool, state.lastTurn);
     const zone = clientTimeZone();
     state.lastAttemptAt = Date.now();
     try {
@@ -362,6 +440,15 @@ var AutoContinueRunner = class {
         state.lastSentText = text;
         writeLastSend(sessionId, now);
         this.log(`已自动发送「${text}」到 ${sessionId}(${reason}), 第 ${state.consecutive} 次连续`);
+        if (config.notify) {
+          notify("dsh-auto-continue: 已自动继续", `${sessionId}: 已发送「${text}」(第 ${state.consecutive} 次连续)`);
+        }
+        if (state.consecutive >= config.maxConsecutive) {
+          this.log(`达到连续上限 ${config.maxConsecutive} 次, 停止自动继续 ${sessionId}`);
+          if (config.notify) {
+            notify("dsh-auto-continue: 已停止自动继续", `${sessionId}: 连续失败 ${state.consecutive} 次, 需要人工介入`);
+          }
+        }
       } else {
         this.log(
           `发送失败 ${sessionId}: ${response.result.error.code} ${response.result.error.message}`
@@ -429,7 +516,7 @@ var AutoContinueRunner = class {
       const state = this.state(summary.sessionId);
       if (state.pendingTimer !== void 0) continue;
       if (state.consecutive >= config.maxConsecutive) continue;
-      if (now - state.lastAttemptAt < config.cooldownMs) continue;
+      if (now - state.lastAttemptAt < this.cooldownFor(state)) continue;
       let events;
       try {
         const page = await this.api.sessions.history({
@@ -493,6 +580,14 @@ var zh = {
   "field.reconnectBackoffMsHint": "事件流断开后的重连间隔。",
   "field.verbose": "详细日志",
   "field.verboseHint": "在浏览器控制台输出 [auto-continue] 日志。",
+  "field.classify": "错误分类",
+  "field.classifyHint": "仅自动恢复临时性错误(网络/超时/5xx 等); 认证/余额/模型不存在等永久性错误跳过并通知。",
+  "field.backoffFactor": "退避系数",
+  "field.backoffFactorHint": "连续失败时冷却间隔的倍率(如 2 表示 20s→40s→80s 递增)。",
+  "field.backoffMaxMs": "最大退避间隔 (ms)",
+  "field.backoffMaxMsHint": "自适应退避的上限, 防止等待过久。",
+  "field.notify": "浏览器通知",
+  "field.notifyHint": "自动继续成功/放弃/遇到永久性错误时弹出浏览器通知。",
   "chrome.collapse": "收起设置",
   "chrome.expand": "展开设置",
   "chrome.unsaved": "未保存",
@@ -531,6 +626,14 @@ var en = {
   "field.reconnectBackoffMsHint": "Interval between event-stream reconnect attempts.",
   "field.verbose": "Verbose logs",
   "field.verboseHint": "Log [auto-continue] lines to the browser console.",
+  "field.classify": "Classify errors",
+  "field.classifyHint": "Auto-resume transient failures only (network/timeout/5xx…); auth, balance and model errors are skipped and notified.",
+  "field.backoffFactor": "Backoff factor",
+  "field.backoffFactorHint": "Cooldown multiplier per consecutive failure (2 = 20s→40s→80s…).",
+  "field.backoffMaxMs": "Max backoff (ms)",
+  "field.backoffMaxMsHint": "Cap on the adaptive backoff interval.",
+  "field.notify": "Browser notifications",
+  "field.notifyHint": "Notify when auto-continue fires, gives up, or hits a permanent error.",
   "chrome.collapse": "Hide settings",
   "chrome.expand": "Show settings",
   "chrome.unsaved": "Unsaved",
@@ -892,7 +995,11 @@ var AutoContinueSettingsCardController = class {
       numberField("freshMs", 0),
       numberField("reconnectScanDelayMs", 0),
       numberField("reconnectBackoffMs", 0),
-      booleanField("verbose")
+      booleanField("verbose"),
+      booleanField("classify"),
+      numberField("backoffFactor", 1),
+      numberField("backoffMaxMs", 0),
+      booleanField("notify")
     ]);
     this.store = this.form.bind(() => this.projection(), import_client.createSnapshotStore);
   }
@@ -908,7 +1015,11 @@ var AutoContinueSettingsCardController = class {
       freshMs: this.form.field("freshMs"),
       reconnectScanDelayMs: this.form.field("reconnectScanDelayMs"),
       reconnectBackoffMs: this.form.field("reconnectBackoffMs"),
-      verbose: this.form.field("verbose")
+      verbose: this.form.field("verbose"),
+      classify: this.form.field("classify"),
+      backoffFactor: this.form.field("backoffFactor"),
+      backoffMaxMs: this.form.field("backoffMaxMs"),
+      notify: this.form.field("notify")
     };
   }
   /**
@@ -1159,6 +1270,56 @@ function AutoContinueSettingsCard(props) {
             onEdit: (text) => props.edit("verbose", text),
             onReset: () => props.resetField("verbose")
           }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          BooleanField,
+          {
+            id: "auto-continue-classify",
+            label: t("field.classify"),
+            hint: t("field.classifyHint"),
+            ...shared,
+            ...state.classify,
+            onEdit: (text) => props.edit("classify", text),
+            onReset: () => props.resetField("classify")
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          ValueField,
+          {
+            id: "auto-continue-backoff-factor",
+            label: t("field.backoffFactor"),
+            hint: t("field.backoffFactorHint"),
+            numeric: true,
+            ...shared,
+            ...state.backoffFactor,
+            onEdit: (text) => props.edit("backoffFactor", text),
+            onReset: () => props.resetField("backoffFactor")
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          ValueField,
+          {
+            id: "auto-continue-backoff-max",
+            label: t("field.backoffMaxMs"),
+            hint: t("field.backoffMaxMsHint"),
+            numeric: true,
+            ...shared,
+            ...state.backoffMaxMs,
+            onEdit: (text) => props.edit("backoffMaxMs", text),
+            onReset: () => props.resetField("backoffMaxMs")
+          }
+        ),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          BooleanField,
+          {
+            id: "auto-continue-notify",
+            label: t("field.notify"),
+            hint: t("field.notifyHint"),
+            ...shared,
+            ...state.notify,
+            onEdit: (text) => props.edit("notify", text),
+            onReset: () => props.resetField("notify")
+          }
         )
       ]
     }