agent-relay 2.1.3 → 2.1.5

package/dist/index.cjs

@@ -3147,13 +3147,13 @@ var init_logger = __esm({
 });
 
 // packages/config/dist/bridge-utils.js
-var import_node_child_process8, import_node_util3, execAsync2;
+var import_node_child_process9, import_node_util3, execAsync2;
 var init_bridge_utils = __esm({
   "packages/config/dist/bridge-utils.js"() {
     "use strict";
-    import_node_child_process8 = require("node:child_process");
+    import_node_child_process9 = require("node:child_process");
     import_node_util3 = require("node:util");
-    execAsync2 = (0, import_node_util3.promisify)(import_node_child_process8.exec);
+    execAsync2 = (0, import_node_util3.promisify)(import_node_child_process9.exec);
   }
 });
 
@@ -7441,11 +7441,11 @@ var require_core = __commonJS({
     Ajv2.ValidationError = validation_error_1.default;
     Ajv2.MissingRefError = ref_error_1.default;
     exports2.default = Ajv2;
-    function checkOptions(checkOpts, options, msg, log7 = "error") {
+    function checkOptions(checkOpts, options, msg, log8 = "error") {
       for (const key in checkOpts) {
         const opt = key;
         if (opt in options)
-          this.logger[log7](`${msg}: option ${key}. ${checkOpts[opt]}`);
+          this.logger[log8](`${msg}: option ${key}. ${checkOpts[opt]}`);
       }
     }
     function getSchEnv(keyRef) {
@@ -20852,7 +20852,7 @@ var require_node = __commonJS({
     var tty = require("tty");
     var util2 = require("util");
     exports2.init = init;
-    exports2.log = log7;
+    exports2.log = log8;
     exports2.formatArgs = formatArgs;
     exports2.save = save;
     exports2.load = load;
@@ -20987,7 +20987,7 @@ var require_node = __commonJS({
       }
       return (/* @__PURE__ */ new Date()).toISOString() + " ";
     }
-    function log7(...args) {
+    function log8(...args) {
       return process.stderr.write(util2.formatWithOptions(exports2.inspectOpts, ...args) + "\n");
     }
     function save(namespaces) {
@@ -31619,13 +31619,13 @@ var channel_membership_store_exports = {};
 __export(channel_membership_store_exports, {
   CloudChannelMembershipStore: () => CloudChannelMembershipStore
 });
-var log6, CloudChannelMembershipStore;
+var log7, CloudChannelMembershipStore;
 var init_channel_membership_store = __esm({
   "packages/daemon/dist/channel-membership-store.js"() {
     "use strict";
     init_esm();
     init_logger();
-    log6 = createLogger2("channel-membership-store");
+    log7 = createLogger2("channel-membership-store");
     CloudChannelMembershipStore = class {
       workspaceId;
       pool;
@@ -31655,7 +31655,7 @@ var init_channel_membership_store = __esm({
             member: row.member_id
           })).filter((row) => Boolean(row.channel && row.member));
         } catch (err) {
-          log6.error("Failed to load channel memberships from cloud DB", {
+          log7.error("Failed to load channel memberships from cloud DB", {
             error: err instanceof Error ? err.message : String(err)
           });
           return [];
@@ -31678,7 +31678,7 @@ var init_channel_membership_store = __esm({
             member: row.member_id
           })).filter((row) => Boolean(row.channel && row.member));
         } catch (err) {
-          log6.error("Failed to load channel memberships for agent from cloud DB", {
+          log7.error("Failed to load channel memberships for agent from cloud DB", {
             memberName,
             error: err instanceof Error ? err.message : String(err)
           });
@@ -31704,7 +31704,7 @@ var init_channel_membership_store = __esm({
           ON CONFLICT (channel_id, member_id) DO NOTHING
         `, [channelRowId, member]);
         } catch (err) {
-          log6.error("Failed to add channel member in cloud DB", {
+          log7.error("Failed to add channel member in cloud DB", {
             channel: normalized,
             member,
             error: err instanceof Error ? err.message : String(err)
@@ -31726,7 +31726,7 @@ var init_channel_membership_store = __esm({
         try {
           await this.pool.query("DELETE FROM channel_members WHERE channel_id = $1 AND member_id = $2", [channelRowId, member]);
         } catch (err) {
-          log6.error("Failed to remove channel member in cloud DB", {
+          log7.error("Failed to remove channel member in cloud DB", {
             channel: normalized,
             member,
             error: err instanceof Error ? err.message : String(err)
@@ -31766,7 +31766,7 @@ var init_channel_membership_store = __esm({
           LIMIT 1
         `, [this.workspaceId, channelId]);
           if (!result.rows[0]?.id) {
-            log6.warn("Channel not found in cloud DB for membership update", {
+            log7.warn("Channel not found in cloud DB for membership update", {
               workspaceId: this.workspaceId,
               channelId
             });
@@ -31774,7 +31774,7 @@ var init_channel_membership_store = __esm({
           }
           return result.rows[0].id;
         } catch (err) {
-          log6.error("Failed to look up channel row in cloud DB", {
+          log7.error("Failed to look up channel row in cloud DB", {
             channelId,
             error: err instanceof Error ? err.message : String(err)
           });
@@ -37398,6 +37398,7 @@ function createInjectionMetrics() {
 }
 function detectCliType(command) {
   const cmdLower = command.toLowerCase();
+  const cmdName = cmdLower.split(/[\s/\\]/).pop() || cmdLower;
   if (cmdLower.includes("gemini"))
     return "gemini";
   if (cmdLower.includes("codex"))
@@ -37410,6 +37411,8 @@ function detectCliType(command) {
     return "opencode";
   if (cmdLower.includes("cursor"))
     return "cursor";
+  if (cmdName === "agent" || cmdName === "cursor-agent")
+    return "cursor";
   return "other";
 }
 function getDefaultRelayPrefix() {
@@ -43430,9 +43433,9 @@ var AgentHealthMonitor = class extends import_events.EventEmitter {
    * Get memory and CPU usage for a process
    */
   async getProcessUsage(pid) {
-    const { execSync: execSync9 } = await import("child_process");
+    const { execSync: execSync10 } = await import("child_process");
     try {
-      const output = execSync9(`ps -o rss=,pcpu= -p ${pid}`, { encoding: "utf8" }).trim();
+      const output = execSync10(`ps -o rss=,pcpu= -p ${pid}`, { encoding: "utf8" }).trim();
       const [rss, cpu] = output.split(/\s+/);
       return {
         memory: parseInt(rss, 10) * 1024,
@@ -46306,6 +46309,54 @@ var __filename2 = (0, import_node_url2.fileURLToPath)(import_meta_url);
 var __dirname2 = (0, import_node_path11.dirname)(__filename2);
 var MAX_SOCKET_PATH_LENGTH = 107;
 var MAX_OUTPUT_BUFFER_SIZE = 10 * 1024 * 1024;
+var ACTIVITY_VERIFICATION = {
+  /** Time to wait for activity patterns after injection (ms) */
+  TIMEOUT_MS: 5e3,
+  /** How often to check for activity patterns (ms) */
+  POLL_INTERVAL_MS: 200,
+  /** Maximum retries when no activity is detected */
+  MAX_RETRIES: 3,
+  /** Delay between retries (ms) */
+  RETRY_DELAY_MS: 500,
+  /**
+   * Patterns indicating the task was received and displayed.
+   * These are the primary verification patterns.
+   */
+  TASK_RECEIVED_PATTERNS: [
+    /\[Pasted text #\d+/,
+    // Claude Code shows "[Pasted text #1 +95 lines]"
+    /› Relay message from/,
+    // Codex shows "› Relay message from"
+    /Relay message from \w+ \[[\w-]+\]/
+    // Droid/Gemini shows "Relay message from Agent [id]:"
+  ],
+  /**
+   * Patterns indicating the CLI is thinking/processing.
+   * Secondary verification - proves the CLI is active.
+   */
+  THINKING_PATTERNS: [
+    /\(.*esc to (?:interrupt|stop)\)/i,
+    // All CLIs: "(esc to interrupt)" or "(Press ESC to stop)"
+    /[✻✶✳✢·✽⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏]/,
+    // Spinner characters (Claude + Droid)
+    /Thinking\.\.\./,
+    // Droid: "Thinking..."
+    /Working/,
+    // Codex: "Working"
+    /Forming|Noodling|Manifesting/i
+    // Claude Code thinking states
+  ],
+  /**
+   * Patterns indicating tool execution started.
+   * Tertiary verification - proves the CLI is working.
+   */
+  TOOL_EXECUTION_PATTERNS: [
+    /⏺\s*(Bash|Read|Write|Edit|Glob|Grep|Task|WebFetch)/,
+    // Claude Code tool markers
+    /•\s*Running/
+    // Codex: "• Running: command"
+  ]
+};
 function hashWorkspaceId(workspaceId) {
   return (0, import_node_crypto9.createHash)("sha256").update(workspaceId).digest("hex").slice(0, 12);
 }
@@ -46328,6 +46379,7 @@ var RelayPtyOrchestrator = class extends BaseWrapper {
   outputBuffer = "";
   rawBuffer = "";
   lastParsedLength = 0;
+  bufferTrimCount = 0;
   // Interactive mode (show output to terminal)
   isInteractive = false;
   // Injection state
@@ -46876,13 +46928,19 @@ Stderr: ${stderrBuffer.slice(0, 500)}` : "";
     this.rawBuffer += data;
     this.outputBuffer += data;
     this.hasReceivedOutput = true;
+    let buffersTrimmed = false;
     if (this.rawBuffer.length > MAX_OUTPUT_BUFFER_SIZE) {
       const trimAmount = this.rawBuffer.length - MAX_OUTPUT_BUFFER_SIZE;
       this.rawBuffer = this.rawBuffer.slice(-MAX_OUTPUT_BUFFER_SIZE);
       this.lastParsedLength = Math.max(0, this.lastParsedLength - trimAmount);
+      buffersTrimmed = true;
     }
     if (this.outputBuffer.length > MAX_OUTPUT_BUFFER_SIZE) {
       this.outputBuffer = this.outputBuffer.slice(-MAX_OUTPUT_BUFFER_SIZE);
+      buffersTrimmed = true;
+    }
+    if (buffersTrimmed) {
+      this.bufferTrimCount += 1;
     }
     this.feedIdleDetectorOutput(data);
     const indicator = this.formatUnreadIndicator();
@@ -48126,14 +48184,103 @@ Then output: \`->relay-file:spawn\`
     this.relayPtyProcess.stdin.write(buffer);
   }
   /**
-   * Inject a task using the socket-based injection system with verification.
+   * Verify that the CLI shows activity after task injection.
+   * Checks output for patterns indicating the task was received and processing started.
+   *
+   * This catches the race condition where PTY write succeeds but CLI wasn't ready
+   * (the T-003 failure scenario where CLI showed bell characters instead of processing).
+   *
+   * @param outputBefore The output buffer content before injection
+   * @returns Promise resolving to true if activity detected, false otherwise
+   */
+  async verifyActivityAfterInjection(outputBefore) {
+    const startTime = Date.now();
+    const { TIMEOUT_MS, POLL_INTERVAL_MS, TASK_RECEIVED_PATTERNS, THINKING_PATTERNS, TOOL_EXECUTION_PATTERNS } = ACTIVITY_VERIFICATION;
+    const trimCountBefore = this.bufferTrimCount;
+    while (Date.now() - startTime < TIMEOUT_MS) {
+      if (this.bufferTrimCount !== trimCountBefore) {
+        this.log(` Activity verified: output buffer trimmed during verification (large output)`);
+        return true;
+      }
+      const currentOutput = this.outputBuffer;
+      const newOutput = currentOutput.slice(outputBefore.length);
+      if (newOutput.length > 0) {
+        const belCount = (newOutput.match(/\x07/g) || []).length;
+        if (belCount > 10) {
+          this.logError(` Input rejected: CLI produced ${belCount} BEL characters`);
+          return false;
+        }
+        for (const pattern of TASK_RECEIVED_PATTERNS) {
+          if (pattern.test(newOutput)) {
+            this.log(` Activity verified: task received pattern matched`);
+            return true;
+          }
+        }
+        for (const pattern of THINKING_PATTERNS) {
+          if (pattern.test(newOutput)) {
+            this.log(` Activity verified: thinking pattern matched`);
+            return true;
+          }
+        }
+        for (const pattern of TOOL_EXECUTION_PATTERNS) {
+          if (pattern.test(newOutput)) {
+            this.log(` Activity verified: tool execution pattern matched`);
+            return true;
+          }
+        }
+        const meaningfulOutput = newOutput.replace(/[\x00-\x1f]/g, "");
+        if (meaningfulOutput.length > 100) {
+          this.log(` Activity verified: significant output growth (${meaningfulOutput.length} meaningful chars)`);
+          return true;
+        }
+      }
+      await sleep(POLL_INTERVAL_MS);
+    }
+    this.log(` No activity detected within ${TIMEOUT_MS}ms`);
+    return false;
+  }
+  /**
+   * Inject a task using the socket-based injection system with activity verification.
    * This is the preferred method for spawned agent task delivery.
    *
+   * After socket confirms delivery, verifies the CLI shows activity (task received,
+   * thinking indicators, or tool execution). Retries if no activity is detected.
+   *
    * @param task The task text to inject
    * @param from The sender name (default: "spawner")
-   * @returns Promise resolving to true if injection succeeded, false otherwise
+   * @returns Promise resolving to true if task was delivered AND activity verified, false otherwise
    */
   async injectTask(task, from = "spawner") {
+    const { MAX_RETRIES, RETRY_DELAY_MS } = ACTIVITY_VERIFICATION;
+    const STABILIZATION_DELAY_MS = 1500;
+    this.log(` Waiting ${STABILIZATION_DELAY_MS}ms for CLI stabilization before task injection`);
+    await sleep(STABILIZATION_DELAY_MS);
+    for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+      if (attempt > 0) {
+        this.log(` Retry ${attempt}/${MAX_RETRIES} - waiting ${RETRY_DELAY_MS}ms before retry`);
+        await sleep(RETRY_DELAY_MS);
+      }
+      const outputBefore = this.outputBuffer;
+      const delivered = await this.performTaskInjection(task, from);
+      if (!delivered) {
+        this.logError(` Task delivery failed on attempt ${attempt + 1}`);
+        continue;
+      }
+      const activityVerified = await this.verifyActivityAfterInjection(outputBefore);
+      if (activityVerified) {
+        this.log(` Task delivered and activity verified successfully`);
+        return true;
+      }
+      this.logError(` Task delivered but no activity detected (attempt ${attempt + 1})`);
+    }
+    this.logError(` Task injection failed after ${MAX_RETRIES + 1} attempts - no CLI activity detected`);
+    return false;
+  }
+  /**
+   * Perform a single task injection attempt (without retry logic).
+   * @returns true if the injection was sent successfully, false otherwise
+   */
+  async performTaskInjection(task, from) {
     if (!this.socket || !this.socketConnected) {
       this.log(` Socket not connected for task injection, falling back to stdin write`);
       try {
@@ -48386,6 +48533,12 @@ var openCodeApi = new OpenCodeApi();
 
 // packages/wrapper/dist/opencode-wrapper.js
 var import_node_child_process4 = require("node:child_process");
+var TASK_INJECTION = {
+  /** Maximum retries when injection fails */
+  MAX_RETRIES: 3,
+  /** Delay between retries (ms) */
+  RETRY_DELAY_MS: 500
+};
 var OpenCodeWrapper = class extends BaseWrapper {
   config;
   // OpenCode API client
@@ -48641,19 +48794,32 @@ var OpenCodeWrapper = class extends BaseWrapper {
     }
   }
   /**
-   * Inject a task into the agent
+   * Inject a task into the agent with retry logic.
+   *
+   * Retries on transient failures to match RelayPtyOrchestrator behavior.
+   * This ensures consistent reliability across all wrapper types.
+   *
    * @param task - The task description to inject
    * @param _from - The sender name (used for formatting)
-   * @returns true if injection succeeded
+   * @returns true if injection succeeded, false otherwise
    */
   async injectTask(task, _from) {
-    try {
-      await this.performInjection(task);
-      return true;
-    } catch (error2) {
-      console.error("[OpenCodeWrapper] Task injection failed:", error2);
-      return false;
+    const { MAX_RETRIES, RETRY_DELAY_MS } = TASK_INJECTION;
+    for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+      if (attempt > 0) {
+        console.log(`[OpenCodeWrapper] Retry ${attempt}/${MAX_RETRIES} - waiting ${RETRY_DELAY_MS}ms before retry`);
+        await sleep(RETRY_DELAY_MS);
+      }
+      try {
+        await this.performInjection(task);
+        console.log(`[OpenCodeWrapper] Task delivered successfully${attempt > 0 ? ` (attempt ${attempt + 1})` : ""}`);
+        return true;
+      } catch (error2) {
+        console.error(`[OpenCodeWrapper] Task delivery failed (attempt ${attempt + 1}/${MAX_RETRIES + 1}):`, error2);
+      }
     }
+    console.error(`[OpenCodeWrapper] Task injection failed after ${MAX_RETRIES + 1} attempts`);
+    return false;
   }
   /**
    * Get output lines (for compatibility with spawner)
@@ -55172,9 +55338,55 @@ async function selectShadowCli(primaryCli, options) {
   throw new Error("No shadow-capable CLI authenticated. Install Claude or OpenCode (codex) and try again.");
 }
 
+// packages/bridge/dist/cli-resolution.js
+var import_node_child_process8 = require("node:child_process");
+init_logger();
+var log2 = createLogger2("cli-resolution");
+function commandExists2(cmd) {
+  try {
+    const whichCmd = process.platform === "win32" ? "where" : "which";
+    (0, import_node_child_process8.execSync)(`${whichCmd} ${cmd}`, { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+var detectedCursorCli = null;
+function detectCursorCli() {
+  if (detectedCursorCli !== null) {
+    return detectedCursorCli;
+  }
+  if (commandExists2("agent")) {
+    detectedCursorCli = "agent";
+    log2.debug("Detected Cursor CLI: agent (newer version)");
+    return "agent";
+  }
+  if (commandExists2("cursor-agent")) {
+    detectedCursorCli = "cursor-agent";
+    log2.debug("Detected Cursor CLI: cursor-agent (older version)");
+    return "cursor-agent";
+  }
+  log2.debug("Cursor CLI not found (neither agent nor cursor-agent)");
+  return null;
+}
+function resolveCli(rawCommand) {
+  const cmdLower = rawCommand.toLowerCase();
+  if (cmdLower === "cursor" || cmdLower === "cursor-agent") {
+    const cursorCli = detectCursorCli();
+    if (cursorCli) {
+      return cursorCli;
+    }
+    return "agent";
+  }
+  if (cmdLower === "google") {
+    return "gemini";
+  }
+  return rawCommand;
+}
+
 // packages/bridge/dist/spawner.js
 var import_node_fs14 = __toESM(require("node:fs"), 1);
-var import_node_child_process11 = require("node:child_process");
+var import_node_child_process12 = require("node:child_process");
 var import_node_path17 = __toESM(require("node:path"), 1);
 var import_node_url3 = require("node:url");
 
@@ -63297,8 +63509,8 @@ var relayStatusSchema = external_exports.object({});
 
 // packages/mcp/dist/tools/relay-logs.js
 var import_node_util4 = require("node:util");
-var import_node_child_process9 = require("node:child_process");
-var execAsync3 = (0, import_node_util4.promisify)(import_node_child_process9.exec);
+var import_node_child_process10 = require("node:child_process");
+var execAsync3 = (0, import_node_util4.promisify)(import_node_child_process10.exec);
 var relayLogsSchema = external_exports.object({
   agent: external_exports.string().describe("Name of the agent to get logs for"),
   lines: external_exports.number().optional().default(50).describe("Number of lines to retrieve (default: 50)")
@@ -63393,7 +63605,7 @@ var relayVoteSchema = external_exports.object({
 var import_node_fs13 = require("node:fs");
 var import_node_path16 = require("node:path");
 var import_node_os9 = require("node:os");
-var import_node_child_process10 = require("node:child_process");
+var import_node_child_process11 = require("node:child_process");
 
 // node_modules/smol-toml/dist/error.js
 function getLineColFromPtr(string3, ptr) {
@@ -64301,7 +64513,7 @@ function getConfigPaths() {
 }
 function isUsingNvm() {
   try {
-    const nodePath = (0, import_node_child_process10.execSync)("which node", { encoding: "utf-8" }).trim();
+    const nodePath = (0, import_node_child_process11.execSync)("which node", { encoding: "utf-8" }).trim();
     return nodePath.includes(".nvm");
   } catch {
     return false;
@@ -64309,14 +64521,14 @@ function isUsingNvm() {
 }
 function getNodePath() {
   try {
-    return (0, import_node_child_process10.execSync)("which node", { encoding: "utf-8" }).trim();
+    return (0, import_node_child_process11.execSync)("which node", { encoding: "utf-8" }).trim();
   } catch {
     return null;
   }
 }
 function getGlobalMcpBinPath() {
   try {
-    const npmPrefix = (0, import_node_child_process10.execSync)("npm prefix -g", { encoding: "utf-8" }).trim();
+    const npmPrefix = (0, import_node_child_process11.execSync)("npm prefix -g", { encoding: "utf-8" }).trim();
     const binPath = (0, import_node_path16.join)(npmPrefix, "lib", "node_modules", "@agent-relay", "mcp", "dist", "bin.js");
     if ((0, import_node_fs13.existsSync)(binPath)) {
       return binPath;
@@ -64544,14 +64756,7 @@ function installMcpConfig(configPath, options = {}) {
 // packages/bridge/dist/spawner.js
 var __filename3 = (0, import_node_url3.fileURLToPath)(import_meta_url);
 var __dirname3 = import_node_path17.default.dirname(__filename3);
-var log2 = createLogger2("spawner");
-var CLI_COMMAND_MAP = {
-  cursor: "agent",
-  // Cursor CLI installs as 'agent'
-  google: "gemini"
-  // Google provider uses 'gemini' CLI
-  // Other providers use their name as the command (claude, codex, etc.)
-};
+var log3 = createLogger2("spawner");
 function extractGhTokenFromHosts(content) {
   const lines = content.split(/\r?\n/);
   let inGithubSection = false;
@@ -64614,7 +64819,7 @@ function ensureMcpPermissions(projectRoot, cliType, debug = false) {
   const config2 = configMap[effectiveCli];
   if (!config2) {
     if (debug)
-      log2.debug(`CLI ${cliType} uses flag-based permissions, skipping config setup`);
+      log3.debug(`CLI ${cliType} uses flag-based permissions, skipping config setup`);
     return;
   }
   const settingsPath = import_node_path17.default.join(config2.settingsDir, config2.settingsFile);
@@ -64634,7 +64839,7 @@ function ensureMcpPermissions(projectRoot, cliType, debug = false) {
     if (config2.enableAllKey && settings[config2.enableAllKey] !== true) {
       settings[config2.enableAllKey] = true;
       if (debug)
-        log2.debug(`Setting ${config2.enableAllKey}: true`);
+        log3.debug(`Setting ${config2.enableAllKey}: true`);
     }
     if (config2.permissionKey) {
       const keyParts = config2.permissionKey.split(".");
@@ -64655,14 +64860,14 @@ function ensureMcpPermissions(projectRoot, cliType, debug = false) {
       if (!allowList.includes(agentRelayPermission)) {
         allowList.push(agentRelayPermission);
         if (debug)
-          log2.debug(`Added MCP permission: ${agentRelayPermission}`);
+          log3.debug(`Added MCP permission: ${agentRelayPermission}`);
       }
     }
     import_node_fs14.default.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + "\n");
     if (debug)
-      log2.debug(`MCP permissions configured at ${settingsPath}`);
+      log3.debug(`MCP permissions configured at ${settingsPath}`);
   } catch (err) {
-    log2.warn("Failed to pre-configure MCP permissions", {
+    log3.warn("Failed to pre-configure MCP permissions", {
       cli: cliType,
       error: err instanceof Error ? err.message : String(err)
     });
@@ -64712,9 +64917,9 @@ function hasRelayPtyBinary2() {
     relayPtyBinaryChecked = true;
     if (process.env.DEBUG_SPAWN === "1") {
       if (relayPtyBinaryPath) {
-        log2.debug(`relay-pty binary found: ${relayPtyBinaryPath}`);
+        log3.debug(`relay-pty binary found: ${relayPtyBinaryPath}`);
       } else {
-        log2.debug("relay-pty binary not found, will use PtyWrapper fallback");
+        log3.debug("relay-pty binary not found, will use PtyWrapper fallback");
       }
     }
   }
@@ -64743,7 +64948,7 @@ var AgentSpawner = class _AgentSpawner {
     const effectiveTeamDir = options.teamDir ?? paths.teamDir;
     this.agentsPath = import_node_path17.default.join(effectiveTeamDir, "connected-agents.json");
     this.registryPath = import_node_path17.default.join(effectiveTeamDir, "agents.json");
-    log2.info(`AgentSpawner paths: projectRoot=${this.projectRoot} teamDir=${effectiveTeamDir} (explicit=${!!options.teamDir}) agentsPath=${this.agentsPath}`);
+    log3.info(`AgentSpawner paths: projectRoot=${this.projectRoot} teamDir=${effectiveTeamDir} (explicit=${!!options.teamDir}) agentsPath=${this.agentsPath}`);
     this.socketPath = options.socketPath ?? paths.socketPath;
     this.logsDir = import_node_path17.default.join(effectiveTeamDir, "worker-logs");
     this.workersPath = import_node_path17.default.join(effectiveTeamDir, "workers.json");
@@ -64758,7 +64963,7 @@ var AgentSpawner = class _AgentSpawner {
         workspaceId: process.env.WORKSPACE_ID,
         strictMode: process.env.AGENT_POLICY_STRICT === "1"
       });
-      log2.info("Policy enforcement enabled");
+      log3.info("Policy enforcement enabled");
     }
   }
   /**
@@ -64800,7 +65005,7 @@ var AgentSpawner = class _AgentSpawner {
       });
       clearTimeout(timeoutId);
       if (!response.ok) {
-        log2.warn(`Failed to fetch GH token from cloud: ${response.status} ${response.statusText}`);
+        log3.warn(`Failed to fetch GH token from cloud: ${response.status} ${response.statusText}`);
         return null;
       }
       const data = await response.json();
@@ -64808,9 +65013,9 @@ var AgentSpawner = class _AgentSpawner {
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       if (message.includes("abort")) {
-        log2.info("Cloud API timeout (5s) - using local auth");
+        log3.info("Cloud API timeout (5s) - using local auth");
       } else {
-        log2.warn("Failed to fetch GH token from cloud", { error: message });
+        log3.warn("Failed to fetch GH token from cloud", { error: message });
       }
       return null;
     }
@@ -64857,7 +65062,7 @@ var AgentSpawner = class _AgentSpawner {
       return null;
     }
     return await new Promise((resolve5) => {
-      (0, import_node_child_process11.execFile)(ghPath, ["auth", "token", "--hostname", "github.com"], { timeout: 5e3 }, (err, stdout) => {
+      (0, import_node_child_process12.execFile)(ghPath, ["auth", "token", "--hostname", "github.com"], { timeout: 5e3 }, (err, stdout) => {
         if (err) {
           resolve5(null);
           return;
@@ -64901,7 +65106,7 @@ var AgentSpawner = class _AgentSpawner {
    * Called after the dashboard server starts and we know the actual port.
    */
   setDashboardPort(port) {
-    log2.info(`Dashboard port set to ${port} - nested spawns now enabled`);
+    log3.info(`Dashboard port set to ${port} - nested spawns now enabled`);
     this.dashboardPort = port;
   }
   /**
@@ -64920,7 +65125,7 @@ var AgentSpawner = class _AgentSpawner {
    */
   setCloudPersistence(handler) {
     this.cloudPersistence = handler;
-    log2.info("Cloud persistence handler set");
+    log3.info("Cloud persistence handler set");
   }
   /**
    * Bind cloud persistence event handlers to a RelayPtyOrchestrator.
@@ -64933,14 +65138,14 @@ var AgentSpawner = class _AgentSpawner {
       try {
         await this.cloudPersistence.onSummary(name, event);
       } catch (err) {
-        log2.error(`Cloud persistence summary error for ${name}`, { error: err instanceof Error ? err.message : String(err) });
+        log3.error(`Cloud persistence summary error for ${name}`, { error: err instanceof Error ? err.message : String(err) });
       }
     };
     const sessionEndListener = async (event) => {
       try {
         await this.cloudPersistence.onSessionEnd(name, event);
       } catch (err) {
-        log2.error(`Cloud persistence session-end error for ${name}`, { error: err instanceof Error ? err.message : String(err) });
+        log3.error(`Cloud persistence session-end error for ${name}`, { error: err instanceof Error ? err.message : String(err) });
       }
     };
     pty.on("summary", summaryListener);
@@ -64993,7 +65198,7 @@ var AgentSpawner = class _AgentSpawner {
     const maxAgents = parseInt(process.env.MAX_AGENTS ?? "", 10) || 1e4;
     const currentAgentCount = this.activeWorkers.size;
     if (currentAgentCount >= maxAgents) {
-      log2.warn(`Agent limit reached: ${currentAgentCount}/${maxAgents}`);
+      log3.warn(`Agent limit reached: ${currentAgentCount}/${maxAgents}`);
       return {
         success: false,
         name,
@@ -65003,7 +65208,7 @@ var AgentSpawner = class _AgentSpawner {
     if (this.policyEnforcementEnabled && this.policyService && spawnerName) {
       const decision = await this.policyService.canSpawn(spawnerName, name, cli);
       if (!decision.allowed) {
-        log2.warn(`Policy blocked spawn: ${spawnerName} -> ${name}: ${decision.reason}`);
+        log3.warn(`Policy blocked spawn: ${spawnerName} -> ${name}: ${decision.reason}`);
         return {
           success: false,
           name,
@@ -65012,26 +65217,26 @@ var AgentSpawner = class _AgentSpawner {
         };
       }
       if (debug) {
-        log2.debug(`Policy allowed spawn: ${spawnerName} -> ${name} (source: ${decision.policySource})`);
+        log3.debug(`Policy allowed spawn: ${spawnerName} -> ${name} (source: ${decision.policySource})`);
       }
     }
     try {
       const cliParts = cli.split(" ");
       const rawCommandName = cliParts[0];
-      const commandName = CLI_COMMAND_MAP[rawCommandName] || rawCommandName;
+      const commandName = resolveCli(rawCommandName);
       const args = cliParts.slice(1);
       if (commandName !== rawCommandName && debug) {
-        log2.debug(`Mapped CLI '${rawCommandName}' -> '${commandName}'`);
+        log3.debug(`Mapped CLI '${rawCommandName}' -> '${commandName}'`);
       }
       const command = resolveCommand(commandName);
       if (debug)
-        log2.debug(`Resolved '${commandName}' -> '${command}'`);
+        log3.debug(`Resolved '${commandName}' -> '${command}'`);
       if (command === commandName && !commandName.startsWith("/")) {
-        log2.warn(`Could not resolve path for '${commandName}', spawn may fail`);
+        log3.warn(`Could not resolve path for '${commandName}', spawn may fail`);
       }
       ensureMcpPermissions(this.projectRoot, commandName, debug);
       const isClaudeCli = commandName.startsWith("claude");
-      const isCursorCli = commandName === "agent" || rawCommandName === "cursor";
+      const isCursorCli = commandName === "agent" || rawCommandName === "cursor" || rawCommandName === "cursor-agent";
       if (!interactive) {
         if (isClaudeCli && !args.includes("--dangerously-skip-permissions")) {
           args.push("--dangerously-skip-permissions");
@@ -65041,7 +65246,7 @@ var AgentSpawner = class _AgentSpawner {
         }
       } else {
         if (debug)
-          log2.debug(`Interactive mode: skipping auto-accept flags for ${name}`);
+          log3.debug(`Interactive mode: skipping auto-accept flags for ${name}`);
       }
       if (isClaudeCli) {
         const agentConfig = findAgentConfig(name, this.projectRoot);
@@ -65051,9 +65256,9 @@ var AgentSpawner = class _AgentSpawner {
         const configuredArgs = buildClaudeArgs(name, args, this.projectRoot);
         args.length = 0;
         args.push(...configuredArgs);
-        log2.info(`Agent ${name}: model=${effectiveModel}, cli=${cli}, variant=${cliVariant}`);
+        log3.info(`Agent ${name}: model=${effectiveModel}, cli=${cli}, variant=${cliVariant}`);
         if (debug)
-          log2.debug(`Applied agent config for ${name}: ${args.join(" ")}`);
+          log3.debug(`Applied agent config for ${name}: ${args.join(" ")}`);
       }
       const isCodexCli = commandName.startsWith("codex");
       const isGeminiCli = commandName === "gemini";
@@ -65079,12 +65284,12 @@ var AgentSpawner = class _AgentSpawner {
           });
           if (result.success) {
             if (debug)
-              log2.debug(`Auto-installed MCP config at ${projectMcpConfigPath}`);
+              log3.debug(`Auto-installed MCP config at ${projectMcpConfigPath}`);
           } else {
-            log2.warn(`Failed to auto-install MCP config: ${result.error}`);
+            log3.warn(`Failed to auto-install MCP config: ${result.error}`);
           }
         } catch (err) {
-          log2.warn("Failed to auto-install MCP config", {
+          log3.warn("Failed to auto-install MCP config", {
             error: err instanceof Error ? err.message : String(err)
           });
         }
@@ -65099,7 +65304,7 @@ var AgentSpawner = class _AgentSpawner {
         }
       }
       if (debug && hasMcp)
-        log2.debug(`MCP tools available for ${name} (MCP config found, socket ${relaySocket})`);
+        log3.debug(`MCP tools available for ${name} (MCP config found, socket ${relaySocket})`);
       let relayInstructions = getRelayInstructions(name, { hasMcp, includeWorkflowConventions });
       const agentConfigForRole = isClaudeCli ? findAgentConfig(name, this.projectRoot) : null;
       if (agentConfigForRole?.role) {
@@ -65115,10 +65320,10 @@ var AgentSpawner = class _AgentSpawner {
 
 ${relayInstructions}`;
               if (debug)
-                log2.debug(`Composed role prompt for ${name} (role: ${role})`);
+                log3.debug(`Composed role prompt for ${name} (role: ${role})`);
             }
           } catch (err) {
-            log2.warn(`Failed to compose role prompt for ${name}: ${err.message}`);
+            log3.warn(`Failed to compose role prompt for ${name}: ${err.message}`);
           }
         }
       }
@@ -65135,7 +65340,7 @@ ${relayInstructions}`;
         args.unshift("login");
       }
       if (debug)
-        log2.debug(`Spawning ${name} with: ${command} ${args.join(" ")}`);
+        log3.debug(`Spawning ${name} with: ${command} ${args.join(" ")}`);
       let agentCwd;
       if (request.cwd && typeof request.cwd === "string") {
         const resolvedCwd = import_node_path17.default.resolve(this.projectRoot, request.cwd);
@@ -65152,14 +65357,14 @@ ${relayInstructions}`;
       } else {
         agentCwd = this.projectRoot;
       }
-      log2.info(`Spawning ${name}: dashboardPort=${this.dashboardPort || "none"} (${this.dashboardPort ? "nested spawns enabled" : "nested spawns disabled"})`);
+      log3.info(`Spawning ${name}: dashboardPort=${this.dashboardPort || "none"} (${this.dashboardPort ? "nested spawns enabled" : "nested spawns disabled"})`);
       let userEnv;
       if (userId) {
         try {
           const userDirService = getUserDirectoryService();
           userEnv = userDirService.getUserEnvironment(userId);
         } catch (err) {
-          log2.warn("Failed to resolve user environment, using default", {
+          log3.warn("Failed to resolve user environment, using default", {
             userId,
             error: err instanceof Error ? err.message : String(err)
           });
@@ -65176,7 +65381,7 @@ ${relayInstructions}`;
         userEnv = mergedUserEnv;
       }
       if (debug)
-        log2.debug(`Socket path for ${name}: ${this.socketPath ?? "undefined"}`);
+        log3.debug(`Socket path for ${name}: ${this.socketPath ?? "undefined"}`);
       if (!hasRelayPtyBinary2()) {
         const checkedPaths = getLastSearchPaths();
         const tracedError = createTraceableError("relay-pty binary not found", {
@@ -65188,10 +65393,10 @@ ${relayInstructions}`;
           totalPathsChecked: checkedPaths.length,
           hint: "Set RELAY_PTY_BINARY env var to override, or reinstall: npm install agent-relay"
         });
-        log2.error(tracedError.logMessage);
+        log3.error(tracedError.logMessage);
         if (debug) {
-          log2.debug("All paths checked for relay-pty binary:");
-          checkedPaths.forEach((p, i) => log2.debug(`  ${i + 1}. ${p}`));
+          log3.debug("All paths checked for relay-pty binary:");
+          checkedPaths.forEach((p, i) => log3.debug(`  ${i + 1}. ${p}`));
         }
         return {
           success: false,
@@ -65202,7 +65407,7 @@ ${relayInstructions}`;
       }
       const onExitHandler = (code) => {
         if (debug)
-          log2.debug(`Worker ${name} exited with code ${code}`);
+          log3.debug(`Worker ${name} exited with code ${code}`);
         const worker = this.activeWorkers.get(name);
         const agentId = worker?.pty?.getAgentId?.();
         if (worker?.listeners) {
@@ -65212,7 +65417,7 @@ ${relayInstructions}`;
         try {
           this.saveWorkersMetadata();
         } catch (err) {
-          log2.error("Failed to save metadata on exit", { error: err instanceof Error ? err.message : String(err) });
+          log3.error("Failed to save metadata on exit", { error: err instanceof Error ? err.message : String(err) });
         }
         if (code !== 0 && code !== null && this.onAgentDeath) {
           const crashError = createTraceableError("Agent crashed unexpectedly", {
@@ -65221,7 +65426,7 @@ ${relayInstructions}`;
             cli,
             agentId
           });
-          log2.error(crashError.logMessage);
+          log3.error(crashError.logMessage);
           this.onAgentDeath({
             name,
             exitCode: code,
@@ -65233,7 +65438,7 @@ ${relayInstructions}`;
       };
       const onSpawnHandler = this.dashboardPort ? void 0 : async (workerName, workerCli, workerTask) => {
         if (debug)
-          log2.debug(`Nested spawn: ${workerName}`);
+          log3.debug(`Nested spawn: ${workerName}`);
         await this.spawn({
           name: workerName,
           cli: workerCli,
@@ -65243,7 +65448,7 @@ ${relayInstructions}`;
       };
       const onReleaseHandler = this.dashboardPort ? void 0 : async (workerName) => {
         if (debug)
-          log2.debug(`Release request: ${workerName}`);
+          log3.debug(`Release request: ${workerName}`);
         await this.release(workerName);
       };
       if (isOpenCodeCli) {
@@ -65253,7 +65458,7 @@ ${relayInstructions}`;
         const shouldUseHttpApi = serveAvailable || isCloudWorkspace2;
         if (shouldUseHttpApi) {
           if (debug)
-            log2.debug(`OpenCode: serve=${serveAvailable ? "available" : "will-auto-start"}, cloud=${isCloudWorkspace2}, using OpenCodeWrapper for ${name}`);
+            log3.debug(`OpenCode: serve=${serveAvailable ? "available" : "will-auto-start"}, cloud=${isCloudWorkspace2}, using OpenCodeWrapper for ${name}`);
           const openCodeConfig = {
             name,
             command,
@@ -65295,11 +65500,11 @@ ${relayInstructions}`;
           if (this.onMarkSpawning) {
             this.onMarkSpawning(name);
             if (debug)
-              log2.debug(`Marked ${name} as spawning`);
+              log3.debug(`Marked ${name} as spawning`);
           }
           await openCodeWrapper.start();
           if (debug)
-            log2.debug(`OpenCodeWrapper started for ${name}, HTTP mode: ${openCodeWrapper.isHttpApiMode}`);
+            log3.debug(`OpenCodeWrapper started for ${name}, HTTP mode: ${openCodeWrapper.isHttpApiMode}`);
           const registered2 = await this.waitForAgentRegistration(name, 3e4, 500);
           if (!registered2) {
             const tracedError = createTraceableError("Agent registration timeout", {
@@ -65308,7 +65513,7 @@ ${relayInstructions}`;
               pid: openCodeWrapper.pid,
               timeoutMs: 3e4
             });
-            log2.error(tracedError.logMessage);
+            log3.error(tracedError.logMessage);
             if (this.onClearSpawning) {
               this.onClearSpawning(name);
             }
@@ -65322,15 +65527,35 @@ ${relayInstructions}`;
           }
           if (task && task.trim()) {
             const ready = await openCodeWrapper.waitUntilReadyForMessages(2e4, 100);
+            let taskSent = false;
             if (ready) {
-              const taskSent = await openCodeWrapper.injectTask(task, spawnerName || "spawner");
+              taskSent = await openCodeWrapper.injectTask(task, spawnerName || "spawner");
               if (!taskSent) {
-                log2.warn(`Failed to inject task for ${name} via OpenCodeWrapper`);
+                log3.warn(`Failed to inject task for ${name} via OpenCodeWrapper`);
               } else if (debug) {
-                log2.debug(`Task injected to ${name} via OpenCodeWrapper`);
+                log3.debug(`Task injected to ${name} via OpenCodeWrapper`);
               }
             } else {
-              log2.warn(`OpenCodeWrapper ${name} not ready for task injection`);
+              log3.warn(`OpenCodeWrapper ${name} not ready for task injection`);
+            }
+            if (!taskSent) {
+              const tracedError = createTraceableError("Task injection failed", {
+                agentName: name,
+                cli,
+                taskLength: task.length,
+                ready
+              });
+              log3.error(`CRITICAL: ${tracedError.logMessage}`);
+              await openCodeWrapper.stop();
+              if (this.onClearSpawning) {
+                this.onClearSpawning(name);
+              }
+              return {
+                success: false,
+                name,
+                error: tracedError.userMessage,
+                errorId: tracedError.errorId
+              };
             }
           }
           const workerInfo2 = {
@@ -65349,7 +65574,7 @@ ${relayInstructions}`;
           this.saveWorkersMetadata();
           const teamInfo2 = team ? ` [team: ${team}]` : "";
           const shadowInfo2 = request.shadowOf ? ` [shadow of: ${request.shadowOf}]` : "";
-          log2.info(`Spawned ${name} (${cli}) via OpenCodeWrapper${teamInfo2}${shadowInfo2} [HTTP mode: ${openCodeWrapper.isHttpApiMode}]`);
+          log3.info(`Spawned ${name} (${cli}) via OpenCodeWrapper${teamInfo2}${shadowInfo2} [HTTP mode: ${openCodeWrapper.isHttpApiMode}]`);
           return {
             success: true,
             name,
@@ -65357,7 +65582,7 @@ ${relayInstructions}`;
           };
         }
         if (debug)
-          log2.debug(`OpenCode: serve not available, not cloud workspace, falling back to RelayPtyOrchestrator for ${name}`);
+          log3.debug(`OpenCode: serve not available, not cloud workspace, falling back to RelayPtyOrchestrator for ${name}`);
       }
       const ptyConfig = {
         name,
@@ -65391,7 +65616,7 @@ ${relayInstructions}`;
       };
       const pty = new RelayPtyOrchestrator(ptyConfig);
       if (debug)
-        log2.debug(`Using RelayPtyOrchestrator for ${name}`);
+        log3.debug(`Using RelayPtyOrchestrator for ${name}`);
       const listeners = {};
       const outputListener = (data) => {
         const broadcast = global.__broadcastLogOutput;
@@ -65409,19 +65634,19 @@ ${relayInstructions}`;
       if (this.onMarkSpawning) {
         this.onMarkSpawning(name);
         if (debug)
-          log2.debug(`Marked ${name} as spawning`);
+          log3.debug(`Marked ${name} as spawning`);
       }
       await pty.start();
       if (debug)
-        log2.debug(`PTY started, pid: ${pty.pid}`);
+        log3.debug(`PTY started, pid: ${pty.pid}`);
       if (isCursorCli && interactive) {
         await sleep2(1500);
         if (debug)
-          log2.debug(`Sending initial keystroke for Cursor setup to bypass "Press any key" prompt`);
+          log3.debug(`Sending initial keystroke for Cursor setup to bypass "Press any key" prompt`);
         try {
           await pty.write("\r");
         } catch (err) {
-          log2.warn(`Failed to send initial keystroke for Cursor: ${err}`);
+          log3.warn(`Failed to send initial keystroke for Cursor: ${err}`);
         }
       }
       const registered = await this.waitForAgentRegistration(name, 3e4, 500);
@@ -65432,7 +65657,7 @@ ${relayInstructions}`;
           pid: pty.pid,
           timeoutMs: 3e4
         });
-        log2.error(tracedError.logMessage);
+        log3.error(tracedError.logMessage);
         if (this.onClearSpawning) {
           this.onClearSpawning(name);
         }
@@ -65454,12 +65679,12 @@ ${relayInstructions}`;
               const orchestrator = pty;
               const ready = await orchestrator.waitUntilReadyForMessages(2e4, 100);
               if (!ready) {
-                log2.debug(`Attempt ${attempt}/${maxRetries}: ${name} not ready for messages within timeout`);
+                log3.debug(`Attempt ${attempt}/${maxRetries}: ${name} not ready for messages within timeout`);
                 if (attempt < maxRetries) {
                   await sleep2(retryDelayMs);
                   continue;
                 }
-                log2.error(`${name} failed to become ready after ${maxRetries} attempts - task may be lost`);
+                log3.error(`${name} failed to become ready after ${maxRetries} attempts - task may be lost`);
                 break;
               }
             } else if ("waitUntilCliReady" in pty) {
@@ -65469,13 +65694,13 @@ ${relayInstructions}`;
             if (success) {
               taskSent = true;
               if (debug)
-                log2.debug(`Task injected to ${name} (attempt ${attempt})`);
+                log3.debug(`Task injected to ${name} (attempt ${attempt})`);
               break;
             } else {
-              throw new Error("Task injection returned false");
+              throw new Error("Task injection returned false - delivery failed");
             }
           } catch (err) {
-            log2.debug(`Attempt ${attempt}/${maxRetries}: Error injecting task for ${name}: ${err.message}`);
+            log3.debug(`Attempt ${attempt}/${maxRetries}: Error injecting task for ${name}: ${err.message}`);
             if (attempt < maxRetries) {
               await sleep2(retryDelayMs);
             }
@@ -65488,7 +65713,18 @@ ${relayInstructions}`;
             attempts: maxRetries,
             taskLength: task.length
           });
-          log2.error(`CRITICAL: ${tracedError.logMessage}`);
+          log3.error(`CRITICAL: ${tracedError.logMessage}`);
+          await pty.stop();
+          this.activeWorkers.delete(name);
+          if (this.onClearSpawning) {
+            this.onClearSpawning(name);
+          }
+          return {
+            success: false,
+            name,
+            error: tracedError.userMessage,
+            errorId: tracedError.errorId
+          };
         }
       }
       const workerInfo = {
@@ -65508,7 +65744,7 @@ ${relayInstructions}`;
       this.saveWorkersMetadata();
       const teamInfo = team ? ` [team: ${team}]` : "";
       const shadowInfo = request.shadowOf ? ` [shadow of: ${request.shadowOf}]` : "";
-      log2.info(`Spawned ${name} (${cli})${teamInfo}${shadowInfo} [pid: ${pty.pid}]`);
+      log3.info(`Spawned ${name} (${cli})${teamInfo}${shadowInfo} [pid: ${pty.pid}]`);
       return {
         success: true,
         name,
@@ -65520,9 +65756,9 @@ ${relayInstructions}`;
         cli,
         task: task?.substring(0, 100)
       }, err instanceof Error ? err : void 0);
-      log2.error(tracedError.logMessage);
+      log3.error(tracedError.logMessage);
       if (debug)
-        log2.debug("Full error", { error: err?.stack || String(err) });
+        log3.debug("Full error", { error: err?.stack || String(err) });
       if (this.onClearSpawning) {
         this.onClearSpawning(name);
       }
@@ -65569,12 +65805,12 @@ ${relayInstructions}`;
         preferredShadowCli: shadow.command
       });
     } catch (err) {
-      log2.warn(`Shadow CLI selection failed for ${shadow.name}: ${err.message}`);
+      log3.warn(`Shadow CLI selection failed for ${shadow.name}: ${err.message}`);
     }
     if (debug) {
       const mode = shadowSelection?.mode ?? "unknown";
       const cli = shadowSelection?.command ?? shadow.command ?? primary.command ?? "claude";
-      log2.debug(`spawnWithShadow: primary=${primary.name}, shadow=${shadow.name}, mode=${mode}, cli=${cli}, speakOn=${speakOn.join(",")}`);
+      log3.debug(`spawnWithShadow: primary=${primary.name}, shadow=${shadow.name}, mode=${mode}, cli=${cli}, speakOn=${speakOn.join(",")}`);
     }
     const primaryResult = await this.spawn({
       name: primary.name,
@@ -65591,7 +65827,7 @@ ${relayInstructions}`;
     }
     await sleep2(1e3);
     if (shadowSelection?.mode === "subagent") {
-      log2.info(`Shadow ${shadow.name} will run as ${shadowSelection.cli} subagent inside ${primary.name} (no separate process)`);
+      log3.info(`Shadow ${shadow.name} will run as ${shadowSelection.cli} subagent inside ${primary.name} (no separate process)`);
       return {
         success: true,
         primary: primaryResult,
@@ -65602,7 +65838,7 @@ ${relayInstructions}`;
       };
     }
     if (!shadowSelection) {
-      log2.warn(`No authenticated shadow CLI available; ${primary.name} will run without a shadow`);
+      log3.warn(`No authenticated shadow CLI available; ${primary.name} will run without a shadow`);
       return {
         success: true,
         primary: primaryResult,
@@ -65618,7 +65854,7 @@ ${relayInstructions}`;
       shadowSpeakOn: speakOn
     });
     if (!shadowResult.success) {
-      log2.warn(`Shadow agent ${shadow.name} failed to spawn, primary ${primary.name} continues without shadow`);
+      log3.warn(`Shadow agent ${shadow.name} failed to spawn, primary ${primary.name} continues without shadow`);
       return {
         success: true,
         // Primary succeeded, overall operation is partial success
@@ -65627,7 +65863,7 @@ ${relayInstructions}`;
         error: `Shadow spawn failed: ${shadowResult.error}`
       };
     }
-    log2.info(`Spawned pair: ${primary.name} with shadow ${shadow.name} (speakOn: ${speakOn.join(",")})`);
+    log3.info(`Spawned pair: ${primary.name} with shadow ${shadow.name} (speakOn: ${speakOn.join(",")})`);
     return {
       success: true,
       primary: primaryResult,
@@ -65640,7 +65876,7 @@ ${relayInstructions}`;
   async release(name) {
     const worker = this.activeWorkers.get(name);
     if (!worker) {
-      log2.debug(`Worker ${name} not found`);
+      log3.debug(`Worker ${name} not found`);
       return false;
     }
     try {
@@ -65651,10 +65887,10 @@ ${relayInstructions}`;
       }
       this.activeWorkers.delete(name);
       this.saveWorkersMetadata();
-      log2.info(`Released ${name}`);
+      log3.info(`Released ${name}`);
       return true;
     } catch (err) {
-      log2.error(`Failed to release ${name}: ${err.message}`);
+      log3.error(`Failed to release ${name}: ${err.message}`);
       this.unbindListeners(worker.pty, worker.listeners);
       this.activeWorkers.delete(name);
       this.saveWorkersMetadata();
@@ -65747,15 +65983,15 @@ ${relayInstructions}`;
       const connected = this.isAgentConnected(name);
       const recentlySeen = this.isAgentRecentlySeen(name);
       if (pollCount <= 3 || pollCount % 10 === 0) {
-        log2.info(`Registration poll #${pollCount} for ${name}: connected=${connected} recentlySeen=${recentlySeen} agentsPath=${this.agentsPath}`);
+        log3.info(`Registration poll #${pollCount} for ${name}: connected=${connected} recentlySeen=${recentlySeen} agentsPath=${this.agentsPath}`);
       }
       if (connected && recentlySeen) {
-        log2.info(`Agent ${name} registered after ${pollCount} polls`);
+        log3.info(`Agent ${name} registered after ${pollCount} polls`);
         return true;
       }
       await sleep2(pollIntervalMs);
     }
-    log2.info(`Registration timeout for ${name} after ${pollCount} polls`);
+    log3.info(`Registration timeout for ${name} after ${pollCount} polls`);
     return false;
   }
   isAgentRegistered(name) {
@@ -65765,12 +66001,12 @@ ${relayInstructions}`;
     const debug = process.env.DEBUG_SPAWN === "1";
     if (!this.agentsPath) {
       if (debug)
-        log2.debug(`isAgentConnected(${name}): no agentsPath`);
+        log3.debug(`isAgentConnected(${name}): no agentsPath`);
       return false;
     }
     if (!import_node_fs14.default.existsSync(this.agentsPath)) {
       if (debug)
-        log2.debug(`isAgentConnected(${name}): file not found: ${this.agentsPath}`);
+        log3.debug(`isAgentConnected(${name}): file not found: ${this.agentsPath}`);
       return false;
     }
     try {
@@ -65779,14 +66015,14 @@ ${relayInstructions}`;
       const updatedAt = typeof raw?.updatedAt === "number" ? raw.updatedAt : 0;
       const isFresh = Date.now() - updatedAt <= _AgentSpawner.ONLINE_THRESHOLD_MS;
       if (debug) {
-        log2.debug(`isAgentConnected(${name}): path=${this.agentsPath} agents=${agents.join(",")} updatedAt=${updatedAt} isFresh=${isFresh}`);
+        log3.debug(`isAgentConnected(${name}): path=${this.agentsPath} agents=${agents.join(",")} updatedAt=${updatedAt} isFresh=${isFresh}`);
       }
       if (!isFresh)
         return false;
       const lowerName = name.toLowerCase();
       return agents.some((a) => typeof a === "string" && a.toLowerCase() === lowerName);
     } catch (err) {
-      log2.error("Failed to read connected-agents.json", { error: err.message, path: this.agentsPath });
+      log3.error("Failed to read connected-agents.json", { error: err.message, path: this.agentsPath });
       return false;
     }
   }
@@ -65804,7 +66040,7 @@ ${relayInstructions}`;
         return false;
       return Date.now() - new Date(agent.lastSeen).getTime() <= _AgentSpawner.ONLINE_THRESHOLD_MS;
     } catch (err) {
-      log2.error("Failed to read agents.json", { error: err.message });
+      log3.error("Failed to read agents.json", { error: err.message });
       return false;
     }
   }
@@ -65825,7 +66061,7 @@ ${relayInstructions}`;
       }));
       import_node_fs14.default.writeFileSync(this.workersPath, JSON.stringify({ workers }, null, 2));
     } catch (err) {
-      log2.error("Failed to save workers metadata", { error: err.message });
+      log3.error("Failed to save workers metadata", { error: err.message });
     }
   }
   /**
@@ -70262,7 +70498,7 @@ async function createStorageAdapter(dbPath, config2) {
 var import_node_fs21 = __toESM(require("node:fs"), 1);
 var import_node_path24 = __toESM(require("node:path"), 1);
 init_logger();
-var log3 = createLogger2("registry");
+var log4 = createLogger2("registry");
 var AgentRegistry = class {
   registryPath;
   agents = /* @__PURE__ */ new Map();
@@ -70385,7 +70621,7 @@ var AgentRegistry = class {
       if (lastSeenTime < cutoff) {
         this.agents.delete(name);
         removed++;
-        log3.info("Pruned stale agent", { name, lastSeen: record2.lastSeen });
+        log4.info("Pruned stale agent", { name, lastSeen: record2.lastSeen });
       }
     }
     if (removed > 0) {
@@ -70442,7 +70678,7 @@ var AgentRegistry = class {
         this.agents.set(record2.name, record2);
       }
     } catch (err) {
-      log3.error("Failed to load agents.json", { error: String(err) });
+      log4.error("Failed to load agents.json", { error: String(err) });
     }
   }
   save() {
@@ -70452,7 +70688,7 @@ var AgentRegistry = class {
       import_node_fs21.default.writeFileSync(tempPath, data, "utf-8");
       import_node_fs21.default.renameSync(tempPath, this.registryPath);
     } catch (err) {
-      log3.error("Failed to write agents.json", { error: String(err) });
+      log4.error("Failed to write agents.json", { error: String(err) });
     }
   }
 };
@@ -70476,7 +70712,7 @@ var import_node_zlib = require("node:zlib");
 var import_node_util5 = require("node:util");
 init_logger();
 var gzipAsync = (0, import_node_util5.promisify)(import_node_zlib.gzip);
-var log4 = createLogger2("sync-queue");
+var log5 = createLogger2("sync-queue");
 var DEFAULT_SYNC_QUEUE_CONFIG = {
   cloudUrl: "https://agent-relay.com",
   apiKey: "",
@@ -70532,7 +70768,7 @@ var SyncQueue = class {
     } else if (!this.flushTimer) {
       this.flushTimer = setTimeout(() => {
         this.flush().catch((err) => {
-          log4.error("Timer flush failed", { error: String(err) });
+          log5.error("Timer flush failed", { error: String(err) });
         });
       }, this.config.batchDelayMs);
     }
@@ -70594,7 +70830,7 @@ var SyncQueue = class {
         if (attempt < this.config.maxRetries - 1) {
           const delay = this.config.retryDelayMs * Math.pow(2, attempt);
           if (this.config.verbose) {
-            log4.warn(`Sync attempt ${attempt + 1} failed, retrying in ${delay}ms`, {
+            log5.warn(`Sync attempt ${attempt + 1} failed, retrying in ${delay}ms`, {
               error: lastError.message
             });
           }
@@ -70602,7 +70838,7 @@ var SyncQueue = class {
         }
       }
     }
-    log4.error("Sync failed after retries, spilling to disk", {
+    log5.error("Sync failed after retries, spilling to disk", {
       count: messages.length,
       error: lastError?.message
     });
@@ -70646,7 +70882,7 @@ var SyncQueue = class {
       contentEncoding = "gzip";
       if (this.config.verbose) {
         const ratio = ((1 - body.length / payloadBytes) * 100).toFixed(1);
-        log4.info(`Compressed ${payloadBytes} \u2192 ${body.length} bytes (${ratio}% reduction)`);
+        log5.info(`Compressed ${payloadBytes} \u2192 ${body.length} bytes (${ratio}% reduction)`);
       }
     } else {
       body = payloadJson;
@@ -70687,11 +70923,11 @@ var SyncQueue = class {
       await fs25.writeFile(filepath, JSON.stringify(messages));
       this.stats.spilledFiles++;
       if (this.config.verbose) {
-        log4.info(`Spilled ${messages.length} messages to ${filename}`);
+        log5.info(`Spilled ${messages.length} messages to ${filename}`);
       }
       await this.cleanupSpillFiles();
     } catch (err) {
-      log4.error("Failed to spill to disk", { error: String(err) });
+      log5.error("Failed to spill to disk", { error: String(err) });
     }
   }
   /**
@@ -70715,23 +70951,23 @@ var SyncQueue = class {
             recovered += messages.length;
             this.stats.spilledFiles = Math.max(0, this.stats.spilledFiles - 1);
             if (this.config.verbose) {
-              log4.info(`Recovered ${messages.length} messages from ${file}`);
+              log5.info(`Recovered ${messages.length} messages from ${file}`);
             }
           } else {
             failed += messages.length;
           }
         } catch (err) {
-          log4.warn(`Failed to recover ${file}`, { error: String(err) });
+          log5.warn(`Failed to recover ${file}`, { error: String(err) });
           failed++;
         }
       }
     } catch (err) {
       if (err.code !== "ENOENT") {
-        log4.error("Failed to scan spill directory", { error: String(err) });
+        log5.error("Failed to scan spill directory", { error: String(err) });
       }
     }
     if (recovered > 0) {
-      log4.info(`Recovered ${recovered} messages from spill files`);
+      log5.info(`Recovered ${recovered} messages from spill files`);
     }
     return { recovered, failed };
   }
@@ -70749,7 +70985,7 @@ var SyncQueue = class {
           });
         }
         if (this.config.verbose) {
-          log4.info(`Cleaned up ${toDelete.length} old spill files`);
+          log5.info(`Cleaned up ${toDelete.length} old spill files`);
         }
       }
     } catch {
@@ -70799,7 +71035,7 @@ var SyncQueue = class {
 // packages/utils/dist/git-remote.js
 var fs26 = __toESM(require("node:fs"), 1);
 var path27 = __toESM(require("node:path"), 1);
-var import_node_child_process12 = require("node:child_process");
+var import_node_child_process13 = require("node:child_process");
 function parseGitRemoteUrl(url) {
   if (!url)
     return null;
@@ -70819,7 +71055,7 @@ function getGitRemoteUrl(workingDirectory, remoteName = "origin") {
     if (!fs26.existsSync(gitDir)) {
       return null;
     }
-    const result = (0, import_node_child_process12.execSync)(`git remote get-url ${remoteName}`, {
+    const result = (0, import_node_child_process13.execSync)(`git remote get-url ${remoteName}`, {
       cwd: workingDirectory,
       encoding: "utf-8",
       timeout: 5e3,
@@ -70872,7 +71108,7 @@ function getRepoFullNameFromPath(workingDirectory) {
 }
 
 // packages/daemon/dist/cloud-sync.js
-var log5 = createLogger2("cloud-sync");
+var log6 = createLogger2("cloud-sync");
 var CloudSyncService = class extends import_events7.EventEmitter {
   config;
   heartbeatTimer;
@@ -70907,7 +71143,7 @@ var CloudSyncService = class extends import_events7.EventEmitter {
     this.projectDirectory = this.config.projectDirectory || process.cwd();
     this.repoFullName = getRepoFullNameFromPath(this.projectDirectory);
     if (this.repoFullName) {
-      log5.info("Detected git repository", { repoFullName: this.repoFullName });
+      log6.info("Detected git repository", { repoFullName: this.repoFullName });
     }
     if (this.config.useOptimizedSync && this.config.apiKey) {
       this.syncQueue = new SyncQueue({
@@ -70940,19 +71176,19 @@ var CloudSyncService = class extends import_events7.EventEmitter {
    */
   async start() {
     if (!this.config.enabled || !this.config.apiKey) {
-      log5.info("Disabled (no API key configured)");
-      log5.info("Run `agent-relay cloud link` to connect to cloud");
+      log6.info("Disabled (no API key configured)");
+      log6.info("Run `agent-relay cloud link` to connect to cloud");
       return;
     }
-    log5.info("Starting cloud sync", { url: this.config.cloudUrl });
+    log6.info("Starting cloud sync", { url: this.config.cloudUrl });
     if (this.syncQueue) {
       const { recovered, failed } = await this.syncQueue.recoverSpilledMessages();
       if (recovered > 0 || failed > 0) {
-        log5.info("Recovered spilled messages", { recovered, failed });
+        log6.info("Recovered spilled messages", { recovered, failed });
       }
     }
     await this.sendHeartbeat();
-    this.heartbeatTimer = setInterval(() => this.sendHeartbeat().catch((err) => log5.error("Heartbeat failed", { error: String(err) })), this.config.heartbeatInterval);
+    this.heartbeatTimer = setInterval(() => this.sendHeartbeat().catch((err) => log6.error("Heartbeat failed", { error: String(err) })), this.config.heartbeatInterval);
     this.connected = true;
     this.emit("connected");
   }
@@ -70979,7 +71215,7 @@ var CloudSyncService = class extends import_events7.EventEmitter {
       this.localAgents.set(agent.name, agent);
     }
     if (this.connected) {
-      this.syncAgents().catch((err) => log5.error("Agent sync failed", { error: String(err) }));
+      this.syncAgents().catch((err) => log6.error("Agent sync failed", { error: String(err) }));
     }
   }
   /**
@@ -71046,7 +71282,7 @@ var CloudSyncService = class extends import_events7.EventEmitter {
       }).finally(() => clearTimeout(timeoutId));
       if (!response.ok) {
         if (response.status === 401) {
-          log5.error("Invalid API key. Run `agent-relay cloud link` to re-authenticate.");
+          log6.error("Invalid API key. Run `agent-relay cloud link` to re-authenticate.");
           this.stop();
           return;
         }
@@ -71067,18 +71303,18 @@ var CloudSyncService = class extends import_events7.EventEmitter {
     } catch (error2) {
       const errorMessage = String(error2);
       if (error2 instanceof Error && error2.name === "AbortError") {
-        log5.error("Heartbeat timeout (10s)", { url: this.config.cloudUrl });
+        log6.error("Heartbeat timeout (10s)", { url: this.config.cloudUrl });
       } else if (errorMessage.includes("fetch failed") || errorMessage.includes("ECONNREFUSED")) {
-        log5.error("Heartbeat network error - cloud server unreachable", {
+        log6.error("Heartbeat network error - cloud server unreachable", {
           url: this.config.cloudUrl,
           error: errorMessage
         });
       } else if (errorMessage.includes("ENOTFOUND") || errorMessage.includes("getaddrinfo")) {
-        log5.error("Heartbeat DNS error - cannot resolve cloud server", {
+        log6.error("Heartbeat DNS error - cannot resolve cloud server", {
           url: this.config.cloudUrl
         });
       } else {
-        log5.error("Heartbeat error", { error: errorMessage });
+        log6.error("Heartbeat error", { error: errorMessage });
       }
       this.emit("error", error2);
     }
@@ -71168,14 +71404,14 @@ var CloudSyncService = class extends import_events7.EventEmitter {
    */
   setStorage(storage) {
     this.storage = storage;
-    log5.info("Storage adapter configured for message sync");
+    log6.info("Storage adapter configured for message sync");
   }
   /**
    * Set the metrics provider for agent metrics sync
    */
   setMetricsProvider(provider) {
     this.metricsProvider = provider;
-    log5.info("Metrics provider configured for agent metrics sync");
+    log6.info("Metrics provider configured for agent metrics sync");
   }
   /**
    * Push agent metrics to cloud monitoring API.
@@ -71222,11 +71458,11 @@ var CloudSyncService = class extends import_events7.EventEmitter {
       }
       const result = await response.json();
       if (result.recorded > 0) {
-        log5.info(`Pushed ${result.recorded} agent metrics to cloud`);
+        log6.info(`Pushed ${result.recorded} agent metrics to cloud`);
       }
       return { recorded: result.recorded };
     } catch (error2) {
-      log5.error("Failed to push agent metrics", { error: String(error2) });
+      log6.error("Failed to push agent metrics", { error: String(error2) });
       return null;
     }
   }
@@ -71257,10 +71493,10 @@ var CloudSyncService = class extends import_events7.EventEmitter {
         throw new Error(`Session create failed: ${response.status}`);
       }
       const result = await response.json();
-      log5.info(`Created session ${result.sessionId.substring(0, 8)} for ${agentName}`);
+      log6.info(`Created session ${result.sessionId.substring(0, 8)} for ${agentName}`);
       return result.sessionId;
     } catch (error2) {
-      log5.error("Failed to create session", { agentName, error: String(error2) });
+      log6.error("Failed to create session", { agentName, error: String(error2) });
       return null;
     }
   }
@@ -71288,10 +71524,10 @@ var CloudSyncService = class extends import_events7.EventEmitter {
         throw new Error(`Summary add failed: ${response.status}`);
       }
       const result = await response.json();
-      log5.info(`Added summary for ${agentName}: ${summary.currentTask || "no task"}`);
+      log6.info(`Added summary for ${agentName}: ${summary.currentTask || "no task"}`);
       return result.summaryId;
     } catch (error2) {
-      log5.error("Failed to add summary", { sessionId, agentName, error: String(error2) });
+      log6.error("Failed to add summary", { sessionId, agentName, error: String(error2) });
       return null;
     }
   }
@@ -71317,10 +71553,10 @@ var CloudSyncService = class extends import_events7.EventEmitter {
       if (!response.ok) {
         throw new Error(`Session end failed: ${response.status}`);
       }
-      log5.info(`Ended session ${sessionId.substring(0, 8)}: ${endMarker?.summary || "no summary"}`);
+      log6.info(`Ended session ${sessionId.substring(0, 8)}: ${endMarker?.summary || "no summary"}`);
       return true;
     } catch (error2) {
-      log5.error("Failed to end session", { sessionId, error: String(error2) });
+      log6.error("Failed to end session", { sessionId, error: String(error2) });
       return false;
     }
   }
@@ -71409,11 +71645,11 @@ var CloudSyncService = class extends import_events7.EventEmitter {
         this.lastMessageSyncTs = Math.max(...messages.map((m) => m.ts));
       }
       if (result.synced > 0) {
-        log5.info(`Synced ${result.synced} messages to cloud`, { duplicates: result.duplicates });
+        log6.info(`Synced ${result.synced} messages to cloud`, { duplicates: result.duplicates });
       }
       return result;
     } catch (error2) {
-      log5.error("Message sync error", { error: String(error2) });
+      log6.error("Message sync error", { error: String(error2) });
       return { synced: 0, duplicates: 0 };
     } finally {
       this.messageSyncInProgress = false;
@@ -71438,7 +71674,7 @@ function createCloudPersistenceHandler(cloudSync, workspaceId) {
           sessionId = newSessionId;
           agentSessions.set(agentName, sessionId);
         } else {
-          log5.warn(`Failed to create session for ${agentName}, skipping summary`);
+          log6.warn(`Failed to create session for ${agentName}, skipping summary`);
           return;
         }
       }
@@ -71450,7 +71686,7 @@ function createCloudPersistenceHandler(cloudSync, workspaceId) {
         await cloudSync.endSession(sessionId, event.marker);
         agentSessions.delete(agentName);
       } else {
-        log5.warn(`No session found for ${agentName} on session-end`);
+        log6.warn(`No session found for ${agentName} on session-end`);
       }
     },
     destroy() {
@@ -74347,15 +74583,15 @@ var Orchestrator = class extends import_events8.EventEmitter {
    */
   getGitInfo(workspacePath) {
     try {
-      const { execSync: execSync9 } = require("child_process");
-      const branch = execSync9("git branch --show-current", {
+      const { execSync: execSync10 } = require("child_process");
+      const branch = execSync10("git branch --show-current", {
         cwd: workspacePath,
         encoding: "utf8",
         stdio: ["pipe", "pipe", "pipe"]
       }).trim();
       let remote;
       try {
-        remote = execSync9("git remote get-url origin", {
+        remote = execSync10("git remote get-url origin", {
           cwd: workspacePath,
           encoding: "utf8",
           stdio: ["pipe", "pipe", "pipe"]
@@ -76839,7 +77075,7 @@ function manageContext(compactor, messages) {
 }
 
 // packages/daemon/dist/cli-auth.js
-var import_node_child_process13 = require("node:child_process");
+var import_node_child_process14 = require("node:child_process");
 var fs33 = __toESM(require("fs/promises"), 1);
 var os15 = __toESM(require("os"), 1);
 var import_node_path27 = require("node:path");
@@ -76956,7 +77192,7 @@ async function startCLIAuth(provider, options = {}) {
       config2.command,
       ...args
     ];
-    const proc = (0, import_node_child_process13.spawn)(relayPtyPath, relayArgs, {
+    const proc = (0, import_node_child_process14.spawn)(relayPtyPath, relayArgs, {
       cwd: process.cwd(),
       env: {
         ...process.env,
@@ -78198,11 +78434,11 @@ var HookRegistry = class {
 };
 
 // packages/trajectory/dist/integration.js
-var import_node_child_process14 = require("node:child_process");
+var import_node_child_process15 = require("node:child_process");
 async function runTrail2(args) {
   return new Promise((resolve5) => {
     const trajectoryEnv = getTrajectoryEnvVars();
-    const proc = (0, import_node_child_process14.spawn)("trail", args, {
+    const proc = (0, import_node_child_process15.spawn)("trail", args, {
       cwd: getProjectPaths().projectRoot,
       env: { ...process.env, ...trajectoryEnv },
       stdio: ["pipe", "pipe", "pipe"]
@@ -78473,7 +78709,7 @@ var TrajectoryIntegration2 = class {
    */
   isTrailInstalledSync() {
     try {
-      (0, import_node_child_process14.execSync)("which trail", { stdio: "pipe" });
+      (0, import_node_child_process15.execSync)("which trail", { stdio: "pipe" });
       return true;
     } catch {
       return false;