super-dsh 0.1.10 → 0.1.11

package/agent-hermes/dist/agent.js

@@ -291,6 +291,12 @@ export class HermesAgent {
      */
     #remoteQueue = [];
     #bridgedToolResults = new Set();
+    /** callIds already advertised by an appended assistant/message frame — the
+     *  strict validator refuses any `tool/call` whose callId no assistant frame
+     *  advertised (2026-10-04 dev3 case C: the hermes wire never delivers the
+     *  tool_use-bearing intermediate assistant messages, so execution frames
+     *  arrived with no advertisement anchor). */
+    #advertisedToolCalls = new Set();
     /** Fires when the agent has been idle past HERMES_IDLE_EXIT_MS (tears down the client). */
     #onIdleExit;
     #idleExitTimer = undefined;
@@ -495,7 +501,8 @@ export class HermesAgent {
             return;
         this.session.append("turn/start", { turn: this.#dashTurn });
         await this.#emitRequestContext();
-        this.#titleSourceSeq ??= this.session.append("user/message", message, { surfaceOp: "append" }).seq;
+        const event = this.session.append("user/message", message, { surfaceOp: "append" });
+        this.#titleSourceSeq ??= event.seq;
         this.#armTurnDeadline();
         void this.#client
             .prompt(userMessageText(message))
@@ -525,6 +532,12 @@ export class HermesAgent {
         await this.#handshake(`session.create`, () => this.#client.createSession({
             cwd: sessionCtx?.cwd ?? process.cwd(),
             ...(route?.model !== undefined ? { model: route.model } : {}),
+            // The route's provider slug MUST ride with the model: without it the
+            // gateway pins the session to its default provider (deepseek) and any
+            // foreign-family model id (z-ai/glm-*, anthropic/*, …) dies at
+            // session.create with `Model … is not served by provider 'deepseek'`
+            // (-32602). The gateway normalizes aliases (`z-ai` → `zai`) itself.
+            ...(route?.provider !== undefined ? { provider: route.provider } : {}),
             ...(sessionCtx?.title !== undefined && sessionCtx.title !== "" ? { title: sessionCtx.title } : {}),
         }));
     }
@@ -892,13 +905,40 @@ export class HermesAgent {
                     break;
                 const callId = String(event.toolCallId ?? "");
                 const name = String(event.toolName ?? "");
+                const argumentsJson = String(event.argumentsJson ?? JSON.stringify(event.args ?? {}));
                 this.#commitStepStart();
+                // Advertisement-before-execution (validator invariant): the hermes wire
+                // never delivers the tool_use-bearing intermediate assistant messages,
+                // so unless a real assistant frame already advertised this callId,
+                // bridge a minimal assistant/message carrying the tool-call block —
+                // arguments copied verbatim into both frames (validator: lifecycle
+                // arguments ≡ advertised, strict string equality; 2026-10-04 dev3
+                // case C). A live stream bridge is left untouched — the final real
+                // assistant message settles it.
+                if (!this.#advertisedToolCalls.has(callId)) {
+                    const advertisement = createAssistantMessage({
+                        content: [{ type: "tool-call", id: ToolCallId(callId), name, arguments: argumentsJson }],
+                        source: {
+                            provider: String(this.options.provider ?? ""),
+                            model: String(this.options.model ?? ""),
+                        },
+                    });
+                    this.session.append("assistant/message", {
+                        turn: this.#dashTurn,
+                        step: this.#step,
+                        message: advertisement,
+                        stream: [],
+                    }, {
+                        surfaceOp: "append",
+                    });
+                    this.#advertisedToolCalls.add(callId);
+                }
                 this.session.append("tool/call", {
                     turn: this.#dashTurn,
                     step: this.#step,
                     callId: ToolCallId(callId),
                     name,
-                    arguments: String(event.argumentsJson ?? JSON.stringify(event.args ?? {})),
+                    arguments: argumentsJson,
                 });
                 break;
             }
@@ -1016,6 +1056,10 @@ export class HermesAgent {
     }
     #appendAssistantMessage(message, usage) {
         const content = convertContent(message.content);
+        for (const block of content) {
+            if (block.type === "tool-call")
+                this.#advertisedToolCalls.add(block.id);
+        }
         const assistant = createAssistantMessage({
             content,
             source: {

package/agent-hermes/dist/hermes-client.js

@@ -61,7 +61,7 @@
  * (keep the spawned stdio transport the only transport).
  */
 import { spawn } from "node:child_process";
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { delimiter, resolve } from "node:path";
 import { createInterface } from "node:readline";
@@ -124,6 +124,46 @@ export function resolveHermesPython(root) {
 export function resolveHermesRoot() {
     return process.env.SUPERD_HERMES_ROOT?.trim() || resolve(homedir(), ".hermes/hermes-agent");
 }
+/** Parse one `.env` body into entries: `#` comments, optional `export ` prefix,
+ *  optional single/double quotes, `KEY=VALUE` on one line each. Unparsable
+ *  lines are skipped (best effort — the gateway tolerates partial envs). */
+export function parseDotEnv(text) {
+    const out = {};
+    for (const rawLine of text.split(/\r?\n/)) {
+        const line = rawLine.trim();
+        if (line === "" || line.startsWith("#"))
+            continue;
+        const body = line.startsWith("export ") ? line.slice("export ".length).trim() : line;
+        const eq = body.indexOf("=");
+        if (eq <= 0)
+            continue;
+        const key = body.slice(0, eq).trim();
+        if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key))
+            continue;
+        let value = body.slice(eq + 1).trim();
+        if (value.length >= 2 && ((value.startsWith('"') && value.endsWith('"')) || (value.startsWith("'") && value.endsWith("'")))) {
+            value = value.slice(1, -1);
+        }
+        out[key] = value;
+    }
+    return out;
+}
+/** The native home's `.env` (`~/.hermes/.env`), parsed once per call. The omp
+ *  and pi runtimes load their own native `.env` on startup; the hermes gateway
+ *  child does NOT (and the harness env deliberately carries no provider
+ *  keys), so without this the spawned gateway sees zero provider credentials
+ *  — every provider request dies as quota/auth regardless of model. */
+export function loadHermesDotEnv() {
+    const path = resolve(resolveHermesRoot(), "..", ".env");
+    if (!existsSync(path))
+        return {};
+    try {
+        return parseDotEnv(readFileSync(path, "utf8"));
+    }
+    catch {
+        return {};
+    }
+}
 function asRecord(value) {
     if (value === null || typeof value !== "object" || Array.isArray(value))
         return null;
@@ -197,6 +237,14 @@ export class HermesGatewayClient {
         const root = resolveHermesRoot();
         const python = resolveHermesPython(root);
         const env = { ...(opts.env ?? process.env) };
+        // Native `.env` fill (dotenv convention: existing env WINS). The omp and
+        // pi runtimes load their own native `.env`; the hermes gateway child does
+        // not, and the harness env carries no provider keys — without this fill
+        // every provider request dies as quota/auth regardless of model.
+        for (const [dotKey, dotValue] of Object.entries(loadHermesDotEnv())) {
+            if (env[dotKey] === undefined || env[dotKey] === "")
+                env[dotKey] = dotValue;
+        }
         const prevPath = env.PYTHONPATH?.trim();
         env.PYTHONPATH = prevPath ? `${root}${delimiter}${prevPath}` : root;
         env.HERMES_PYTHON_SRC_ROOT = root;

package/agent-omp/dist/agent.js

@@ -171,14 +171,23 @@ function userMessageFromOmp(message) {
         source: { kind: "user" },
     });
 }
-/** Extract every tool call an OMP assistant message names, in order, for approval correlation. */
-function toolCalls(blocks) {
+/** Extract every tool call an OMP assistant message names, in order, for approval correlation.
+ *  `arguments` is the ADVERTISED args原文 (same normalization `convertContent` applies): dsh's
+ *  strict validator requires `tool/call.arguments` ≡ the assistant frame's advertised arguments
+ *  byte-for-byte, while `tool_execution_*` events carry runtime-parsed (schema-stripped) args —
+ *  models that add unknown fields (e.g. an intent string) make the two diverge and the stored
+ *  log fail to load (2026-10-04 dev3 case A). Exported for the regression test. */
+export function toolCalls(blocks) {
     if (blocks === undefined)
         return [];
     const result = [];
     for (const block of blocks) {
         if (block.type === "toolCall" && typeof block.id === "string") {
-            result.push({ callId: block.id, name: typeof block.name === "string" ? block.name : "" });
+            result.push({
+                callId: block.id,
+                name: typeof block.name === "string" ? block.name : "",
+                arguments: typeof block.arguments === "string" ? block.arguments : JSON.stringify(block.arguments ?? {}),
+            });
         }
     }
     return result;
@@ -954,12 +963,16 @@ export class OmpAgent {
             case "tool_execution_start": {
                 const callId = String(event.toolCallId ?? "");
                 const name = String(event.toolName ?? "");
+                // Advertised args win (strict validator: tool/call.arguments ≡ the
+                // assistant frame's advertised arguments); execution args are the
+                // fallback for calls no assistant frame ever carried.
+                const advertised = this.#pendingToolCalls.find((pending) => pending.callId === callId);
                 this.session.append("tool/call", {
                     turn: this.#dashTurn,
                     step: this.#step,
                     callId: ToolCallId(callId),
                     name,
-                    arguments: JSON.stringify(event.args ?? {}),
+                    arguments: advertised?.arguments ?? JSON.stringify(event.args ?? {}),
                 });
                 // The assistant's pending tool call is now materialized as a running call.
                 this.#pendingToolCalls = this.#pendingToolCalls.filter((pending) => pending.callId !== callId);

package/agent-omp-sdk/dist/agent.d.ts

@@ -43,6 +43,17 @@ export declare function ompFailure(message: OmpMessage): {
 } | undefined;
 /** Map OMP's usage accounting into Dash `TokenUsage` (disjoint field names). */
 export declare function convertUsage(usage: unknown): TokenUsage | undefined;
+/** Extract every tool call an OMP assistant message names, in order, for approval correlation.
+ *  `arguments` is the ADVERTISED args原文 (same normalization `convertContent` applies): dsh's
+ *  strict validator requires `tool/call.arguments` ≡ the assistant frame's advertised arguments
+ *  byte-for-byte, while `tool_execution_*` events carry runtime-parsed (schema-stripped) args —
+ *  models that add unknown fields (e.g. an intent string) make the two diverge and the stored
+ *  log fail to load (2026-10-04 dev3 case A). Exported for the regression test. */
+export declare function toolCalls(blocks: OmpContentBlock[] | undefined): {
+    callId: string;
+    name: string;
+    arguments: string;
+}[];
 export declare class OmpAgent implements Agent {
     #private;
     readonly id: SessionId;

package/agent-omp-sdk/dist/agent.js

@@ -171,14 +171,23 @@ function userMessageFromOmp(message) {
         source: { kind: "user" },
     });
 }
-/** Extract every tool call an OMP assistant message names, in order, for approval correlation. */
-function toolCalls(blocks) {
+/** Extract every tool call an OMP assistant message names, in order, for approval correlation.
+ *  `arguments` is the ADVERTISED args原文 (same normalization `convertContent` applies): dsh's
+ *  strict validator requires `tool/call.arguments` ≡ the assistant frame's advertised arguments
+ *  byte-for-byte, while `tool_execution_*` events carry runtime-parsed (schema-stripped) args —
+ *  models that add unknown fields (e.g. an intent string) make the two diverge and the stored
+ *  log fail to load (2026-10-04 dev3 case A). Exported for the regression test. */
+export function toolCalls(blocks) {
     if (blocks === undefined)
         return [];
     const result = [];
     for (const block of blocks) {
         if (block.type === "toolCall" && typeof block.id === "string") {
-            result.push({ callId: block.id, name: typeof block.name === "string" ? block.name : "" });
+            result.push({
+                callId: block.id,
+                name: typeof block.name === "string" ? block.name : "",
+                arguments: typeof block.arguments === "string" ? block.arguments : JSON.stringify(block.arguments ?? {}),
+            });
         }
     }
     return result;
@@ -954,12 +963,16 @@ export class OmpAgent {
             case "tool_execution_start": {
                 const callId = String(event.toolCallId ?? "");
                 const name = String(event.toolName ?? "");
+                // Advertised args win (strict validator: tool/call.arguments ≡ the
+                // assistant frame's advertised arguments); execution args are the
+                // fallback for calls no assistant frame ever carried.
+                const advertised = this.#pendingToolCalls.find((pending) => pending.callId === callId);
                 this.session.append("tool/call", {
                     turn: this.#dashTurn,
                     step: this.#step,
                     callId: ToolCallId(callId),
                     name,
-                    arguments: JSON.stringify(event.args ?? {}),
+                    arguments: advertised?.arguments ?? JSON.stringify(event.args ?? {}),
                 });
                 // The assistant's pending tool call is now materialized as a running call.
                 this.#pendingToolCalls = this.#pendingToolCalls.filter((pending) => pending.callId !== callId);

package/agent-pi/dist/agent.js

@@ -206,6 +206,11 @@ export class PiAgent {
      */
     #remoteQueue = [];
     #bridgedToolResults = new Set();
+    /** callIds already advertised by an appended assistant/message frame — the
+     *  strict validator refuses any `tool/call` whose callId no assistant frame
+     *  advertised, and requires the execution arguments to equal the advertised
+     *  string (2026-10-04 dev3 omp/hermes repair: same write-side family). */
+    #advertisedToolCalls = new Set();
     /** The last title already mirrored into the log (dedupe). */
     #mirroredTitle = null;
     /** The open compaction lifecycle's id (`compaction/start` … `compaction/end`). */
@@ -750,7 +755,30 @@ export class PiAgent {
             case "tool_execution_start": {
                 const callId = String(event.toolCallId ?? "");
                 const name = String(event.toolName ?? "");
+                const argumentsJson = typeof event.args === "string" ? event.args : JSON.stringify(event.args ?? {});
                 this.#commitStepStart();
+                // Advertisement-before-execution (validator invariant, 2026-10-04 dev3
+                // omp/hermes repair family): unless a real assistant frame advertised
+                // this callId, bridge a minimal assistant/message carrying the
+                // tool-call block — arguments copied verbatim into both frames.
+                if (!this.#advertisedToolCalls.has(callId)) {
+                    const advertisement = createAssistantMessage({
+                        content: [{ type: "tool-call", id: ToolCallId(callId), name, arguments: argumentsJson }],
+                        source: {
+                            provider: String(this.options.provider ?? ""),
+                            model: String(this.options.model ?? ""),
+                        },
+                    });
+                    this.session.append("assistant/message", {
+                        turn: this.#dashTurn,
+                        step: this.#step,
+                        message: advertisement,
+                        stream: [],
+                    }, {
+                        surfaceOp: "append",
+                    });
+                    this.#advertisedToolCalls.add(callId);
+                }
                 this.session.append("tool/call", {
                     turn: this.#dashTurn,
                     step: this.#step,
@@ -758,7 +786,7 @@ export class PiAgent {
                     name,
                     // The DSH payload requires the RAW JSON string the model produced;
                     // the projection stringified pi's parsed args object.
-                    arguments: typeof event.args === "string" ? event.args : JSON.stringify(event.args ?? {}),
+                    arguments: argumentsJson,
                 });
                 break;
             }
@@ -882,6 +910,10 @@ export class PiAgent {
     }
     #appendAssistantMessage(message) {
         const content = convertContent(message.content);
+        for (const block of content) {
+            if (block.type === "tool-call")
+                this.#advertisedToolCalls.add(block.id);
+        }
         // pi reports usage on every assistant message — same-event attachment,
         // no lag.
         const usage = convertUsage(message.usage);