dsh-loop-engine 1.0.0-rc13 → 1.0.0-rc15

package/README.md

@@ -34,13 +34,10 @@ matched — a mismatch fails loudly at boot or session resume:
 
 | dsh-loop-engine | Requires harness |
 |---|---|
-| 1.0.0-rc13 | **0.1.2-rc.1** |
-| 1.0.0-rc12 | **0.1.2-rc.1** |
-| 1.0.0-rc11 | **0.1.2-rc.1** |
-| 1.0.0-rc10 | **0.1.2-rc.1** |
-| 1.0.0-rc7 | 0.1.1-rc.2 |
+| 1.0.0-rc8 and later | **0.1.2-rc.1** |
+| 1.0.0-rc7 and earlier | 0.1.1-rc.2 |
 
-- **1.0.0-rc13 (and rc12 / rc11 / rc10 / rc9 / rc8) is not compatible with harness 0.1.1-rc.2 or earlier.** It uses
+- **1.0.0-rc8 and later is not compatible with harness 0.1.1-rc.2 or earlier.** It uses
   the 0.1.2 persistence seam (`SessionPersistence.create` / `open` +
   `SessionHandle`), the `installSection` settings API, `ToolCallId`, and
   `Session.snapshotEvents()` — none of which exist in older harnesses.

package/README.zh.md

@@ -21,6 +21,19 @@ dsh plugin --profile web add dsh-loop-engine
 - 使用 Pi 引擎时需要以 `pi` 要求的方式完成认证(其自身的 `~/.pi/agent/auth.json`,或提供方的 API-key 环境变量,如 `ANTHROPIC_API_KEY`)。
 - 使用 Kimi Code 引擎时需要本机已安装并登录 `kimi` CLI(例如 `kimi login`),且在 `PATH` 上(或在组合条目里用 `kimiBin` 固定为绝对路径)。
 
+## 版本兼容
+
+`dsh-loop-engine` 与 harness **独立**版本(`1.0.0-rcN`),但通过 `peerDependencies` 绑定到特定 harness 版本;两者必须匹配——不匹配会在启动或会话恢复时响亮地失败:
+
+| dsh-loop-engine | 需要 harness |
+|---|---|
+| 1.0.0-rc8 及以后 | **0.1.2-rc.1** |
+| 1.0.0-rc7 及更早 | 0.1.1-rc.2 |
+
+- **1.0.0-rc8 及以后不兼容 harness 0.1.1-rc.2 或更早版本。** 它使用 0.1.2 的持久化 seam(`SessionPersistence.create` / `open` + `SessionHandle`)、`installSection` settings API、`ToolCallId` 与 `Session.snapshotEvents()` —— 这些在更老的 harness 里都不存在。
+- 要在更老的 harness 上使用本插件,请安装与之匹配的 loop-engine 版本(例如 harness 0.1.1-rc.2 用 `npm i dsh-loop-engine@1.0.0-rc7`)。
+- 每个 tag 的 GitHub Release 正文会写明它针对的 harness 版本。
+
 ## 使用方法
 
 1. 在 **Settings → Loop engine** 选择引擎——`in-process`(默认)、`claude-code`、`codex`、`pi` 或 `kimi`——然后重启 `dsh web`。

package/lib/index.js

@@ -1347,6 +1347,11 @@ var ClaudeCodeLoop = class extends Service {
     const handle = await persistence.create(session.header, {
       inheritedEventCount: session.inheritedEventCount,
       ...signal === void 0 ? {} : { signal }
+    }).catch((error) => {
+      if (error instanceof TypeError && error.message.includes("SessionLogOffset")) {
+        return persistence.create(session.header, session.inheritedEventCount);
+      }
+      throw error;
     });
     return { handle, storedCount: 0 };
   }
@@ -1395,26 +1400,38 @@ var ClaudeCodeLoop = class extends Service {
       let preparation;
       try {
         try {
-          handle = await raceAbortCall(
-            () => persistence.open(id, "write", { signal: fused }),
-            fused,
-            id,
-            (abandoned) => {
-              void abandoned.close();
-            }
-          );
-          const persisted = await handle.read(0, void 0, { signal: fused });
-          fused.throwIfAborted();
-          const closers = interruptedTurnClosers(persisted);
-          if (closers.length > 0) await handle.append(closers);
-          preparation = SessionPreparation.create(this.runtime.ctx.sessions.prepare(id, {
-            seed: [...persisted, ...closers],
-            meta: structuredClone(handle.header),
-            inheritedEventCount: handle.inheritedEventCount,
-            seedSource: "persistence"
-          }));
-          stored = { handle, storedCount: persisted.length + closers.length };
-          await this.appendUnstoredSuffix(stored, preparation.session);
+          if (typeof persistence.open === "function") {
+            handle = await raceAbortCall(
+              () => persistence.open(id, "write", { signal: fused }),
+              fused,
+              id,
+              (abandoned) => {
+                void abandoned.close();
+              }
+            );
+            const persisted = await handle.read(0, void 0, { signal: fused });
+            fused.throwIfAborted();
+            const closers = interruptedTurnClosers(persisted);
+            if (closers.length > 0) await handle.append(closers);
+            preparation = SessionPreparation.create(this.runtime.ctx.sessions.prepare(id, {
+              seed: [...persisted, ...closers],
+              meta: structuredClone(handle.header),
+              inheritedEventCount: handle.inheritedEventCount,
+              seedSource: "persistence"
+            }));
+            stored = { handle, storedCount: persisted.length + closers.length };
+            await this.appendUnstoredSuffix(stored, preparation.session);
+          } else {
+            const publishedApi = persistence;
+            preparation = await raceAbortCall(
+              () => publishedApi.prepare(id, fused),
+              fused,
+              id,
+              (abandoned) => {
+                abandoned?.[Symbol.dispose]?.();
+              }
+            );
+          }
         } finally {
           await unfollowOwner();
         }
@@ -2573,6 +2590,11 @@ var CodexLoop = class extends Service2 {
     const handle = await persistence.create(session.header, {
       inheritedEventCount: session.inheritedEventCount,
       ...signal === void 0 ? {} : { signal }
+    }).catch((error) => {
+      if (error instanceof TypeError && error.message.includes("SessionLogOffset")) {
+        return persistence.create(session.header, session.inheritedEventCount);
+      }
+      throw error;
     });
     return { handle, storedCount: 0 };
   }
@@ -2621,26 +2643,38 @@ var CodexLoop = class extends Service2 {
       let preparation;
       try {
         try {
-          handle = await raceAbortCall(
-            () => persistence.open(id, "write", { signal: fused }),
-            fused,
-            id,
-            (abandoned) => {
-              void abandoned.close();
-            }
-          );
-          const persisted = await handle.read(0, void 0, { signal: fused });
-          fused.throwIfAborted();
-          const closers = interruptedTurnClosers2(persisted);
-          if (closers.length > 0) await handle.append(closers);
-          preparation = SessionPreparation2.create(this.runtime.ctx.sessions.prepare(id, {
-            seed: [...persisted, ...closers],
-            meta: structuredClone(handle.header),
-            inheritedEventCount: handle.inheritedEventCount,
-            seedSource: "persistence"
-          }));
-          stored = { handle, storedCount: persisted.length + closers.length };
-          await this.appendUnstoredSuffix(stored, preparation.session);
+          if (typeof persistence.open === "function") {
+            handle = await raceAbortCall(
+              () => persistence.open(id, "write", { signal: fused }),
+              fused,
+              id,
+              (abandoned) => {
+                void abandoned.close();
+              }
+            );
+            const persisted = await handle.read(0, void 0, { signal: fused });
+            fused.throwIfAborted();
+            const closers = interruptedTurnClosers2(persisted);
+            if (closers.length > 0) await handle.append(closers);
+            preparation = SessionPreparation2.create(this.runtime.ctx.sessions.prepare(id, {
+              seed: [...persisted, ...closers],
+              meta: structuredClone(handle.header),
+              inheritedEventCount: handle.inheritedEventCount,
+              seedSource: "persistence"
+            }));
+            stored = { handle, storedCount: persisted.length + closers.length };
+            await this.appendUnstoredSuffix(stored, preparation.session);
+          } else {
+            const publishedApi = persistence;
+            preparation = await raceAbortCall(
+              () => publishedApi.prepare(id, fused),
+              fused,
+              id,
+              (abandoned) => {
+                abandoned?.[Symbol.dispose]?.();
+              }
+            );
+          }
         } finally {
           await unfollowOwner();
         }
@@ -2946,7 +2980,7 @@ function specsEqual(a, b) {
   return a.cwd === b.cwd && a.env === b.env && a.argv.length === b.argv.length && a.argv.every((value, index) => value === b.argv[index]);
 }
 var PiAgent = class {
-  constructor(loopCtx, id, options, session, config, spawn4, bin) {
+  constructor(loopCtx, id, options, session, config, spawn4, bin, catalog) {
     this.loopCtx = loopCtx;
     this.id = id;
     this.options = options;
@@ -2954,6 +2988,7 @@ var PiAgent = class {
     this.config = config;
     this.spawn = spawn4;
     this.bin = bin;
+    this.catalog = catalog;
     this.dispatch = agentEvents3(loopCtx, this);
     this.inbox = new Inbox3(session, {
       inserted: (message) => {
@@ -2982,6 +3017,7 @@ var PiAgent = class {
   config;
   spawn;
   bin;
+  catalog;
   inbox;
   phase;
   activityDone = Promise.resolve();
@@ -3303,9 +3339,28 @@ var PiAgent = class {
     return void 0;
   }
   /** Build the `pi --mode rpc` argv/cwd/env for one step's child process. */
+  /**
+   * Resolve the `--model` for the RPC child. The session-selected model (last
+   * `model/selection` event) is honored only when it is one of pi's discovered
+   * models; an unknown harness model (e.g. another provider's model such as
+   * `anyai-v1`, which pi cannot serve) is dropped so the child falls back to pi's
+   * own default instead of exiting with "Model ... not found". An empty catalog
+   * (probe not concluded) keeps the candidate, matching prior behavior.
+   */
+  pickModel() {
+    const candidate = this.dynamicModel() ?? this.config.model;
+    if (candidate === void 0) return void 0;
+    if (this.catalog.entries.length > 0) {
+      const known = this.catalog.entries.some(
+        (entry) => entry.model === candidate || `${entry.provider}/${entry.model}` === candidate
+      );
+      if (!known) return void 0;
+    }
+    return candidate;
+  }
   spawnSpec(cwd) {
     const argv = [];
-    const model = this.dynamicModel() ?? this.config.model;
+    const model = this.pickModel();
     if (this.config.provider !== void 0) argv.push("--provider", this.config.provider);
     if (model !== void 0 && this.config.thinkingLevel !== void 0) {
       argv.push("--model", `${model}:${this.config.thinkingLevel}`);
@@ -3548,6 +3603,8 @@ var PiAgent = class {
     } finally {
       signal.removeEventListener("abort", cancel);
       controller.abort();
+      this.rpc?.dispose();
+      this.rpc = void 0;
     }
   }
   /** Append one Pi tool result to the durable log as a `tool/result` message. */
@@ -3574,24 +3631,30 @@ function waitForExit(child) {
     );
   });
 }
-function collectStdout(child) {
+function collectOutput(child) {
   return new Promise((resolve5) => {
-    let text = "";
-    if (child.stdout.on === void 0) {
+    if (child.stdout.on === void 0 || child.stderr.on === void 0) {
       resolve5("");
       return;
     }
+    let text = "";
+    let pending = 2;
+    const finish = () => {
+      pending -= 1;
+      if (pending === 0) resolve5(text);
+    };
     const out = child.stdout;
+    const err = child.stderr;
     out.setEncoding("utf8");
     out.on("data", (data) => {
       text += String(data);
     });
-    out.on("end", () => {
-      resolve5(text);
-    });
-    out.on("close", () => {
-      resolve5(text);
+    out.on("close", finish);
+    err.setEncoding("utf8");
+    err.on("data", (data) => {
+      text += String(data);
     });
+    err.on("close", finish);
   });
 }
 function parsePiModelList(output) {
@@ -3619,11 +3682,11 @@ async function probePiModels(bin, spawn4) {
   } catch {
     return [];
   }
-  const stdoutPromise = collectStdout(child);
+  const outputPromise = collectOutput(child);
   const exitCode = await waitForExit(child);
   if (exitCode !== 0) return [];
-  const stdout = await stdoutPromise;
-  return parsePiModelList(stdout);
+  const output = await outputPromise;
+  return parsePiModelList(output);
 }
 
 // src/engine-pi/loop.ts
@@ -3696,12 +3759,15 @@ var PiLoop = class extends Service3 {
   spawn;
   /** Resolved Pi CLI entrypoint; `argv[0]` of every Pi RPC child. */
   bin;
+  /** Discovered Pi model catalog, forwarded to each agent so it can validate the session-selected model against what pi can actually serve. */
+  catalog;
   constructor(ctx, config) {
     super(ctx, "agentLoopPi");
     this.config = resolveConfig3(config);
     this.ownership = new FactoryOwnership(ctx.fiber);
     this.runtime = { ctx };
     this.bin = piCliEntrypoint();
+    this.catalog = config.piCatalogHolder ?? { entries: [] };
     this.spawn = (spec) => fromSubprocess(this.runtime.ctx.subprocess.spawn(piSubprocessSpec(spec, PI_DISPOSE_GRACE_MS)));
     const holder = config.piCatalogHolder;
     if (holder !== void 0) {
@@ -3789,7 +3855,16 @@ var PiLoop = class extends Service3 {
       throw abort.signal.reason instanceof Error ? abort.signal.reason : new Error(String(abort.signal.reason));
     };
     try {
-      const agent = machine = new PiAgent(loopCtx, id, options, session, this.config, this.spawn, this.bin);
+      const agent = machine = new PiAgent(
+        loopCtx,
+        id,
+        options,
+        session,
+        this.config,
+        this.spawn,
+        this.bin,
+        this.catalog
+      );
       machineReady.resolve();
       assertLive();
       return {
@@ -3906,6 +3981,11 @@ var PiLoop = class extends Service3 {
     const handle = await persistence.create(session.header, {
       inheritedEventCount: session.inheritedEventCount,
       ...signal === void 0 ? {} : { signal }
+    }).catch((error) => {
+      if (error instanceof TypeError && error.message.includes("SessionLogOffset")) {
+        return persistence.create(session.header, session.inheritedEventCount);
+      }
+      throw error;
     });
     return { handle, storedCount: 0 };
   }
@@ -3954,26 +4034,38 @@ var PiLoop = class extends Service3 {
       let preparation;
       try {
         try {
-          handle = await raceAbortCall(
-            () => persistence.open(id, "write", { signal: fused }),
-            fused,
-            id,
-            (abandoned) => {
-              void abandoned.close();
-            }
-          );
-          const persisted = await handle.read(0, void 0, { signal: fused });
-          fused.throwIfAborted();
-          const closers = interruptedTurnClosers3(persisted);
-          if (closers.length > 0) await handle.append(closers);
-          preparation = SessionPreparation3.create(this.runtime.ctx.sessions.prepare(id, {
-            seed: [...persisted, ...closers],
-            meta: structuredClone(handle.header),
-            inheritedEventCount: handle.inheritedEventCount,
-            seedSource: "persistence"
-          }));
-          stored = { handle, storedCount: persisted.length + closers.length };
-          await this.appendUnstoredSuffix(stored, preparation.session);
+          if (typeof persistence.open === "function") {
+            handle = await raceAbortCall(
+              () => persistence.open(id, "write", { signal: fused }),
+              fused,
+              id,
+              (abandoned) => {
+                void abandoned.close();
+              }
+            );
+            const persisted = await handle.read(0, void 0, { signal: fused });
+            fused.throwIfAborted();
+            const closers = interruptedTurnClosers3(persisted);
+            if (closers.length > 0) await handle.append(closers);
+            preparation = SessionPreparation3.create(this.runtime.ctx.sessions.prepare(id, {
+              seed: [...persisted, ...closers],
+              meta: structuredClone(handle.header),
+              inheritedEventCount: handle.inheritedEventCount,
+              seedSource: "persistence"
+            }));
+            stored = { handle, storedCount: persisted.length + closers.length };
+            await this.appendUnstoredSuffix(stored, preparation.session);
+          } else {
+            const publishedApi = persistence;
+            preparation = await raceAbortCall(
+              () => publishedApi.prepare(id, fused),
+              fused,
+              id,
+              (abandoned) => {
+                abandoned?.[Symbol.dispose]?.();
+              }
+            );
+          }
         } finally {
           await unfollowOwner();
         }
@@ -5020,6 +5112,11 @@ var KimiLoop = class extends Service4 {
     const handle = await persistence.create(session.header, {
       inheritedEventCount: session.inheritedEventCount,
       ...signal === void 0 ? {} : { signal }
+    }).catch((error) => {
+      if (error instanceof TypeError && error.message.includes("SessionLogOffset")) {
+        return persistence.create(session.header, session.inheritedEventCount);
+      }
+      throw error;
     });
     return { handle, storedCount: 0 };
   }
@@ -5068,26 +5165,38 @@ var KimiLoop = class extends Service4 {
       let preparation;
       try {
         try {
-          handle = await raceAbortCall(
-            () => persistence.open(id, "write", { signal: fused }),
-            fused,
-            id,
-            (abandoned) => {
-              void abandoned.close();
-            }
-          );
-          const persisted = await handle.read(0, void 0, { signal: fused });
-          fused.throwIfAborted();
-          const closers = interruptedTurnClosers4(persisted);
-          if (closers.length > 0) await handle.append(closers);
-          preparation = SessionPreparation4.create(this.runtime.ctx.sessions.prepare(id, {
-            seed: [...persisted, ...closers],
-            meta: structuredClone(handle.header),
-            inheritedEventCount: handle.inheritedEventCount,
-            seedSource: "persistence"
-          }));
-          stored = { handle, storedCount: persisted.length + closers.length };
-          await this.appendUnstoredSuffix(stored, preparation.session);
+          if (typeof persistence.open === "function") {
+            handle = await raceAbortCall(
+              () => persistence.open(id, "write", { signal: fused }),
+              fused,
+              id,
+              (abandoned) => {
+                void abandoned.close();
+              }
+            );
+            const persisted = await handle.read(0, void 0, { signal: fused });
+            fused.throwIfAborted();
+            const closers = interruptedTurnClosers4(persisted);
+            if (closers.length > 0) await handle.append(closers);
+            preparation = SessionPreparation4.create(this.runtime.ctx.sessions.prepare(id, {
+              seed: [...persisted, ...closers],
+              meta: structuredClone(handle.header),
+              inheritedEventCount: handle.inheritedEventCount,
+              seedSource: "persistence"
+            }));
+            stored = { handle, storedCount: persisted.length + closers.length };
+            await this.appendUnstoredSuffix(stored, preparation.session);
+          } else {
+            const publishedApi = persistence;
+            preparation = await raceAbortCall(
+              () => publishedApi.prepare(id, fused),
+              fused,
+              id,
+              (abandoned) => {
+                abandoned?.[Symbol.dispose]?.();
+              }
+            );
+          }
         } finally {
           await unfollowOwner();
         }

package/lib/types/engine-pi/agent.d.ts

@@ -16,6 +16,7 @@ import type { Scope } from '@deepseek-ai/dsh-scope';
 import type { Session, SessionId, UserMessage } from '@deepseek-ai/dsh-session';
 import type { Context } from '@deepseek-ai/cordis';
 import type { ResolvedConfig } from './types.ts';
+import type { PiModelEntry } from './probe.ts';
 import { type PiSpawnCapability } from './rpc/client.ts';
 /** Provider route label used for logged header snapshots and message provenance. */
 export declare const PROVIDER = "pi";
@@ -28,6 +29,7 @@ export declare class PiAgent implements Agent {
     private readonly config;
     private readonly spawn;
     private readonly bin;
+    private readonly catalog;
     readonly inbox: Inbox;
     private phase;
     private activityDone;
@@ -42,7 +44,9 @@ export declare class PiAgent implements Agent {
     private rpc;
     /** The spawn spec the cached client was built from; a change forces a respawn. */
     private lastSpec;
-    constructor(loopCtx: Context, id: SessionId, options: AgentOptions, session: Session, config: ResolvedConfig, spawn: PiSpawnCapability, bin: string);
+    constructor(loopCtx: Context, id: SessionId, options: AgentOptions, session: Session, config: ResolvedConfig, spawn: PiSpawnCapability, bin: string, catalog: {
+        readonly entries: readonly PiModelEntry[];
+    });
     /** Return the cached RPC client, respawning when the spec or process changed. */
     private rpcClient;
     get status(): AgentStatus;
@@ -118,6 +122,15 @@ export declare class PiAgent implements Agent {
      */
     private dynamicModel;
     /** Build the `pi --mode rpc` argv/cwd/env for one step's child process. */
+    /**
+     * Resolve the `--model` for the RPC child. The session-selected model (last
+     * `model/selection` event) is honored only when it is one of pi's discovered
+     * models; an unknown harness model (e.g. another provider's model such as
+     * `anyai-v1`, which pi cannot serve) is dropped so the child falls back to pi's
+     * own default instead of exiting with "Model ... not found". An empty catalog
+     * (probe not concluded) keeps the candidate, matching prior behavior.
+     */
+    private pickModel;
     private spawnSpec;
     /**
      * Run one Pi RPC query for the current step and map its event stream into the

package/lib/types/engine-pi/loop.d.ts

@@ -70,6 +70,8 @@ export declare class PiLoop extends Service implements AgentFactory {
     readonly spawn: (spec: PiSpawnSpec) => PiProcess;
     /** Resolved Pi CLI entrypoint; `argv[0]` of every Pi RPC child. */
     readonly bin: string;
+    /** Discovered Pi model catalog, forwarded to each agent so it can validate the session-selected model against what pi can actually serve. */
+    private readonly catalog;
     constructor(ctx: Context, config: Config);
     /**
      * Construct the driver, scope, and one memoized reverse teardown for a new

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-loop-engine",
   "description": "Web-switchable agent loop engine selection for the DeepSeek Harness - out-of-tree plugin (Claude Code / Codex / Pi / Kimi Code drivers) maintained by @kuun993, zero main-repo changes",
-  "version": "1.0.0-rc13",
+  "version": "1.0.0-rc15",
   "publishConfig": {
     "access": "public"
   },