@openagents-org/agent-launcher 0.2.180 → 0.2.182

package/src/adapters/aider.js

@@ -35,7 +35,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execSync, spawn } = require('child_process');
+const { execSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn, resolveWslBinary } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { whichBinary, getEnhancedEnv, aiderBinDirs } = require('../paths');
@@ -262,7 +266,7 @@ class AiderAdapter extends BaseAdapter {
     // PATH (nvm/fnm/volta/homebrew + the Aider install dirs added to paths.js)
     // — covers the GUI/daemon "not on PATH" case for uv-tool / pipx / pip-user
     // installs.
-    const resolved = whichBinary('aider');
+    const resolved = whichBinary('aider', { allowWsl: false });
     if (resolved) return resolved;
 
     // Explicit fallback over every real install dir (XDG bin, XDG_DATA_HOME/../
@@ -274,7 +278,10 @@ class AiderAdapter extends BaseAdapter {
         if (fs.existsSync(c)) return c;
       }
     }
-    return null;
+    // Nothing native anywhere. Last of all, look inside WSL: a CLI the user
+    // installed in their distro is a real install, and the marked path it comes
+    // back as is what the spawn bridge in ../wsl turns into a wsl.exe run.
+    return resolveWslBinary('aider');
   }
 
   // ------------------------------------------------------------------

package/src/adapters/amp.js

@@ -25,7 +25,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execSync, spawn } = require('child_process');
+const { execSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn, resolveWslBinary } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { buildOpenclawSystemPrompt } = require('./workspace-prompt');
@@ -123,7 +127,7 @@ class AmpAdapter extends BaseAdapter {
     // the Amp installer's ~/.amp/bin. This is what makes detection work inside
     // a GUI- or daemon-spawned process that did NOT inherit the user's
     // interactive shell PATH (the common "installed but not found" case).
-    const resolved = whichBinary('amp');
+    const resolved = whichBinary('amp', { allowWsl: false });
     if (resolved) return resolved;
 
     // Tier 2: explicit known install dirs as a last resort. The official
@@ -145,7 +149,10 @@ class AmpAdapter extends BaseAdapter {
       if (c && fs.existsSync(c)) return c;
     }
 
-    return null;
+    // Nothing native anywhere. Last of all, look inside WSL: a CLI the user
+    // installed in their distro is a real install, and the marked path it comes
+    // back as is what the spawn bridge in ../wsl turns into a wsl.exe run.
+    return resolveWslBinary('amp');
   }
 
   /**
@@ -181,6 +188,7 @@ class AmpAdapter extends BaseAdapter {
       endpoint: this.endpoint,
       token: this.token,
       mode: this._mode,
+      model: this.modelLabel(),
       disabledModules: this.disabledModules,
       browserEnabled,
       ...this.pinnedPromptOpts(channelName),

package/src/adapters/antigravity.js

@@ -17,7 +17,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execSync, spawn } = require('child_process');
+const { execSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn, resolveWslBinary } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { whereBinary } = require('../paths');
@@ -131,7 +135,10 @@ class AntigravityAdapter extends BaseAdapter {
     for (const c of candidates) {
       if (fs.existsSync(c)) return c;
     }
-    return null;
+    // Nothing native anywhere. Last of all, look inside WSL: a CLI the user
+    // installed in their distro is a real install, and the marked path it comes
+    // back as is what the spawn bridge in ../wsl turns into a wsl.exe run.
+    return resolveWslBinary('agy');
   }
 
   /**
@@ -178,6 +185,7 @@ class AntigravityAdapter extends BaseAdapter {
       workspaceId: this.workspaceId,
       channelName,
       mode: this._mode,
+      model: this.modelLabel(),
       decisionLog: pinned.decisionLog ? { ...pinned.decisionLog, writeAccess: false } : null,
       glossary: pinned.glossary ? { ...pinned.glossary, writeAccess: false } : null,
     });

package/src/adapters/base.js

@@ -60,6 +60,18 @@ const CURSOR_RESUME_MAX_AGE_MS = 24 * 60 * 60 * 1000;
 // heartbeat_failed up to the daemon. A success resets the streak immediately.
 const HEARTBEAT_ERROR_THRESHOLD = 2;
 
+/**
+ * Model variables whose name does not follow `<TYPE>_MODEL`. Only the ones an
+ * adapter really reads — see `modelLabel`, which tries `<TYPE>_MODEL` first
+ * and `LLM_MODEL` last, so nothing else needs an entry here.
+ */
+const MODEL_ENV_ALIASES = {
+  claude: ['ANTHROPIC_MODEL', 'CLAUDE_MODEL'],
+  gemini: ['GEMINI_MODEL', 'GOOGLE_GEMINI_MODEL'],
+  antigravity: ['ANTIGRAVITY_MODEL', 'AGY_MODEL'],
+  codex: ['CODEX_MODEL', 'OPENCLAW_MODEL'],
+};
+
 class BaseAdapter {
   /**
    * @param {object} opts
@@ -220,6 +232,40 @@ class BaseAdapter {
     }
   }
 
+  /**
+   * The model this agent is actually running on, for the workspace prompt.
+   *
+   * The one fact about itself an agent cannot look up. Asked "what model are
+   * you?", a CLI-driven agent answers from what its weights remember about
+   * their own training, which is a guess — and a user who had configured
+   * deepseek was told, confidently, "I am Claude, by Anthropic". We know the
+   * real answer: it is the id we hand the CLI.
+   *
+   * Resolution order is the same one the adapters spawn with: a model chosen
+   * in the workspace wins, then this agent type's own model variable, then the
+   * generic LLM_MODEL that the LLM-direct types and the daemon's model.set
+   * both write. Adapters that qualify the id further (OpenWorker prefixes it
+   * with the provider) override this and return exactly what they send.
+   *
+   * Null when nothing is configured — the CLI is then running its own default
+   * and we have nothing truthful to say about it. Better silent than wrong.
+   */
+  modelLabel() {
+    const fromWorkspace = String(this.workspaceModel || '').trim();
+    if (fromWorkspace) return fromWorkspace;
+    const type = String(this.agentType || '').toUpperCase().replace(/[^A-Z0-9]+/g, '_');
+    const candidates = [
+      ...(type ? [`${type}_MODEL`] : []),
+      ...(MODEL_ENV_ALIASES[this.agentType] || []),
+      'LLM_MODEL',
+    ];
+    for (const key of candidates) {
+      const value = String((this.agentEnv && this.agentEnv[key]) || '').trim();
+      if (value) return value;
+    }
+    return null;
+  }
+
   async run() {
     this._running = true;
 

package/src/adapters/claude.js

@@ -14,7 +14,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execSync, spawn } = require('child_process');
+const { execSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { formatAttachmentsForPrompt, SESSION_DEFAULT_RE, generateSessionTitle, redactSecrets } = require('./utils');
@@ -462,6 +466,7 @@ class ClaudeAdapter extends BaseAdapter {
       workspaceId: this.workspaceId,
       channelName,
       mode: this._mode,
+      model: this.modelLabel(),
       browserEnabled,
       toolMode: this.toolMode,
       decisionLog,

package/src/adapters/cline.js

@@ -26,7 +26,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execSync, execFile, spawn } = require('child_process');
+const { execSync, execFile } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { formatAttachmentsForPrompt, SESSION_DEFAULT_RE, generateSessionTitle } = require('./utils');

package/src/adapters/codebuddy.js

@@ -49,7 +49,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execFileSync, spawn } = require('child_process');
+const { execFileSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { formatAttachmentsForPrompt, SESSION_DEFAULT_RE, generateSessionTitle } = require('./utils');
@@ -824,6 +828,7 @@ class CodeBuddyAdapter extends BaseAdapter {
       workspaceId: this.workspaceId,
       channelName: channel,
       mode: this._mode,
+      model: this.modelLabel(),
       browserEnabled: await this.getBrowserEnabled(),
       toolMode: 'mcp',
     });

package/src/adapters/codex.js

@@ -15,7 +15,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execSync, spawn } = require('child_process');
+const { execSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn, resolveWslBinary } = require('../wsl');
 const http = require('http');
 const https = require('https');
 
@@ -165,7 +169,10 @@ class CodexAdapter extends BaseAdapter {
       if (fs.existsSync(c)) return c;
     }
 
-    return null;
+    // Nothing native anywhere. Last of all, look inside WSL: a CLI the user
+    // installed in their distro is a real install, and the marked path it comes
+    // back as is what the spawn bridge in ../wsl turns into a wsl.exe run.
+    return resolveWslBinary('codex');
   }
 
   _buildSystemContext(channelName) {
@@ -176,6 +183,7 @@ class CodexAdapter extends BaseAdapter {
       endpoint: this.endpoint,
       token: this.token,
       mode: this._mode,
+      model: this.modelLabel(),
       disabledModules: this.disabledModules,
       ...this.pinnedPromptOpts(channelName),
     });

package/src/adapters/commandcode.js

@@ -45,7 +45,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execFileSync, spawn } = require('child_process');
+const { execFileSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { formatAttachmentsForPrompt, SESSION_DEFAULT_RE, generateSessionTitle } = require('./utils');

package/src/adapters/copilot-stream-parser.js

@@ -168,17 +168,50 @@ function parseLine(line) {
  * When real samples are available, extend THIS table only.
  */
 const EVENT_KIND_BY_TYPE = {
-  // session lifecycle / identity (kind only mapped when an id is also present)
+  // ── CAPTURED from a real authenticated run (CLI v1.0.83) ────────────────
+  // Every name in this block was read off a live JSONL stream, not inferred.
+  // The payload of each sits under `data` (see the `data` unwrap in
+  // classifyEvent) — except `result`, which is flat.
+  //
+  // The full type list observed in one turn: assistant.turn_start,
+  // assistant.reasoning_delta, assistant.reasoning, assistant.message_start,
+  // assistant.message_delta, assistant.turn_end, assistant.idle,
+  // model.call_start, model.call_finished, session.auto_mode_resolved,
+  // session.usage_checkpoint, session.tools_updated, session.skills_loaded,
+  // session.mcp_servers_loaded, session.mcp_server_status_changed,
+  // session.custom_agents_updated, user.message, result.
+  //
+  // The ones with no entry here are deliberate: they carry no content the
+  // workspace shows (lifecycle bookkeeping, or `user.message`, which is our
+  // own prompt echoed back). They degrade to `unknown`, which is logged and
+  // ignored — mapping them would put noise in the chat.
+  'assistant.message_delta': 'text_delta',   // data.deltaContent — THE answer
+  'assistant.reasoning': 'reasoning',        // data.content — ONE whole block
+  result: 'done',                            // flat: sessionId, exitCode, usage
+  // NOT mapped on purpose: `assistant.reasoning_delta`. Copilot streams at
+  // TOKEN granularity — 81 deltas for one short thought in the captured turn —
+  // and every adapter here narrates progress in whole blocks (claude sends
+  // `block.text`, codex `item.text`). Mapping the deltas posted one chat
+  // message per token: a column of "How" / "can" / "I" / "help" / "?" in the
+  // workspace. `assistant.reasoning` carries the same content as a single
+  // block afterwards, so that is what gets narrated.
+  'session.usage_checkpoint': 'usage',
+  'session.auto_mode_resolved': 'usage',     // data.chosenModel under Auto
+  'model.call_finished': 'usage',
+
+  // ── INFERRED — no live sample yet ───────────────────────────────────────
+  // The captured turn was a plain greeting, so no tool/file/shell/permission
+  // event appeared in it. The names below predate that capture and are kept
+  // as a net: they cost nothing (the real names above are matched first) and
+  // an unrecognized event is logged, never rendered. Replace them the moment
+  // a tool-using turn is captured — do not add more guesses.
   session: 'session', 'session.created': 'session', 'session.started': 'session',
   session_started: 'session', thread: 'session', 'thread.started': 'session',
-  // streaming assistant text (qualified names only — no bare 'delta'/'token')
   'text.delta': 'text_delta', text_delta: 'text_delta',
   'message.delta': 'text_delta', 'assistant.delta': 'text_delta',
   content_block_delta: 'text_delta',
-  // final assistant text (qualified/explicit names only — no bare 'message')
   text: 'text', 'message.completed': 'text', 'assistant.message': 'text',
   assistant: 'text', completion: 'text', agent_message: 'text',
-  // reasoning / status narration
   reasoning: 'reasoning', thinking: 'reasoning', thought: 'reasoning',
   status: 'reasoning', progress: 'reasoning',
   // tool calls
@@ -250,7 +283,14 @@ function classifyEvent(obj) {
     const itemKind = itemType ? EVENT_KIND_BY_TYPE[itemType.toLowerCase()] : undefined;
     if (itemKind) kind = itemKind;
   }
-  const src = item || obj;
+  // Copilot puts every event's payload under `data`, with the envelope
+  // (type/id/timestamp/parentId) on the outside — so reading fields off the
+  // top level found nothing and the answer came back empty. `result` is the
+  // one exception: it is flat, and falls through to `obj` here.
+  const data = (obj.data && typeof obj.data === 'object' && !Array.isArray(obj.data))
+    ? obj.data
+    : null;
+  const src = item || data || obj;
 
   switch (kind) {
     case 'session': {
@@ -261,7 +301,9 @@ function classifyEvent(obj) {
       return { kind: 'session', sessionId };
     }
     case 'text_delta': {
-      const text = _coerceText(src.delta) ?? _coerceText(src.text) ?? _coerceText(src.content) ?? _coerceText(src);
+      // `deltaContent` is Copilot's own field name, verified on v1.0.83.
+      const text = _coerceText(src.deltaContent) ?? _coerceText(src.delta)
+        ?? _coerceText(src.text) ?? _coerceText(src.content) ?? _coerceText(src);
       return { kind: 'text_delta', text: text || '' };
     }
     case 'text': {
@@ -269,7 +311,8 @@ function classifyEvent(obj) {
       return { kind: 'text', text: text || '' };
     }
     case 'reasoning': {
-      const text = _coerceText(src.text) ?? _coerceText(src.reasoning) ?? _coerceText(src.message)
+      const text = _coerceText(src.deltaContent) ?? _coerceText(src.text)
+        ?? _coerceText(src.reasoning) ?? _coerceText(src.message)
         ?? _coerceText(src.content) ?? _firstString(src, ['status', 'label', 'title']) ?? '';
       return { kind: 'reasoning', text };
     }
@@ -313,7 +356,14 @@ function classifyEvent(obj) {
     }
     case 'done': {
       const status = _firstString(src, ['status', 'reason', 'result']) || 'completed';
-      return { kind: 'done', status };
+      // The `result` frame is also where the real session id finally shows up
+      // — there is no session event earlier in the stream. Carrying it here is
+      // what lets the next turn resume instead of starting over. Read from the
+      // top level too: `result` is flat, so `src` is already `obj`, but an
+      // `item`-wrapped variant would not be.
+      const sessionId = _firstString(src, ['sessionId', 'session_id'])
+        ?? _firstString(obj, ['sessionId', 'session_id']);
+      return sessionId ? { kind: 'done', status, sessionId } : { kind: 'done', status };
     }
     case 'error': {
       const err = (src.error && typeof src.error === 'object') ? src.error : src;

package/src/adapters/copilot.js

@@ -38,7 +38,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execSync, execFileSync, spawn } = require('child_process');
+const { execSync, execFileSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { buildOpenclawSystemPrompt } = require('./workspace-prompt');
@@ -326,6 +330,7 @@ class CopilotAdapter extends BaseAdapter {
       endpoint: this.endpoint,
       token: this.token,
       mode: this._mode,
+      model: this.modelLabel(),
       disabledModules: this.disabledModules,
       ...this.pinnedPromptOpts(channelName),
     });
@@ -606,10 +611,14 @@ class CopilotAdapter extends BaseAdapter {
             }
             break;
           case 'text_delta':
-            // Streamed interim text is shown live as `thinking`; the final
-            // `text` event (if any) is the authoritative answer.
+            // Accumulate only — never narrate. These deltas ARE the final
+            // answer being streamed a token at a time (Copilot's
+            // `assistant.message_delta`), and the answer is posted in full
+            // when the turn ends. Sending each one as `thinking` published the
+            // reply twice: once as a column of one-word messages, then again
+            // whole.
             if (sawToolSinceText) { finalParts.length = 0; deltaBuf = ''; sawToolSinceText = false; }
-            if (ev.text) { deltaBuf += ev.text; try { await this.sendThinking(channel, ev.text); } catch {} }
+            if (ev.text) deltaBuf += ev.text;
             break;
           case 'text':
             // A complete message supersedes the deltas streamed for this block.
@@ -655,6 +664,13 @@ class CopilotAdapter extends BaseAdapter {
             errorEvent = errorEvent || { message: ev.message, code: ev.code };
             break;
           case 'done':
+            // Copilot reports its session id only in the terminal `result`
+            // frame — no session event precedes it — so this is the one place
+            // a resumable id can be captured.
+            if (ev.sessionId && this._channelSessions[channel] !== ev.sessionId) {
+              this._channelSessions[channel] = ev.sessionId;
+              this._saveSessions();
+            }
             break;
           case 'unknown':
             // Preserve a redacted diagnostic; never crash the task.

package/src/adapters/cursor.js

@@ -12,7 +12,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execSync, spawn } = require('child_process');
+const { execSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { formatAttachmentsForPrompt, SESSION_DEFAULT_RE, generateSessionTitle } = require('./utils');

package/src/adapters/deepseek.js

@@ -47,7 +47,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execFileSync, spawn, execSync } = require('child_process');
+const { execFileSync, execSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { whichBinary, getEnhancedEnv } = require('../paths');

package/src/adapters/gemini.js

@@ -11,7 +11,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execSync, spawn } = require('child_process');
+const { execSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn, resolveWslBinary } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { whereBinary } = require('../paths');
@@ -183,7 +187,10 @@ class GeminiAdapter extends BaseAdapter {
       if (fs.existsSync(c)) return c;
     }
 
-    return null;
+    // Nothing native anywhere. Last of all, look inside WSL: a CLI the user
+    // installed in their distro is a real install, and the marked path it comes
+    // back as is what the spawn bridge in ../wsl turns into a wsl.exe run.
+    return resolveWslBinary('gemini');
   }
 
   // The Gemini CLI refuses to run non-interactively unless an auth method is
@@ -232,6 +239,7 @@ class GeminiAdapter extends BaseAdapter {
       workspaceId: this.workspaceId,
       channelName,
       mode: this._mode,
+      model: this.modelLabel(),
       decisionLog: pinned.decisionLog ? { ...pinned.decisionLog, writeAccess: false } : null,
       glossary: pinned.glossary ? { ...pinned.glossary, writeAccess: false } : null,
     });

package/src/adapters/goose.js

@@ -28,7 +28,11 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const crypto = require('crypto');
-const { spawn, execSync, execFileSync } = require('child_process');
+const { execSync, execFileSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { GooseStreamParser, classifyGooseError, redactSecrets } = require('./goose-stream');
@@ -249,7 +253,7 @@ class GooseAdapter extends BaseAdapter {
 
   _buildSystemPrompt(channelName) {
     const pinned = this.pinnedPromptOpts(channelName);
-    let prompt = buildWorkspaceIdentity(this.agentName, this.workspaceId, channelName, this._mode)
+    let prompt = buildWorkspaceIdentity(this.agentName, this.workspaceId, channelName, this._mode, 'mcp', this.modelLabel())
       + buildCollaborationPrompt()
       + buildModePrompt(this._mode)
       + buildPinnedSections({

package/src/adapters/hermes.js

@@ -17,7 +17,11 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { execSync, spawn } = require('child_process');
+const { execSync } = require('child_process');
+// spawn() here is the WSL bridge from ../wsl: same signature as
+// child_process.spawn, and a straight pass-through unless the resolved CLI
+// lives on the other side of the Windows/WSL boundary.
+const { spawn, bridgeSpawn } = require('../wsl');
 
 const BaseAdapter = require('./base');
 const { buildOpenclawSystemPrompt } = require('./workspace-prompt');
@@ -71,9 +75,6 @@ class HermesAdapter extends BaseAdapter {
 
   _findHermesBinary() {
     const home = os.homedir();
-    // Reset each call. When set, this._hermesBin is a path INSIDE WSL and must
-    // be invoked as `wsl -e <path> …` rather than spawned natively.
-    this._hermesViaWsl = false;
 
     // Tier 1: PATH (enriched env so we see the dirs the launcher adds; a fresh
     // install updates the user PATH, which the running daemon won't pick up).
@@ -112,40 +113,13 @@ class HermesAdapter extends BaseAdapter {
       if (fs.existsSync(c)) return c;
     }
 
-    // Tier 3: Deep scan of every known bin dir.
+    // Tier 3: Deep scan of every known bin dir — which ends inside WSL when
+    // nothing native turned up, so a hermes the user set up in their distro is
+    // found here and comes back marked for the ../wsl spawn bridge. Native
+    // Windows (Tiers 1-2) is still preferred.
     const viaWhich = whichBinary('hermes');
     if (viaWhich) return viaWhich;
 
-    // Tier 4 (Windows only): fall back to a WSL install if one exists. Native
-    // Windows (Tiers 1-3) is preferred, but a user who set hermes up inside
-    // WSL2 still works — resolve its absolute in-WSL path; _runHermes then
-    // invokes it as `wsl -e <path> …`.
-    if (IS_WINDOWS) {
-      const wslPath = this._resolveWslHermes();
-      if (wslPath) {
-        this._hermesViaWsl = true;
-        return wslPath;
-      }
-    }
-
-    return null;
-  }
-
-  /**
-   * Resolve hermes's absolute path inside the default WSL distro, or null.
-   * Uses a login shell (`bash -lc`) so the installer's PATH additions
-   * (~/.local/bin) are visible. Returns an absolute Linux path like
-   * /home/<user>/.local/bin/hermes.
-   */
-  _resolveWslHermes() {
-    if (!IS_WINDOWS) return null;
-    try {
-      const out = execSync('wsl.exe -e bash -lc "command -v hermes"', {
-        encoding: 'utf-8', timeout: 8000, windowsHide: true,
-      }).trim();
-      const p = out.split(/\r?\n/).map((s) => s.trim()).find(Boolean);
-      if (p && p.startsWith('/')) return p;
-    } catch {}
     return null;
   }
 
@@ -240,6 +214,7 @@ class HermesAdapter extends BaseAdapter {
         endpoint: this.endpoint,
         token: this.token,
         mode: this._mode,
+        model: this.modelLabel(),
         disabledModules: this.disabledModules,
         ...this.pinnedPromptOpts(channelName),
       }),
@@ -314,23 +289,17 @@ class HermesAdapter extends BaseAdapter {
 
     const env = { ...(this.agentEnv || process.env) };
 
-    // On Windows hermes lives inside WSL: invoke `wsl -e <wsl-hermes-path> …`.
-    // `-e` runs the binary directly (no shell), so every arg — including the
-    // multi-line prompt in `-q` — passes through verbatim with no quoting hazard.
-    // hermes then uses its own config (~/.hermes inside WSL) for model/keys.
-    let spawnBin = this._hermesBin;
-    let spawnArgs = args;
-    if (this._hermesViaWsl) {
-      spawnBin = 'wsl.exe';
-      spawnArgs = ['-e', this._hermesBin, ...args];
-    }
-
-    const proc = spawn(spawnBin, spawnArgs, {
+    // A hermes that lives inside WSL is rewritten to `wsl.exe -e <path> …` by
+    // the bridge in ../wsl (which also forces detached off, there being no
+    // process group on the far side, and hands the distro the agent's env via
+    // WSLENV). hermes then uses its own config — ~/.hermes inside the distro —
+    // for model and keys. Nothing to special-case here.
+    const proc = spawn(this._hermesBin, args, {
       env,
       stdio: ['ignore', 'pipe', 'pipe'],
-      // No process group on Windows / WSL (can't signal a group); windowsHide
-      // keeps the wsl.exe console from flashing up.
-      detached: !IS_WINDOWS && !this._hermesViaWsl,
+      // No process group on Windows (can't signal one); windowsHide keeps a
+      // console from flashing up.
+      detached: !IS_WINDOWS,
       windowsHide: true,
     });
     this._channelProcesses[channelName] = proc;
@@ -469,9 +438,10 @@ class HermesAdapter extends BaseAdapter {
 
     const { execFileSync } = require('child_process');
     const run = (args) => {
-      const spawnBin = probe._hermesViaWsl ? 'wsl.exe' : bin;
-      const spawnArgs = probe._hermesViaWsl ? ['-e', bin, ...args] : args;
-      execFileSync(spawnBin, spawnArgs, {
+      // Same rewrite the spawn bridge does, for the one call here that needs to
+      // be synchronous: an in-distro hermes is only reachable through wsl.exe.
+      const { file, args: argv } = bridgeSpawn(bin, args);
+      execFileSync(file, argv, {
         stdio: 'ignore',
         timeout: 20000,
         windowsHide: true,