@adhdev/daemon-standalone 1.0.45-rc.4 → 1.0.45-rc.6

package/dist/index.js

@@ -31423,9 +31423,9 @@ var require_streamx = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/b4a/index.js
+// ../../node_modules/tar-stream/node_modules/b4a/index.js
 var require_b4a2 = __commonJS({
-  "../daemon-core/node_modules/b4a/index.js"(exports2, module2) {
+  "../../node_modules/tar-stream/node_modules/b4a/index.js"(exports2, module2) {
     "use strict";
     function isBuffer(value) {
       return Buffer.isBuffer(value) || value instanceof Uint8Array;
@@ -31581,9 +31581,9 @@ var require_b4a2 = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/headers.js
+// ../../node_modules/tar-stream/headers.js
 var require_headers = __commonJS({
-  "../daemon-core/node_modules/tar-stream/headers.js"(exports2) {
+  "../../node_modules/tar-stream/headers.js"(exports2) {
     "use strict";
     var b4a = require_b4a2();
     var ZEROS = "0000000000000000000";
@@ -31844,9 +31844,9 @@ var require_headers = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/extract.js
+// ../../node_modules/tar-stream/extract.js
 var require_extract = __commonJS({
-  "../daemon-core/node_modules/tar-stream/extract.js"(exports2, module2) {
+  "../../node_modules/tar-stream/extract.js"(exports2, module2) {
     "use strict";
     var { Writable, Readable, getStreamError } = require_streamx();
     var FIFO = require_fast_fifo();
@@ -32189,9 +32189,9 @@ var require_extract = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/constants.js
+// ../../node_modules/tar-stream/constants.js
 var require_constants = __commonJS({
-  "../daemon-core/node_modules/tar-stream/constants.js"(exports2, module2) {
+  "../../node_modules/tar-stream/constants.js"(exports2, module2) {
     "use strict";
     var constants = {
       // just for envs without fs
@@ -32210,9 +32210,9 @@ var require_constants = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/pack.js
+// ../../node_modules/tar-stream/pack.js
 var require_pack = __commonJS({
-  "../daemon-core/node_modules/tar-stream/pack.js"(exports2, module2) {
+  "../../node_modules/tar-stream/pack.js"(exports2, module2) {
     "use strict";
     var { Readable, Writable, getStreamError } = require_streamx();
     var b4a = require_b4a2();
@@ -32445,9 +32445,9 @@ var require_pack = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-stream/index.js
+// ../../node_modules/tar-stream/index.js
 var require_tar_stream = __commonJS({
-  "../daemon-core/node_modules/tar-stream/index.js"(exports2) {
+  "../../node_modules/tar-stream/index.js"(exports2) {
     "use strict";
     exports2.extract = require_extract();
     exports2.pack = require_pack();
@@ -32690,9 +32690,9 @@ var require_pump = __commonJS({
   }
 });
 
-// ../daemon-core/node_modules/tar-fs/index.js
+// ../../node_modules/tar-fs/index.js
 var require_tar_fs = __commonJS({
-  "../daemon-core/node_modules/tar-fs/index.js"(exports2) {
+  "../../node_modules/tar-fs/index.js"(exports2) {
     "use strict";
     var tar = require_tar_stream();
     var pump = require_pump();
@@ -37020,10 +37020,10 @@ var require_dist3 = __commonJS({
     }
     function getDaemonBuildInfo() {
       if (cached2) return cached2;
-      const commit = readInjected(true ? "c4c08d064cf2ec5754b25d3a73098b518fe14ae0" : void 0) ?? "unknown";
-      const commitShort = readInjected(true ? "c4c08d0" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
-      const version2 = readInjected(true ? "1.0.45-rc.4" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
-      const builtAt = readInjected(true ? "2026-08-11T16:57:07.456Z" : void 0);
+      const commit = readInjected(true ? "ad6b5dfbb762ac45467586208d4393788832ad7a" : void 0) ?? "unknown";
+      const commitShort = readInjected(true ? "ad6b5dfb" : void 0) ?? (commit !== "unknown" ? commit.slice(0, 7) : "unknown");
+      const version2 = readInjected(true ? "1.0.45-rc.6" : void 0) ?? readInjected(typeof process !== "undefined" ? process.env?.ADHDEV_PKG_VERSION : void 0) ?? "unknown";
+      const builtAt = readInjected(true ? "2026-08-12T05:35:42.422Z" : void 0);
       cached2 = builtAt ? { commit, commitShort, version: version2, builtAt } : { commit, commitShort, version: version2 };
       return cached2;
     }
@@ -53763,6 +53763,7 @@ When the user asks to **set up / configure / onboard** this repo for Repo Mesh (
     __export2(mesh_coordinator_exports, {
       applyMeshCoordinatorSystemPromptInjection: () => applyMeshCoordinatorSystemPromptInjection,
       buildMeshCoordinatorRegistrationPlan: () => buildMeshCoordinatorRegistrationPlan,
+      cleanupCoordinatorAgentFile: () => cleanupCoordinatorAgentFile,
       createHermesManualMeshCoordinatorSetup: () => createHermesManualMeshCoordinatorSetup,
       execUnderPty: () => execUnderPty,
       resolveMeshCoordinatorSetup: () => resolveMeshCoordinatorSetup,
@@ -54012,6 +54013,22 @@ ${(0, import_node_path3.resolve)(workspace || os7.tmpdir())}`;
           ctx.launchEnv[injection.name] = systemPrompt;
           return {};
         }
+        case "agent_file": {
+          if (!injection.flag) return {};
+          const template = injection.template && injection.template.includes("{prompt}") ? injection.template : "{prompt}";
+          const body = template.replace(/\{prompt\}/g, systemPrompt);
+          try {
+            const dir = (0, import_node_fs3.mkdtempSync)((0, import_node_path3.join)(os7.tmpdir(), `adhdev-coord-${ctx.cliType}-`));
+            const filePath = (0, import_node_path3.join)(dir, "coordinator-agent.md");
+            (0, import_node_fs3.writeFileSync)(filePath, body, "utf-8");
+            ctx.cliArgs.push(injection.flag, filePath);
+            LOG2.info("MeshCoordinator", `Wrote coordinator agent file to ${filePath} (${ctx.cliType})`);
+            return { agentFilePath: filePath };
+          } catch (error48) {
+            LOG2.warn("MeshCoordinator", `Could not write coordinator agent file: ${error48?.message || error48}`);
+            return {};
+          }
+        }
         case "context_file": {
           if (!injection.path) return {};
           const target = (0, import_node_path3.isAbsolute)(injection.path) ? injection.path : (0, import_node_path3.join)(ctx.workspace, injection.path);
@@ -54023,6 +54040,7 @@ ${systemPrompt}`;
           const rendered = wrapper.replace(/\{prompt\}/g, promptWithNote);
           const sentinel = wrapper.split("{prompt}")[0].trim();
           try {
+            (0, import_node_fs3.mkdirSync)((0, import_node_path3.dirname)(target), { recursive: true });
             if ((0, import_node_fs3.existsSync)(target)) {
               const existing = (0, import_node_fs3.readFileSync)(target, "utf-8");
               if (sentinel && existing.includes(sentinel)) {
@@ -54040,7 +54058,7 @@ ${rendered}`, "utf-8");
               (0, import_node_fs3.writeFileSync)(target, rendered, "utf-8");
             }
             LOG2.info("MeshCoordinator", `Wrote coordinator prompt to ${target} (${ctx.cliType})`);
-            return { contextFilePath: target };
+            return { contextFilePath: target, contextFileOwned: injection.owned === true };
           } catch (error48) {
             LOG2.warn("MeshCoordinator", `Could not write ${target}: ${error48?.message || error48}`);
             return {};
@@ -54050,11 +54068,19 @@ ${rendered}`, "utf-8");
           return {};
       }
     }
-    function stripCoordinatorWrapperFile(filePath) {
+    function stripCoordinatorWrapperFile(filePath, owned = false) {
       const OPEN = "<!-- adhdev-mesh-coordinator-prompt -->";
       const CLOSE = "<!-- /adhdev-mesh-coordinator-prompt -->";
       try {
         if (!(0, import_node_fs3.existsSync)(filePath)) return;
+        if (owned) {
+          try {
+            const fs56 = require("fs");
+            fs56.unlinkSync(filePath);
+          } catch {
+          }
+          return;
+        }
         const existing = (0, import_node_fs3.readFileSync)(filePath, "utf-8");
         const openIdx = existing.indexOf(OPEN);
         if (openIdx < 0) return;
@@ -54073,6 +54099,13 @@ ${rendered}`, "utf-8");
       } catch {
       }
     }
+    function cleanupCoordinatorAgentFile(filePath) {
+      try {
+        if (!(0, import_node_fs3.existsSync)(filePath)) return;
+        (0, import_node_fs3.rmSync)((0, import_node_path3.dirname)(filePath), { recursive: true, force: true });
+      } catch {
+      }
+    }
     function buildMeshCoordinatorRegistrationPlan(cliType, serverName, registrationCommand) {
       const commandParts = registrationCommand.trim().split(/\s+/).filter(Boolean);
       const [command, ...args] = commandParts;
@@ -54206,12 +54239,13 @@ ${rendered}`, "utf-8");
       saveRegistry();
       if (!entry) return;
       const workspace = entry.workspace;
+      const owned = entry.injection?.owned === true;
       const target = entry.injection?.mode === "context_file" && typeof entry.injection.target === "string" ? entry.injection.target : "";
       if (!workspace || !target) return;
       const filePath = `${workspace.replace(/\/$/, "")}/${target}`;
       try {
         const { stripCoordinatorWrapperFile: stripCoordinatorWrapperFile2 } = (init_mesh_coordinator(), __toCommonJS2(mesh_coordinator_exports));
-        stripCoordinatorWrapperFile2(filePath);
+        stripCoordinatorWrapperFile2(filePath, owned);
       } catch {
       }
     }
@@ -70887,6 +70921,7 @@ ${cleanBody}`;
       };
     }
     function extractBuiltinTurnTerminalMarkers(agentType, lines) {
+      if (agentType === "kimi") return extractKimiTurnTerminalMarkers(lines);
       if (agentType !== "codex-cli") return [];
       const markers = [];
       for (const rec of lines) {
@@ -70910,6 +70945,23 @@ ${cleanBody}`;
       }
       return markers;
     }
+    function extractKimiTurnTerminalMarkers(lines) {
+      const markers = [];
+      for (const rec of lines) {
+        if (String(rec?.type ?? "") !== "turn.ended") continue;
+        const receivedAt = parseTimestamp(rec?.time) ?? Date.now();
+        const reason = String(rec?.reason ?? "").trim();
+        const rawTurnId = rec?.turnId;
+        const turnId = typeof rawTurnId === "number" && Number.isFinite(rawTurnId) ? String(rawTurnId) : typeof rawTurnId === "string" && rawTurnId.trim() ? rawTurnId.trim() : "";
+        markers.push({
+          receivedAt,
+          outcome: reason === "cancelled" ? "aborted" : "completed",
+          summary: "",
+          ...turnId ? { turnId } : {}
+        });
+      }
+      return markers;
+    }
     function flattenJsonlText(value) {
       if (typeof value === "string") return value.trim();
       if (value == null) return "";
@@ -72358,7 +72410,109 @@ ${cleanBody}`;
       if (!event || typeof event !== "object") return null;
       return event;
     }
+    function parseSelectorRow(line) {
+      const m = line.match(/^\s*(?:❯\s*)?(\S[\s\S]*?)\s*$/);
+      if (!m) return null;
+      const parts = m[1].split(/\s{2,}/);
+      const label = (parts[0] ?? "").trim();
+      if (!label) return null;
+      const description = parts.length > 1 ? parts.slice(1).join(" ").trim() : void 0;
+      return { label, ...description ? { description } : {} };
+    }
+    function detectKimiIdleSelectorPrompt(screenText) {
+      if (!screenText) return null;
+      const lines = screenText.split("\n");
+      let titleIdx = -1;
+      for (let i = lines.length - 1; i >= 0; i -= 1) {
+        if (IDLE_SELECTOR_TITLE.test(lines[i])) {
+          titleIdx = i;
+          break;
+        }
+      }
+      if (titleIdx < 0) return null;
+      let hintIdx = -1;
+      for (let i = titleIdx + 1; i <= Math.min(lines.length - 1, titleIdx + 4); i += 1) {
+        if (IDLE_SELECTOR_HINT.test(lines[i])) {
+          hintIdx = i;
+          break;
+        }
+      }
+      if (hintIdx < 0) return null;
+      let cursorIdx = -1;
+      for (let i = hintIdx + 1; i < lines.length; i += 1) {
+        const t = lines[i].trim();
+        if (!t) continue;
+        if (/^─+$/.test(t)) break;
+        if (t.startsWith("\u276F")) {
+          cursorIdx = i;
+          break;
+        }
+      }
+      if (cursorIdx < 0) return null;
+      const options = [];
+      for (let i = cursorIdx; i < lines.length; i += 1) {
+        const t = lines[i].trim();
+        if (!t || /^─+$/.test(t)) break;
+        const row = parseSelectorRow(lines[i]);
+        if (!row) break;
+        options.push(row);
+      }
+      if (options.length < 2) return null;
+      let question = "";
+      for (let i = cursorIdx - 1; i > hintIdx; i -= 1) {
+        const t = lines[i].trim();
+        if (!t || /^─+$/.test(t)) continue;
+        question = t;
+        break;
+      }
+      if (!question) return null;
+      const questions = [{
+        questionId: "q1",
+        question,
+        header: lines[titleIdx].trim(),
+        multiSelect: false,
+        options
+      }];
+      return {
+        promptId: `${KIMI_TUI_SELECTOR_PROMPT_PREFIX}${interactivePromptContentFingerprint(questions)}`,
+        origin: "cli",
+        providerType: "kimi",
+        createdAt: Date.now(),
+        questions
+      };
+    }
+    function buildKimiSelectorAnswerSteps(prompt, response, screenText) {
+      if (response.promptId !== prompt.promptId) throw new Error("Interactive prompt response does not match active prompt");
+      if (prompt.questions.length !== 1) throw new Error("kimi built-in selector prompt must have exactly one question");
+      const question = prompt.questions[0];
+      const answer = response.answers[question.questionId];
+      if (!answer) throw new Error(`Missing answer for ${question.questionId}`);
+      if (answer.freeformText?.trim()) throw new Error("kimi built-in selector has no freeform input");
+      if (answer.selectedLabels.length !== 1) throw new Error(`Expected one selected label for ${question.questionId}`);
+      const target = question.options.findIndex((o) => o.label === answer.selectedLabels[0]);
+      if (target < 0) throw new Error(`Unknown option for ${question.questionId}: ${answer.selectedLabels[0]}`);
+      let cursor = 0;
+      for (const line of (screenText ?? "").split("\n")) {
+        if (!line.trim().startsWith("\u276F")) continue;
+        const row = parseSelectorRow(line);
+        if (!row) continue;
+        const idx = question.options.findIndex((o) => o.label === row.label);
+        if (idx >= 0) {
+          cursor = idx;
+          break;
+        }
+      }
+      const steps = [];
+      const diff = target - cursor;
+      const key2 = diff > 0 ? "\x1B[B" : "\x1B[A";
+      for (let i = 0; i < Math.abs(diff); i += 1) steps.push(key2);
+      steps.push("\r");
+      return steps;
+    }
     var TAIL_BYTES2;
+    var KIMI_TUI_SELECTOR_PROMPT_PREFIX;
+    var IDLE_SELECTOR_TITLE;
+    var IDLE_SELECTOR_HINT;
     var init_kimi_pending_question = __esm2({
       "src/providers/kimi-pending-question.ts"() {
         "use strict";
@@ -72367,6 +72521,9 @@ ${cleanBody}`;
         init_background_task_detector();
         init_interactive_prompt();
         TAIL_BYTES2 = 512 * 1024;
+        KIMI_TUI_SELECTOR_PROMPT_PREFIX = "kimi-tui-selector-";
+        IDLE_SELECTOR_TITLE = /This session has been idle for/i;
+        IDLE_SELECTOR_HINT = /↑↓\s*navigate\s*·\s*Enter\s+select/i;
       }
     });
     var pty_transport_exports = {};
@@ -75441,12 +75598,13 @@ ${cont}` : cont;
           // it. Reset to 0 the instant any poll is ineligible.
           staticIdlePollStreak = 0;
           /**
-           * kimi AskUserQuestion picker hold (wire.jsonl authority). kimi renders
-           * AskUserQuestion as a TUI picker the modal/spinner matchers do NOT
-           * classify, so the session reads 'generating' while parked on the
-           * question. Refreshed from the session's own wire.jsonl on each
-           * getScriptParsedStatus() poll (refreshKimiPendingQuestion — same
-           * cadence/rationale as the background-task passthrough), surfaced on
+           * kimi interactive-picker hold. Covers (a) the AskUserQuestion picker
+           * (wire.jsonl authority — kimi renders it as a TUI picker the modal/spinner
+           * matchers do NOT classify, so the session reads 'generating' while parked)
+           * and (b) kimi's built-in idle/cache-expired selector (screen authority —
+           * a TUI built-in the wire never carries). Refreshed on each
+           * getScriptParsedStatus()/getStatus() poll (refreshKimiPendingQuestion —
+           * same cadence/rationale as the background-task passthrough), surfaced on
            * getStatus() as activeInteractivePrompt so CliProviderInstance overlays
            * waiting_choice and the status-transition layer emits agent:waiting_choice,
            * and consumed by setInteractivePromptResponse (mesh_answer_question) to
@@ -76343,23 +76501,28 @@ ${lastSnapshot}`;
            */
           refreshKimiPendingQuestion() {
             if (this.cliType !== "kimi") return;
-            const nativeHistory = this.provider?.nativeHistory;
-            if (!nativeHistory?.source) return;
             try {
-              const prompt = detectKimiPendingQuestion(nativeHistory, {
-                agentType: this.cliType,
-                providerSessionId: this.providerSessionId || void 0,
-                sessionStartedAtMs: this.spawnAt,
-                envOverrides: this.extraEnv,
-                workspace: this.workingDir,
-                // Sidecar-claim owner token (== session registry sessionId ==
-                // the read path's targetSessionId). WITHOUT it claiming is
-                // skipped and the sidecar resolution fails closed on
-                // ambiguity — any second kimi session dir in the workspace
-                // (e.g. a probe session) made detection silently dead
-                // (live: coordinator AskUserQuestion never surfaced).
-                instanceId: this.owningSessionId || void 0
-              });
+              const nativeHistory = this.provider?.nativeHistory;
+              let prompt = null;
+              if (nativeHistory?.source) {
+                prompt = detectKimiPendingQuestion(nativeHistory, {
+                  agentType: this.cliType,
+                  providerSessionId: this.providerSessionId || void 0,
+                  sessionStartedAtMs: this.spawnAt,
+                  envOverrides: this.extraEnv,
+                  workspace: this.workingDir,
+                  // Sidecar-claim owner token (== session registry sessionId ==
+                  // the read path's targetSessionId). WITHOUT it claiming is
+                  // skipped and the sidecar resolution fails closed on
+                  // ambiguity — any second kimi session dir in the workspace
+                  // (e.g. a probe session) made detection silently dead
+                  // (live: coordinator AskUserQuestion never surfaced).
+                  instanceId: this.owningSessionId || void 0
+                });
+              }
+              if (!prompt && this.engine.currentStatus !== "generating") {
+                prompt = detectKimiIdleSelectorPrompt(this.terminalScreen.getText());
+              }
               if ((prompt?.promptId ?? null) !== (this.activeInteractivePrompt?.promptId ?? null)) {
                 this.activeInteractivePrompt = prompt;
                 this.onStatusChange?.();
@@ -76419,7 +76582,7 @@ ${lastSnapshot}`;
               if (!prompt || prompt.promptId !== response.promptId) {
                 throw new Error("Interactive prompt response does not match active prompt");
               }
-              const steps = buildKimiInteractiveTuiAnswerSteps(prompt, response);
+              const steps = prompt.promptId.startsWith(KIMI_TUI_SELECTOR_PROMPT_PREFIX) ? buildKimiSelectorAnswerSteps(prompt, response, this.terminalScreen.getText()) : buildKimiInteractiveTuiAnswerSteps(prompt, response);
               for (const step of steps) {
                 await this.writeToPty(step);
                 await new Promise((resolve29) => setTimeout(resolve29, 180));
@@ -78272,16 +78435,27 @@ ${lastSnapshot}`;
                       type: "object",
                       additionalProperties: false,
                       required: ["mode", "path"],
-                      properties: { mode: { const: "context_file" }, path: { type: "string" }, wrapper: { type: "string" } }
+                      properties: { mode: { const: "context_file" }, path: { type: "string" }, wrapper: { type: "string" }, owned: { type: "boolean" } }
                     },
                     {
                       type: "object",
                       additionalProperties: false,
                       required: ["mode", "name"],
                       properties: { mode: { const: "env_var" }, name: { type: "string" } }
+                    },
+                    {
+                      type: "object",
+                      additionalProperties: false,
+                      required: ["mode", "flag"],
+                      properties: { mode: { const: "agent_file" }, flag: { type: "string" }, template: { type: "string" } }
                     }
                   ]
                 },
+                launchArgs: {
+                  description: "Extra spawn args appended ONLY for coordinator launches (e.g. cursor-agent's --approve-mcps accepts the daemon-written .cursor/mcp.json without parking on the MCP-approval modal).",
+                  type: "array",
+                  items: { type: "string", minLength: 1 }
+                },
                 delegatedWorkerIsolation: {
                   description: "Provider-declared launch isolation for coordinator-spawned worker sessions. Keeps worker-only sessions from inheriting coordinator MCP/tools/config.",
                   type: "object",
@@ -81327,8 +81501,8 @@ ${lastSnapshot}`;
           if ((0, import_fs17.existsSync)(bundledCli)) resolvedCli = bundledCli;
         }
         if (!resolvedCli && appPath && os28 === "win32") {
-          const { dirname: dirname22 } = await import("path");
-          const appDir = dirname22(appPath);
+          const { dirname: dirname23 } = await import("path");
+          const appDir = dirname23(appPath);
           const candidates = [
             `${appDir}\\\\bin\\\\${def.cli}.cmd`,
             `${appDir}\\\\bin\\\\${def.cli}`,
@@ -109396,8 +109570,8 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
             normalizeRepoMeshDeclarativeConfig: normalizeRepoMeshDeclarativeConfig2,
             MESH_JSON_CONFIG_LOCATIONS: MESH_JSON_CONFIG_LOCATIONS2
           } = await Promise.resolve().then(() => (init_mesh_json_config(), mesh_json_config_exports));
-          const { mkdirSync: mkdirSync29, writeFileSync: writeFileSync30 } = await import("fs");
-          const { dirname: dirname22, join: join62 } = await import("path");
+          const { mkdirSync: mkdirSync30, writeFileSync: writeFileSync30 } = await import("fs");
+          const { dirname: dirname23, join: join62 } = await import("path");
           const scaffold = buildMeshJsonConfigScaffold2(mesh);
           const scaffoldJson = serializeMeshJsonConfigScaffold2(scaffold);
           const relativePath = MESH_JSON_CONFIG_LOCATIONS2[0];
@@ -109437,7 +109611,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
               note: "Dry-run: nothing written. Re-run with write=true to persist to the repo (commit target). meshes.json is untouched."
             };
           }
-          mkdirSync29(dirname22(absolutePath), { recursive: true });
+          mkdirSync30(dirname23(absolutePath), { recursive: true });
           writeFileSync30(absolutePath, `${scaffoldJson}
 `, "utf-8");
           return {
@@ -109507,8 +109681,8 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
             normalizeRepoMeshDeclarativeConfig: normalizeRepoMeshDeclarativeConfig2,
             MESH_JSON_CONFIG_LOCATIONS: MESH_JSON_CONFIG_LOCATIONS2
           } = await Promise.resolve().then(() => (init_mesh_json_config(), mesh_json_config_exports));
-          const { existsSync: existsSync62, readFileSync: readFileSync53, mkdirSync: mkdirSync29, writeFileSync: writeFileSync30 } = await import("fs");
-          const { dirname: dirname22, join: join62 } = await import("path");
+          const { existsSync: existsSync62, readFileSync: readFileSync53, mkdirSync: mkdirSync30, writeFileSync: writeFileSync30 } = await import("fs");
+          const { dirname: dirname23, join: join62 } = await import("path");
           const yaml6 = await Promise.resolve().then(() => (init_js_yaml(), js_yaml_exports));
           const relativePath = MESH_JSON_CONFIG_LOCATIONS2[0];
           let baseDoc = { version: 1 };
@@ -109572,7 +109746,7 @@ ${formatManifestValidationIssues2(validation2.issues)}`);
               note: "Dry-run: nothing written. Re-run with write=true to persist. Only the providerDefaults zone is merged; other repo zones are preserved."
             };
           }
-          mkdirSync29(dirname22(absolutePath), { recursive: true });
+          mkdirSync30(dirname23(absolutePath), { recursive: true });
           writeFileSync30(absolutePath, serialized, "utf-8");
           return {
             success: true,
@@ -111588,6 +111762,8 @@ ${ptyResult.output.slice(-2e3)}`);
             const cliCmdArgs = [];
             const cliCmdEnv = {};
             let cliCmdContextFilePath;
+            let cliCmdContextFileOwned = false;
+            let cliCmdAgentFilePath;
             if (cliCmdSystemPrompt) {
               const { applyMeshCoordinatorSystemPromptInjection: applyMeshCoordinatorSystemPromptInjection2 } = await Promise.resolve().then(() => (init_mesh_coordinator(), mesh_coordinator_exports));
               const effect = applyMeshCoordinatorSystemPromptInjection2(
@@ -111596,6 +111772,12 @@ ${ptyResult.output.slice(-2e3)}`);
                 { cliArgs: cliCmdArgs, launchEnv: cliCmdEnv, workspace, cliType }
               );
               cliCmdContextFilePath = effect.contextFilePath;
+              cliCmdContextFileOwned = effect.contextFileOwned === true;
+              cliCmdAgentFilePath = effect.agentFilePath;
+            }
+            const cliCmdProviderLaunchArgs = providerMeta?.meshCoordinator?.launchArgs;
+            if (Array.isArray(cliCmdProviderLaunchArgs)) {
+              cliCmdArgs.push(...cliCmdProviderLaunchArgs.filter((a) => typeof a === "string" && a.trim()));
             }
             const cliCmdLaunch = await ctx.deps.cliManager.handleCliCommand("launch_cli", {
               cliType,
@@ -111628,14 +111810,24 @@ ${ptyResult.output.slice(-2e3)}`);
             });
             if (cliCmdLaunch?.success && cliCmdContextFilePath) {
               const stripPath = cliCmdContextFilePath;
+              const stripOwned = cliCmdContextFileOwned;
               setTimeout(() => {
                 void Promise.resolve().then(() => (init_mesh_coordinator(), mesh_coordinator_exports)).then(({ stripCoordinatorWrapperFile: stripCoordinatorWrapperFile2 }) => {
-                  stripCoordinatorWrapperFile2(stripPath);
+                  stripCoordinatorWrapperFile2(stripPath, stripOwned);
                   LOG2.info("MeshCoordinator", `Stripped wrapper from ${stripPath} after launch settle (cli_command)`);
                 }).catch(() => {
                 });
               }, 5e3);
             }
+            if (cliCmdLaunch?.success && cliCmdAgentFilePath) {
+              const agentPath = cliCmdAgentFilePath;
+              setTimeout(() => {
+                void Promise.resolve().then(() => (init_mesh_coordinator(), mesh_coordinator_exports)).then(({ cleanupCoordinatorAgentFile: cleanupCoordinatorAgentFile2 }) => {
+                  cleanupCoordinatorAgentFile2(agentPath);
+                }).catch(() => {
+                });
+              }, 5e3);
+            }
             if (!cliCmdLaunch?.success) {
               return { success: false, error: cliCmdLaunch?.error || "Failed to launch CLI session" };
             }
@@ -111653,7 +111845,8 @@ ${ptyResult.output.slice(-2e3)}`);
                 extraSystemPrompt: extraSystemPrompt || void 0,
                 injection: cliCmdInjectionDecl ? {
                   mode: cliCmdInjectionDecl.mode,
-                  target: "flag" in cliCmdInjectionDecl ? cliCmdInjectionDecl.flag : "name" in cliCmdInjectionDecl ? cliCmdInjectionDecl.name : "path" in cliCmdInjectionDecl ? cliCmdInjectionDecl.path : void 0
+                  target: "flag" in cliCmdInjectionDecl ? cliCmdInjectionDecl.flag : "name" in cliCmdInjectionDecl ? cliCmdInjectionDecl.name : "path" in cliCmdInjectionDecl ? cliCmdInjectionDecl.path : void 0,
+                  ..."owned" in cliCmdInjectionDecl ? { owned: cliCmdInjectionDecl.owned === true } : {}
                 } : void 0
               });
             }
@@ -111708,8 +111901,8 @@ ${ptyResult.output.slice(-2e3)}`);
               workspace
             };
           }
-          const { existsSync: existsSync62, readFileSync: readFileSync53, writeFileSync: writeFileSync30, copyFileSync: copyFileSync3, mkdirSync: mkdirSync29 } = await import("fs");
-          const { dirname: dirname22 } = await import("path");
+          const { existsSync: existsSync62, readFileSync: readFileSync53, writeFileSync: writeFileSync30, copyFileSync: copyFileSync3, mkdirSync: mkdirSync30 } = await import("fs");
+          const { dirname: dirname23 } = await import("path");
           const mcpConfigPath = coordinatorSetup.configPath;
           const hermesManualFallback = cliType === "hermes-cli" && configFormat === "hermes_config_yaml" ? createHermesManualMeshCoordinatorSetup(meshId, workspace) : null;
           let hermesBaseConfig = null;
@@ -111746,7 +111939,7 @@ ${ptyResult.output.slice(-2e3)}`);
             ...mcpServerEnv ? { env: mcpServerEnv } : {}
           });
           try {
-            mkdirSync29(dirname22(mcpConfigPath), { recursive: true });
+            mkdirSync30(dirname23(mcpConfigPath), { recursive: true });
           } catch (error48) {
             const message = `Could not prepare MCP config path for automatic setup: ${error48?.message || error48}`;
             LOG2.error("MeshCoordinator", message);
@@ -111756,7 +111949,7 @@ ${ptyResult.output.slice(-2e3)}`);
           const hadExistingMcpConfig = existsSync62(mcpConfigPath);
           let existingMcpConfig = hermesBaseConfig?.config || {};
           if (hermesBaseConfig) {
-            copyHermesCoordinatorCredentialFiles(hermesBaseConfig.sourceHome, dirname22(mcpConfigPath));
+            copyHermesCoordinatorCredentialFiles(hermesBaseConfig.sourceHome, dirname23(mcpConfigPath));
           }
           if (hadExistingMcpConfig) {
             try {
@@ -111794,10 +111987,12 @@ ${ptyResult.output.slice(-2e3)}`);
           const cliArgs = [];
           const launchEnv = {};
           if (configFormat === "hermes_config_yaml") {
-            launchEnv.HERMES_HOME = dirname22(mcpConfigPath);
+            launchEnv.HERMES_HOME = dirname23(mcpConfigPath);
             launchEnv.HERMES_IGNORE_USER_CONFIG = "";
           }
           let autoImportContextFilePath;
+          let autoImportContextFileOwned = false;
+          let autoImportAgentFilePath;
           if (systemPrompt) {
             const { applyMeshCoordinatorSystemPromptInjection: applyMeshCoordinatorSystemPromptInjection2 } = await Promise.resolve().then(() => (init_mesh_coordinator(), mesh_coordinator_exports));
             const effect = applyMeshCoordinatorSystemPromptInjection2(
@@ -111806,6 +112001,12 @@ ${ptyResult.output.slice(-2e3)}`);
               { cliArgs, launchEnv, workspace, cliType }
             );
             autoImportContextFilePath = effect.contextFilePath;
+            autoImportContextFileOwned = effect.contextFileOwned === true;
+            autoImportAgentFilePath = effect.agentFilePath;
+          }
+          const autoImportProviderLaunchArgs = providerMeta?.meshCoordinator?.launchArgs;
+          if (Array.isArray(autoImportProviderLaunchArgs)) {
+            cliArgs.push(...autoImportProviderLaunchArgs.filter((a) => typeof a === "string" && a.trim()));
           }
           if (cliType === "claude-cli") {
             cliArgs.push("--mcp-config", coordinatorSetup.configPath);
@@ -111835,14 +112036,24 @@ ${ptyResult.output.slice(-2e3)}`);
           });
           if (launchResult?.success && autoImportContextFilePath) {
             const stripPath = autoImportContextFilePath;
+            const stripOwned = autoImportContextFileOwned;
             setTimeout(() => {
               void Promise.resolve().then(() => (init_mesh_coordinator(), mesh_coordinator_exports)).then(({ stripCoordinatorWrapperFile: stripCoordinatorWrapperFile2 }) => {
-                stripCoordinatorWrapperFile2(stripPath);
+                stripCoordinatorWrapperFile2(stripPath, stripOwned);
                 LOG2.info("MeshCoordinator", `Stripped wrapper from ${stripPath} after launch settle (auto_import)`);
               }).catch(() => {
               });
             }, 5e3);
           }
+          if (launchResult?.success && autoImportAgentFilePath) {
+            const agentPath = autoImportAgentFilePath;
+            setTimeout(() => {
+              void Promise.resolve().then(() => (init_mesh_coordinator(), mesh_coordinator_exports)).then(({ cleanupCoordinatorAgentFile: cleanupCoordinatorAgentFile2 }) => {
+                cleanupCoordinatorAgentFile2(agentPath);
+              }).catch(() => {
+              });
+            }, 5e3);
+          }
           if (!launchResult?.success) {
             return { success: false, error: launchResult?.error || "Failed to launch CLI session" };
           }
@@ -111861,7 +112072,8 @@ ${ptyResult.output.slice(-2e3)}`);
               mcpConfigPath,
               injection: autoImportInjectionDecl ? {
                 mode: autoImportInjectionDecl.mode,
-                target: "flag" in autoImportInjectionDecl ? autoImportInjectionDecl.flag : "name" in autoImportInjectionDecl ? autoImportInjectionDecl.name : "path" in autoImportInjectionDecl ? autoImportInjectionDecl.path : void 0
+                target: "flag" in autoImportInjectionDecl ? autoImportInjectionDecl.flag : "name" in autoImportInjectionDecl ? autoImportInjectionDecl.name : "path" in autoImportInjectionDecl ? autoImportInjectionDecl.path : void 0,
+                ..."owned" in autoImportInjectionDecl ? { owned: autoImportInjectionDecl.owned === true } : {}
               } : void 0
             });
           }