dsh-client-auto-continue 0.10.0 → 0.10.2

package/README.md

@@ -17,6 +17,7 @@
   <a href="https://github.com/HsiangNianian/dsh-auto-continue/stargazers"><img src="https://img.shields.io/github/stars/HsiangNianian/dsh-auto-continue?logo=github&label=Stars" alt="GitHub stars"></a>
   <a href="https://github.com/HsiangNianian/dsh-auto-continue/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-65a30d?style=flat" alt="MIT license"></a>
   <a href="https://awesome-dsh-plugin.com"><img src="https://awesome-dsh-plugin.com/badge.svg" alt="awesome · DSH plugin"></a>
+  <a href="https://www.dsh.so/artifact/dsh-auto-continue/"><img src="https://www.dsh.so/badge/install/dsh-auto-continue.svg" alt="dsh.so install"></a>
   <br>
   <img src="https://img.shields.io/badge/TypeScript-3178C6?style=flat&logo=typescript&logoColor=fff" alt="TypeScript">
   <img src="https://img.shields.io/badge/esbuild-FFCF00?style=flat&logo=esbuild&logoColor=000" alt="esbuild">

package/README.zh.md

@@ -17,6 +17,7 @@
   <a href="https://github.com/HsiangNianian/dsh-auto-continue/stargazers"><img src="https://img.shields.io/github/stars/HsiangNianian/dsh-auto-continue?logo=github&label=Stars" alt="GitHub stars"></a>
   <a href="https://github.com/HsiangNianian/dsh-auto-continue/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-MIT-65a30d?style=flat" alt="MIT license"></a>
   <a href="https://awesome-dsh-plugin.com"><img src="https://awesome-dsh-plugin.com/badge.svg" alt="awesome · DSH plugin"></a>
+  <a href="https://www.dsh.so/artifact/dsh-auto-continue/"><img src="https://www.dsh.so/badge/install/dsh-auto-continue.svg" alt="dsh.so install"></a>
   <br>
   <img src="https://img.shields.io/badge/TypeScript-3178C6?style=flat&logo=typescript&logoColor=fff" alt="TypeScript">
   <img src="https://img.shields.io/badge/esbuild-FFCF00?style=flat&logo=esbuild&logoColor=000" alt="esbuild">

package/lib/index.js

@@ -317,7 +317,10 @@ var AutoContinueRunner = class {
     this.noticeListeners = /* @__PURE__ */ new Set();
     this.stateListeners = /* @__PURE__ */ new Set();
     this.disposed = false;
-    ctx.on("session/event", (session, event) => this.onHostEvent(session, event));
+    this.disposeSessionEvents = ctx.on(
+      "session/event",
+      (session, event) => this.onHostEvent(session, event)
+    );
     const config = this.getConfig();
     if (config.scanOnBoot) {
       void this.bootScanLoop();
@@ -379,7 +382,9 @@ var AutoContinueRunner = class {
     this.emitState();
   }
   dispose() {
+    if (this.disposed) return;
     this.disposed = true;
+    this.disposeSessionEvents();
     for (const state of this.states.values()) {
       if (state.pendingTimer !== void 0) clearTimeout(state.pendingTimer);
       if (state.loopRetryTimer !== void 0) clearTimeout(state.loopRetryTimer);
@@ -560,7 +565,11 @@ ${event.data.arguments}`;
               if (state.loopRetryTimer !== void 0) clearTimeout(state.loopRetryTimer);
               state.loopRetryTimer = setTimeout(() => {
                 state.loopRetryTimer = void 0;
-                this.schedule(sessionId, "loop:aborted");
+                try {
+                  this.schedule(sessionId, "loop:aborted");
+                } catch (error) {
+                  console.error(`[auto-continue] loop 重启异常 ${sessionId}: ${error instanceof Error ? error.message : String(error)}`);
+                }
               }, remaining);
               this.log(`loop 重启延迟 ${remaining}ms(冷却期) ${sessionId}`);
             } else {
@@ -691,7 +700,11 @@ ${event.data.arguments}`;
       clearTimeout(state.pendingTimer);
       state.pendingTimer = void 0;
     }
-    await this.fire(sessionId, "manual:notification", true);
+    try {
+      await this.fire(sessionId, "manual:notification", true);
+    } catch (error) {
+      console.error(`[auto-continue] 手动续跑异常 ${sessionId}: ${error instanceof Error ? error.message : String(error)}`);
+    }
   }
   /** 本会话当前生效的冷却间隔(自适应退避)。 */
   cooldownFor(state) {
@@ -726,7 +739,11 @@ ${event.data.arguments}`;
     const timer = setTimeout(() => {
       if (state.pendingTimer !== timer) return;
       state.pendingTimer = void 0;
-      void this.fire(sessionId, reason);
+      try {
+        void this.fire(sessionId, reason);
+      } catch (error) {
+        console.error(`[auto-continue] 定时发送异常 ${sessionId}: ${error instanceof Error ? error.message : String(error)}`);
+      }
     }, config.graceMs);
     state.pendingTimer = timer;
     const template = reason.startsWith("loop:") ? config.loopText : reason.includes("max-tokens") ? config.continueTextMaxTokens : config.continueText;
@@ -992,11 +1009,14 @@ function apply(ctx) {
       applies: "live"
     });
   });
+  let runnerRef;
   ctx.inject(["settings", "agents", "webServer"], (engineCtx) => {
+    if (runnerRef !== void 0) runnerRef.dispose();
     const runner = new AutoContinueRunner(
       engineCtx,
       () => resolveConfig(engineCtx.settings.get(settingsNamespace(AUTO_CONTINUE_NS)))
     );
+    runnerRef = runner;
     const sseClients = /* @__PURE__ */ new Set();
     const pushToAll = (data) => {
       for (const send of sseClients) {
@@ -1071,6 +1091,11 @@ function apply(ctx) {
       }
     });
   });
+  ctx.effect(() => () => {
+    const runner = runnerRef;
+    runnerRef = void 0;
+    if (runner !== void 0) runner.dispose();
+  });
 }
 export {
   AUTO_CONTINUE_NS,

package/lib/types/host/engine.d.ts

@@ -36,6 +36,7 @@ export declare class AutoContinueRunner {
     private readonly notices;
     private readonly noticeListeners;
     private readonly stateListeners;
+    private readonly disposeSessionEvents;
     private disposed;
     /**
      * @param ctx - host plugin context (agents registry, session events, settings).

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-client-auto-continue",
   "description": "DSH Web UI plugin: automatically sends a localized continue prompt when a request is interrupted by network errors or other non-human causes",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -46,7 +46,7 @@
     "build": "node build.mjs && tsc -p tsconfig.build.json",
     "watch": "node build.mjs --watch",
     "typecheck": "tsc --noEmit",
-    "test": "node tests/simulate-host.mjs && node tests/simulate-client-loader.mjs",
+    "test": "node tests/simulate-host.mjs && node tests/simulate-client-loader.mjs && node tests/prepare-github-package.mjs",
     "prepack": "npm run build"
   },
   "keywords": [

package/scripts/prepare-github-package.mjs

@@ -0,0 +1,39 @@
+import { readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+export const SOURCE_PACKAGE_NAME = 'dsh-client-auto-continue';
+export const GITHUB_PACKAGE_NAME = '@hsiangnianian/dsh-auto-continue';
+
+const sourceEntry = `name: '${SOURCE_PACKAGE_NAME}'`;
+const githubEntry = `name: '${GITHUB_PACKAGE_NAME}'`;
+
+/** Rewrite the publish-only package identity and its DSH loader row together. */
+export function prepareGitHubPackage(root) {
+  const manifestPath = join(root, 'package.json');
+  const patchPath = join(root, 'cordis.patch.yml');
+  const manifest = JSON.parse(readFileSync(manifestPath, 'utf8'));
+  const patch = readFileSync(patchPath, 'utf8');
+
+  if (manifest.name !== SOURCE_PACKAGE_NAME) {
+    throw new Error(`Expected package name ${SOURCE_PACKAGE_NAME}, received ${String(manifest.name)}`);
+  }
+
+  const entryCount = patch.split(sourceEntry).length - 1;
+  if (entryCount !== 1) {
+    throw new Error(`Cordis patch must reference ${SOURCE_PACKAGE_NAME} exactly once`);
+  }
+
+  manifest.name = GITHUB_PACKAGE_NAME;
+  writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
+  writeFileSync(patchPath, patch.replace(sourceEntry, githubEntry));
+
+  return { sourceName: SOURCE_PACKAGE_NAME, packageName: GITHUB_PACKAGE_NAME };
+}
+
+const scriptPath = fileURLToPath(import.meta.url);
+if (process.argv[1] && resolve(process.argv[1]) === scriptPath) {
+  const root = process.argv[2] ? resolve(process.argv[2]) : resolve(dirname(scriptPath), '..');
+  const result = prepareGitHubPackage(root);
+  console.log(`Prepared ${result.packageName} from ${result.sourceName}`);
+}

package/src/host/engine.ts

@@ -143,6 +143,7 @@ export class AutoContinueRunner {
   private readonly notices: HostNotice[] = [];
   private readonly noticeListeners = new Set<() => void>();
   private readonly stateListeners = new Set<() => void>();
+  private readonly disposeSessionEvents: () => void;
   private disposed = false;
 
   /**
@@ -154,7 +155,9 @@ export class AutoContinueRunner {
     private readonly getConfig: () => AutoContinueConfig,
   ) {
     // 单实例事件源: 宿主进程内的会话事件 firehose, 天然覆盖所有会话。
-    ctx.on('session/event', (session, event) => this.onHostEvent(session, event));
+    this.disposeSessionEvents = ctx.on('session/event', (session, event) =>
+      this.onHostEvent(session, event),
+    );
     const config = this.getConfig();
     if (config.scanOnBoot) {
       void this.bootScanLoop();
@@ -226,7 +229,9 @@ export class AutoContinueRunner {
   }
 
   dispose(): void {
+    if (this.disposed) return;
     this.disposed = true;
+    this.disposeSessionEvents();
     for (const state of this.states.values()) {
       if (state.pendingTimer !== undefined) clearTimeout(state.pendingTimer);
       if (state.loopRetryTimer !== undefined) clearTimeout(state.loopRetryTimer);
@@ -434,7 +439,11 @@ export class AutoContinueRunner {
               if (state.loopRetryTimer !== undefined) clearTimeout(state.loopRetryTimer);
               state.loopRetryTimer = setTimeout(() => {
                 state.loopRetryTimer = undefined;
-                this.schedule(sessionId, 'loop:aborted');
+                try {
+                  this.schedule(sessionId, 'loop:aborted');
+                } catch (error) {
+                  console.error(`[auto-continue] loop 重启异常 ${sessionId}: ${error instanceof Error ? error.message : String(error)}`);
+                }
               }, remaining);
               this.log(`loop 重启延迟 ${remaining}ms(冷却期) ${sessionId}`);
             } else {
@@ -591,7 +600,11 @@ export class AutoContinueRunner {
       clearTimeout(state.pendingTimer);
       state.pendingTimer = undefined;
     }
-    await this.fire(sessionId, 'manual:notification', true);
+    try {
+      await this.fire(sessionId, 'manual:notification', true);
+    } catch (error) {
+      console.error(`[auto-continue] 手动续跑异常 ${sessionId}: ${error instanceof Error ? error.message : String(error)}`);
+    }
   }
 
   /** 本会话当前生效的冷却间隔(自适应退避)。 */
@@ -628,7 +641,12 @@ export class AutoContinueRunner {
     const timer = setTimeout(() => {
       if (state.pendingTimer !== timer) return;
       state.pendingTimer = undefined;
-      void this.fire(sessionId, reason);
+      // 保险丝: 定时器回调内任何异常(含 inactive context)都不得成为未捕获异常炸掉进程。
+      try {
+        void this.fire(sessionId, reason);
+      } catch (error) {
+        console.error(`[auto-continue] 定时发送异常 ${sessionId}: ${error instanceof Error ? error.message : String(error)}`);
+      }
     }, config.graceMs);
     state.pendingTimer = timer;
     const template = reason.startsWith('loop:')

package/src/index.ts

@@ -98,11 +98,19 @@ export function apply(ctx: Context): void {
     });
   });
 
+  // 引擎引用: inject 回调可能重入(依赖组合变化), 顶层 effect 在 fiber 卸载时必跑。
+  // dispose 绑定必须挂在 apply 的顶层 ctx 上——挂 inject 派生 ctx 的 effect 在 config HMR
+  // 替换行时不会执行, 悬空定时器会撞上 inactive context 炸掉整个进程。
+  let runnerRef: AutoContinueRunner | undefined;
+
   // 单实例引擎: host 进程内监听会话事件, 所有标签页共享同一个引擎。
   ctx.inject(['settings', 'agents', 'webServer'], (engineCtx) => {
+    // 回调重入时先清理旧引擎, 避免定时器与监听器叠加。
+    if (runnerRef !== undefined) runnerRef.dispose();
     const runner = new AutoContinueRunner(engineCtx, () =>
       resolveConfig(engineCtx.settings.get(settingsNamespace(AUTO_CONTINUE_NS)) as AutoContinueSettings | undefined),
     );
+    runnerRef = runner;
 
     // 状态桥: browser 侧订阅通知与运行时状态(SSE)。
     const sseClients = new Set<(data: string) => void>();
@@ -178,4 +186,12 @@ export function apply(ctx: Context): void {
       },
     });
   });
+
+  // 顶层生命周期绑定: fiber 卸载时清理引擎(定时器/监听器)。
+  // 挂在 apply 的 ctx 上保证 Cordis 一定会调用, 防止 inactive context 崩溃。
+  ctx.effect(() => () => {
+    const runner = runnerRef;
+    runnerRef = undefined;
+    if (runner !== undefined) runner.dispose();
+  });
 }