super-dsh 0.3.3 → 0.3.4-c

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

@@ -1,8 +1,12 @@
 /**
  * HermesGatewayClient — the reusable TUI-gateway client seam (AW-H Task 3).
  *
- * One client = one spawned gateway child (`python -m tui_gateway.entry`,
- * stdio ndjson JSON-RPC) = one bound gateway session. Spawn/env/ready patterns
+ * One client = one gateway child bound to one gateway session. Transports:
+ * `stdio` spawns `python -m tui_gateway.entry` (owns the Hermes home
+ * exclusively); `attach` (SUPERD_HERMES_TRANSPORT=attach) spawns the
+ * WS-attach bridge — same stdio ndjson JSON-RPC contract, frames relayed to
+ * the profile's canonical gateway WebSocket; `auto` (default) = stdio first,
+ * flips to attach on the gateway ownership refusal (resolveHermesTransportMode).
  * follow the upstream reference client `ui-tui/src/gatewayClient.ts` and the
  * Task 1 spike (`src/spike.ts`, live-pinned protocol facts):
  *
@@ -64,6 +68,7 @@ import { spawn, execFile } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { delimiter, resolve, join } from "node:path";
+import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
 import { prepareHermesNativePlugin } from "@pgmi-builds/superd-hub/foreign-native";
 import { createInterface } from "node:readline";
@@ -166,6 +171,28 @@ export function loadHermesDotEnv() {
         return {};
     }
 }
+export function resolveHermesTransportMode(dotEnv = {}) {
+    const raw = (process.env.SUPERD_HERMES_TRANSPORT?.trim() || dotEnv.SUPERD_HERMES_TRANSPORT?.trim() || "auto").toLowerCase();
+    return raw === "stdio" || raw === "attach" ? raw : "auto";
+}
+/** The hermes-side refusal that makes stdio impossible while a resident
+ *  gateway holds the home: `... is owned by a running gateway; attach to it
+ *  instead` (hermes' own exit text, observed 2026-11-02 on PC + dev3). */
+const GATEWAY_OWNERSHIP_REFUSAL = /owned by a running gateway/i;
+/** Process-wide sticky: a resident gateway owns `~/.hermes`; every future
+ *  spawn in this process (any client) skips the doomed stdio attempt. */
+let gatewayOwnershipDetected = false;
+/** Test-only: clear the sticky auto-attach flip between tests. */
+export function resetHermesAutoAttachForTests() {
+    gatewayOwnershipDetected = false;
+}
+/** The WS-attach bridge script, shipped at the package root (`bridge/`). */
+export function hermesBridgeScriptPath() {
+    const path = fileURLToPath(new URL("../bridge/hermes-ws-bridge.py", import.meta.url));
+    if (!existsSync(path))
+        throw new Error(`hermes ws-attach bridge missing: ${path}`);
+    return path;
+}
 function asRecord(value) {
     if (value === null || typeof value !== "object" || Array.isArray(value))
         return null;
@@ -196,6 +223,8 @@ export class HermesGatewayClient {
     #readySettled = false;
     /** Pre-ready respawn attempts (full-lazy ruling: bounded at SPAWN_ATTEMPTS). */
     #spawnAttempts = 0;
+    /** Transport used by the CURRENT child attempt (drives the auto-attach flip). */
+    #transport = "stdio";
     #readyTimer = null;
     #killTimer = null;
     #failure = null;
@@ -244,6 +273,13 @@ export class HermesGatewayClient {
         const attempt = this.#spawnAttempts;
         const root = resolveHermesRoot();
         const python = resolveHermesPython(root);
+        const dotEnv = loadHermesDotEnv();
+        const mode = resolveHermesTransportMode(dotEnv);
+        // auto: stdio first; once a resident gateway's ownership refusal is seen,
+        // the whole process flips to attach (sticky — later clients skip the
+        // doomed stdio attempt entirely). Explicit stdio/attach never flip.
+        const transport = mode === "attach" || (mode === "auto" && gatewayOwnershipDetected) ? "attach" : "stdio";
+        this.#transport = transport;
         const env = { ...(opts.env ?? process.env) };
         if (this.#hubSession !== undefined)
             env.SUPERD_HUB_SESSION = this.#hubSession;
@@ -253,7 +289,7 @@ export class HermesGatewayClient {
         // 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())) {
+        for (const [dotKey, dotValue] of Object.entries(dotEnv)) {
             if (env[dotKey] === undefined || env[dotKey] === "")
                 env[dotKey] = dotValue;
         }
@@ -266,12 +302,11 @@ export class HermesGatewayClient {
         delete env.HERMES_CWD;
         delete env.HERMES_TUI_GATEWAY_URL;
         delete env.HERMES_TUI_SIDECAR_URL;
-        this.#child = gatewayFactory({
-            command: python,
-            args: ["-m", "tui_gateway.entry"],
-            cwd: opts.cwd ?? root,
-            env,
-        });
+        const childSpec = transport === "attach"
+            ? { command: python, args: [hermesBridgeScriptPath()], cwd: opts.cwd ?? root, env }
+            : { command: python, args: ["-m", "tui_gateway.entry"], cwd: opts.cwd ?? root, env };
+        this.#trace(`spawn transport=${transport} cmd=${childSpec.command} args=${JSON.stringify(childSpec.args)}`);
+        this.#child = gatewayFactory(childSpec);
         // The ready gate is created ONCE and survives every pre-ready respawn —
         // replacing it would orphan callers awaiting the earlier object.
         if (this.#readyPromise === null) {
@@ -283,7 +318,9 @@ export class HermesGatewayClient {
             // surface an unhandledRejection when this gate rejects (timeout/close).
             this.#readyPromise.catch(() => { });
         }
-        const readyTimeoutMs = opts.readyTimeoutMs ?? READY_TIMEOUT_MS;
+        // attach: gateway discovery (5s) or an idle-exit daemon start (ensure
+        // timeout 30s) can exceed the stdio boot budget before gateway.ready.
+        const readyTimeoutMs = opts.readyTimeoutMs ?? (transport === "attach" ? 45_000 : READY_TIMEOUT_MS);
         this.#readyTimer = setTimeout(() => {
             this.#preReadyFailure(new Error(`timed out waiting for gateway.ready after ${readyTimeoutMs}ms (spawn attempt ${attempt}/${HERMES_SPAWN_ATTEMPTS}); stderr tail:\n${this.#stderrTail()}`));
         }, readyTimeoutMs);
@@ -924,6 +961,10 @@ export class HermesGatewayClient {
             this.#fail(error);
             return;
         }
+        if (!gatewayOwnershipDetected && this.#transport === "stdio" && GATEWAY_OWNERSHIP_REFUSAL.test(error.message)) {
+            gatewayOwnershipDetected = true;
+            this.#trace("gateway ownership refusal in spawn failure — auto-attach engaged for future spawns");
+        }
         if (this.#spawnAttempts < HERMES_SPAWN_ATTEMPTS) {
             this.#trace(`pre-ready failure on spawn attempt ${this.#spawnAttempts}/${HERMES_SPAWN_ATTEMPTS} — respawning: ${error.message.slice(0, 200)}`);
             this.#discardChildQuietly();
@@ -1019,6 +1060,10 @@ export class HermesGatewayClient {
         if (this.#stderrLines.length > STDERR_RING)
             this.#stderrLines.shift();
         this.#trace(`stderr: ${trimmed.slice(0, 240)}`);
+        if (!gatewayOwnershipDetected && this.#transport === "stdio" && GATEWAY_OWNERSHIP_REFUSAL.test(trimmed)) {
+            gatewayOwnershipDetected = true;
+            this.#trace("gateway ownership refusal on stderr — auto-attach engaged for future spawns");
+        }
     }
     #stderrTail() {
         return this.#stderrLines.slice(-20).join("\n");

package/agent-hermes/dist/index.js

@@ -364,9 +364,18 @@ export class HermesProvider extends Service {
             throw new Error(`cannot resume session "${id}": no Hermes gateway session is recorded for this Dash session id`);
         }
         const persistence = this.requirePersistence("resume");
-        if ((record.gatewayStoredSessionId === null || record.gatewayStoredSessionId === undefined)
-            && (await readStoredEvents(persistence, id, options.signal)).some(event => event.type === "turn/start" || event.type === "user/message" || event.type === "assistant/message")) {
-            throw new Error(`cannot resume session "${id}": no durable gateway session id is recorded (this record predates durable-id capture; re-create the session)`);
+        if (record.gatewayStoredSessionId === null || record.gatewayStoredSessionId === undefined) {
+            const events = await readStoredEvents(persistence, id, options.signal);
+            if (events.some(event => event.type === "turn/start" || event.type === "user/message" || event.type === "assistant/message")) {
+                if (events.some(event => event.type === "assistant/message")) {
+                    // Completed turns but no durable id: a record from before the adapter captured ids.
+                    throw new Error(`cannot resume session "${id}": no durable gateway session id is recorded (this record predates durable-id capture; re-create the session)`);
+                }
+                // Turn content with no assistant output and no durable id: the gateway never produced a
+                // session for this record (cold-start failure — e.g. the native home was owned by a
+                // running gateway). Nothing in it reached the model, so resume has nothing to attach to.
+                throw new Error(`cannot resume session "${id}": no durable gateway session id is recorded (the Hermes gateway failed before this session was created; its recorded turn never reached the model — re-create the session)`);
+            }
         }
         // Spawn cwd comes from the recorded pairing — re-realpath and re-verify.
         const spawnCwd = validatedCwd(record.cwd);

package/agent-hermes/dist/world-plugin.js

@@ -46,6 +46,7 @@ export function apply(ctx) {
         key: KEY,
         adapterPkg: '@pgmi-builds/agent-hermes',
         worldHome,
+        host: ctx,
     });
     const world = ownWorld(ctx, { key: KEY, label: 'Hermes' }, (ownerId) => spawnWorld({
         appName: `superd-${KEY}`,

package/agent-hermes/package.json

@@ -26,13 +26,13 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-agent-presets": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-llm": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-scope": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-session": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-session-persistence": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-typert-protocol": ">=0.2.2-0 <1.0.0-0",
+    "@deepseek-ai/dsh-agent": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-agent-presets": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-llm": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-scope": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-session": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-session-persistence": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-typert-protocol": ">=0.2.0-0 <1.0.0-0",
     "@pgmi-builds/superd-hub": "*"
   },
   "peerDependenciesMeta": {

package/agent-omp/dist/world-plugin.js

@@ -62,6 +62,7 @@ export function apply(ctx) {
         key: KEY,
         adapterPkg: '@pgmi-builds/agent-omp',
         worldHome,
+        host: ctx,
     });
     const world = ownWorld(ctx, { key: KEY, label: 'OMP' }, (ownerId) => spawnWorld({
         appName: `superd-${KEY}`,

package/agent-omp/package.json

@@ -34,14 +34,14 @@
   "dependencies": {},
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-agent-presets": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-llm": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-scope": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-session": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-session-persistence": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-typert-protocol": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-home-paths": ">=0.2.2-0 <1.0.0-0",
+    "@deepseek-ai/dsh-agent": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-agent-presets": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-llm": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-scope": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-session": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-session-persistence": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-typert-protocol": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-home-paths": ">=0.2.0-0 <1.0.0-0",
     "@pgmi-builds/superd-hub": "*"
   },
   "peerDependenciesMeta": {

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

@@ -79,6 +79,7 @@ export function apply(ctx) {
         key: KEY,
         adapterPkg: '@pgmi-builds/agent-omp-sdk',
         worldHome,
+        host: ctx,
     });
     const world = ownWorld(ctx, { key: KEY, label: 'OMP (SDK)' }, (ownerId) => spawnWorld({
         appName: `superd-${KEY}`,

package/agent-omp-sdk/package.json

@@ -26,14 +26,14 @@
   "dependencies": {},
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-agent-presets": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-llm": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-scope": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-session": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-session-persistence": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-typert-protocol": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-home-paths": ">=0.2.2-0 <1.0.0-0",
+    "@deepseek-ai/dsh-agent": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-agent-presets": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-llm": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-scope": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-session": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-session-persistence": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-typert-protocol": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-home-paths": ">=0.2.0-0 <1.0.0-0",
     "@pgmi-builds/superd-hub": "*"
   },
   "peerDependenciesMeta": {

package/agent-pi/dist/world-plugin.js

@@ -43,6 +43,7 @@ export function apply(ctx) {
         key: KEY,
         adapterPkg: '@pgmi-builds/agent-pi',
         worldHome,
+        host: ctx,
     });
     const world = ownWorld(ctx, { key: KEY, label: 'Pi' }, (ownerId) => spawnWorld({
         appName: `superd-${KEY}`,

package/agent-pi/package.json

@@ -27,13 +27,13 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-agent-presets": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-llm": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-scope": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-session": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-session-persistence": ">=0.2.2-0 <1.0.0-0",
-    "@deepseek-ai/dsh-typert-protocol": ">=0.2.2-0 <1.0.0-0",
+    "@deepseek-ai/dsh-agent": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-agent-presets": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-llm": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-scope": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-session": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-session-persistence": ">=0.2.0-0 <1.0.0-0",
+    "@deepseek-ai/dsh-typert-protocol": ">=0.2.0-0 <1.0.0-0",
     "@pgmi-builds/superd-hub": "*"
   },
   "peerDependenciesMeta": {