super-dsh 0.1.10-e → 0.1.11

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);

package/client/index.js

@@ -1738,14 +1738,14 @@ function modelOption(raw) {
 	};
 }
 function providerAuthKind(raw) {
-	return raw === "env" ? "env" : raw === "authToken" ? "authToken" : "apiKey";
+	return raw === "oauth" ? "oauth" : raw === "env" ? "env" : raw === "authToken" ? "authToken" : "apiKey";
 }
 function providerOption(raw) {
 	if (typeof raw !== "object" || raw === null) return void 0;
 	const record = raw;
 	const id = nonEmpty(record.id);
 	const label = nonEmpty(record.label);
-	const baseUrl = nonEmpty(record.baseUrl);
+	const baseUrl = nonEmpty(record.baseUrl) ?? (record.authKind === "oauth" ? "" : void 0);
 	if (id === void 0 || label === void 0 || baseUrl === void 0) return void 0;
 	const models = Array.isArray(record.models) ? record.models.map(modelOption).filter((entry) => entry !== void 0) : [];
 	const envName = nonEmpty(record.envName);
@@ -2650,6 +2650,10 @@ function ProvidersPanel({ agent, namespace }) {
 						style: chip,
 						children: "token"
 					}),
+					provider.authKind === "oauth" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						style: chip,
+						children: "native OAuth"
+					}),
 					!provider.hasKey && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						style: chip,
 						children: "no key"
@@ -2668,13 +2672,13 @@ function ProvidersPanel({ agent, namespace }) {
 					}),
 					provider.models.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						style: chipWarn,
-						children: "no models yet — add one"
+						children: provider.authKind === "oauth" ? "model cache unavailable — open Codex to refresh" : "no models yet — add one"
 					}),
 					busy === `remove:${provider.id}` && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						style: chip,
 						children: "removing…"
 					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					provider.authKind !== "oauth" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 						type: "button",
 						style: buttonStyle,
 						disabled: busy !== null,
@@ -2682,8 +2686,7 @@ function ProvidersPanel({ agent, namespace }) {
 							openEdit(provider);
 						},
 						children: "Edit"
-					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 						type: "button",
 						style: {
 							...buttonStyle,
@@ -2695,7 +2698,7 @@ function ProvidersPanel({ agent, namespace }) {
 							run(`remove:${provider.id}`, () => removeProvider(agent.key, namespace, provider.id));
 						},
 						children: "Delete"
-					})
+					})] })
 				]
 			}, provider.id)),
 			editing === null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-dsh",
-  "version": "0.1.10-e",
+  "version": "0.1.11",
   "description": "Super D for the DeepSeek Harness (DSH) \u2014 one dsh plugin that mounts the superd hub (runtime selector, roster, per-runtime agents) and joins local foreign-agent runtimes (OMP, Codex, Claude, Pi, Hermes, Antigravity) into the DSH Web UI. Each runtime keeps its native home and session store; the hub only bridges.",
   "type": "module",
   "license": "MIT",
@@ -80,7 +80,7 @@
   },
   "dependencies": {
     "@earendil-works/pi-coding-agent": "0.84.2",
-    "@openai/codex": "0.154.0",
+    "@openai/codex": "0.160.0",
     "ws": "^8.21.0",
     "zod": "4.4.3",
     "@modelcontextprotocol/sdk": "^1.29.0"

package/superd-hub/dist/client/agent-settings.d.ts

@@ -108,7 +108,7 @@ export interface ProviderModelOption {
  * addition on save, which is why the form offers kinds per view
  * (`authKindOptions`) instead of one fixed list.
  */
-export type ProviderAuthKind = 'apiKey' | 'env' | 'authToken';
+export type ProviderAuthKind = 'apiKey' | 'env' | 'authToken' | 'oauth';
 /** One configured provider, listed but never carrying its key. */
 export interface ProviderOption {
     readonly id: string;

package/superd-hub/dist/client/agent-settings.js

@@ -138,7 +138,7 @@ function modelOption(raw) {
 function providerAuthKind(raw) {
     // An unstated or unknown kind reads as the shared conservative default,
     // never as the other face's shape.
-    return raw === 'env' ? 'env' : raw === 'authToken' ? 'authToken' : 'apiKey';
+    return raw === 'oauth' ? 'oauth' : raw === 'env' ? 'env' : raw === 'authToken' ? 'authToken' : 'apiKey';
 }
 function providerOption(raw) {
     if (typeof raw !== 'object' || raw === null)
@@ -146,7 +146,7 @@ function providerOption(raw) {
     const record = raw;
     const id = nonEmpty(record.id);
     const label = nonEmpty(record.label);
-    const baseUrl = nonEmpty(record.baseUrl);
+    const baseUrl = nonEmpty(record.baseUrl) ?? (record.authKind === 'oauth' ? '' : undefined);
     if (id === undefined || label === undefined || baseUrl === undefined)
         return undefined;
     const models = Array.isArray(record.models)

package/superd-hub/dist/world-mount.d.ts

@@ -93,13 +93,14 @@ export declare const WORLD_WAVE1_DISABLED_ROWS: readonly string[];
  * Wave-2 of world composition minimization: the CLIENT lane. The
  * multi-ctx-multi-ui → native-ui-only transition (0.1.5 / T-D) retired the
  * world's own web UI (webserver/hmr/web-runtime/client-hmr above); wave-2
- * completes it by stripping the browser-half rows of the web-app bundle —
- * every dsh-client-* row plus the cordis client runner. In a world these
- * only registered modules into a table no browser ever reads.
+ * completes it by stripping the browser-only rows of the web-app bundle
+ * plus the cordis client runner. A dsh-client-* package can also provide
+ * host services, so its name alone does not make it safe to disable.
  *
  * Dependency-cleared 2026-09-27: the KEEP side (api controllers, gateway,
- * session core, adapters) injects none of their services with ONE
- * exceptions — `connection` (dsh-client-connection: the world's typert
+ * session core, adapters) keeps the required host services:
+ * `file-upload` (dsh-client-file-upload: sessionController injects its
+ * fileUploads service), `connection` (dsh-client-connection: the world's typert
  * gateway injects it) and `modules` (dsh-client-modules: its activation
  * work fails in world trees ("client bundles not found") and at least one
  * fiber treats it as required — the load-bearing parking restatement

package/superd-hub/dist/world-mount.js

@@ -95,13 +95,14 @@ export const WORLD_WAVE1_DISABLED_ROWS = [
  * Wave-2 of world composition minimization: the CLIENT lane. The
  * multi-ctx-multi-ui → native-ui-only transition (0.1.5 / T-D) retired the
  * world's own web UI (webserver/hmr/web-runtime/client-hmr above); wave-2
- * completes it by stripping the browser-half rows of the web-app bundle —
- * every dsh-client-* row plus the cordis client runner. In a world these
- * only registered modules into a table no browser ever reads.
+ * completes it by stripping the browser-only rows of the web-app bundle
+ * plus the cordis client runner. A dsh-client-* package can also provide
+ * host services, so its name alone does not make it safe to disable.
  *
  * Dependency-cleared 2026-09-27: the KEEP side (api controllers, gateway,
- * session core, adapters) injects none of their services with ONE
- * exceptions — `connection` (dsh-client-connection: the world's typert
+ * session core, adapters) keeps the required host services:
+ * `file-upload` (dsh-client-file-upload: sessionController injects its
+ * fileUploads service), `connection` (dsh-client-connection: the world's typert
  * gateway injects it) and `modules` (dsh-client-modules: its activation
  * work fails in world trees ("client bundles not found") and at least one
  * fiber treats it as required — the load-bearing parking restatement
@@ -110,7 +111,6 @@ export const WORLD_WAVE1_DISABLED_ROWS = [
 export const WORLD_WAVE2_DISABLED_ROWS = [
     'cordis-client-runner',
     'directory-picker-browse-surface',
-    'file-upload',
     'locale',
     'resources',
     'ui-agent-preset', 'ui-approval', 'ui-attachment', 'ui-brand-official',

package/superd-hub/lib/client/index.js

@@ -1738,14 +1738,14 @@ function modelOption(raw) {
 	};
 }
 function providerAuthKind(raw) {
-	return raw === "env" ? "env" : raw === "authToken" ? "authToken" : "apiKey";
+	return raw === "oauth" ? "oauth" : raw === "env" ? "env" : raw === "authToken" ? "authToken" : "apiKey";
 }
 function providerOption(raw) {
 	if (typeof raw !== "object" || raw === null) return void 0;
 	const record = raw;
 	const id = nonEmpty(record.id);
 	const label = nonEmpty(record.label);
-	const baseUrl = nonEmpty(record.baseUrl);
+	const baseUrl = nonEmpty(record.baseUrl) ?? (record.authKind === "oauth" ? "" : void 0);
 	if (id === void 0 || label === void 0 || baseUrl === void 0) return void 0;
 	const models = Array.isArray(record.models) ? record.models.map(modelOption).filter((entry) => entry !== void 0) : [];
 	const envName = nonEmpty(record.envName);
@@ -2650,6 +2650,10 @@ function ProvidersPanel({ agent, namespace }) {
 						style: chip,
 						children: "token"
 					}),
+					provider.authKind === "oauth" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						style: chip,
+						children: "native OAuth"
+					}),
 					!provider.hasKey && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						style: chip,
 						children: "no key"
@@ -2668,13 +2672,13 @@ function ProvidersPanel({ agent, namespace }) {
 					}),
 					provider.models.length === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						style: chipWarn,
-						children: "no models yet — add one"
+						children: provider.authKind === "oauth" ? "model cache unavailable — open Codex to refresh" : "no models yet — add one"
 					}),
 					busy === `remove:${provider.id}` && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 						style: chip,
 						children: "removing…"
 					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					provider.authKind !== "oauth" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 						type: "button",
 						style: buttonStyle,
 						disabled: busy !== null,
@@ -2682,8 +2686,7 @@ function ProvidersPanel({ agent, namespace }) {
 							openEdit(provider);
 						},
 						children: "Edit"
-					}),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 						type: "button",
 						style: {
 							...buttonStyle,
@@ -2695,7 +2698,7 @@ function ProvidersPanel({ agent, namespace }) {
 							run(`remove:${provider.id}`, () => removeProvider(agent.key, namespace, provider.id));
 						},
 						children: "Delete"
-					})
+					})] })
 				]
 			}, provider.id)),
 			editing === null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {