super-dsh 0.3.4-a → 0.3.4-c

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

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

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

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

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

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

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

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

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

@@ -2,10 +2,11 @@
  * HermesGatewayClient — the reusable TUI-gateway client seam (AW-H Task 3).
  *
  * One client = one gateway child bound to one gateway session. Transports:
- * `stdio` (legacy default) spawns `python -m tui_gateway.entry` (owns the
- * Hermes home); `attach` (SUPERD_HERMES_TRANSPORT=attach) spawns the
+ * `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. Spawn/env/ready patterns
+ * 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):
  *
@@ -170,20 +171,20 @@ export function loadHermesDotEnv() {
         return {};
     }
 }
-/** Gateway child transport. `stdio` = the legacy in-child `tui_gateway.entry`
- *  server (owns the Hermes home exclusively). `attach` = the WS-attach bridge
- *  (`bridge/hermes-ws-bridge.py`): frames ride the profile's canonical gateway
- *  WebSocket via `hermes_cli.gateway_client.connect_gateway`, which attaches
- *  to the running owner or starts an idle-exit one — REQUIRED whenever the
- *  user's native Hermes gateway already owns `~/.hermes` (2026-11-02: every
- *  stdio spawn died with `[gateway-exit] refused: ... owned by a running
- *  gateway`, and the reserved-turn failure window corrupted session logs).
- *  Selection: `SUPERD_HERMES_TRANSPORT` process env wins, then the native
- *  `~/.hermes/.env` key (hot-editable without touching the host process),
- *  else `stdio`. Unknown values fall back to `stdio`. */
-export function resolveHermesTransport(dotEnv = {}) {
-    const raw = process.env.SUPERD_HERMES_TRANSPORT?.trim() || dotEnv.SUPERD_HERMES_TRANSPORT?.trim() || "stdio";
-    return raw === "attach" ? "attach" : "stdio";
+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() {
@@ -222,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;
@@ -271,7 +274,12 @@ export class HermesGatewayClient {
         const root = resolveHermesRoot();
         const python = resolveHermesPython(root);
         const dotEnv = loadHermesDotEnv();
-        const transport = resolveHermesTransport(dotEnv);
+        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;
@@ -953,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();
@@ -1048,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/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-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-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-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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-dsh",
-  "version": "0.3.4-a",
+  "version": "0.3.4-c",
   "description": "Super D for the DeepSeek Harness (DSH) — 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",

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

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

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

@@ -23,6 +23,10 @@ export interface ProvisionWorldOptions {
     worldHome: string;
     /** Profile directory name under `<worldHome>/profiles`. Default `'web'`. */
     profileName?: string;
+    /** Host surface (the caller's ctx0 context) — carries `profileContext` for CTX0 mirrors. */
+    host?: {
+        get(name: string): unknown;
+    };
 }
 /**
  * Provision one world's nested profile (idempotent: rewrites profile files,

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

@@ -104,6 +104,36 @@ function resolveHostPackageDir(spec) {
     }
     throw new Error(`super-dsh: cannot resolve ${spec} from the running host (set SUPERD_DSH_ANCHOR)`);
 }
+/**
+ * Copy the CTX0 profile patch's `ui-settings-general` row (id..next-row) verbatim
+ * into a world's patch template. Best-effort: no CTX0 facts or no row → no lines.
+ */
+function mirrorCtx0SettingsGeneralRow(host) {
+    try {
+        const launcher = host?.get('profileContext');
+        if (launcher === undefined || typeof launcher.home !== 'string' || typeof launcher.name !== 'string')
+            return [];
+        const patch = readFileSync(join(launcher.home, 'profiles', launcher.name, 'cordis.patch.yml'), 'utf8');
+        const lines = patch.split('\n');
+        const start = lines.findIndex((line) => line.trim() === '- id: ui-settings-general');
+        if (start < 0)
+            return [];
+        let end = start + 1;
+        while (end < lines.length && !lines[end].startsWith('- id:'))
+            end++;
+        while (end > start && lines[end - 1].trim() === '')
+            end--;
+        return [
+            '# Mirror of the CTX0 profile patch (ui-settings-general): worlds project the',
+            '# same settings namespace values — the welcome-notice ack rides this row.',
+            ...lines.slice(start, end),
+            '',
+        ];
+    }
+    catch {
+        return []; // best-effort mirror: the notice degrades to today's behavior
+    }
+}
 /**
  * Provision one world's nested profile (idempotent: rewrites profile files,
  * re-links packages — lstat-safe against dangling links). Returns whether
@@ -171,6 +201,13 @@ function provisionWorldProfileUnchecked(opts) {
         '  disabled: true',
         '- id: client-hmr',
         '  disabled: true',
+        // Native settings namespaces project their values from the composition
+        // row, not a mutable store: without this mirror every world reads
+        // `ui-settings-general` as UNACKNOWLEDGED and the native Preview Notice
+        // mounts (its Continue cannot save — the read-back projects the same
+        // composition). Mirror the CTX0 row verbatim so worlds see what ctx0
+        // sees; upstream version bumps flow through automatically.
+        ...mirrorCtx0SettingsGeneralRow(opts.host),
         '',
     ].join('\n'));
     // @pgmi-builds links, plugin-add shape: adapter + hub into the world