dsh-loop-engine 1.0.0-rc14 → 1.0.0-rc15

package/lib/index.js

@@ -2980,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;
@@ -2988,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) => {
@@ -3016,6 +3017,7 @@ var PiAgent = class {
   config;
   spawn;
   bin;
+  catalog;
   inbox;
   phase;
   activityDone = Promise.resolve();
@@ -3337,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}`);
@@ -3582,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. */
@@ -3608,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) {
@@ -3653,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
@@ -3730,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) {
@@ -3823,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 {

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-rc14",
+  "version": "1.0.0-rc15",
   "publishConfig": {
     "access": "public"
   },