@runfusion/fusion 0.13.0 → 0.14.1

package/dist/bin.js

@@ -1009,11 +1009,40 @@ function hasAgentIdentity(agent) {
   if (!agent) return false;
   return !!(agent.soul?.trim() || agent.instructionsText?.trim() || agent.instructionsPath?.trim() || agent.memory?.trim());
 }
-function getDefaultHeartbeatProcedurePath(agentId) {
+function slugifyAgentAssetSegment(value) {
+  return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+}
+function getSafeAgentAssetIdSegment(agentId) {
+  const slug = slugifyAgentAssetSegment(agentId);
+  return slug || "agent";
+}
+function getCanonicalAgentAssetDirectoryName(agentName, agentId) {
+  if (!agentId || typeof agentId !== "string") {
+    throw new Error("getCanonicalAgentAssetDirectoryName requires a non-empty agentId");
+  }
+  const safeId = getSafeAgentAssetIdSegment(agentId);
+  const nameSlug = slugifyAgentAssetSegment(agentName ?? "");
+  const prefix = nameSlug || safeId;
+  return `${prefix}-${safeId}`;
+}
+function getLegacyAgentAssetDirectoryName(agentId) {
+  if (!agentId || typeof agentId !== "string") {
+    throw new Error("getLegacyAgentAssetDirectoryName requires a non-empty agentId");
+  }
+  return agentId;
+}
+function getCanonicalAgentInstructionsBundleDirName(agentName, agentId) {
+  return `${getCanonicalAgentAssetDirectoryName(agentName, agentId)}-instructions`;
+}
+function getLegacyAgentInstructionsBundleDirName(agentId) {
+  return `${getLegacyAgentAssetDirectoryName(agentId)}-instructions`;
+}
+function getDefaultHeartbeatProcedurePath(agentId, agentName) {
   if (!agentId || typeof agentId !== "string") {
     throw new Error("getDefaultHeartbeatProcedurePath requires a non-empty agentId");
   }
-  return `.fusion/agents/${agentId}/HEARTBEAT.md`;
+  const directory = agentName ? getCanonicalAgentAssetDirectoryName(agentName, agentId) : getLegacyAgentAssetDirectoryName(agentId);
+  return `.fusion/agents/${directory}/HEARTBEAT.md`;
 }
 function agentToConfigSnapshot(agent) {
   return {
@@ -2707,7 +2736,7 @@ var init_db = __esm({
     "use strict";
     init_sqlite_adapter();
     init_types();
-    SCHEMA_VERSION = 57;
+    SCHEMA_VERSION = 58;
     SCHEMA_SQL = `
 -- Tasks table with JSON columns for nested data
 CREATE TABLE IF NOT EXISTS tasks (
@@ -4408,6 +4437,27 @@ CREATE INDEX IF NOT EXISTS idxTodoItemsSortOrder ON todo_items(listId, sortOrder
             }
           });
         }
+        if (version < 58) {
+          this.applyMigration(58, () => {
+            const newCommand = "npx runfusion.ai backup --create";
+            if (this.hasTable("automations") && this.hasColumn("automations", "command")) {
+              this.db.prepare(
+                `UPDATE automations
+                  SET command = ?, updatedAt = ?
+                WHERE name = 'Database Backup'
+                  AND (command LIKE 'fn backup%' OR command LIKE 'kb backup%' OR command LIKE 'fusion backup%')`
+              ).run(newCommand, (/* @__PURE__ */ new Date()).toISOString());
+            }
+            if (this.hasTable("routines") && this.hasColumn("routines", "command")) {
+              this.db.prepare(
+                `UPDATE routines
+                  SET command = ?, updatedAt = ?
+                WHERE name = 'Database Backup'
+                  AND (command LIKE 'fn backup%' OR command LIKE 'kb backup%' OR command LIKE 'fusion backup%')`
+              ).run(newCommand, (/* @__PURE__ */ new Date()).toISOString());
+            }
+          });
+        }
       }
       /**
        * Run a single migration step inside a transaction and bump the version.
@@ -4671,7 +4721,7 @@ var init_agent_store = __esm({
           if (agent.heartbeatProcedurePath !== DEFAULT_HEARTBEAT_PROCEDURE_PATH) {
             continue;
           }
-          const newRelPath = getDefaultHeartbeatProcedurePath(agent.id);
+          const newRelPath = await this.resolveCompatibleHeartbeatProcedurePath(agent);
           const newAbsPath = join3(this.rootDir, "..", newRelPath);
           if (legacyContent !== null) {
             try {
@@ -4832,7 +4882,7 @@ var init_agent_store = __esm({
         const metadata = input.metadata ?? {};
         const runtimeConfig = resolveCreationRuntimeConfig(input.runtimeConfig, metadata);
         const ephemeral = isEphemeralAgent({ metadata, name: input.name, role: input.role, reportsTo: input.reportsTo });
-        const resolvedHeartbeatProcedurePath = input.heartbeatProcedurePath ?? (ephemeral ? void 0 : getDefaultHeartbeatProcedurePath(agentId));
+        const resolvedHeartbeatProcedurePath = input.heartbeatProcedurePath ?? (ephemeral ? void 0 : getDefaultHeartbeatProcedurePath(agentId, input.name));
         const agent = {
           id: agentId,
           name: input.name.trim(),
@@ -5069,14 +5119,16 @@ var init_agent_store = __esm({
        * Does not create the directory.
        */
       getInstructionsDir(agentId) {
-        return this.getBundleDir(agentId);
+        const agent = this.readAgent(agentId);
+        const agentName = agent?.name ?? "";
+        return join3(this.agentsDir, getCanonicalAgentInstructionsBundleDirName(agentName, agentId));
       }
       /**
        * List markdown files in an agent's managed instructions bundle.
        * Returns [] when the bundle directory does not exist.
        */
       async listBundleFiles(agentId) {
-        const bundleDir = this.getBundleDir(agentId);
+        const bundleDir = await this.resolveCompatibleBundleDir(agentId, false);
         try {
           const entries = await readdir(bundleDir, { withFileTypes: true });
           return entries.filter((entry) => entry.isFile() && entry.name.endsWith(".md")).map((entry) => entry.name).sort((a, b) => a.localeCompare(b));
@@ -5092,7 +5144,8 @@ var init_agent_store = __esm({
        */
       async readBundleFile(agentId, filePath) {
         this.validateBundleFilePath(filePath);
-        const resolvedPath = join3(this.getBundleDir(agentId), filePath);
+        const bundleDir = await this.resolveCompatibleBundleDir(agentId, false);
+        const resolvedPath = join3(bundleDir, filePath);
         return readFile(resolvedPath, "utf-8");
       }
       /**
@@ -5101,7 +5154,7 @@ var init_agent_store = __esm({
       async writeBundleFile(agentId, filePath, content) {
         return this.withLock(agentId, async () => {
           this.validateBundleFilePath(filePath);
-          const bundleDir = this.getBundleDir(agentId);
+          const bundleDir = await this.resolveCompatibleBundleDir(agentId, true);
           await mkdir(bundleDir, { recursive: true });
           const existingFiles = await this.listBundleFiles(agentId);
           const isOverwrite = existingFiles.includes(filePath);
@@ -5120,7 +5173,8 @@ var init_agent_store = __esm({
       async deleteBundleFile(agentId, filePath) {
         return this.withLock(agentId, async () => {
           this.validateBundleFilePath(filePath);
-          await unlink(join3(this.getBundleDir(agentId), filePath));
+          const bundleDir = await this.resolveCompatibleBundleDir(agentId, false);
+          await unlink(join3(bundleDir, filePath));
         });
       }
       /**
@@ -5142,7 +5196,7 @@ var init_agent_store = __esm({
         };
         const updated = await this.updateAgent(agentId, { bundleConfig: normalizedConfig });
         if (normalizedConfig.mode === "managed") {
-          await mkdir(this.getBundleDir(agentId), { recursive: true });
+          await mkdir(await this.resolveCompatibleBundleDir(agentId, true), { recursive: true });
         }
         return updated;
       }
@@ -5165,7 +5219,7 @@ var init_agent_store = __esm({
             bundleConfig: { mode: "managed", entryFile, files: [] }
           });
         }
-        await mkdir(this.getBundleDir(agentId), { recursive: true });
+        await mkdir(await this.resolveCompatibleBundleDir(agentId, true), { recursive: true });
         const files = [];
         if (hasInstructionsText) {
           await this.writeBundleFile(agentId, entryFile, agent.instructionsText ?? "");
@@ -6126,8 +6180,87 @@ var init_agent_store = __esm({
         }
         return null;
       }
-      getBundleDir(agentId) {
-        return join3(this.agentsDir, `${agentId}-instructions`);
+      getCanonicalBundleDir(agent) {
+        return join3(this.agentsDir, getCanonicalAgentInstructionsBundleDirName(agent.name, agent.id));
+      }
+      getLegacyBundleDir(agentId) {
+        return join3(this.agentsDir, getLegacyAgentInstructionsBundleDirName(agentId));
+      }
+      async resolveCompatibleBundleDir(agentId, createIfMissing) {
+        const agent = this.readAgent(agentId);
+        if (!agent) {
+          throw new Error(`Agent ${agentId} not found`);
+        }
+        const canonicalDir = this.getCanonicalBundleDir(agent);
+        if (await this.pathExists(canonicalDir)) {
+          return canonicalDir;
+        }
+        const compatibleDir = await this.findExistingDisplayNameBundleDir(agent);
+        if (compatibleDir) {
+          return compatibleDir;
+        }
+        const legacyDir = this.getLegacyBundleDir(agent.id);
+        if (await this.pathExists(legacyDir)) {
+          return legacyDir;
+        }
+        return createIfMissing ? canonicalDir : canonicalDir;
+      }
+      async findExistingDisplayNameBundleDir(agent) {
+        const safeId = getSafeAgentAssetIdSegment(agent.id);
+        try {
+          const entries = await readdir(this.agentsDir, { withFileTypes: true });
+          const candidates = entries.filter((entry) => entry.isDirectory() && entry.name.endsWith("-instructions")).map((entry) => entry.name).filter((name) => {
+            const base = name.slice(0, -"-instructions".length);
+            return base.endsWith(`-${safeId}`);
+          }).sort((a, b) => a.localeCompare(b));
+          if (candidates.length === 0) {
+            return null;
+          }
+          const canonicalName = getCanonicalAgentInstructionsBundleDirName(agent.name, agent.id);
+          const selected = candidates.find((candidate) => candidate === canonicalName) ?? candidates[0];
+          return join3(this.agentsDir, selected);
+        } catch (err) {
+          if (err.code === "ENOENT") {
+            return null;
+          }
+          throw err;
+        }
+      }
+      async resolveCompatibleHeartbeatProcedurePath(agent) {
+        const canonicalPath = getDefaultHeartbeatProcedurePath(agent.id, agent.name);
+        const canonicalAbs = join3(this.rootDir, "..", canonicalPath);
+        if (await this.pathExists(canonicalAbs)) {
+          return canonicalPath;
+        }
+        const safeId = getSafeAgentAssetIdSegment(agent.id);
+        try {
+          const entries = await readdir(this.agentsDir, { withFileTypes: true });
+          const compatibleDir = entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name).find((name) => name.endsWith(`-${safeId}`));
+          if (compatibleDir) {
+            const candidatePath = `.fusion/agents/${compatibleDir}/HEARTBEAT.md`;
+            if (await this.pathExists(join3(this.rootDir, "..", candidatePath))) {
+              return candidatePath;
+            }
+          }
+        } catch (err) {
+          if (err.code !== "ENOENT") {
+            throw err;
+          }
+        }
+        const legacyPath = `.fusion/agents/${getLegacyAgentAssetDirectoryName(agent.id)}/HEARTBEAT.md`;
+        const legacyAbs = join3(this.rootDir, "..", legacyPath);
+        if (await this.pathExists(legacyAbs)) {
+          return legacyPath;
+        }
+        return canonicalPath;
+      }
+      async pathExists(path5) {
+        try {
+          await access(path5, fsConstants.F_OK);
+          return true;
+        } catch {
+          return false;
+        }
       }
       validateBundleFilePath(filePath) {
         if (typeof filePath !== "string") {
@@ -7013,9 +7146,9 @@ var init_global_settings = __esm({
        * Serialize operations via promise chain to prevent lost-update races.
        */
       withLock(fn) {
-        let resolve40;
+        let resolve42;
         const next = new Promise((r) => {
-          resolve40 = r;
+          resolve42 = r;
         });
         const prev = this.lock;
         this.lock = next;
@@ -7023,7 +7156,7 @@ var init_global_settings = __esm({
           try {
             return await fn();
           } finally {
-            resolve40();
+            resolve42();
           }
         });
       }
@@ -10240,7 +10373,7 @@ function validatePluginManifest(manifest) {
   const m = manifest;
   if (!m.id || typeof m.id !== "string" || m.id.trim() === "") {
     errors.push("id is required and must be a non-empty string");
-  } else if (!/^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/.test(m.id)) {
+  } else if (!SLUG_PATTERN.test(m.id)) {
     errors.push("id must be a valid slug (lowercase, alphanumeric, hyphens only, cannot start or end with hyphen)");
   }
   if (!m.name || typeof m.name !== "string" || m.name.trim() === "") {
@@ -10293,7 +10426,7 @@ function validatePluginManifest(manifest) {
       const runtime = m.runtime;
       if (!runtime.runtimeId || typeof runtime.runtimeId !== "string" || runtime.runtimeId.trim() === "") {
         errors.push("runtime.runtimeId is required and must be a non-empty string");
-      } else if (!/^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/.test(runtime.runtimeId)) {
+      } else if (!SLUG_PATTERN.test(runtime.runtimeId)) {
         errors.push("runtime.runtimeId must be a valid slug (lowercase, alphanumeric, hyphens only, cannot start or end with hyphen)");
       }
       if (!runtime.name || typeof runtime.name !== "string" || runtime.name.trim() === "") {
@@ -10308,14 +10441,93 @@ function validatePluginManifest(manifest) {
       }
     }
   }
+  if (m.skills !== void 0) {
+    if (!Array.isArray(m.skills)) {
+      errors.push("skills must be an array");
+    } else {
+      for (const [index2, skill] of m.skills.entries()) {
+        if (!skill || typeof skill !== "object") {
+          errors.push(`skills[${index2}] must be an object`);
+          continue;
+        }
+        const skillMeta = skill;
+        if (!skillMeta.skillId || typeof skillMeta.skillId !== "string" || skillMeta.skillId.trim() === "") {
+          errors.push(`skills[${index2}].skillId is required and must be a non-empty string`);
+        } else if (!SLUG_PATTERN.test(skillMeta.skillId)) {
+          errors.push(`skills[${index2}].skillId must be a valid slug (lowercase, alphanumeric, hyphens only, cannot start or end with hyphen)`);
+        }
+        if (!skillMeta.name || typeof skillMeta.name !== "string" || skillMeta.name.trim() === "") {
+          errors.push(`skills[${index2}].name is required and must be a non-empty string`);
+        }
+      }
+    }
+  }
+  if (m.workflowSteps !== void 0) {
+    if (!Array.isArray(m.workflowSteps)) {
+      errors.push("workflowSteps must be an array");
+    } else {
+      for (const [index2, step] of m.workflowSteps.entries()) {
+        if (!step || typeof step !== "object") {
+          errors.push(`workflowSteps[${index2}] must be an object`);
+          continue;
+        }
+        const stepMeta = step;
+        if (!stepMeta.stepId || typeof stepMeta.stepId !== "string" || stepMeta.stepId.trim() === "") {
+          errors.push(`workflowSteps[${index2}].stepId is required and must be a non-empty string`);
+        } else if (!SLUG_PATTERN.test(stepMeta.stepId)) {
+          errors.push(`workflowSteps[${index2}].stepId must be a valid slug (lowercase, alphanumeric, hyphens only, cannot start or end with hyphen)`);
+        }
+        if (!stepMeta.name || typeof stepMeta.name !== "string" || stepMeta.name.trim() === "") {
+          errors.push(`workflowSteps[${index2}].name is required and must be a non-empty string`);
+        }
+        if (stepMeta.mode !== void 0 && (typeof stepMeta.mode !== "string" || !["prompt", "script"].includes(stepMeta.mode))) {
+          errors.push(`workflowSteps[${index2}].mode must be one of: prompt, script`);
+        }
+      }
+    }
+  }
+  if (m.promptSurfaces !== void 0) {
+    if (!Array.isArray(m.promptSurfaces)) {
+      errors.push("promptSurfaces must be an array");
+    } else {
+      for (const [index2, surface] of m.promptSurfaces.entries()) {
+        if (typeof surface !== "string" || !PROMPT_CONTRIBUTION_SURFACES.includes(surface)) {
+          errors.push(`promptSurfaces[${index2}] must be one of: ${PROMPT_CONTRIBUTION_SURFACES.join(", ")}`);
+        }
+      }
+    }
+  }
+  if (m.setup !== void 0) {
+    if (typeof m.setup !== "object" || m.setup === null) {
+      errors.push("setup must be an object");
+    } else {
+      const setup = m.setup;
+      if (!setup.binaryName || typeof setup.binaryName !== "string" || setup.binaryName.trim() === "") {
+        errors.push("setup.binaryName is required and must be a non-empty string");
+      }
+      if (!setup.description || typeof setup.description !== "string" || setup.description.trim() === "") {
+        errors.push("setup.description is required and must be a non-empty string");
+      }
+      if (setup.channel !== void 0 && (typeof setup.channel !== "string" || !SETUP_CHANNELS.includes(setup.channel))) {
+        errors.push(`setup.channel must be one of: ${SETUP_CHANNELS.join(", ")}`);
+      }
+      if (setup.defaultTimeoutMs !== void 0 && (typeof setup.defaultTimeoutMs !== "number" || !Number.isFinite(setup.defaultTimeoutMs) || setup.defaultTimeoutMs <= 0)) {
+        errors.push("setup.defaultTimeoutMs must be a positive finite number");
+      }
+    }
+  }
   return {
     valid: errors.length === 0,
     errors
   };
 }
+var SLUG_PATTERN, PROMPT_CONTRIBUTION_SURFACES, SETUP_CHANNELS;
 var init_plugin_types = __esm({
   "../core/src/plugin-types.ts"() {
     "use strict";
+    SLUG_PATTERN = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?$/;
+    PROMPT_CONTRIBUTION_SURFACES = ["executor-system", "executor-task", "triage", "reviewer", "heartbeat"];
+    SETUP_CHANNELS = ["stable", "beta", "nightly"];
   }
 });
 
@@ -28483,8 +28695,8 @@ var require_CronFileParser = __commonJS({
        * @throws If file cannot be read
        */
       static parseFileSync(filePath) {
-        const { readFileSync: readFileSync24 } = __require("fs");
-        const data = readFileSync24(filePath, "utf8");
+        const { readFileSync: readFileSync25 } = __require("fs");
+        const data = readFileSync25(filePath, "utf8");
         return _CronFileParser.#parseContent(data);
       }
       /**
@@ -28701,9 +28913,9 @@ var init_automation_store = __esm({
        */
       withScheduleLock(id, fn) {
         const prev = this.scheduleLocks.get(id) ?? Promise.resolve();
-        let resolve40;
+        let resolve42;
         const next = new Promise((r) => {
-          resolve40 = r;
+          resolve42 = r;
         });
         this.scheduleLocks.set(id, next);
         return prev.then(async () => {
@@ -28713,7 +28925,7 @@ var init_automation_store = __esm({
             if (this.scheduleLocks.get(id) === next) {
               this.scheduleLocks.delete(id);
             }
-            resolve40();
+            resolve42();
           }
         });
       }
@@ -30502,7 +30714,7 @@ var init_project_memory = __esm({
 // ../core/src/run-command.ts
 import { spawn } from "node:child_process";
 function runCommandAsync(command, options = {}) {
-  return new Promise((resolve40) => {
+  return new Promise((resolve42) => {
     const maxBuffer = options.maxBuffer ?? DEFAULT_MAX_BUFFER;
     let stdout = "";
     let stderr = "";
@@ -30561,7 +30773,7 @@ function runCommandAsync(command, options = {}) {
         clearTimeout(forceKillTimer);
         forceKillTimer = null;
       }
-      resolve40({
+      resolve42({
         stdout,
         stderr,
         exitCode: null,
@@ -30579,7 +30791,7 @@ function runCommandAsync(command, options = {}) {
       }
       signalProcessGroup("SIGTERM");
       scheduleForceKill(NORMAL_CLEANUP_FORCE_KILL_DELAY_MS);
-      resolve40({
+      resolve42({
         stdout,
         stderr,
         exitCode: code,
@@ -31794,9 +32006,9 @@ ${outcome}`;
        * lost-update races on the nextId counter.
        */
       withConfigLock(fn) {
-        let resolve40;
+        let resolve42;
         const next = new Promise((r) => {
-          resolve40 = r;
+          resolve42 = r;
         });
         const prev = this.configLock;
         this.configLock = next;
@@ -31804,7 +32016,7 @@ ${outcome}`;
           try {
             return await fn();
           } finally {
-            resolve40();
+            resolve42();
           }
         });
       }
@@ -31814,9 +32026,9 @@ ${outcome}`;
        */
       withTaskLock(id, fn) {
         const prev = this.taskLocks.get(id) ?? Promise.resolve();
-        let resolve40;
+        let resolve42;
         const next = new Promise((r) => {
-          resolve40 = r;
+          resolve42 = r;
         });
         this.taskLocks.set(id, next);
         return prev.then(async () => {
@@ -31826,7 +32038,7 @@ ${outcome}`;
             if (this.taskLocks.get(id) === next) {
               this.taskLocks.delete(id);
             }
-            resolve40();
+            resolve42();
           }
         });
       }
@@ -34094,7 +34306,7 @@ ${task.description}
               }
             }
           }
-          await new Promise((resolve40) => setImmediate(resolve40));
+          await new Promise((resolve42) => setImmediate(resolve42));
           const selectClause = this.getTaskSelectClause(true);
           const changedRows = this.lastPollTime ? this.db.prepare(`SELECT ${selectClause} FROM tasks WHERE updatedAt > ? OR columnMovedAt > ?`).all(this.lastPollTime, this.lastPollTime) : this.db.prepare(`SELECT ${selectClause} FROM tasks`).all();
           this.lastPollTime = (/* @__PURE__ */ new Date()).toISOString();
@@ -34114,7 +34326,7 @@ ${task.description}
               this.emit("task:updated", task);
             }
             if (i > 0 && i % 50 === 0) {
-              await new Promise((resolve40) => setImmediate(resolve40));
+              await new Promise((resolve42) => setImmediate(resolve42));
             }
           }
           const elapsed = Date.now() - startTime;
@@ -35859,6 +36071,20 @@ function reconcileClaudeCliPaths(paths, vendoredPath) {
   }
   return filtered;
 }
+function isExternalDroidCliPath(p, vendoredPath) {
+  if (vendoredPath && p === vendoredPath) return false;
+  return /(^|[/\\])droid-cli([/\\]|$)/i.test(p);
+}
+function reconcileDroidCliPaths(paths, vendoredPath) {
+  if (!vendoredPath) {
+    return [...paths];
+  }
+  const filtered = paths.filter((p) => !isExternalDroidCliPath(p, vendoredPath));
+  if (!filtered.includes(vendoredPath)) {
+    return [vendoredPath, ...filtered];
+  }
+  return filtered;
+}
 function getDisplayPathWithinRoot(root, targetPath) {
   const usesWindowsPaths = /^[A-Za-z]:[\\/]/.test(root) || /^[A-Za-z]:[\\/]/.test(targetPath) || root.includes("\\") || targetPath.includes("\\");
   const pathApi = usesWindowsPaths ? win32 : { relative: relative2, isAbsolute: isAbsolute5, sep: sep4 };
@@ -35970,7 +36196,7 @@ function runGh(args, cwd) {
 }
 function runGhAsync(args, cwdOrOptions) {
   const { cwd, signal: externalSignal, timeoutMs = DEFAULT_GH_TIMEOUT_MS } = normalizeRunGhOptions(cwdOrOptions);
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     if (externalSignal?.aborted) {
       reject2(makeGhError(`gh command aborted: ${describeAbortReason(externalSignal.reason)}`, "ABORT_ERR"));
       return;
@@ -36021,7 +36247,7 @@ function runGhAsync(args, cwdOrOptions) {
           ghError.stderr = stderr ?? "";
           reject2(ghError);
         } else {
-          resolve40(stdout ?? "");
+          resolve42(stdout ?? "");
         }
       }
     );
@@ -36116,6 +36342,85 @@ var init_gh_cli = __esm({
   }
 });
 
+// ../core/src/fn-binary.ts
+import { spawn as spawn2 } from "node:child_process";
+import { platform as platform2 } from "node:os";
+function runProbe(command, args, timeoutMs) {
+  return new Promise((resolve42) => {
+    let stdout = "";
+    let stderr = "";
+    const child = spawn2(command, args, { stdio: ["ignore", "pipe", "pipe"], shell: false });
+    const timer = setTimeout(() => {
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+    }, timeoutMs);
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk.toString("utf8");
+    });
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk.toString("utf8");
+    });
+    child.on("error", (err) => {
+      clearTimeout(timer);
+      resolve42({ exitCode: null, stdout, stderr: stderr || err.message });
+    });
+    child.on("close", (exitCode) => {
+      clearTimeout(timer);
+      resolve42({ exitCode, stdout, stderr });
+    });
+  });
+}
+async function whichBinary(name) {
+  const isWindows = platform2() === "win32";
+  const lookup = isWindows ? "where" : "which";
+  const result = await runProbe(lookup, [name], 5e3);
+  if (result.exitCode !== 0) return void 0;
+  const firstLine = result.stdout.split(/\r?\n/).map((s) => s.trim()).find(Boolean);
+  return firstLine || void 0;
+}
+async function probeVersion(binary) {
+  const result = await runProbe(binary, ["--version"], 1e4);
+  if (result.exitCode !== 0) return void 0;
+  const text = (result.stdout || result.stderr).trim();
+  if (!text) return void 0;
+  const match = text.match(/\d+\.\d+\.\d+(?:-[\w.]+)?/);
+  return match ? match[0] : text.split(/\s+/)[0];
+}
+async function detectFnBinary() {
+  for (const candidate of CANDIDATES) {
+    try {
+      const resolvedPath = await whichBinary(candidate);
+      if (!resolvedPath) continue;
+      const version = await probeVersion(candidate);
+      return {
+        installed: true,
+        binary: candidate,
+        path: resolvedPath,
+        version,
+        invocation: candidate
+      };
+    } catch {
+    }
+  }
+  return {
+    installed: false,
+    invocation: FN_NPX_INVOCATION
+  };
+}
+var FN_NPM_PACKAGE, FN_INSTALL_CURL, FN_INSTALL_NPM, FN_NPX_INVOCATION, CANDIDATES;
+var init_fn_binary = __esm({
+  "../core/src/fn-binary.ts"() {
+    "use strict";
+    FN_NPM_PACKAGE = "runfusion.ai";
+    FN_INSTALL_CURL = "curl -fsSL https://runfusion.ai/install.sh | sh";
+    FN_INSTALL_NPM = `npm install -g ${FN_NPM_PACKAGE}`;
+    FN_NPX_INVOCATION = `npx -y ${FN_NPM_PACKAGE}`;
+    CANDIDATES = ["fn", "fusion"];
+  }
+});
+
 // ../core/src/settings-validation.ts
 function validateUnavailableNodePolicy(value) {
   if (value === void 0) {
@@ -36309,9 +36614,9 @@ var init_routine_store = __esm({
        */
       withRoutineLock(id, fn) {
         const prev = this.routineLocks.get(id) ?? Promise.resolve();
-        let resolve40;
+        let resolve42;
         const next = new Promise((r) => {
-          resolve40 = r;
+          resolve42 = r;
         });
         this.routineLocks.set(id, next);
         return prev.then(async () => {
@@ -36321,7 +36626,7 @@ var init_routine_store = __esm({
             if (this.routineLocks.get(id) === next) {
               this.routineLocks.delete(id);
             }
-            resolve40();
+            resolve42();
           }
         });
       }
@@ -36920,13 +37225,13 @@ var init_plugin_loader = __esm({
        * Execute a promise with a timeout.
        */
       withTimeout(promise, ms, timeoutMessage) {
-        return new Promise((resolve40, reject2) => {
+        return new Promise((resolve42, reject2) => {
           const timer = setTimeout(() => {
             reject2(new Error(timeoutMessage));
           }, ms);
           promise.then((result) => {
             clearTimeout(timer);
-            resolve40(result);
+            resolve42(result);
           }).catch((err) => {
             clearTimeout(timer);
             reject2(err);
@@ -40491,7 +40796,7 @@ var require_get_stream = __commonJS({
       };
       const { maxBuffer } = options;
       let stream;
-      await new Promise((resolve40, reject2) => {
+      await new Promise((resolve42, reject2) => {
         const rejectPromise = (error) => {
           if (error && stream.getBufferedLength() <= BufferConstants.MAX_LENGTH) {
             error.bufferedData = stream.getBufferedValue();
@@ -40503,7 +40808,7 @@ var require_get_stream = __commonJS({
             rejectPromise(error);
             return;
           }
-          resolve40();
+          resolve42();
         });
         stream.on("data", () => {
           if (stream.getBufferedLength() > maxBuffer) {
@@ -41797,7 +42102,7 @@ var require_extract_zip = __commonJS({
         debug("opening", this.zipPath, "with opts", this.opts);
         this.zipfile = await openZip(this.zipPath, { lazyEntries: true });
         this.canceled = false;
-        return new Promise((resolve40, reject2) => {
+        return new Promise((resolve42, reject2) => {
           this.zipfile.on("error", (err) => {
             this.canceled = true;
             reject2(err);
@@ -41806,7 +42111,7 @@ var require_extract_zip = __commonJS({
           this.zipfile.on("close", () => {
             if (!this.canceled) {
               debug("zip extraction complete");
-              resolve40();
+              resolve42();
             }
           });
           this.zipfile.on("entry", async (entry) => {
@@ -50403,6 +50708,10 @@ __export(src_exports, {
   EXECUTION_MODES: () => EXECUTION_MODES,
   FEATURE_LOOP_STATES: () => FEATURE_LOOP_STATES,
   FEATURE_STATUSES: () => FEATURE_STATUSES,
+  FN_INSTALL_CURL: () => FN_INSTALL_CURL,
+  FN_INSTALL_NPM: () => FN_INSTALL_NPM,
+  FN_NPM_PACKAGE: () => FN_NPM_PACKAGE,
+  FN_NPX_INVOCATION: () => FN_NPX_INVOCATION,
   FileMemoryBackend: () => FileMemoryBackend,
   FirstRunDetector: () => FirstRunDetector,
   GLOBAL_SETTINGS_KEYS: () => GLOBAL_SETTINGS_KEYS,
@@ -50514,6 +50823,7 @@ __export(src_exports, {
   createInsightExtractionAutomation: () => createInsightExtractionAutomation,
   createMemoryDreamsAutomation: () => createMemoryDreamsAutomation,
   dailyMemoryPath: () => dailyMemoryPath,
+  detectFnBinary: () => detectFnBinary,
   detectLegacyData: () => detectLegacyData,
   diffConfigSnapshots: () => diffConfigSnapshots,
   discoverPiExtensions: () => discoverPiExtensions,
@@ -50635,6 +50945,7 @@ __export(src_exports, {
   readProjectMemoryWithBackend: () => readProjectMemoryWithBackend,
   readWorkingMemory: () => readWorkingMemory,
   reconcileClaudeCliPaths: () => reconcileClaudeCliPaths,
+  reconcileDroidCliPaths: () => reconcileDroidCliPaths,
   refreshQmdProjectMemoryIndex: () => refreshQmdProjectMemoryIndex,
   registerMemoryBackend: () => registerMemoryBackend,
   renderMemoryAuditMarkdown: () => renderMemoryAuditMarkdown,
@@ -50724,6 +51035,7 @@ var init_src = __esm({
     init_automation();
     init_automation_store();
     init_run_command();
+    init_fn_binary();
     init_node_override_guard();
     init_settings_validation();
     init_routine();
@@ -51885,12 +52197,12 @@ var init_concurrency = __esm({
           this._active++;
           return Promise.resolve();
         }
-        return new Promise((resolve40) => {
+        return new Promise((resolve42) => {
           this._waiters.push({
             priority,
             resolve: () => {
               this._active++;
-              resolve40();
+              resolve42();
             }
           });
         });
@@ -53454,8 +53766,23 @@ function getPackageManagerAgentDir() {
 }
 function resolveVendoredClaudeCliEntry() {
   try {
-    const require_2 = createRequire2(import.meta.url);
-    const pkgJsonPath = require_2.resolve("@fusion/pi-claude-cli/package.json");
+    const require_3 = createRequire2(import.meta.url);
+    const pkgJsonPath = require_3.resolve("@fusion/pi-claude-cli/package.json");
+    const pkgJson = JSON.parse(readFileSync9(pkgJsonPath, "utf-8"));
+    const extensions = pkgJson.pi?.extensions;
+    if (!Array.isArray(extensions) || extensions.length === 0) return null;
+    const entry = extensions[0];
+    if (typeof entry !== "string" || entry.length === 0) return null;
+    const path5 = resolve11(dirname8(pkgJsonPath), entry);
+    return existsSync20(path5) ? path5 : null;
+  } catch {
+    return null;
+  }
+}
+function resolveVendoredDroidCliEntry() {
+  try {
+    const require_3 = createRequire2(import.meta.url);
+    const pkgJsonPath = require_3.resolve("@fusion/droid-cli/package.json");
     const pkgJson = JSON.parse(readFileSync9(pkgJsonPath, "utf-8"));
     const extensions = pkgJson.pi?.extensions;
     if (!Array.isArray(extensions) || extensions.length === 0) return null;
@@ -53482,8 +53809,13 @@ async function registerExtensionProviders(cwd, modelRegistry) {
       [...getEnabledPiExtensionPaths(cwd), ...packageExtensionPaths],
       vendoredClaudeCli
     );
-    const extensionsResult = await discoverAndLoadExtensions(
+    const vendoredDroidCli = resolveVendoredDroidCliEntry();
+    const doubleReconciledPaths = reconcileDroidCliPaths(
       reconciledPaths,
+      vendoredDroidCli
+    );
+    const extensionsResult = await discoverAndLoadExtensions(
+      doubleReconciledPaths,
       cwd,
       join25(resolvePiExtensionProjectRoot(cwd), ".fusion", "disabled-auto-extension-discovery")
     );
@@ -53727,11 +54059,8 @@ async function createFnAgent2(options) {
   const createSessionWithModel = async (modelOverride) => {
     const customToolList = [
       ...wrappedTools,
-      ...isReadonly ? [] : options.customTools ?? []
+      ...options.customTools ?? []
     ];
-    if (isReadonly && (options.customTools?.length ?? 0) > 0) {
-      piLog.log(`readonly session \u2014 customTools (${options.customTools.length}) skipped`);
-    }
     if (options.beforeSpawnSession) {
       await options.beforeSpawnSession();
     }
@@ -54422,8 +54751,8 @@ var init_page_fetch_provider = __esm({
 
 // ../engine/src/research/providers/web-search-provider.ts
 async function sleep(ms, signal) {
-  await new Promise((resolve40, reject2) => {
-    const timer = setTimeout(resolve40, ms);
+  await new Promise((resolve42, reject2) => {
+    const timer = setTimeout(resolve42, ms);
     const onAbort = () => {
       clearTimeout(timer);
       reject2(new ResearchProviderError({ providerType: "web-search", code: "abort", message: "Search aborted" }));
@@ -55140,14 +55469,25 @@ async function getAgentMemoryWindow(rootDir, agentMemory, path5, startLine = 1,
     backend: "agent-memory"
   };
 }
-function createTaskCreateTool(store, provenance) {
+async function createAgentTask(store, input, options) {
+  const settings = typeof store.getSettings === "function" ? await store.getSettings() : {};
+  const rootDir = options?.rootDir;
+  return store.createTask(input, {
+    settings: { autoSummarizeTitles: settings.autoSummarizeTitles === true },
+    onSummarize: rootDir ? async (description) => {
+      const resolved = resolveTitleSummarizerSettingsModel(settings);
+      return summarizeTitle(description, rootDir, resolved.provider, resolved.modelId);
+    } : void 0
+  });
+}
+function createTaskCreateTool(store, provenance, options) {
   return {
     name: "fn_task_create",
     label: "Create Task",
     description: "Create a new task for out-of-scope work discovered during execution. The task goes into triage where it will be specified by the AI. Optionally set dependencies (e.g., the new task depends on the current one, or the current task should wait for the new one).",
     parameters: taskCreateParams,
     execute: async (_id, params) => {
-      const task = await store.createTask({
+      const task = await createAgentTask(store, {
         description: params.description,
         dependencies: params.dependencies,
         column: "triage",
@@ -55156,7 +55496,7 @@ function createTaskCreateTool(store, provenance) {
           sourceAgentId: provenance.sourceAgentId,
           sourceRunId: provenance.sourceRunId
         } : void 0
-      });
+      }, options);
       const deps = task.dependencies.length ? ` (depends on: ${task.dependencies.join(", ")})` : "";
       return {
         content: [{
@@ -55509,7 +55849,7 @@ ${lines.join("\n\n")}` }],
     }
   };
 }
-function createDelegateTaskTool(agentStore, taskStore) {
+function createDelegateTaskTool(agentStore, taskStore, options) {
   return {
     name: "fn_delegate_task",
     label: "Delegate Task",
@@ -55529,13 +55869,13 @@ function createDelegateTaskTool(agentStore, taskStore) {
           details: {}
         };
       }
-      const task = await taskStore.createTask({
+      const task = await createAgentTask(taskStore, {
         description: params.description,
         dependencies: params.dependencies,
         column: "todo",
         assignedAgentId: params.agent_id,
         source: { sourceType: "api" }
-      });
+      }, options);
       const deps = task.dependencies.length ? ` (depends on: ${task.dependencies.join(", ")})` : "";
       return {
         content: [{
@@ -55710,9 +56050,9 @@ function createResearchTools(options) {
       const maxWaitMs = Math.max(1e3, Math.min(params.max_wait_ms ?? 9e4, resolved.limits.maxDurationMs));
       const completed = await Promise.race([
         runPromise,
-        new Promise((resolve40) => setTimeout(() => {
+        new Promise((resolve42) => setTimeout(() => {
           const latest = options.store.getResearchStore().getRun(runId);
-          resolve40(latest ?? {
+          resolve42(latest ?? {
             id: runId,
             query: params.query,
             status: "running",
@@ -57286,20 +57626,20 @@ async function withRateLimitRetry(fn, options = {}) {
   throw lastError ?? new Error("withRateLimitRetry: unexpected state");
 }
 function sleep2(ms, signal) {
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     if (signal?.aborted) {
       reject2(signal.reason ?? new Error("Aborted"));
       return;
     }
-    const timer = setTimeout(resolve40, ms);
+    const timer = setTimeout(resolve42, ms);
     if (signal) {
       const onAbort = () => {
         clearTimeout(timer);
         reject2(signal.reason ?? new Error("Aborted"));
       };
       signal.addEventListener("abort", onAbort, { once: true });
-      const origResolve = resolve40;
-      resolve40 = () => {
+      const origResolve = resolve42;
+      resolve42 = () => {
         signal.removeEventListener("abort", onAbort);
         origResolve();
       };
@@ -58362,7 +58702,7 @@ Write the PROMPT.md directly using the write tool, then call \`fn_review_spec()\
               // Agent delegation tools — discover and delegate work to other agents.
               ...this.options.agentStore ? [
                 createListAgentsTool(this.options.agentStore),
-                createDelegateTaskTool(this.options.agentStore, this.store)
+                createDelegateTaskTool(this.options.agentStore, this.store, { rootDir: this.rootDir })
               ] : [],
               this.createReviewSpecTool(
                 task.id,
@@ -58901,7 +59241,7 @@ Remove or replace these ids and call fn_task_create again.`
                 planLog.warn(`${options.parentTaskId}: failed to load parent task for fn_task_create inheritance: ${msg}`);
                 parentTask = void 0;
               }
-              const newTask = await store.createTask({
+              const newTask = await createAgentTask(store, {
                 title: params.title,
                 description: params.description,
                 dependencies: validDeps,
@@ -58915,7 +59255,7 @@ Remove or replace these ids and call fn_task_create again.`
                   sourceType: "agent_heartbeat",
                   sourceParentTaskId: options.parentTaskId
                 }
-              });
+              }, { rootDir: this.rootDir });
               options.createdSubtasksRef.current.push(newTask.id);
               return {
                 content: [
@@ -59343,13 +59683,13 @@ var init_run_audit = __esm({
 });
 
 // ../engine/src/merger.ts
-import { execSync, exec as exec2, spawn as spawn2 } from "node:child_process";
+import { execSync, exec as exec2, spawn as spawn3 } from "node:child_process";
 import { promisify as promisify3 } from "node:util";
 import { existsSync as existsSync22 } from "node:fs";
 import { join as join29 } from "node:path";
 import { Type as Type3 } from "typebox";
 async function execWithProcessGroup(command, options) {
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     if (options.signal?.aborted) {
       reject2(Object.assign(
         new Error(`Command aborted before start: ${command}`),
@@ -59358,7 +59698,7 @@ async function execWithProcessGroup(command, options) {
       return;
     }
     const useProcessGroup = process.platform !== "win32";
-    const child = spawn2(command, {
+    const child = spawn3(command, {
       cwd: options.cwd,
       shell: true,
       detached: useProcessGroup,
@@ -59442,7 +59782,7 @@ async function execWithProcessGroup(command, options) {
         return;
       }
       if (code === 0) {
-        resolve40({ stdout, stderr, bufferOverflow: stdoutOverflow || stderrOverflow });
+        resolve42({ stdout, stderr, bufferOverflow: stdoutOverflow || stderrOverflow });
         return;
       }
       reject2(Object.assign(
@@ -63866,7 +64206,7 @@ function resolveExecutorModelPair(taskModelProvider, taskModelId, settings) {
   return { provider: void 0, modelId: void 0 };
 }
 function sleep3(ms) {
-  return new Promise((resolve40) => setTimeout(resolve40, ms));
+  return new Promise((resolve42) => setTimeout(resolve42, ms));
 }
 var execAsync4, stepExecLog, MAX_STEP_RETRIES, RETRY_DELAYS_MS, NOOP_TASK_STORE, StepSessionExecutor;
 var init_step_session_executor = __esm({
@@ -64094,10 +64434,10 @@ var init_step_session_executor = __esm({
               ] : [];
               const memoryTools = createMemoryTools(this.options.rootDir, settings);
               const taskLogTool = this.options.store ? [createTaskLogTool(this.options.store, taskDetail.id)] : [];
-              const taskCreateTool = this.options.store ? [createTaskCreateTool(this.options.store)] : [];
+              const taskCreateTool = this.options.store ? [createTaskCreateTool(this.options.store, void 0, { rootDir: this.options.rootDir })] : [];
               const delegationTools = this.options.agentStore ? [
                 createListAgentsTool(this.options.agentStore),
-                createDelegateTaskTool(this.options.agentStore, this.options.store)
+                createDelegateTaskTool(this.options.agentStore, this.options.store, { rootDir: this.options.rootDir })
               ] : [];
               const messagingTools = this.options.messageStore && taskDetail.assignedAgentId ? [
                 createSendMessageTool(this.options.messageStore, taskDetail.assignedAgentId),
@@ -64508,7 +64848,7 @@ var init_task_completion = __esm({
 });
 
 // ../engine/src/run-verification-tool.ts
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 import { existsSync as existsSync26 } from "node:fs";
 import { isAbsolute as isAbsolute10, join as join34 } from "node:path";
 import { Type as Type4 } from "@mariozechner/pi-ai";
@@ -64540,8 +64880,8 @@ async function runVerificationCommand2(opts) {
   const warnings = [];
   const stdoutBuf = { head: "", tail: "", totalBytes: 0 };
   const stderrBuf = { head: "", tail: "", totalBytes: 0 };
-  return new Promise((resolve40) => {
-    const child = spawn3(command, {
+  return new Promise((resolve42) => {
+    const child = spawn4(command, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process.env },
@@ -64619,7 +64959,7 @@ async function runVerificationCommand2(opts) {
           `[fn_run_verification] command failed (exit=${exitCode}, signal=${signal ?? "none"}): ${command}`
         );
       }
-      resolve40({
+      resolve42({
         success,
         exitCode,
         durationMs,
@@ -64639,7 +64979,7 @@ async function runVerificationCommand2(opts) {
       clearTimeout(hardTimer);
       const durationMs = Date.now() - startMs;
       warnings.push(`Spawn error: ${err.message}`);
-      resolve40({
+      resolve42({
         success: false,
         exitCode: null,
         durationMs,
@@ -66829,7 +67169,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
             // Agent delegation tools — discover and delegate work to other agents.
             ...this.options.agentStore ? [
               createListAgentsTool(this.options.agentStore),
-              createDelegateTaskTool(this.options.agentStore, this.store)
+              createDelegateTaskTool(this.options.agentStore, this.store, { rootDir: this.rootDir })
             ] : [],
             // Messaging tools — allows executor agents to send and receive messages.
             ...this.options.messageStore && assignedAgentId ? [
@@ -67523,7 +67863,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
         return createTaskLogTool(this.store, taskId);
       }
       createTaskCreateTool() {
-        return createTaskCreateTool(this.store, { sourceType: "api" });
+        return createTaskCreateTool(this.store, { sourceType: "api" }, { rootDir: this.rootDir });
       }
       createTaskDocumentWriteTool(taskId) {
         return createTaskDocumentWriteTool(this.store, taskId);
@@ -68617,7 +68957,7 @@ Review the work done in this worktree and evaluate it against the criteria in yo
               );
             }
             const delay2 = this.WORKTREE_RETRY_DELAYS[attempt] || 1e3;
-            await new Promise((resolve40) => setTimeout(resolve40, delay2));
+            await new Promise((resolve42) => setTimeout(resolve42, delay2));
           }
         }
         throw new Error("Unexpected exit from worktree creation retry loop");
@@ -72458,7 +72798,7 @@ function isTickableState(state) {
 function isHeartbeatManaged(agent) {
   return !isEphemeralAgent(agent);
 }
-var HEARTBEAT_SYSTEM_PROMPT, HEARTBEAT_NO_TASK_SYSTEM_PROMPT, HEARTBEAT_PROCEDURE, heartbeatDoneParams, HeartbeatMonitor, OVERDUE_FIRE_JITTER_MS, HeartbeatTriggerScheduler;
+var HEARTBEAT_SYSTEM_PROMPT, HEARTBEAT_NO_TASK_SYSTEM_PROMPT, HEARTBEAT_PROCEDURE, HEARTBEAT_NO_TASK_PROCEDURE, heartbeatDoneParams, HeartbeatMonitor, OVERDUE_FIRE_JITTER_MS, HeartbeatTriggerScheduler;
 var init_agent_heartbeat = __esm({
   "../engine/src/agent-heartbeat.ts"() {
     "use strict";
@@ -72648,6 +72988,32 @@ When sending messages:
 Critical: a heartbeat without observable progress (a log, a document write, a
 status change, a comment, a delegation, or an explicit "no-op with reason") is
 a bug. Do not loop on the same plan across heartbeats without recording why.`;
+    HEARTBEAT_NO_TASK_PROCEDURE = `## Heartbeat Procedure (run every tick, in order)
+
+1. **Identity & context** \u2014 review the **Identity Snapshot** at the top of
+   this prompt. Confirm your role, soul, instructions, and memory match what
+   you expect, and surface any anomalies in your first text output before
+   doing anything else. (If fn_identity is available in your runtime you may
+   also call it for full structured detail; the snapshot above is the
+   authoritative source.)
+2. **Inbox** \u2014 when fn_read_messages is available, call it. Process any pending
+   messages first; reply with reply_to_message_id when answering.
+3. **Wake delta** \u2014 read the Wake Delta block above. The wake reason is the
+   highest-priority change for this heartbeat. If you were woken by a comment
+   or a message, acknowledge it before doing anything else.
+4. **Ambient review** \u2014 since you have no assigned task, review board/project
+   signals and recent memory context before acting.
+5. **Pick the next concrete action** \u2014 exactly ONE useful action this heartbeat:
+   create a focused task, delegate work, send/reply to a message, or append
+   durable memory.
+6. **Persist progress** \u2014 use available ambient tools only:
+   fn_task_create, fn_delegate_task, fn_send_message, fn_memory_append.
+7. **Exit** \u2014 call fn_heartbeat_done with a one-line summary of what changed
+   this tick. If you took no action, say so and explain why.
+
+Critical: a heartbeat without observable progress (a created task, delegation,
+message reply, memory append, or explicit "no-op with reason") is a bug. Do
+not loop on the same plan across heartbeats without recording why.`;
     heartbeatDoneParams = Type6.Object({
       summary: Type6.Optional(Type6.String({ description: "Summary of what was accomplished this heartbeat" }))
     });
@@ -72687,13 +73053,6 @@ a bug. Do not loop on the same plan across heartbeats without recording why.`;
         this.rootDir = options.rootDir;
         this.messageStore = options.messageStore;
         this.pluginRunner = options.pluginRunner;
-        this.onRecovered = options.onRecovered;
-        this.onTerminated = options.onTerminated;
-        this.onRunStarted = options.onRunStarted;
-        this.onRunCompleted = options.onRunCompleted;
-        this.taskStore = options.taskStore;
-        this.rootDir = options.rootDir;
-        this.messageStore = options.messageStore;
       }
       /**
        * Start the heartbeat monitoring loop.
@@ -73392,9 +73751,9 @@ a bug. Do not loop on the same plan across heartbeats without recording why.`;
                 sourceType: "agent_heartbeat",
                 sourceAgentId: agentId,
                 sourceRunId: runContext?.runId
-              }));
+              }, { rootDir: this.rootDir }));
               heartbeatTools.push(createListAgentsTool(this.store));
-              heartbeatTools.push(createDelegateTaskTool(this.store, taskStore));
+              heartbeatTools.push(createDelegateTaskTool(this.store, taskStore, { rootDir: this.rootDir }));
               if (this.messageStore) {
                 heartbeatTools.push(createSendMessageTool(this.messageStore, agentId));
                 heartbeatTools.push(createReadMessagesTool(this.messageStore, agentId));
@@ -73417,22 +73776,27 @@ a bug. Do not loop on the same plan across heartbeats without recording why.`;
               heartbeatLog.warn(`Failed to configure heartbeat memory tools for ${agentId}: ${message}`);
             }
             const skillContext = buildSessionSkillContextSync2(agent, "heartbeat", rootDir);
-            let systemPrompt = isNoTaskRun ? HEARTBEAT_NO_TASK_SYSTEM_PROMPT : HEARTBEAT_SYSTEM_PROMPT;
-            const baseHeartbeatSystemPrompt = systemPrompt;
+            const baseHeartbeatSystemPrompt = isNoTaskRun ? HEARTBEAT_NO_TASK_SYSTEM_PROMPT : HEARTBEAT_SYSTEM_PROMPT;
             let resolvedInstructionsForIdentity = "";
             try {
-              const agentInstructions = await resolveAgentInstructionsWithRatings(agent, rootDir, this.store);
-              resolvedInstructionsForIdentity = agentInstructions;
-              const memoryInstructions = memorySettings?.memoryEnabled === false ? "" : buildExecutionMemoryInstructions(rootDir, memorySettings);
-              systemPrompt = buildSystemPromptWithInstructions(
-                baseHeartbeatSystemPrompt,
-                [agentInstructions, memoryInstructions].filter((part) => part.trim()).join("\n\n")
-              );
+              resolvedInstructionsForIdentity = await resolveAgentInstructionsWithRatings(agent, rootDir, this.store);
             } catch (instructionError) {
-              systemPrompt = baseHeartbeatSystemPrompt;
               const message = instructionError instanceof Error ? instructionError.message : String(instructionError);
-              heartbeatLog.warn(`Failed to enrich heartbeat system prompt for ${agentId}: ${message}`);
+              heartbeatLog.warn(`Failed to resolve agent instructions for heartbeat ${agentId}: ${message}`);
+            }
+            let memoryInstructions = "";
+            if (memorySettings?.memoryEnabled !== false) {
+              try {
+                memoryInstructions = buildExecutionMemoryInstructions(rootDir, memorySettings);
+              } catch (memoryInstructionErr) {
+                const message = memoryInstructionErr instanceof Error ? memoryInstructionErr.message : String(memoryInstructionErr);
+                heartbeatLog.warn(`Failed to resolve project memory instructions for heartbeat ${agentId}: ${message}`);
+              }
             }
+            const systemPrompt = buildSystemPromptWithInstructions(
+              baseHeartbeatSystemPrompt,
+              [resolvedInstructionsForIdentity, memoryInstructions].filter((part) => part.trim()).join("\n\n")
+            );
             heartbeatTools.push(createIdentityTool({ agent, resolvedInstructions: resolvedInstructionsForIdentity }));
             heartbeatTools.push(heartbeatDoneTool);
             if (isNoTaskRun) {
@@ -73493,7 +73857,7 @@ a bug. Do not loop on the same plan across heartbeats without recording why.`;
               };
               const wakeReason = deriveWakeReason();
               const customProcedure = await resolveAgentHeartbeatProcedure(agent, rootDir);
-              const heartbeatProcedureText = customProcedure ?? HEARTBEAT_PROCEDURE;
+              const heartbeatProcedureText = customProcedure ?? (isNoTaskRun ? HEARTBEAT_NO_TASK_PROCEDURE : HEARTBEAT_PROCEDURE);
               if (isNoTaskRun) {
                 if (this.messageStore) {
                   try {
@@ -73526,6 +73890,8 @@ a bug. Do not loop on the same plan across heartbeats without recording why.`;
                   `- pending messages: ${pendingMessages.length}`,
                   "",
                   "Treat this wake delta as the highest-priority change for this heartbeat.",
+                  "This is an autonomous heartbeat run (manual or automatic): re-anchor on",
+                  "identity, process wake context, then complete ONE concrete action.",
                   "Run the Heartbeat Procedure (below) before doing anything else \u2014 even a",
                   "timer-only wake should re-check messages, memory, and project state.",
                   "",
@@ -73617,6 +73983,8 @@ a bug. Do not loop on the same plan across heartbeats without recording why.`;
                   `- triggering comments: ${effectiveTriggeringCommentIds?.length ?? 0}`,
                   "",
                   "Treat this wake delta as the highest-priority change for this heartbeat.",
+                  "This is an autonomous heartbeat run (manual or automatic): re-anchor on",
+                  "identity, process wake context, then complete ONE concrete action.",
                   "Before resuming prior task work, run the Heartbeat Procedure (below) and",
                   "decide what action this delta requires. Your assigned task is one input",
                   "to the procedure \u2014 not the only thing to consider.",
@@ -73776,7 +74144,7 @@ ${taskDetail.prompt}` : "No PROMPT.md available.",
         const baseCreateTool = createTaskCreateTool(taskStore, {
           sourceType: "agent_heartbeat",
           sourceAgentId: agentId
-        });
+        }, { rootDir: this.rootDir });
         const trackedCreateTool = {
           ...baseCreateTool,
           execute: async (id, params, signal, onUpdate, ctx) => {
@@ -73803,7 +74171,7 @@ ${taskDetail.prompt}` : "No PROMPT.md available.",
         tools.push(createTaskDocumentWriteTool(taskStore, taskId));
         tools.push(createTaskDocumentReadTool(taskStore, taskId));
         tools.push(createListAgentsTool(this.store));
-        tools.push(createDelegateTaskTool(this.store, taskStore));
+        tools.push(createDelegateTaskTool(this.store, taskStore, { rootDir: this.rootDir }));
         if (messageStore) {
           tools.push(createSendMessageTool(messageStore, agentId));
           tools.push(createReadMessagesTool(messageStore, agentId));
@@ -75387,7 +75755,7 @@ var init_shell_utils = __esm({
 // ../engine/src/cron-runner.ts
 import { exec as exec6 } from "node:child_process";
 function execCommand(command, options) {
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     exec6(command, options, (error, stdout, stderr) => {
       const stdoutText = typeof stdout === "string" ? stdout : String(stdout ?? "");
       const stderrText = typeof stderr === "string" ? stderr : String(stderr ?? "");
@@ -75398,7 +75766,7 @@ function execCommand(command, options) {
         reject2(errWithOutput);
         return;
       }
-      resolve40({ stdout: stdoutText, stderr: stderrText });
+      resolve42({ stdout: stdoutText, stderr: stderrText });
     });
   });
 }
@@ -78749,13 +79117,13 @@ var init_plugin_runner = __esm({
        * Returns the result on success, throws on timeout.
        */
       withTimeout(promise, ms, timeoutMessage) {
-        return new Promise((resolve40, reject2) => {
+        return new Promise((resolve42, reject2) => {
           const timer = setTimeout(() => {
             reject2(new Error(timeoutMessage));
           }, ms);
           promise.then((result) => {
             clearTimeout(timer);
-            resolve40(result);
+            resolve42(result);
           }).catch((err) => {
             clearTimeout(timer);
             reject2(err);
@@ -79391,7 +79759,7 @@ var init_in_process_runtime = __esm({
             runtimeLog.log(
               `Waiting for ${metrics.inFlightTasks} in-flight tasks to complete...`
             );
-            await new Promise((resolve40) => setTimeout(resolve40, 1e3));
+            await new Promise((resolve42) => setTimeout(resolve42, 1e3));
           }
           const finalMetrics = this.getMetrics();
           if (finalMetrics.inFlightTasks > 0) {
@@ -79788,13 +80156,13 @@ var init_ipc_host = __esm({
         }
         const id = generateCorrelationId();
         const message = { type, id, payload };
-        return new Promise((resolve40, reject2) => {
+        return new Promise((resolve42, reject2) => {
           const timeout2 = setTimeout(() => {
             this.pendingCommands.delete(id);
             reject2(new Error(`Command ${type} timed out after ${timeoutMs ?? this.commandTimeoutMs}ms`));
           }, timeoutMs ?? this.commandTimeoutMs);
           this.pendingCommands.set(id, {
-            resolve: resolve40,
+            resolve: resolve42,
             reject: reject2,
             timeout: timeout2,
             type
@@ -80603,8 +80971,8 @@ var init_remote_node_client = __esm({
         return error instanceof TypeError;
       }
       async sleep(ms) {
-        await new Promise((resolve40) => {
-          setTimeout(resolve40, ms);
+        await new Promise((resolve42) => {
+          setTimeout(resolve42, ms);
         });
       }
     };
@@ -80868,14 +81236,14 @@ var init_remote_node_runtime = __esm({
         return error instanceof Error ? error : new Error(String(error));
       }
       async sleep(ms, signal) {
-        await new Promise((resolve40) => {
+        await new Promise((resolve42) => {
           const timeout2 = setTimeout(() => {
             cleanup();
-            resolve40();
+            resolve42();
           }, ms);
           const onAbort = () => {
             cleanup();
-            resolve40();
+            resolve42();
           };
           const cleanup = () => {
             clearTimeout(timeout2);
@@ -81505,7 +81873,7 @@ var init_provider_adapters = __esm({
 
 // ../engine/src/remote-access/tunnel-process-manager.ts
 import { EventEmitter as EventEmitter24 } from "node:events";
-import { exec as exec9, execFile as execFile3, spawn as spawn4 } from "node:child_process";
+import { exec as exec9, execFile as execFile3, spawn as spawn5 } from "node:child_process";
 import { promisify as promisify9 } from "node:util";
 function nowIso() {
   return (/* @__PURE__ */ new Date()).toISOString();
@@ -81596,7 +81964,7 @@ var init_tunnel_process_manager = __esm({
         super();
         this.maxLogEntries = options.maxLogEntries ?? DEFAULT_MAX_LOG_ENTRIES;
         this.defaultStopTimeoutMs = options.stopTimeoutMs ?? DEFAULT_STOP_TIMEOUT_MS2;
-        this.spawnImpl = options.spawnImpl ?? spawn4;
+        this.spawnImpl = options.spawnImpl ?? spawn5;
       }
       getStatus() {
         return { ...this.status, lastError: this.status.lastError ? { ...this.status.lastError } : null };
@@ -81826,10 +82194,10 @@ var init_tunnel_process_manager = __esm({
           lastError: null
         });
         this.emitLog("info", "manager", `Stopping ${currentHandle.provider} tunnel (pid=${currentHandle.child.pid ?? "n/a"})`);
-        this.activeStopPromise = new Promise((resolve40) => {
+        this.activeStopPromise = new Promise((resolve42) => {
           const onClose = () => {
             currentHandle.child.removeListener("close", onClose);
-            resolve40();
+            resolve42();
           };
           currentHandle.child.once("close", onClose);
           killManagedProcess(currentHandle.child, "SIGTERM");
@@ -81970,6 +82338,7 @@ var execFileAsync2, MERGE_HANDOFF_GRACE_MS, isRemoteActive, ProjectEngine;
 var init_project_engine = __esm({
   "../engine/src/project-engine.ts"() {
     "use strict";
+    init_src();
     init_in_process_runtime();
     init_pr_monitor();
     init_pr_comment_handler();
@@ -82436,12 +82805,12 @@ ${detail}`
        */
       async onMerge(taskId) {
         if (this.mergeActive.has(taskId)) {
-          return new Promise((resolve40, reject2) => {
-            this.manualMergeResolvers.set(taskId, { resolve: resolve40, reject: reject2 });
+          return new Promise((resolve42, reject2) => {
+            this.manualMergeResolvers.set(taskId, { resolve: resolve42, reject: reject2 });
           });
         }
-        return new Promise((resolve40, reject2) => {
-          this.manualMergeResolvers.set(taskId, { resolve: resolve40, reject: reject2 });
+        return new Promise((resolve42, reject2) => {
+          this.manualMergeResolvers.set(taskId, { resolve: resolve42, reject: reject2 });
           this.internalEnqueueMerge(taskId);
         });
       }
@@ -82664,6 +83033,48 @@ ${detail}`
         if (task.status === "failed") return false;
         return (task.mergeRetries ?? 0) < _ProjectEngine.MAX_AUTO_MERGE_RETRIES || this.hasAutoHealableVerificationBufferFailure(task) || this.isRetryCooldownElapsed(task);
       }
+      /**
+       * Remove and return the highest-priority taskId from the merge queue.
+       * Ordering: priority (urgent→low), then createdAt ASC, then id ASC — matching
+       * the triage and scheduler comparators. Manual merges (onMerge resolvers) are
+       * preferred over auto-merges so awaited callers aren't starved by a flood of
+       * higher-priority auto-enqueues. IDs whose tasks can't be loaded fall back to
+       * FIFO order so they still drain.
+       */
+      async pickNextMergeTaskId(store) {
+        if (this.mergeQueue.length === 0) return void 0;
+        if (this.mergeQueue.length === 1) {
+          return this.mergeQueue.shift();
+        }
+        const queueSnapshot = [...this.mergeQueue];
+        const entries = [];
+        for (let i = 0; i < queueSnapshot.length; i++) {
+          const taskId = queueSnapshot[i];
+          const task = await store.getTask(taskId).catch(() => void 0);
+          entries.push({
+            taskId,
+            task,
+            manual: this.manualMergeResolvers.has(taskId),
+            order: i
+          });
+        }
+        if (this.shuttingDown) return void 0;
+        entries.sort((a, b) => {
+          if (a.manual !== b.manual) return a.manual ? -1 : 1;
+          if (a.task && b.task) return compareTasksByPriorityThenAgeAndId(a.task, b.task);
+          if (a.task) return -1;
+          if (b.task) return 1;
+          return a.order - b.order;
+        });
+        for (const entry of entries) {
+          const liveIndex = this.mergeQueue.indexOf(entry.taskId);
+          if (liveIndex !== -1) {
+            this.mergeQueue.splice(liveIndex, 1);
+            return entry.taskId;
+          }
+        }
+        return void 0;
+      }
       internalEnqueueMerge(taskId) {
         if (this.shuttingDown) return;
         if (this.mergeActive.has(taskId)) return;
@@ -82671,6 +83082,23 @@ ${detail}`
         this.mergeQueue.push(taskId);
         void this.drainMergeQueue();
       }
+      /**
+       * Filter a sweep's listTasks() result to merge-eligible tasks, sort by
+       * priority (urgent → low, then createdAt ASC, then id ASC), and enqueue.
+       * Sorting before enqueue matters because each enqueue may immediately
+       * trigger drainMergeQueue's single-item fast path, so the first task
+       * pushed wins. listTasks returns createdAt ASC — without this sort an
+       * older low-priority task would start before a later urgent one.
+       */
+      enqueueEligibleInReviewTasks(tasks) {
+        const eligible = sortTasksByPriorityThenAgeAndId(
+          tasks.filter((t) => !t.paused && this.canMergeTask(t))
+        );
+        for (const t of eligible) {
+          this.internalEnqueueMerge(t.id);
+        }
+        return eligible.length;
+      }
       async drainMergeQueue() {
         if (this.mergeRunning) return;
         this.mergeRunning = true;
@@ -82678,7 +83106,9 @@ ${detail}`
           const store = this.runtime.getTaskStore();
           const cwd = this.config.workingDirectory;
           while (this.mergeQueue.length > 0 && !this.shuttingDown) {
-            const taskId = this.mergeQueue.shift();
+            const taskId = await this.pickNextMergeTaskId(store);
+            if (!taskId) break;
+            if (this.shuttingDown) break;
             const manualResolver = this.manualMergeResolvers.get(taskId);
             try {
               if (!manualResolver) {
@@ -83148,12 +83578,9 @@ ${detail}`
           }
           const settings = await store.getSettings();
           if (!settings.autoMerge) return;
-          const eligible = tasks.filter((t) => !t.paused && this.canMergeTask(t));
-          if (eligible.length > 0) {
-            runtimeLog.log(`Auto-merge startup sweep: enqueueing ${eligible.length} task(s)`);
-            for (const t of eligible) {
-              this.internalEnqueueMerge(t.id);
-            }
+          const enqueued = this.enqueueEligibleInReviewTasks(tasks);
+          if (enqueued > 0) {
+            runtimeLog.log(`Auto-merge startup sweep: enqueueing ${enqueued} task(s)`);
           }
         } catch (err) {
           runtimeLog.warn(
@@ -83169,14 +83596,7 @@ ${detail}`
             const settings = await store.getSettings();
             if (!settings.globalPause && !settings.enginePaused && settings.autoMerge) {
               const tasks = await store.listTasks({ column: "in-review" });
-              for (const t of tasks) {
-                if (t.paused) {
-                  continue;
-                }
-                if (this.canMergeTask(t)) {
-                  this.internalEnqueueMerge(t.id);
-                }
-              }
+              this.enqueueEligibleInReviewTasks(tasks);
             }
           } catch (err) {
             runtimeLog.warn(
@@ -83232,14 +83652,7 @@ ${detail}`
             if (s.autoMerge) {
               try {
                 const tasks = await store.listTasks({ column: "in-review" });
-                for (const t of tasks) {
-                  if (t.paused) {
-                    continue;
-                  }
-                  if (this.canMergeTask(t)) {
-                    this.internalEnqueueMerge(t.id);
-                  }
-                }
+                this.enqueueEligibleInReviewTasks(tasks);
               } catch (err) {
                 runtimeLog.warn(
                   `Global unpause: failed to scan in-review tasks for auto-merge: ${err instanceof Error ? err.message : String(err)}`
@@ -83269,14 +83682,7 @@ ${detail}`
             if (s.autoMerge) {
               try {
                 const tasks = await store.listTasks({ column: "in-review" });
-                for (const t of tasks) {
-                  if (t.paused) {
-                    continue;
-                  }
-                  if (this.canMergeTask(t)) {
-                    this.internalEnqueueMerge(t.id);
-                  }
-                }
+                this.enqueueEligibleInReviewTasks(tasks);
               } catch (err) {
                 runtimeLog.warn(
                   `Engine unpause: failed to scan in-review tasks for auto-merge: ${err instanceof Error ? err.message : String(err)}`
@@ -83869,7 +84275,7 @@ var init_peer_exchange_service = __esm({
       syncIntervalMs;
       interval = null;
       activeSync = null;
-      stopped = false;
+      running = false;
       /** Whether settings sync is enabled. Default: false. */
       settingsSyncEnabled;
       /** Minimum interval between settings syncs with the same node in ms. Default: 5 minutes. */
@@ -83911,10 +84317,11 @@ var init_peer_exchange_service = __esm({
        * Begins periodic gossip with all online remote nodes.
        */
       start() {
-        if (this.stopped) {
-          peerExchangeLog.warn("Cannot start - service has been stopped");
+        if (this.running) {
+          peerExchangeLog.log("Peer exchange service already running");
           return;
         }
+        this.running = true;
         this.centralCore.listNodes().then((nodes) => {
           const onlineRemoteCount = nodes.filter(
             (n) => n.type === "remote" && n.status === "online" && n.url
@@ -83924,6 +84331,7 @@ var init_peer_exchange_service = __esm({
           peerExchangeLog.warn(`Failed to get initial peer count: ${err}`);
         });
         this.interval = setInterval(() => {
+          if (!this.running) return;
           void this.syncWithAllPeers();
         }, this.syncIntervalMs);
       }
@@ -83931,12 +84339,21 @@ var init_peer_exchange_service = __esm({
        * Stop the peer exchange service.
        * Clears the sync interval and prevents further syncs.
        */
-      stop() {
+      async stop() {
+        if (!this.running) {
+          return;
+        }
+        this.running = false;
         if (this.interval) {
           clearInterval(this.interval);
           this.interval = null;
         }
-        this.stopped = true;
+        if (this.activeSync) {
+          try {
+            await this.activeSync;
+          } catch {
+          }
+        }
         peerExchangeLog.log("Stopped peer exchange service");
       }
       /**
@@ -85495,7 +85912,7 @@ For completion:
 }`;
     SESSION_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
     CLEANUP_INTERVAL_MS2 = 5 * 60 * 1e3;
-    MAX_SESSIONS_PER_IP_PER_HOUR = 5;
+    MAX_SESSIONS_PER_IP_PER_HOUR = 1e3;
     RATE_LIMIT_WINDOW_MS2 = 60 * 60 * 1e3;
     GENERATION_TIMEOUT_MS = 12e4;
     sessions = /* @__PURE__ */ new Map();
@@ -88381,7 +88798,7 @@ var init_src3 = __esm({
 });
 
 // ../../plugins/fusion-plugin-hermes-runtime/dist/cli-spawn.js
-import { spawn as spawn5, spawnSync } from "node:child_process";
+import { spawn as spawn6, spawnSync } from "node:child_process";
 import os2 from "node:os";
 import path, { sep as PATH_SEP } from "node:path";
 function resolveBinaryForSpawn(binary) {
@@ -88443,9 +88860,9 @@ function hermesProfileHome(profileName) {
 async function listHermesProfiles(opts) {
   const binary = resolveBinaryForSpawn(opts?.binaryPath ?? "hermes");
   const timeoutMs = opts?.timeoutMs ?? 5e3;
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     let settled = false;
-    const child = spawn5(binary, ["profile", "list"], {
+    const child = spawn6(binary, ["profile", "list"], {
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process.env }
     });
@@ -88486,7 +88903,7 @@ async function listHermesProfiles(opts) {
 ${combined}`));
         return;
       }
-      resolve40(parseProfileListOutput(stdout));
+      resolve42(parseProfileListOutput(stdout));
     });
   });
 }
@@ -88563,13 +88980,13 @@ function buildHermesArgs(prompt, settings, resumeSessionId) {
 async function invokeHermesCli(prompt, settings, resumeSessionId, signal) {
   const args = buildHermesArgs(prompt, settings, resumeSessionId);
   const binary = resolveBinaryForSpawn(settings.binaryPath);
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     let settled = false;
     const spawnEnv = { ...process.env, PYTHONUNBUFFERED: "1" };
     if (settings.profile) {
       spawnEnv.HERMES_HOME = hermesProfileHome(settings.profile);
     }
-    const child = spawn5(binary, args, {
+    const child = spawn6(binary, args, {
       stdio: ["ignore", "pipe", "pipe"],
       env: spawnEnv
     });
@@ -88631,7 +89048,7 @@ ${combined}`));
         return;
       }
       try {
-        resolve40(parseHermesOutput(stdout, stderr));
+        resolve42(parseHermesOutput(stdout, stderr));
       } catch (parseErr) {
         reject2(parseErr);
       }
@@ -88724,7 +89141,7 @@ var init_runtime_adapter = __esm({
 });
 
 // ../../plugins/fusion-plugin-hermes-runtime/dist/probe.js
-import { spawn as spawn6 } from "node:child_process";
+import { spawn as spawn7 } from "node:child_process";
 async function probeHermesBinary(opts) {
   const startedAt = Date.now();
   const binary = typeof opts?.binaryPath === "string" && opts.binaryPath.trim().length > 0 ? opts.binaryPath.trim() : "hermes";
@@ -88735,7 +89152,7 @@ async function probeHermesBinary(opts) {
       resolvePromise({ ...result, probeDurationMs: Date.now() - startedAt });
     };
     let settled = false;
-    const child = spawn6(resolvedPath ?? binary, ["--version"], {
+    const child = spawn7(resolvedPath ?? binary, ["--version"], {
       stdio: ["ignore", "pipe", "pipe"]
     });
     const timer = setTimeout(() => {
@@ -88796,7 +89213,7 @@ async function probeHermesBinary(opts) {
 async function tryResolveBinaryPath(binary) {
   return new Promise((resolvePromise) => {
     const which = process.platform === "win32" ? "where" : "which";
-    const child = spawn6(which, [binary], { stdio: ["ignore", "pipe", "ignore"] });
+    const child = spawn7(which, [binary], { stdio: ["ignore", "pipe", "ignore"] });
     let out = "";
     child.stdout?.on("data", (chunk) => {
       out += chunk.toString("utf-8");
@@ -88874,7 +89291,7 @@ var init_dist = __esm({
 });
 
 // ../../plugins/fusion-plugin-openclaw-runtime/dist/pi-module.js
-import { spawn as spawn7 } from "node:child_process";
+import { spawn as spawn8 } from "node:child_process";
 import { randomUUID as randomUUID15 } from "node:crypto";
 function asString(v) {
   return typeof v === "string" && v.trim() !== "" ? v.trim() : void 0;
@@ -88949,9 +89366,9 @@ async function promptCli(session, message, config, callbacks, signal) {
   const args = buildOpenClawArgs(config, session.sessionId, message);
   const cb = { ...session.callbacks, ...callbacks };
   cb.onToolStart?.("openclaw.agent", { sessionId: session.sessionId });
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     let settled = false;
-    const child = spawn7(config.binaryPath, args, {
+    const child = spawn8(config.binaryPath, args, {
       stdio: ["ignore", "pipe", "pipe"]
     });
     const hardKill = setTimeout(() => {
@@ -89042,7 +89459,7 @@ async function promptCli(session, message, config, callbacks, signal) {
         ...metaError ? { error: metaError } : {},
         ...errorText.length > 0 ? { toolErrors: errorText } : {}
       });
-      resolve40();
+      resolve42();
     });
   });
 }
@@ -89102,7 +89519,7 @@ var init_runtime_adapter2 = __esm({
 });
 
 // ../../plugins/fusion-plugin-openclaw-runtime/dist/probe.js
-import { spawn as spawn8 } from "node:child_process";
+import { spawn as spawn9 } from "node:child_process";
 async function probeOpenClawBinary(opts = {}) {
   const startedAt = Date.now();
   const binary = opts.binaryPath ?? "openclaw";
@@ -89113,7 +89530,7 @@ async function probeOpenClawBinary(opts = {}) {
       resolvePromise({ ...partial, probeDurationMs: Date.now() - startedAt });
     };
     let settled = false;
-    const child = spawn8(resolvedPath ?? binary, ["--version"], {
+    const child = spawn9(resolvedPath ?? binary, ["--version"], {
       stdio: ["ignore", "pipe", "pipe"]
     });
     const timer = setTimeout(() => {
@@ -89174,7 +89591,7 @@ async function probeOpenClawBinary(opts = {}) {
 async function tryResolveBinaryPath2(binary) {
   return new Promise((resolvePromise) => {
     const which = process.platform === "win32" ? "where" : "which";
-    const child = spawn8(which, [binary], { stdio: ["ignore", "pipe", "ignore"] });
+    const child = spawn9(which, [binary], { stdio: ["ignore", "pipe", "ignore"] });
     let out = "";
     child.stdout?.on("data", (chunk) => {
       out += chunk.toString("utf-8");
@@ -90595,7 +91012,7 @@ function registerTaskWorkflowRoutes(ctx, deps) {
   router.patch("/tasks/:id", async (req, res) => {
     try {
       const { store: scopedStore } = await getProjectContext3(req);
-      const { title, description, prompt, dependencies, enabledWorkflowSteps, modelProvider, modelId, validatorModelProvider, validatorModelId, planningModelProvider, planningModelId, thinkingLevel, assigneeUserId, reviewLevel, executionMode, sourceIssue, nodeId } = req.body;
+      const { title, description, prompt, priority, dependencies, enabledWorkflowSteps, modelProvider, modelId, validatorModelProvider, validatorModelId, planningModelProvider, planningModelId, thinkingLevel, assigneeUserId, reviewLevel, executionMode, sourceIssue, nodeId } = req.body;
       const hasBodyField = (field) => Object.prototype.hasOwnProperty.call(req.body, field);
       const validateModelField = (value, name) => {
         if (value === void 0) return void 0;
@@ -90625,6 +91042,9 @@ function registerTaskWorkflowRoutes(ctx, deps) {
       if (executionMode !== void 0 && executionMode !== null && !validExecutionModes.includes(executionMode)) {
         throw new Error(`executionMode must be one of: ${validExecutionModes.join(", ")}`);
       }
+      if (priority !== void 0 && priority !== null && !isTaskPriority(priority)) {
+        throw new Error(`priority must be one of: ${TASK_PRIORITIES.join(", ")}`);
+      }
       if (enabledWorkflowSteps !== void 0) {
         if (!Array.isArray(enabledWorkflowSteps) || !enabledWorkflowSteps.every((id) => typeof id === "string")) {
           throw new Error("enabledWorkflowSteps must be an array of strings");
@@ -90684,6 +91104,7 @@ function registerTaskWorkflowRoutes(ctx, deps) {
       if (title !== void 0) updates.title = title;
       if (description !== void 0) updates.description = description;
       if (prompt !== void 0) updates.prompt = prompt;
+      if (hasBodyField("priority")) updates.priority = priority;
       if (dependencies !== void 0) updates.dependencies = dependencies;
       if (enabledWorkflowSteps !== void 0) updates.enabledWorkflowSteps = enabledWorkflowSteps;
       if (hasBodyField("modelProvider")) updates.modelProvider = validatedModelProvider;
@@ -90714,7 +91135,7 @@ function registerTaskWorkflowRoutes(ctx, deps) {
       if (err instanceof ApiError) {
         throw err;
       }
-      const status = (err instanceof Error ? err.message : String(err)).includes("must be a string") || (err instanceof Error ? err.message : String(err)).includes("must be a non-empty string") || (err instanceof Error ? err.message : String(err)).includes("must be a string or null") || (err instanceof Error ? err.message : String(err)).includes("must be an array of strings") || (err instanceof Error ? err.message : String(err)).includes("thinkingLevel must be one of") || (err instanceof Error ? err.message : String(err)).includes("reviewLevel must be an integer") || (err instanceof Error ? err.message : String(err)).includes("executionMode must be one of") || (err instanceof Error ? err.message : String(err)).includes("sourceIssue") ? 400 : 500;
+      const status = (err instanceof Error ? err.message : String(err)).includes("must be a string") || (err instanceof Error ? err.message : String(err)).includes("must be a non-empty string") || (err instanceof Error ? err.message : String(err)).includes("must be a string or null") || (err instanceof Error ? err.message : String(err)).includes("must be an array of strings") || (err instanceof Error ? err.message : String(err)).includes("thinkingLevel must be one of") || (err instanceof Error ? err.message : String(err)).includes("reviewLevel must be an integer") || (err instanceof Error ? err.message : String(err)).includes("executionMode must be one of") || (err instanceof Error ? err.message : String(err)).includes("priority must be one of") || (err instanceof Error ? err.message : String(err)).includes("sourceIssue") ? 400 : 500;
       throw new ApiError(status, err instanceof Error ? err.message : String(err));
     }
   });
@@ -97386,10 +97807,10 @@ var require_browser3 = __commonJS({
           text = canvas;
           canvas = void 0;
         }
-        return new Promise(function(resolve40, reject2) {
+        return new Promise(function(resolve42, reject2) {
           try {
             const data = QRCode2.create(text, opts);
-            resolve40(renderFunc(data, canvas, opts));
+            resolve42(renderFunc(data, canvas, opts));
           } catch (e) {
             reject2(e);
           }
@@ -97471,11 +97892,11 @@ var require_server = __commonJS({
     }
     function render(renderFunc, text, params) {
       if (!params.cb) {
-        return new Promise(function(resolve40, reject2) {
+        return new Promise(function(resolve42, reject2) {
           try {
             const data = QRCode2.create(text, params.opts);
             return renderFunc(data, params.opts, function(err, data2) {
-              return err ? reject2(err) : resolve40(data2);
+              return err ? reject2(err) : resolve42(data2);
             });
           } catch (e) {
             reject2(e);
@@ -99123,9 +99544,9 @@ import * as fs2 from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
 import { join as join42, dirname as dirname12 } from "node:path";
 function getNativePrebuildName() {
-  const platform3 = process.platform === "darwin" ? "darwin" : process.platform === "linux" ? "linux" : process.platform === "win32" ? "win32" : "unknown";
+  const platform4 = process.platform === "darwin" ? "darwin" : process.platform === "linux" ? "linux" : process.platform === "win32" ? "win32" : "unknown";
   const arch = process.arch === "arm64" ? "arm64" : process.arch === "x64" ? "x64" : "unknown";
-  return `${platform3}-${arch}`;
+  return `${platform4}-${arch}`;
 }
 function findInstalledNodePtyNativeDir() {
   try {
@@ -99307,8 +99728,8 @@ var init_terminal_service = __esm({
        * Get the default allowed shells for the current platform
        */
       getAllowedShells() {
-        const platform3 = os3.platform();
-        return ALLOWED_SHELL_PATHS[platform3] || ALLOWED_SHELL_PATHS.linux;
+        const platform4 = os3.platform();
+        return ALLOWED_SHELL_PATHS[platform4] || ALLOWED_SHELL_PATHS.linux;
       }
       /**
        * Validate that a shell path is allowed
@@ -99322,7 +99743,7 @@ var init_terminal_service = __esm({
        * Detect the best shell for the current platform
        */
       detectShell() {
-        const platform3 = os3.platform();
+        const platform4 = os3.platform();
         const allowedShells = this.getAllowedShells();
         const getBasename = (shellPath) => {
           const lastSep = Math.max(shellPath.lastIndexOf("/"), shellPath.lastIndexOf("\\"));
@@ -99339,7 +99760,7 @@ var init_terminal_service = __esm({
           return ["--login"];
         };
         const userShell = process.env.SHELL;
-        if (userShell && platform3 !== "win32") {
+        if (userShell && platform4 !== "win32") {
           const normalizedUserShell = this.isWindows ? userShell.toLowerCase() : userShell;
           for (const allowed of allowedShells) {
             const normalizedAllowed = this.isWindows ? allowed.toLowerCase() : allowed;
@@ -99353,7 +99774,7 @@ var init_terminal_service = __esm({
             return { shell, args: getShellArgs(shell) };
           }
         }
-        if (platform3 === "win32") {
+        if (platform4 === "win32") {
           return { shell: "cmd.exe", args: [] };
         }
         return { shell: "/bin/sh", args: [] };
@@ -100186,7 +100607,7 @@ var init_register_messaging_scripts = __esm({
 
 // ../dashboard/src/github.ts
 function delay(ms) {
-  return new Promise((resolve40) => setTimeout(resolve40, ms));
+  return new Promise((resolve42) => setTimeout(resolve42, ms));
 }
 function normalizeCheckState(state) {
   switch ((state ?? "").toLowerCase()) {
@@ -104580,7 +105001,7 @@ var init_register_git_github = __esm({
 });
 
 // ../dashboard/src/terminal.ts
-import { spawn as spawn9 } from "node:child_process";
+import { spawn as spawn10 } from "node:child_process";
 import { randomUUID as randomUUID17 } from "node:crypto";
 import { EventEmitter as EventEmitter32 } from "node:events";
 function extractBaseCommand(command) {
@@ -104742,7 +105163,7 @@ var init_terminal = __esm({
           return { sessionId: "", error: validation.error };
         }
         const sessionId = randomUUID17();
-        const childProcess = spawn9(command, [], {
+        const childProcess = spawn10(command, [], {
           cwd,
           shell: true,
           stdio: ["pipe", "pipe", "pipe"],
@@ -106460,9 +106881,9 @@ var require_readdir_glob = __commonJS({
     var fs3 = __require("fs");
     var { EventEmitter: EventEmitter37 } = __require("events");
     var { Minimatch } = require_minimatch();
-    var { resolve: resolve40 } = __require("path");
+    var { resolve: resolve42 } = __require("path");
     function readdir12(dir2, strict) {
-      return new Promise((resolve41, reject2) => {
+      return new Promise((resolve43, reject2) => {
         fs3.readdir(dir2, { withFileTypes: true }, (err, files) => {
           if (err) {
             switch (err.code) {
@@ -106470,7 +106891,7 @@ var require_readdir_glob = __commonJS({
                 if (strict) {
                   reject2(err);
                 } else {
-                  resolve41([]);
+                  resolve43([]);
                 }
                 break;
               case "ENOTSUP":
@@ -106480,7 +106901,7 @@ var require_readdir_glob = __commonJS({
               case "ENAMETOOLONG":
               // Filename too long
               case "UNKNOWN":
-                resolve41([]);
+                resolve43([]);
                 break;
               case "ELOOP":
               // Too many levels of symbolic links
@@ -106489,30 +106910,30 @@ var require_readdir_glob = __commonJS({
                 break;
             }
           } else {
-            resolve41(files);
+            resolve43(files);
           }
         });
       });
     }
     function stat12(file, followSymlinks) {
-      return new Promise((resolve41, reject2) => {
+      return new Promise((resolve43, reject2) => {
         const statFunc = followSymlinks ? fs3.stat : fs3.lstat;
         statFunc(file, (err, stats) => {
           if (err) {
             switch (err.code) {
               case "ENOENT":
                 if (followSymlinks) {
-                  resolve41(stat12(file, false));
+                  resolve43(stat12(file, false));
                 } else {
-                  resolve41(null);
+                  resolve43(null);
                 }
                 break;
               default:
-                resolve41(null);
+                resolve43(null);
                 break;
             }
           } else {
-            resolve41(stats);
+            resolve43(stats);
           }
         });
       });
@@ -106602,7 +107023,7 @@ var require_readdir_glob = __commonJS({
             (skip) => new Minimatch(skip, { dot: true })
           );
         }
-        this.iterator = explore(resolve40(cwd || "."), this.options.follow, this.options.stat, this._shouldSkipDirectory.bind(this));
+        this.iterator = explore(resolve42(cwd || "."), this.options.follow, this.options.stat, this._shouldSkipDirectory.bind(this));
         this.paused = false;
         this.inactive = false;
         this.aborted = false;
@@ -106856,10 +107277,10 @@ function awaitify(asyncFn, arity) {
     if (typeof args[arity - 1] === "function") {
       return asyncFn.apply(this, args);
     }
-    return new Promise((resolve40, reject2) => {
+    return new Promise((resolve42, reject2) => {
       args[arity - 1] = (err, ...cbArgs) => {
         if (err) return reject2(err);
-        resolve40(cbArgs.length > 1 ? cbArgs : cbArgs[0]);
+        resolve42(cbArgs.length > 1 ? cbArgs : cbArgs[0]);
       };
       asyncFn.apply(this, args);
     });
@@ -107041,13 +107462,13 @@ function mapSeries(coll, iteratee, callback) {
   return _asyncMap(eachOfSeries$1, coll, iteratee, callback);
 }
 function promiseCallback() {
-  let resolve40, reject2;
+  let resolve42, reject2;
   function callback(err, ...args) {
     if (err) return reject2(err);
-    resolve40(args.length > 1 ? args : args[0]);
+    resolve42(args.length > 1 ? args : args[0]);
   }
   callback[PROMISE_SYMBOL] = new Promise((res, rej) => {
-    resolve40 = res, reject2 = rej;
+    resolve42 = res, reject2 = rej;
   });
   return callback;
 }
@@ -107320,8 +107741,8 @@ function queue$1(worker, concurrency, payload) {
       });
     }
     if (rejectOnError || !callback) {
-      return new Promise((resolve40, reject2) => {
-        res = resolve40;
+      return new Promise((resolve42, reject2) => {
+        res = resolve42;
         rej = reject2;
       });
     }
@@ -107360,10 +107781,10 @@ function queue$1(worker, concurrency, payload) {
   }
   const eventMethod = (name) => (handler) => {
     if (!handler) {
-      return new Promise((resolve40, reject2) => {
+      return new Promise((resolve42, reject2) => {
         once3(name, (err, data) => {
           if (err) return reject2(err);
-          resolve40(data);
+          resolve42(data);
         });
       });
     }
@@ -108539,7 +108960,7 @@ var require_polyfills = __commonJS({
     var constants2 = __require("constants");
     var origCwd = process.cwd;
     var cwd = null;
-    var platform3 = process.env.GRACEFUL_FS_PLATFORM || process.platform;
+    var platform4 = process.env.GRACEFUL_FS_PLATFORM || process.platform;
     process.cwd = function() {
       if (!cwd)
         cwd = origCwd.call(process);
@@ -108598,7 +109019,7 @@ var require_polyfills = __commonJS({
         fs3.lchownSync = function() {
         };
       }
-      if (platform3 === "win32") {
+      if (platform4 === "win32") {
         fs3.rename = typeof fs3.rename !== "function" ? fs3.rename : (function(fs$rename) {
           function rename6(from, to, cb) {
             var start = Date.now();
@@ -113369,25 +113790,25 @@ var require_util2 = __commonJS({
         };
       },
       createDeferredPromise: function() {
-        let resolve40;
+        let resolve42;
         let reject2;
         const promise = new Promise((res, rej) => {
-          resolve40 = res;
+          resolve42 = res;
           reject2 = rej;
         });
         return {
           promise,
-          resolve: resolve40,
+          resolve: resolve42,
           reject: reject2
         };
       },
       promisify(fn) {
-        return new Promise((resolve40, reject2) => {
+        return new Promise((resolve42, reject2) => {
           fn((err, ...args) => {
             if (err) {
               return reject2(err);
             }
-            return resolve40(...args);
+            return resolve42(...args);
           });
         });
       },
@@ -114179,7 +114600,7 @@ var require_end_of_stream2 = __commonJS({
         validateBoolean3(opts.cleanup, "cleanup");
         autoCleanup = opts.cleanup;
       }
-      return new Promise2((resolve40, reject2) => {
+      return new Promise2((resolve42, reject2) => {
         const cleanup = eos(stream, opts, (err) => {
           if (autoCleanup) {
             cleanup();
@@ -114187,7 +114608,7 @@ var require_end_of_stream2 = __commonJS({
           if (err) {
             reject2(err);
           } else {
-            resolve40();
+            resolve42();
           }
         });
       });
@@ -115354,7 +115775,7 @@ var require_readable2 = __commonJS({
         error = this.readableEnded ? null : new AbortError();
         this.destroy(error);
       }
-      return new Promise2((resolve40, reject2) => eos(this, (err) => err && err !== error ? reject2(err) : resolve40(null)));
+      return new Promise2((resolve42, reject2) => eos(this, (err) => err && err !== error ? reject2(err) : resolve42(null)));
     };
     Readable2.prototype.push = function(chunk, encoding) {
       return readableAddChunk(this, chunk, encoding, false);
@@ -115898,12 +116319,12 @@ var require_readable2 = __commonJS({
     }
     async function* createAsyncIterator(stream, options) {
       let callback = nop;
-      function next(resolve40) {
+      function next(resolve42) {
         if (this === stream) {
           callback();
           callback = nop;
         } else {
-          callback = resolve40;
+          callback = resolve42;
         }
       }
       stream.on("readable", next);
@@ -116956,7 +117377,7 @@ var require_duplexify = __commonJS({
       );
     };
     function fromAsyncGen(fn) {
-      let { promise, resolve: resolve40 } = createDeferredPromise();
+      let { promise, resolve: resolve42 } = createDeferredPromise();
       const ac = new AbortController2();
       const signal = ac.signal;
       const value = fn(
@@ -116971,7 +117392,7 @@ var require_duplexify = __commonJS({
               throw new AbortError(void 0, {
                 cause: signal.reason
               });
-            ({ promise, resolve: resolve40 } = createDeferredPromise());
+            ({ promise, resolve: resolve42 } = createDeferredPromise());
             yield chunk;
           }
         })(),
@@ -116982,8 +117403,8 @@ var require_duplexify = __commonJS({
       return {
         value,
         write(chunk, encoding, cb) {
-          const _resolve = resolve40;
-          resolve40 = null;
+          const _resolve = resolve42;
+          resolve42 = null;
           _resolve({
             chunk,
             done: false,
@@ -116991,8 +117412,8 @@ var require_duplexify = __commonJS({
           });
         },
         final(cb) {
-          const _resolve = resolve40;
-          resolve40 = null;
+          const _resolve = resolve42;
+          resolve42 = null;
           _resolve({
             done: true,
             cb
@@ -117444,7 +117865,7 @@ var require_pipeline = __commonJS({
           callback();
         }
       };
-      const wait = () => new Promise2((resolve40, reject2) => {
+      const wait = () => new Promise2((resolve42, reject2) => {
         if (error) {
           reject2(error);
         } else {
@@ -117452,7 +117873,7 @@ var require_pipeline = __commonJS({
             if (error) {
               reject2(error);
             } else {
-              resolve40();
+              resolve42();
             }
           };
         }
@@ -118096,8 +118517,8 @@ var require_operators = __commonJS({
                 next = null;
               }
               if (!done && (queue2.length >= highWaterMark2 || cnt >= concurrency)) {
-                await new Promise2((resolve40) => {
-                  resume = resolve40;
+                await new Promise2((resolve42) => {
+                  resume = resolve42;
                 });
               }
             }
@@ -118131,8 +118552,8 @@ var require_operators = __commonJS({
               queue2.shift();
               maybeResume();
             }
-            await new Promise2((resolve40) => {
-              next = resolve40;
+            await new Promise2((resolve42) => {
+              next = resolve42;
             });
           }
         } finally {
@@ -118390,7 +118811,7 @@ var require_promises = __commonJS({
     var { finished } = require_end_of_stream2();
     require_stream2();
     function pipeline(...streams) {
-      return new Promise2((resolve40, reject2) => {
+      return new Promise2((resolve42, reject2) => {
         let signal;
         let end;
         const lastArg = streams[streams.length - 1];
@@ -118405,7 +118826,7 @@ var require_promises = __commonJS({
             if (err) {
               reject2(err);
             } else {
-              resolve40(value);
+              resolve42(value);
             }
           },
           {
@@ -123178,10 +123599,10 @@ var require_commonjs3 = __commonJS({
        * Return a void Promise that resolves once the stream ends.
        */
       async promise() {
-        return new Promise((resolve40, reject2) => {
+        return new Promise((resolve42, reject2) => {
           this.on(DESTROYED, () => reject2(new Error("stream destroyed")));
           this.on("error", (er) => reject2(er));
-          this.on("end", () => resolve40());
+          this.on("end", () => resolve42());
         });
       }
       /**
@@ -123205,7 +123626,7 @@ var require_commonjs3 = __commonJS({
             return Promise.resolve({ done: false, value: res });
           if (this[EOF])
             return stop();
-          let resolve40;
+          let resolve42;
           let reject2;
           const onerr = (er) => {
             this.off("data", ondata);
@@ -123219,19 +123640,19 @@ var require_commonjs3 = __commonJS({
             this.off("end", onend);
             this.off(DESTROYED, ondestroy);
             this.pause();
-            resolve40({ value, done: !!this[EOF] });
+            resolve42({ value, done: !!this[EOF] });
           };
           const onend = () => {
             this.off("error", onerr);
             this.off("data", ondata);
             this.off(DESTROYED, ondestroy);
             stop();
-            resolve40({ done: true, value: void 0 });
+            resolve42({ done: true, value: void 0 });
           };
           const ondestroy = () => onerr(new Error("stream destroyed"));
           return new Promise((res2, rej) => {
             reject2 = rej;
-            resolve40 = res2;
+            resolve42 = res2;
             this.once(DESTROYED, ondestroy);
             this.once("error", onerr);
             this.once("end", onend);
@@ -124247,9 +124668,9 @@ var require_commonjs4 = __commonJS({
         if (this.#asyncReaddirInFlight) {
           await this.#asyncReaddirInFlight;
         } else {
-          let resolve40 = () => {
+          let resolve42 = () => {
           };
-          this.#asyncReaddirInFlight = new Promise((res) => resolve40 = res);
+          this.#asyncReaddirInFlight = new Promise((res) => resolve42 = res);
           try {
             for (const e of await this.#fs.promises.readdir(fullpath, {
               withFileTypes: true
@@ -124262,7 +124683,7 @@ var require_commonjs4 = __commonJS({
             children.provisional = 0;
           }
           this.#asyncReaddirInFlight = void 0;
-          resolve40();
+          resolve42();
         }
         return children.slice(0, children.provisional);
       }
@@ -125129,7 +125550,7 @@ var require_pattern = __commonJS({
       #isUNC;
       #isAbsolute;
       #followGlobstar = true;
-      constructor(patternList, globList, index2, platform3) {
+      constructor(patternList, globList, index2, platform4) {
         if (!isPatternList(patternList)) {
           throw new TypeError("empty pattern list");
         }
@@ -125146,7 +125567,7 @@ var require_pattern = __commonJS({
         this.#patternList = patternList;
         this.#globList = globList;
         this.#index = index2;
-        this.#platform = platform3;
+        this.#platform = platform4;
         if (this.#index === 0) {
           if (this.isUNC()) {
             const [p0, p1, p2, p3, ...prest] = this.#patternList;
@@ -125298,12 +125719,12 @@ var require_ignore = __commonJS({
       absoluteChildren;
       platform;
       mmopts;
-      constructor(ignored, { nobrace, nocase, noext, noglobstar, platform: platform3 = defaultPlatform }) {
+      constructor(ignored, { nobrace, nocase, noext, noglobstar, platform: platform4 = defaultPlatform }) {
         this.relative = [];
         this.absolute = [];
         this.relativeChildren = [];
         this.absoluteChildren = [];
-        this.platform = platform3;
+        this.platform = platform4;
         this.mmopts = {
           dot: true,
           nobrace,
@@ -125311,7 +125732,7 @@ var require_ignore = __commonJS({
           noext,
           noglobstar,
           optimizationLevel: 2,
-          platform: platform3,
+          platform: platform4,
           nocomment: true,
           nonegate: true
         };
@@ -127035,11 +127456,11 @@ var require_core = __commonJS({
         this._finalize();
       }
       var self2 = this;
-      return new Promise(function(resolve40, reject2) {
+      return new Promise(function(resolve42, reject2) {
         var errored;
         self2._module.on("end", function() {
           if (!errored) {
-            resolve40();
+            resolve42();
           }
         });
         self2._module.on("error", function(err) {
@@ -127533,8 +127954,8 @@ var require_zip_archive_entry = __commonJS({
       }
       this.name = name;
     };
-    ZipArchiveEntry.prototype.setPlatform = function(platform3) {
-      this.platform = platform3;
+    ZipArchiveEntry.prototype.setPlatform = function(platform4) {
+      this.platform = platform4;
     };
     ZipArchiveEntry.prototype.setSize = function(size) {
       if (size < 0) {
@@ -129479,8 +129900,8 @@ var require_streamx = __commonJS({
             return this;
           },
           next() {
-            return new Promise(function(resolve40, reject2) {
-              promiseResolve = resolve40;
+            return new Promise(function(resolve42, reject2) {
+              promiseResolve = resolve42;
               promiseReject = reject2;
               const data = stream.read();
               if (data !== null) ondata(data);
@@ -129510,11 +129931,11 @@ var require_streamx = __commonJS({
         }
         function destroy(err) {
           stream.destroy(err);
-          return new Promise((resolve40, reject2) => {
-            if (stream._duplexState & DESTROYED) return resolve40({ value: void 0, done: true });
+          return new Promise((resolve42, reject2) => {
+            if (stream._duplexState & DESTROYED) return resolve42({ value: void 0, done: true });
             stream.once("close", function() {
               if (err) reject2(err);
-              else resolve40({ value: void 0, done: true });
+              else resolve42({ value: void 0, done: true });
             });
           });
         }
@@ -129558,8 +129979,8 @@ var require_streamx = __commonJS({
         const writes = pending + (ws._duplexState & WRITE_WRITING ? 1 : 0);
         if (writes === 0) return Promise.resolve(true);
         if (state.drains === null) state.drains = [];
-        return new Promise((resolve40) => {
-          state.drains.push({ writes, resolve: resolve40 });
+        return new Promise((resolve42) => {
+          state.drains.push({ writes, resolve: resolve42 });
         });
       }
       write(data) {
@@ -129664,10 +130085,10 @@ var require_streamx = __commonJS({
       cb(null);
     }
     function pipelinePromise(...streams) {
-      return new Promise((resolve40, reject2) => {
+      return new Promise((resolve42, reject2) => {
         return pipeline(...streams, (err) => {
           if (err) return reject2(err);
-          resolve40();
+          resolve42();
         });
       });
     }
@@ -130324,16 +130745,16 @@ var require_extract = __commonJS({
           entryCallback = null;
           cb(err);
         }
-        function onnext(resolve40, reject2) {
+        function onnext(resolve42, reject2) {
           if (error) {
             return reject2(error);
           }
           if (entryStream) {
-            resolve40({ value: entryStream, done: false });
+            resolve42({ value: entryStream, done: false });
             entryStream = null;
             return;
           }
-          promiseResolve = resolve40;
+          promiseResolve = resolve42;
           promiseReject = reject2;
           consumeCallback(null);
           if (extract._finished && promiseResolve) {
@@ -130361,11 +130782,11 @@ var require_extract = __commonJS({
         function destroy(err) {
           extract.destroy(err);
           consumeCallback(err);
-          return new Promise((resolve40, reject2) => {
-            if (extract.destroyed) return resolve40({ value: void 0, done: true });
+          return new Promise((resolve42, reject2) => {
+            if (extract.destroyed) return resolve42({ value: void 0, done: true });
             extract.once("close", function() {
               if (err) reject2(err);
-              else resolve40({ value: void 0, done: true });
+              else resolve42({ value: void 0, done: true });
             });
           });
         }
@@ -133702,6 +134123,20 @@ var init_register_settings_sync_inbound_routes = __esm({
 });
 
 // ../dashboard/src/routes/register-agent-core-routes.ts
+function isCompatibleDefaultHeartbeatPath(path5, agent) {
+  const trimmed = path5?.trim();
+  if (!trimmed) {
+    return false;
+  }
+  if (trimmed === getDefaultHeartbeatProcedurePath(agent.id, agent.name)) {
+    return true;
+  }
+  if (trimmed === getDefaultHeartbeatProcedurePath(agent.id)) {
+    return true;
+  }
+  const safeId = agent.id.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "agent";
+  return new RegExp(`^\\.fusion/agents/[^/]+-${safeId}/HEARTBEAT\\.md$`).test(trimmed);
+}
 function registerAgentCoreListCreateRoutes(ctx, deps) {
   const { router, getProjectContext: getProjectContext3, rethrowAsApiError: rethrowAsApiError8 } = ctx;
   const { sanitizeAgentTaskLinks, validateAgentInstructionsPayload } = deps;
@@ -133831,7 +134266,7 @@ function registerAgentCoreListCreateRoutes(ctx, deps) {
         bundleConfig: bundleConfig ?? void 0,
         heartbeatProcedurePath: heartbeatProcedurePath ?? void 0
       });
-      const expectedDefaultPath = getDefaultHeartbeatProcedurePath(agent.id);
+      const expectedDefaultPath = getDefaultHeartbeatProcedurePath(agent.id, agent.name);
       if (agent.heartbeatProcedurePath === expectedDefaultPath) {
         try {
           await ensureDefaultHeartbeatProcedureFile(scopedStore.getRootDir(), expectedDefaultPath, HEARTBEAT_PROCEDURE);
@@ -134089,7 +134524,7 @@ function registerAgentCoreRoutes(ctx, deps) {
       if (!existing) {
         throw notFound(`agent ${req.params.id} not found`);
       }
-      const targetPath = getDefaultHeartbeatProcedurePath(req.params.id);
+      const targetPath = isCompatibleDefaultHeartbeatPath(existing.heartbeatProcedurePath, existing) ? existing.heartbeatProcedurePath : getDefaultHeartbeatProcedurePath(existing.id, existing.name);
       const filePath = await ensureDefaultHeartbeatProcedureFile(
         scopedStore.getRootDir(),
         targetPath,
@@ -137349,9 +137784,9 @@ function registerProxyRoutes(router, deps) {
         if (req.rawBody && req.rawBody.length > 0) {
           body = req.rawBody;
         } else {
-          await new Promise((resolve40, reject2) => {
+          await new Promise((resolve42, reject2) => {
             req.on("data", (chunk) => chunks.push(chunk));
-            req.on("end", resolve40);
+            req.on("end", resolve42);
             req.on("error", reject2);
           });
           if (chunks.length > 0) {
@@ -137482,6 +137917,7 @@ var init_register_model_routes = __esm({
         let defaultProvider;
         let defaultModelId;
         let useClaudeCli = false;
+        let useDroidCli = false;
         if (store) {
           try {
             const globalStore = store.getGlobalSettingsStore();
@@ -137491,6 +137927,7 @@ var init_register_model_routes = __esm({
             defaultProvider = globalSettings.defaultProvider;
             defaultModelId = globalSettings.defaultModelId;
             useClaudeCli = globalSettings.useClaudeCli === true;
+            useDroidCli = globalSettings.useDroidCli === true;
           } catch {
           }
         }
@@ -137516,6 +137953,9 @@ var init_register_model_routes = __esm({
           if (!useClaudeCli) {
             models = models.filter((m) => m.provider !== "pi-claude-cli");
           }
+          if (!useDroidCli) {
+            models = models.filter((m) => m.provider !== "droid-cli");
+          }
           res.json({
             models,
             favoriteProviders,
@@ -137763,13 +138203,13 @@ function getHomeDir5() {
   return process.env.HOME || process.env.USERPROFILE || os4.homedir();
 }
 function execFileAsync5(file, args, options) {
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     child_process.execFile(file, args, options, (error, stdout, stderr) => {
       if (error) {
         reject2(error);
         return;
       }
-      resolve40({ stdout: String(stdout), stderr: String(stderr) });
+      resolve42({ stdout: String(stdout), stderr: String(stderr) });
     });
   });
 }
@@ -137828,7 +138268,7 @@ function formatDuration(ms) {
   return remHours > 0 ? `${days}d ${remHours}h` : `${days}d`;
 }
 function httpsRequest(url, options) {
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     const parsed = new URL(url);
     const req = https.request(
       {
@@ -137848,7 +138288,7 @@ function httpsRequest(url, options) {
             if (typeof v === "string") hdrs[k.toLowerCase()] = v;
             else if (Array.isArray(v)) hdrs[k.toLowerCase()] = v.join(", ");
           }
-          resolve40({
+          resolve42({
             status: res.statusCode || 0,
             headers: hdrs,
             body: Buffer.concat(chunks).toString("utf-8")
@@ -138095,7 +138535,7 @@ async function fetchClaudeUsageViaCli() {
       env: { ...process.env, TERM: "xterm-256color" }
     };
     if (isWindows) ptyOptions.useConpty = false;
-    const output = await new Promise((resolve40, reject2) => {
+    const output = await new Promise((resolve42, reject2) => {
       let buf = "";
       let settled = false;
       let sentCommand = false;
@@ -138111,7 +138551,7 @@ async function fetchClaudeUsageViaCli() {
         }
         const clean = _stripClaudeAnsi(buf);
         if (clean.includes("Current session") || clean.includes("% left") || clean.includes("% used")) {
-          resolve40(buf);
+          resolve42(buf);
         } else {
           reject2(new Error("Claude CLI timed out after 60s \u2014 got output but no usage data. Try running `claude /usage` manually."));
         }
@@ -138162,7 +138602,7 @@ async function fetchClaudeUsageViaCli() {
                     ptyProcess.kill();
                   } catch {
                   }
-                  resolve40(buf);
+                  resolve42(buf);
                 }
               }, 2e3);
             }
@@ -138173,7 +138613,7 @@ async function fetchClaudeUsageViaCli() {
         if (settled) return;
         settled = true;
         clearTimeout(timeout2);
-        resolve40(buf);
+        resolve42(buf);
       });
     });
     const cleanOutput = _stripClaudeAnsi(output);
@@ -138841,9 +139281,9 @@ async function fetchGitHubCopilotUsage() {
   return usage;
 }
 function withTimeout(providerPromise, providerName, timeoutMs = PROVIDER_FETCH_TIMEOUT_MS) {
-  return new Promise((resolve40) => {
+  return new Promise((resolve42) => {
     const timer = setTimeout(() => {
-      resolve40({
+      resolve42({
         name: providerName,
         icon: "\u23F1\uFE0F",
         status: "error",
@@ -138853,10 +139293,10 @@ function withTimeout(providerPromise, providerName, timeoutMs = PROVIDER_FETCH_T
     }, timeoutMs);
     providerPromise.then((result) => {
       clearTimeout(timer);
-      resolve40(result);
+      resolve42(result);
     }).catch((err) => {
       clearTimeout(timer);
-      resolve40({
+      resolve42({
         name: providerName,
         icon: "\u23F1\uFE0F",
         status: "error",
@@ -138911,7 +139351,7 @@ var init_usage = __esm({
     ANTHROPIC_OAUTH_CLIENT_ID = "9d1c250a-e61b-44d9-88ed-5944d1962f5e";
     ANTHROPIC_OAUTH_BETA = "oauth-2025-04-20";
     CLAUDE_USAGE_USER_AGENT = "claude-code-fusion-dashboard";
-    _sleep = (ms) => new Promise((resolve40) => setTimeout(resolve40, ms));
+    _sleep = (ms) => new Promise((resolve42) => setTimeout(resolve42, ms));
     sleepFn = _sleep;
     PROVIDER_FETCH_TIMEOUT_MS = 1e4;
     CLAUDE_FETCH_TIMEOUT_MS = 75e3;
@@ -138943,7 +139383,7 @@ var init_register_usage_routes = __esm({
 });
 
 // ../dashboard/src/claude-cli-probe.ts
-import { spawn as spawn10 } from "node:child_process";
+import { spawn as spawn11 } from "node:child_process";
 async function probeClaudeCli(options = {}) {
   const startedAt = Date.now();
   const timeoutMs = options.timeoutMs ?? PROBE_TIMEOUT_MS;
@@ -138953,7 +139393,7 @@ async function probeClaudeCli(options = {}) {
       resolvePromise({ ...result, probeDurationMs: Date.now() - startedAt });
     };
     let settled = false;
-    const child = spawn10(binaryPath ?? "claude", ["--version"], {
+    const child = spawn11(binaryPath ?? "claude", ["--version"], {
       stdio: ["ignore", "pipe", "pipe"]
     });
     const timer = setTimeout(() => {
@@ -139011,7 +139451,7 @@ async function probeClaudeCli(options = {}) {
 async function tryResolveBinaryPath3(binary) {
   return new Promise((resolvePromise) => {
     const which = process.platform === "win32" ? "where" : "which";
-    const child = spawn10(which, [binary], { stdio: ["ignore", "pipe", "ignore"] });
+    const child = spawn11(which, [binary], { stdio: ["ignore", "pipe", "ignore"] });
     let out = "";
     child.stdout?.on("data", (chunk) => {
       out += chunk.toString("utf-8");
@@ -139036,7 +139476,7 @@ var init_claude_cli_probe = __esm({
 });
 
 // ../dashboard/src/droid-cli-probe.ts
-import { spawn as spawn11 } from "node:child_process";
+import { spawn as spawn12 } from "node:child_process";
 async function probeDroidCli(options = {}) {
   const startedAt = Date.now();
   const timeoutMs = options.timeoutMs ?? PROBE_TIMEOUT_MS2;
@@ -139046,7 +139486,7 @@ async function probeDroidCli(options = {}) {
       resolvePromise({ ...result, probeDurationMs: Date.now() - startedAt });
     };
     let settled = false;
-    const child = spawn11(binaryPath ?? "droid", ["--version"], {
+    const child = spawn12(binaryPath ?? "droid", ["--version"], {
       stdio: ["ignore", "pipe", "pipe"]
     });
     const timer = setTimeout(() => {
@@ -139104,7 +139544,7 @@ async function probeDroidCli(options = {}) {
 async function tryResolveBinaryPath4(binary) {
   return new Promise((resolvePromise) => {
     const which = process.platform === "win32" ? "where" : "which";
-    const child = spawn11(which, [binary], { stdio: ["ignore", "pipe", "ignore"] });
+    const child = spawn12(which, [binary], { stdio: ["ignore", "pipe", "ignore"] });
     let out = "";
     child.stdout?.on("data", (chunk) => {
       out += chunk.toString("utf-8");
@@ -139479,8 +139919,8 @@ var init_register_auth_routes = __esm({
           loginInProgress.set(provider, abortController);
           let authResolve;
           let authReject;
-          const authUrlPromise = new Promise((resolve40, reject2) => {
-            authResolve = resolve40;
+          const authUrlPromise = new Promise((resolve42, reject2) => {
+            authResolve = resolve42;
             authReject = reject2;
           });
           const loginPromise = storage.login(provider, {
@@ -139948,7 +140388,7 @@ function stripAnsi2(str) {
   return str.replace(/\x1B\[[0-9;]*[mGKJHFABCDSTsu]/g, "");
 }
 async function mintAgentApiKeyViaCli(opts) {
-  const { spawn: spawn17 } = await import("node:child_process");
+  const { spawn: spawn19 } = await import("node:child_process");
   const bin = opts.cliBinaryPath ?? "paperclipai";
   const args = [
     "agent",
@@ -139969,10 +140409,10 @@ async function mintAgentApiKeyViaCli(opts) {
     args.push("--data-dir", opts.dataDir);
   }
   const timeoutMs = opts.cliTimeoutMs ?? 3e4;
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     let child;
     try {
-      child = spawn17(bin, args, { stdio: ["ignore", "pipe", "pipe"] });
+      child = spawn19(bin, args, { stdio: ["ignore", "pipe", "pipe"] });
     } catch (err) {
       const code = err.code;
       if (code === "ENOENT") {
@@ -140043,7 +140483,7 @@ async function mintAgentApiKeyViaCli(opts) {
       const apiBase = (typeof r.apiBase === "string" ? r.apiBase : void 0) ?? (typeof r.api_base === "string" ? r.api_base : void 0);
       const agentId = (typeof r.agentId === "string" ? r.agentId : void 0) ?? (typeof r.id === "string" ? r.id : void 0);
       const companyId = typeof r.companyId === "string" ? r.companyId : void 0;
-      resolve40({ apiKey, apiBase, agentId, companyId, raw: parsed });
+      resolve42({ apiKey, apiBase, agentId, companyId, raw: parsed });
     });
   });
 }
@@ -140055,7 +140495,7 @@ function remapSpawnError(err, bin) {
   return err instanceof Error ? err : new Error(String(err));
 }
 async function spawnPaperclipCliJson(args, opts) {
-  const { spawn: spawn17 } = await import("node:child_process");
+  const { spawn: spawn19 } = await import("node:child_process");
   const bin = opts.cliBinaryPath ?? "paperclipai";
   const fullArgs = [...args, "--json"];
   if (opts.cliConfigPath) {
@@ -140063,10 +140503,10 @@ async function spawnPaperclipCliJson(args, opts) {
   }
   const timeoutMs = opts.cliTimeoutMs ?? 15e3;
   const label = ["paperclipai", ...args].join(" ");
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     let child;
     try {
-      child = spawn17(bin, fullArgs, { stdio: ["ignore", "pipe", "pipe"] });
+      child = spawn19(bin, fullArgs, { stdio: ["ignore", "pipe", "pipe"] });
     } catch (err) {
       reject2(remapSpawnError(err, bin));
       return;
@@ -140109,7 +140549,7 @@ async function spawnPaperclipCliJson(args, opts) {
         return;
       }
       try {
-        resolve40(JSON.parse(cleaned));
+        resolve42(JSON.parse(cleaned));
       } catch {
         reject2(new Error(`${label} returned non-JSON output: ${cleaned.slice(0, 200)}`));
       }
@@ -140238,7 +140678,7 @@ var init_paperclip_client = __esm({
 // ../../plugins/fusion-plugin-paperclip-runtime/dist/runtime-adapter.js
 import { randomUUID as randomUUID20 } from "node:crypto";
 function sleep4(ms) {
-  return new Promise((resolve40) => setTimeout(resolve40, ms));
+  return new Promise((resolve42) => setTimeout(resolve42, ms));
 }
 function asString2(value) {
   return typeof value === "string" ? value : void 0;
@@ -140879,8 +141319,184 @@ var init_register_runtime_provider_routes = __esm({
   }
 });
 
+// ../dashboard/src/cli-package-version.ts
+import { existsSync as existsSync32, readFileSync as readFileSync10 } from "node:fs";
+import { dirname as dirname15, resolve as resolve23 } from "node:path";
+import { fileURLToPath as fileURLToPath4 } from "node:url";
+function readCliPackageVersion(pkgPath) {
+  if (!existsSync32(pkgPath)) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(readFileSync10(pkgPath, "utf-8"));
+    if (parsed.name === CLI_PACKAGE_NAME && typeof parsed.version === "string" && parsed.version.length > 0) {
+      return {
+        packageJsonPath: pkgPath,
+        version: parsed.version
+      };
+    }
+  } catch {
+  }
+  return null;
+}
+function resolveCliPackageVersionInfo(startDir) {
+  let currentDir = startDir;
+  for (let i = 0; i < 8; i += 1) {
+    const versionInfo = readCliPackageVersion(resolve23(currentDir, "package.json"));
+    if (versionInfo) {
+      return versionInfo;
+    }
+    const parentDir = resolve23(currentDir, "..");
+    if (parentDir === currentDir) {
+      break;
+    }
+    currentDir = parentDir;
+  }
+  currentDir = startDir;
+  for (let i = 0; i < 8; i += 1) {
+    const versionInfo = readCliPackageVersion(resolve23(currentDir, "..", "cli", "package.json"));
+    if (versionInfo) {
+      return versionInfo;
+    }
+    const parentDir = resolve23(currentDir, "..");
+    if (parentDir === currentDir) {
+      break;
+    }
+    currentDir = parentDir;
+  }
+  return null;
+}
+function getCliPackageVersion(importMetaUrl = import.meta.url) {
+  const startDir = dirname15(fileURLToPath4(importMetaUrl));
+  return resolveCliPackageVersionInfo(startDir)?.version ?? process.env.npm_package_version ?? "0.0.0";
+}
+var CLI_PACKAGE_NAME;
+var init_cli_package_version = __esm({
+  "../dashboard/src/cli-package-version.ts"() {
+    "use strict";
+    CLI_PACKAGE_NAME = "@runfusion/fusion";
+  }
+});
+
+// ../dashboard/src/routes/register-fn-binary-routes.ts
+import { spawn as spawn13 } from "node:child_process";
+function buildStatusPayload(binary, expectedVersion) {
+  let state = "missing";
+  if (binary.installed) {
+    state = binary.version && binary.version !== expectedVersion ? "version-mismatch" : "installed";
+  }
+  return {
+    binary,
+    expectedVersion,
+    state,
+    install: {
+      npm: FN_INSTALL_NPM,
+      curl: FN_INSTALL_CURL,
+      package: FN_NPM_PACKAGE
+    }
+  };
+}
+function runNpmInstall() {
+  const startedAt = Date.now();
+  const command = FN_INSTALL_NPM;
+  return new Promise((resolve42) => {
+    let stdout = "";
+    let stderr = "";
+    let timedOut = false;
+    const child = spawn13("npm", ["install", "-g", FN_NPM_PACKAGE], {
+      stdio: ["ignore", "pipe", "pipe"],
+      shell: false
+    });
+    const timer = setTimeout(() => {
+      timedOut = true;
+      try {
+        child.kill("SIGKILL");
+      } catch {
+      }
+    }, INSTALL_TIMEOUT_MS);
+    const append = (target, chunk) => {
+      const text = chunk.toString("utf8");
+      if (target === "stdout") {
+        if (stdout.length < MAX_OUTPUT_BYTES2) {
+          stdout += text.slice(0, MAX_OUTPUT_BYTES2 - stdout.length);
+        }
+      } else {
+        if (stderr.length < MAX_OUTPUT_BYTES2) {
+          stderr += text.slice(0, MAX_OUTPUT_BYTES2 - stderr.length);
+        }
+      }
+    };
+    child.stdout?.on("data", (c) => append("stdout", c));
+    child.stderr?.on("data", (c) => append("stderr", c));
+    child.on("error", (err) => {
+      clearTimeout(timer);
+      resolve42({
+        success: false,
+        exitCode: null,
+        stdout,
+        stderr: stderr || err.message,
+        command,
+        durationMs: Date.now() - startedAt
+      });
+    });
+    child.on("close", (exitCode) => {
+      clearTimeout(timer);
+      const combined = `${stdout}
+${stderr}`;
+      const eaccesHit = /EACCES|permission denied|Operation not permitted/i.test(combined);
+      const success = exitCode === 0 && !timedOut;
+      resolve42({
+        success,
+        exitCode,
+        stdout,
+        stderr: timedOut ? `${stderr}
+[install timed out after ${INSTALL_TIMEOUT_MS / 1e3}s]` : stderr,
+        command,
+        durationMs: Date.now() - startedAt,
+        permissionsHint: !success && eaccesHit ? "npm reported a permissions error. On macOS/Linux this usually means npm's global prefix needs `sudo` or a fix to your npm prefix (https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally)." : void 0
+      });
+    });
+  });
+}
+var INSTALL_TIMEOUT_MS, MAX_OUTPUT_BYTES2, registerFnBinaryRoutes;
+var init_register_fn_binary_routes = __esm({
+  "../dashboard/src/routes/register-fn-binary-routes.ts"() {
+    "use strict";
+    init_src();
+    init_api_error();
+    init_cli_package_version();
+    INSTALL_TIMEOUT_MS = 18e4;
+    MAX_OUTPUT_BYTES2 = 64 * 1024;
+    registerFnBinaryRoutes = (ctx) => {
+      const { router, rethrowAsApiError: rethrowAsApiError8 } = ctx;
+      router.get("/system/fn-binary/status", async (_req, res) => {
+        try {
+          const binary = await detectFnBinary();
+          const expectedVersion = getCliPackageVersion();
+          res.json(buildStatusPayload(binary, expectedVersion));
+        } catch (err) {
+          if (err instanceof ApiError) throw err;
+          rethrowAsApiError8(err);
+        }
+      });
+      router.post("/system/fn-binary/install", async (_req, res) => {
+        try {
+          const installResult = await runNpmInstall();
+          const binary = await detectFnBinary();
+          const expectedVersion = getCliPackageVersion();
+          const status = buildStatusPayload(binary, expectedVersion);
+          res.json({ ...status, installResult });
+        } catch (err) {
+          if (err instanceof ApiError) throw err;
+          rethrowAsApiError8(err);
+        }
+      });
+    };
+  }
+});
+
 // ../dashboard/src/update-check.ts
-import { readFileSync as readFileSync10 } from "node:fs";
+import { readFileSync as readFileSync11 } from "node:fs";
 import { mkdir as mkdir17, rm as rm5, writeFile as writeFile15 } from "node:fs/promises";
 import { join as join47 } from "node:path";
 function ttlForFrequency(frequency) {
@@ -140920,7 +141536,7 @@ function isValidResult(value) {
 }
 function readCachedUpdateCheck(fusionDir) {
   try {
-    const raw = readFileSync10(getCachePath(fusionDir), "utf-8");
+    const raw = readFileSync11(getCachePath(fusionDir), "utf-8");
     const parsed = JSON.parse(raw);
     return isValidResult(parsed) ? parsed : null;
   } catch {
@@ -140987,65 +141603,6 @@ var init_update_check = __esm({
   }
 });
 
-// ../dashboard/src/cli-package-version.ts
-import { existsSync as existsSync32, readFileSync as readFileSync11 } from "node:fs";
-import { dirname as dirname15, resolve as resolve23 } from "node:path";
-import { fileURLToPath as fileURLToPath4 } from "node:url";
-function readCliPackageVersion(pkgPath) {
-  if (!existsSync32(pkgPath)) {
-    return null;
-  }
-  try {
-    const parsed = JSON.parse(readFileSync11(pkgPath, "utf-8"));
-    if (parsed.name === CLI_PACKAGE_NAME && typeof parsed.version === "string" && parsed.version.length > 0) {
-      return {
-        packageJsonPath: pkgPath,
-        version: parsed.version
-      };
-    }
-  } catch {
-  }
-  return null;
-}
-function resolveCliPackageVersionInfo(startDir) {
-  let currentDir = startDir;
-  for (let i = 0; i < 8; i += 1) {
-    const versionInfo = readCliPackageVersion(resolve23(currentDir, "package.json"));
-    if (versionInfo) {
-      return versionInfo;
-    }
-    const parentDir = resolve23(currentDir, "..");
-    if (parentDir === currentDir) {
-      break;
-    }
-    currentDir = parentDir;
-  }
-  currentDir = startDir;
-  for (let i = 0; i < 8; i += 1) {
-    const versionInfo = readCliPackageVersion(resolve23(currentDir, "..", "cli", "package.json"));
-    if (versionInfo) {
-      return versionInfo;
-    }
-    const parentDir = resolve23(currentDir, "..");
-    if (parentDir === currentDir) {
-      break;
-    }
-    currentDir = parentDir;
-  }
-  return null;
-}
-function getCliPackageVersion(importMetaUrl = import.meta.url) {
-  const startDir = dirname15(fileURLToPath4(importMetaUrl));
-  return resolveCliPackageVersionInfo(startDir)?.version ?? process.env.npm_package_version ?? "0.0.0";
-}
-var CLI_PACKAGE_NAME;
-var init_cli_package_version = __esm({
-  "../dashboard/src/cli-package-version.ts"() {
-    "use strict";
-    CLI_PACKAGE_NAME = "@runfusion/fusion";
-  }
-});
-
 // ../dashboard/src/routes/register-update-check-routes.ts
 var registerUpdateCheckRoutes;
 var init_register_update_check_routes = __esm({
@@ -145824,7 +146381,7 @@ function detectPortFromLogLine(line) {
   return detectViteLine(cleanLine) ?? detectNextLine(cleanLine) ?? detectStorybookLine(cleanLine) ?? detectAngularLine(cleanLine) ?? detectGenericUrl(cleanLine) ?? detectGenericPortLine(cleanLine);
 }
 function probePort(host, port, timeoutMs) {
-  return new Promise((resolve40) => {
+  return new Promise((resolve42) => {
     let settled = false;
     const socket = createConnection({ host, port });
     const settle = (isOpen) => {
@@ -145838,7 +146395,7 @@ function probePort(host, port, timeoutMs) {
       } else {
         socket.destroy();
       }
-      resolve40(isOpen);
+      resolve42(isOpen);
     };
     socket.setTimeout(timeoutMs);
     socket.once("connect", () => settle(true));
@@ -145879,7 +146436,7 @@ var init_dev_server_port_detect = __esm({
 
 // ../dashboard/src/dev-server-process.ts
 import { EventEmitter as EventEmitter34 } from "node:events";
-import { spawn as spawn12 } from "node:child_process";
+import { spawn as spawn14 } from "node:child_process";
 function killManagedProcess2(child, signal) {
   if (typeof child.pid !== "number") {
     return;
@@ -145958,15 +146515,15 @@ var init_dev_server_process = __esm({
           detectedUrl: void 0,
           detectedPort: void 0
         });
-        const child = spawn12(safeCommand, [], {
+        const child = spawn14(safeCommand, [], {
           cwd: safeCwd,
           detached: process.platform !== "win32",
           shell: true,
           stdio: ["pipe", "pipe", "pipe"]
         });
         this.childProcess = child;
-        this.closePromise = new Promise((resolve40) => {
-          this.resolveClosePromise = resolve40;
+        this.closePromise = new Promise((resolve42) => {
+          this.resolveClosePromise = resolve42;
         });
         const runningState = await this.store.updateState({
           pid: child.pid,
@@ -147592,6 +148149,7 @@ function createApiRoutes(store, options) {
   registerCustomProviderRoutes(routeContext);
   registerAuthRoutes(routeContext);
   registerRuntimeProviderRoutes(routeContext);
+  registerFnBinaryRoutes(routeContext);
   router.post("/ai/refine-text", async (req, res) => {
     try {
       const { text, type } = req.body;
@@ -149182,15 +149740,15 @@ Description: ${step.description}`
           return;
         }
       }
-      const { resolve: resolve40, dirname: dirname29, join: join70 } = await import("node:path");
+      const { resolve: resolve42, dirname: dirname30, join: join70 } = await import("node:path");
       const { readdir: readdir12, stat: stat12 } = await import("node:fs/promises");
       const rawPath = req.query.path || process.env.HOME || process.env.USERPROFILE || "/";
       const showHidden = req.query.showHidden === "true";
-      const resolvedPath = resolve40(rawPath);
+      const resolvedPath = resolve42(rawPath);
       if (rawPath.includes("..")) {
         throw badRequest("Path must not contain '..' traversal");
       }
-      if (resolvedPath !== resolve40(resolvedPath)) {
+      if (resolvedPath !== resolve42(resolvedPath)) {
         throw badRequest("Path must be absolute");
       }
       let pathStat;
@@ -149217,7 +149775,7 @@ Description: ${step.description}`
         entries.push({ name: entry.name, path: entryPath, hasChildren });
       }
       entries.sort((a, b) => a.name.localeCompare(b.name));
-      const parentPath = dirname29(resolvedPath) === resolvedPath ? null : dirname29(resolvedPath);
+      const parentPath = dirname30(resolvedPath) === resolvedPath ? null : dirname30(resolvedPath);
       res.json({ currentPath: resolvedPath, parentPath, entries });
     } catch (err) {
       if (err instanceof ApiError) {
@@ -149727,6 +150285,7 @@ var init_routes = __esm({
     init_register_usage_routes();
     init_register_auth_routes();
     init_register_runtime_provider_routes();
+    init_register_fn_binary_routes();
     init_register_update_check_routes();
     init_register_integrated_routers();
     init_resolve_diff_base();
@@ -156484,7 +157043,7 @@ var init_task_lifecycle = __esm({
 // src/commands/port-prompt.ts
 import { createInterface } from "node:readline";
 function promptForPort(defaultPort = 4040, input = process.stdin) {
-  return new Promise((resolve40, reject2) => {
+  return new Promise((resolve42, reject2) => {
     const rl = createInterface({
       input,
       output: process.stdout
@@ -156501,7 +157060,7 @@ function promptForPort(defaultPort = 4040, input = process.stdin) {
         if (trimmed === "") {
           process.removeListener("SIGINT", sigintHandler);
           rl.close();
-          resolve40(defaultPort);
+          resolve42(defaultPort);
           return;
         }
         const port = parseInt(trimmed, 10);
@@ -156517,7 +157076,7 @@ function promptForPort(defaultPort = 4040, input = process.stdin) {
         }
         process.removeListener("SIGINT", sigintHandler);
         rl.close();
-        resolve40(port);
+        resolve42(port);
       });
     };
     ask();
@@ -157268,13 +157827,109 @@ var init_claude_cli_extension = __esm({
   }
 });
 
+// src/commands/droid-cli-extension.ts
+import { existsSync as existsSync40, readFileSync as readFileSync18 } from "node:fs";
+import { createRequire as createRequire5 } from "node:module";
+import { dirname as dirname24, resolve as resolve30 } from "node:path";
+import { fileURLToPath as fileURLToPath8 } from "node:url";
+function resolveDroidCliExtensionFromModuleUrl(moduleUrl) {
+  let pkgJsonPath;
+  const here = dirname24(fileURLToPath8(moduleUrl));
+  for (const rel of ["droid-cli", "../droid-cli", "../../droid-cli"]) {
+    const candidate = resolve30(here, rel, "package.json");
+    if (existsSync40(candidate)) {
+      pkgJsonPath = candidate;
+      break;
+    }
+  }
+  if (!pkgJsonPath) {
+    try {
+      pkgJsonPath = require_2.resolve("@fusion/droid-cli/package.json");
+    } catch {
+      return { status: "not-installed" };
+    }
+  }
+  let pkgJson;
+  try {
+    pkgJson = JSON.parse(readFileSync18(pkgJsonPath, "utf-8"));
+  } catch (err) {
+    return {
+      status: "error",
+      reason: `Failed to read @fusion/droid-cli package.json: ${err instanceof Error ? err.message : String(err)}`
+    };
+  }
+  const extensions = pkgJson.pi?.extensions;
+  if (!Array.isArray(extensions) || extensions.length === 0) {
+    return {
+      status: "missing-entry",
+      reason: "@fusion/droid-cli package.json has no pi.extensions array"
+    };
+  }
+  const rawEntry = extensions[0];
+  if (typeof rawEntry !== "string" || rawEntry.length === 0) {
+    return {
+      status: "missing-entry",
+      reason: "@fusion/droid-cli pi.extensions[0] is not a valid path string"
+    };
+  }
+  const entryPath = resolve30(dirname24(pkgJsonPath), rawEntry);
+  if (!existsSync40(entryPath)) {
+    return {
+      status: "missing-entry",
+      reason: `@fusion/droid-cli extension file not found at ${entryPath}`
+    };
+  }
+  return {
+    status: "ok",
+    path: entryPath,
+    packageVersion: pkgJson.version ?? "unknown"
+  };
+}
+function resolveDroidCliExtension() {
+  return resolveDroidCliExtensionFromModuleUrl(import.meta.url);
+}
+function resolveDroidCliExtensionPaths(globalSettings) {
+  const enabled = globalSettings?.useDroidCli === true;
+  if (!enabled) {
+    return { paths: [], resolution: null };
+  }
+  const resolution = resolveDroidCliExtension();
+  switch (resolution.status) {
+    case "ok":
+      return { paths: [resolution.path], resolution };
+    case "not-installed":
+      return {
+        paths: [],
+        resolution,
+        warning: "useDroidCli is on but @fusion/droid-cli is not installed in node_modules. Run `pnpm install`."
+      };
+    case "missing-entry":
+    case "error":
+      return { paths: [], resolution, warning: resolution.reason };
+  }
+}
+function setCachedDroidCliResolution(resolution) {
+  cachedResolution2 = resolution;
+}
+function getCachedDroidCliResolution() {
+  return cachedResolution2;
+}
+var require_2, cachedResolution2;
+var init_droid_cli_extension = __esm({
+  "src/commands/droid-cli-extension.ts"() {
+    "use strict";
+    require_2 = createRequire5(import.meta.url);
+    cachedResolution2 = null;
+  }
+});
+
 // src/update-cache.ts
-import { readFileSync as readFileSync18 } from "node:fs";
+import { readFileSync as readFileSync19 } from "node:fs";
 import { join as join56 } from "node:path";
 function getCachedUpdateStatus(currentVersion) {
   try {
     const cachePath = join56(resolveGlobalDir(), "update-check.json");
-    const raw = readFileSync18(cachePath, "utf-8");
+    const raw = readFileSync19(cachePath, "utf-8");
     const parsed = JSON.parse(raw);
     if (parsed.updateAvailable === true && typeof parsed.latestVersion === "string" && parsed.latestVersion.length > 0 && typeof parsed.currentVersion === "string" && parsed.currentVersion.length > 0) {
       if (typeof currentVersion === "string" && currentVersion.length > 0 && parsed.currentVersion !== currentVersion) {
@@ -157305,17 +157960,17 @@ var init_update_cache = __esm({
 });
 
 // src/commands/self-extension.ts
-import { existsSync as existsSync40, readFileSync as readFileSync19 } from "node:fs";
-import { dirname as dirname24, resolve as resolve30 } from "node:path";
-import { fileURLToPath as fileURLToPath8 } from "node:url";
+import { existsSync as existsSync41, readFileSync as readFileSync20 } from "node:fs";
+import { dirname as dirname25, resolve as resolve31 } from "node:path";
+import { fileURLToPath as fileURLToPath9 } from "node:url";
 function resolveSelfExtension() {
-  const here = dirname24(fileURLToPath8(import.meta.url));
+  const here = dirname25(fileURLToPath9(import.meta.url));
   let pkgDir;
   let cur = here;
   for (let i = 0; i < 5; i++) {
-    if (existsSync40(resolve30(cur, "package.json"))) {
+    if (existsSync41(resolve31(cur, "package.json"))) {
       try {
-        const parsed = JSON.parse(readFileSync19(resolve30(cur, "package.json"), "utf-8"));
+        const parsed = JSON.parse(readFileSync20(resolve31(cur, "package.json"), "utf-8"));
         if (parsed.name === "@runfusion/fusion") {
           pkgDir = cur;
           break;
@@ -157323,7 +157978,7 @@ function resolveSelfExtension() {
       } catch {
       }
     }
-    const parent2 = resolve30(cur, "..");
+    const parent2 = resolve31(cur, "..");
     if (parent2 === cur) break;
     cur = parent2;
   }
@@ -157332,12 +157987,12 @@ function resolveSelfExtension() {
   }
   let pkgJson;
   try {
-    pkgJson = JSON.parse(readFileSync19(resolve30(pkgDir, "package.json"), "utf-8"));
+    pkgJson = JSON.parse(readFileSync20(resolve31(pkgDir, "package.json"), "utf-8"));
   } catch (err) {
     return { status: "missing", reason: `Failed to read @runfusion/fusion package.json: ${err instanceof Error ? err.message : String(err)}` };
   }
-  const srcEntry = resolve30(pkgDir, "src", "extension.ts");
-  if (existsSync40(srcEntry)) {
+  const srcEntry = resolve31(pkgDir, "src", "extension.ts");
+  if (existsSync41(srcEntry)) {
     return { status: "ok", path: srcEntry, packageVersion: pkgJson.version ?? "unknown" };
   }
   const extensions = pkgJson.pi?.extensions;
@@ -157348,8 +158003,8 @@ function resolveSelfExtension() {
   if (typeof rawEntry !== "string" || rawEntry.length === 0) {
     return { status: "missing", reason: "@runfusion/fusion pi.extensions[0] is not a valid path string" };
   }
-  const entryPath = resolve30(pkgDir, rawEntry);
-  if (!existsSync40(entryPath)) {
+  const entryPath = resolve31(pkgDir, rawEntry);
+  if (!existsSync41(entryPath)) {
     return { status: "missing", reason: `@runfusion/fusion extension file not found at ${entryPath}` };
   }
   return { status: "ok", path: entryPath, packageVersion: pkgJson.version ?? "unknown" };
@@ -157561,7 +158216,7 @@ var init_use_projects = __esm({
 });
 
 // src/commands/dashboard-tui/utils.ts
-import { spawn as spawn13 } from "node:child_process";
+import { spawn as spawn15 } from "node:child_process";
 function isTTYAvailable() {
   return Boolean(process.stdout.isTTY && process.stdin.isTTY);
 }
@@ -157572,14 +158227,14 @@ async function copyToClipboard(text) {
     { cmd: "xsel", args: ["--clipboard", "--input"] }
   ];
   for (const { cmd, args } of candidates) {
-    const ok = await new Promise((resolve40) => {
+    const ok = await new Promise((resolve42) => {
       try {
-        const child = spawn13(cmd, args, { stdio: ["pipe", "ignore", "ignore"] });
-        child.once("error", () => resolve40(false));
-        child.once("close", (code) => resolve40(code === 0));
+        const child = spawn15(cmd, args, { stdio: ["pipe", "ignore", "ignore"] });
+        child.once("error", () => resolve42(false));
+        child.once("close", (code) => resolve42(code === 0));
         child.stdin.end(text);
       } catch {
-        resolve40(false);
+        resolve42(false);
       }
     });
     if (ok) return true;
@@ -157601,7 +158256,7 @@ import { useState as useState2, useSyncExternalStore, useCallback as useCallback
 import { Box, Text, useInput, useApp, useStdout } from "ink";
 import Spinner from "ink-spinner";
 import TextInput from "ink-text-input";
-import { spawn as spawn14 } from "node:child_process";
+import { spawn as spawn16 } from "node:child_process";
 import { appendFileSync } from "node:fs";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 function tuiDebug(tag, data) {
@@ -157627,7 +158282,7 @@ function openInBrowser(url) {
     args = [url];
   }
   try {
-    const child = spawn14(cmd, args, { detached: true, stdio: "ignore" });
+    const child = spawn16(cmd, args, { detached: true, stdio: "ignore" });
     child.unref();
   } catch {
   }
@@ -161640,8 +162295,8 @@ async function resolveCachedStartupUpdateStatus(importMetaUrl) {
   try {
     const updateCheckEnabled = await Promise.race([
       isUpdateCheckEnabled(),
-      new Promise((resolve40) => {
-        setTimeout(() => resolve40(false), 3e3);
+      new Promise((resolve42) => {
+        setTimeout(() => resolve42(false), 3e3);
       })
     ]);
     if (!updateCheckEnabled) {
@@ -162361,6 +163016,23 @@ async function runDashboard(port, opts = {}) {
         return [];
       }
     })();
+    const droidCliPaths = await (async () => {
+      try {
+        const globalSettings = await store.getGlobalSettingsStore().getSettings();
+        const result = resolveDroidCliExtensionPaths(globalSettings);
+        setCachedDroidCliResolution(result.resolution);
+        if (result.warning) {
+          console.warn(`[extensions] droid-cli: ${result.warning}`);
+        }
+        return result.paths;
+      } catch (err) {
+        console.warn(
+          `[extensions] Unable to evaluate useDroidCli setting: ${err instanceof Error ? err.message : String(err)}`
+        );
+        setCachedDroidCliResolution(null);
+        return [];
+      }
+    })();
     const selfExtension = resolveSelfExtension();
     const selfExtensionPaths = selfExtension.status === "ok" ? [selfExtension.path] : [];
     if (selfExtension.status !== "ok") {
@@ -162372,7 +163044,8 @@ async function runDashboard(port, opts = {}) {
         ...selfExtensionPaths,
         ...getEnabledPiExtensionPaths(cwd),
         ...packageExtensionPaths,
-        ...claudeCliPaths
+        ...claudeCliPaths,
+        ...droidCliPaths
       ],
       cwd,
       join57(cwd, ".fusion", "disabled-auto-extension-discovery")
@@ -162569,6 +163242,17 @@ async function runDashboard(port, opts = {}) {
         }
         return { status: r.status, reason: r.reason };
       },
+      getDroidCliExtensionStatus: () => {
+        const r = getCachedDroidCliResolution();
+        if (!r) return null;
+        if (r.status === "ok") {
+          return { status: "ok", path: r.path, packageVersion: r.packageVersion };
+        }
+        if (r.status === "not-installed") {
+          return { status: "not-installed" };
+        }
+        return { status: r.status, reason: r.reason };
+      },
       onUseClaudeCliToggled: (_prev, next) => {
         if (!next) return;
         void (async () => {
@@ -162586,6 +163270,11 @@ async function runDashboard(port, opts = {}) {
           }
         })();
       },
+      onUseDroidCliToggled: (_prev, next) => {
+        if (next) {
+          logSink.log("Droid CLI enabled \u2014 restart required for full effect", "extensions");
+        }
+      },
       skillsAdapter,
       https: loadTlsCredentialsFromEnv(),
       daemon: dashboardAuthToken ? { token: dashboardAuthToken } : void 0,
@@ -162752,6 +163441,17 @@ async function runDashboard(port, opts = {}) {
         }
         return { status: r.status, reason: r.reason };
       },
+      getDroidCliExtensionStatus: () => {
+        const r = getCachedDroidCliResolution();
+        if (!r) return null;
+        if (r.status === "ok") {
+          return { status: "ok", path: r.path, packageVersion: r.packageVersion };
+        }
+        if (r.status === "not-installed") {
+          return { status: "not-installed" };
+        }
+        return { status: r.status, reason: r.reason };
+      },
       onUseClaudeCliToggled: (_prev, next) => {
         if (!next) return;
         void (async () => {
@@ -162769,6 +163469,11 @@ async function runDashboard(port, opts = {}) {
           }
         })();
       },
+      onUseDroidCliToggled: (_prev, next) => {
+        if (next) {
+          logSink.log("Droid CLI enabled \u2014 restart required for full effect", "extensions");
+        }
+      },
       skillsAdapter,
       https: loadTlsCredentialsFromEnv(),
       daemon: dashboardAuthToken ? { token: dashboardAuthToken } : void 0,
@@ -163345,6 +164050,7 @@ var init_dashboard = __esm({
     init_project_context();
     init_claude_skills_runner();
     init_claude_cli_extension();
+    init_droid_cli_extension();
     init_update_cache();
     init_self_extension();
     init_custom_provider_registry();
@@ -164122,6 +164828,23 @@ async function runServe(port, opts = {}) {
         return [];
       }
     })();
+    const droidCliPaths = await (async () => {
+      try {
+        const globalSettings = await store.getGlobalSettingsStore().getSettings();
+        const result = resolveDroidCliExtensionPaths(globalSettings);
+        setCachedDroidCliResolution(result.resolution);
+        if (result.warning) {
+          console.warn(`[extensions] droid-cli: ${result.warning}`);
+        }
+        return result.paths;
+      } catch (err) {
+        console.warn(
+          `[extensions] Unable to evaluate useDroidCli setting: ${err instanceof Error ? err.message : String(err)}`
+        );
+        setCachedDroidCliResolution(null);
+        return [];
+      }
+    })();
     const selfExtension = resolveSelfExtension();
     const selfExtensionPaths = selfExtension.status === "ok" ? [selfExtension.path] : [];
     if (selfExtension.status !== "ok") {
@@ -164133,7 +164856,8 @@ async function runServe(port, opts = {}) {
         ...selfExtensionPaths,
         ...getEnabledPiExtensionPaths(cwd),
         ...packageExtensionPaths,
-        ...claudeCliPaths
+        ...claudeCliPaths,
+        ...droidCliPaths
       ],
       cwd,
       join58(cwd, ".fusion", "disabled-auto-extension-discovery")
@@ -164292,6 +165016,17 @@ async function runServe(port, opts = {}) {
       }
       return { status: r.status, reason: r.reason };
     },
+    getDroidCliExtensionStatus: () => {
+      const r = getCachedDroidCliResolution();
+      if (!r) return null;
+      if (r.status === "ok") {
+        return { status: "ok", path: r.path, packageVersion: r.packageVersion };
+      }
+      if (r.status === "not-installed") {
+        return { status: "not-installed" };
+      }
+      return { status: r.status, reason: r.reason };
+    },
     onUseClaudeCliToggled: (_prev, next) => {
       if (!next) return;
       void (async () => {
@@ -164308,14 +165043,19 @@ async function runServe(port, opts = {}) {
         }
       })();
     },
+    onUseDroidCliToggled: (_prev, next) => {
+      if (next) {
+        console.log("[extensions] Droid CLI enabled \u2014 restart required for full effect");
+      }
+    },
     headless: true,
     skillsAdapter,
     daemon: daemonToken ? { token: daemonToken } : void 0,
     https: loadTlsCredentialsFromEnv()
   });
   const server = app.listen(selectedPort, selectedHost);
-  await new Promise((resolve40, reject2) => {
-    server.once("listening", resolve40);
+  await new Promise((resolve42, reject2) => {
+    server.once("listening", resolve42);
     server.once("error", reject2);
   });
   const actualPort = server.address().port;
@@ -164459,6 +165199,7 @@ var init_serve = __esm({
     init_project_context();
     init_claude_skills_runner();
     init_claude_cli_extension();
+    init_droid_cli_extension();
     init_self_extension();
     init_custom_provider_registry();
     DIAGNOSTIC_INTERVAL_MS2 = 30 * 60 * 1e3;
@@ -164730,6 +165471,23 @@ async function runDaemon(opts = {}) {
         return [];
       }
     })();
+    const droidCliPaths = await (async () => {
+      try {
+        const globalSettings = await store.getGlobalSettingsStore().getSettings();
+        const result = resolveDroidCliExtensionPaths(globalSettings);
+        setCachedDroidCliResolution(result.resolution);
+        if (result.warning) {
+          console.warn(`[extensions] droid-cli: ${result.warning}`);
+        }
+        return result.paths;
+      } catch (err) {
+        console.warn(
+          `[extensions] Unable to evaluate useDroidCli setting: ${err instanceof Error ? err.message : String(err)}`
+        );
+        setCachedDroidCliResolution(null);
+        return [];
+      }
+    })();
     const selfExtension = resolveSelfExtension();
     const selfExtensionPaths = selfExtension.status === "ok" ? [selfExtension.path] : [];
     if (selfExtension.status !== "ok") {
@@ -164741,7 +165499,7 @@ async function runDaemon(opts = {}) {
       claudeCliPaths[0] ?? null
     );
     const extensionsResult = await discoverAndLoadExtensions4(
-      reconciledExtensionPaths,
+      [...reconciledExtensionPaths, ...droidCliPaths],
       cwd,
       join59(cwd, ".fusion", "disabled-auto-extension-discovery")
     );
@@ -164812,6 +165570,17 @@ async function runDaemon(opts = {}) {
       }
       return { status: r.status, reason: r.reason };
     },
+    getDroidCliExtensionStatus: () => {
+      const r = getCachedDroidCliResolution();
+      if (!r) return null;
+      if (r.status === "ok") {
+        return { status: "ok", path: r.path, packageVersion: r.packageVersion };
+      }
+      if (r.status === "not-installed") {
+        return { status: "not-installed" };
+      }
+      return { status: r.status, reason: r.reason };
+    },
     onUseClaudeCliToggled: (_prev, next) => {
       if (!next) return;
       void (async () => {
@@ -164828,14 +165597,19 @@ async function runDaemon(opts = {}) {
         }
       })();
     },
+    onUseDroidCliToggled: (_prev, next) => {
+      if (next) {
+        console.log("[extensions] Droid CLI enabled \u2014 restart required for full effect");
+      }
+    },
     headless: true,
     daemon: { token: daemonToken },
     skillsAdapter,
     https: loadTlsCredentialsFromEnv()
   });
   const server = app.listen(selectedPort, selectedHost);
-  await new Promise((resolve40, reject2) => {
-    server.once("listening", resolve40);
+  await new Promise((resolve42, reject2) => {
+    server.once("listening", resolve42);
     server.once("error", reject2);
   });
   const actualPort = server.address().port;
@@ -164929,6 +165703,7 @@ var init_daemon = __esm({
     init_provider_settings();
     init_claude_skills_runner();
     init_claude_cli_extension();
+    init_droid_cli_extension();
     init_self_extension();
     init_provider_auth();
     init_auth_paths2();
@@ -164944,13 +165719,13 @@ var desktop_exports = {};
 __export(desktop_exports, {
   runDesktop: () => runDesktop
 });
-import { spawn as spawn15 } from "node:child_process";
+import { spawn as spawn17 } from "node:child_process";
 import { once as once2 } from "node:events";
 import { join as join60 } from "node:path";
-import { createRequire as createRequire5 } from "node:module";
+import { createRequire as createRequire6 } from "node:module";
 function runCommand(command, args, cwd) {
-  return new Promise((resolve40, reject2) => {
-    const child = spawn15(command, args, {
+  return new Promise((resolve42, reject2) => {
+    const child = spawn17(command, args, {
       cwd,
       stdio: "inherit",
       env: process.env
@@ -164958,7 +165733,7 @@ function runCommand(command, args, cwd) {
     child.on("error", (error) => reject2(error));
     child.on("exit", (code) => {
       if (code === 0) {
-        resolve40();
+        resolve42();
         return;
       }
       reject2(new Error(`${command} ${args.join(" ")} exited with code ${code ?? "unknown"}`));
@@ -165001,8 +165776,8 @@ async function startDashboardRuntime(rootDir, paused) {
   };
 }
 async function closeDashboardRuntime(runtime) {
-  await new Promise((resolve40) => {
-    runtime.server.close(() => resolve40());
+  await new Promise((resolve42) => {
+    runtime.server.close(() => resolve42());
   });
   runtime.store.close();
 }
@@ -165035,7 +165810,7 @@ async function runDesktop(options = {}) {
     electronEnv.FUSION_DASHBOARD_URL = process.env.FUSION_DASHBOARD_URL ?? "http://localhost:5173";
     electronEnv.NODE_ENV = "development";
   }
-  const electronProcess = spawn15(electronBinary, electronArgs, {
+  const electronProcess = spawn17(electronBinary, electronArgs, {
     cwd: rootDir,
     stdio: "inherit",
     env: electronEnv
@@ -165074,7 +165849,7 @@ var init_desktop = __esm({
     "use strict";
     init_src();
     init_src4();
-    require3 = createRequire5(import.meta.url);
+    require3 = createRequire6(import.meta.url);
   }
 });
 
@@ -165110,7 +165885,7 @@ __export(task_exports, {
   runTaskUpdate: () => runTaskUpdate
 });
 import { createInterface as createInterface3 } from "node:readline/promises";
-import { watchFile, unwatchFile, statSync as statSync6, existsSync as existsSync41, readFileSync as readFileSync20 } from "node:fs";
+import { watchFile, unwatchFile, statSync as statSync6, existsSync as existsSync42, readFileSync as readFileSync21 } from "node:fs";
 import { basename as basename17, join as join61 } from "node:path";
 function getGitHubIssueUrl(sourceMetadata) {
   if (!sourceMetadata || typeof sourceMetadata !== "object") return void 0;
@@ -165275,9 +166050,9 @@ async function runTaskCreate(descriptionArg, attachFiles, depends, projectName,
   console.log(`    Path:   .fusion/tasks/${task.id}/`);
   if (attachFiles && attachFiles.length > 0) {
     const { readFile: readFile24 } = await import("node:fs/promises");
-    const { basename: basename22, extname: extname3, resolve: resolve40 } = await import("node:path");
+    const { basename: basename22, extname: extname3, resolve: resolve42 } = await import("node:path");
     for (const filePath of attachFiles) {
-      const resolvedPath = resolve40(filePath);
+      const resolvedPath = resolve42(filePath);
       const filename = basename22(resolvedPath);
       const ext = extname3(filename).toLowerCase();
       const mimeType = MIME_TYPES[ext];
@@ -165412,7 +166187,7 @@ async function runTaskLogs(id, options = {}, projectName) {
   if (options.follow) {
     const projectPath = projectContext?.projectPath ?? process.cwd();
     const logPath = join61(projectPath, ".fusion", "tasks", id, "agent.log");
-    if (!existsSync41(logPath)) {
+    if (!existsSync42(logPath)) {
       console.log(`
   Waiting for log file to be created...`);
     }
@@ -165441,7 +166216,7 @@ async function runTaskLogs(id, options = {}, projectName) {
           lastPosition = 0;
         }
         if (stats.size > lastPosition) {
-          const content = readFileSync20(logPath, "utf-8");
+          const content = readFileSync21(logPath, "utf-8");
           const lines = content.slice(lastPosition).split("\n");
           for (const line of lines) {
             if (!line.trim()) continue;
@@ -165575,8 +166350,8 @@ async function runTaskMerge(id, projectName) {
 async function runTaskAttach(id, filePath, projectName) {
   const { readFile: readFile24 } = await import("node:fs/promises");
   const { basename: basename22, extname: extname3 } = await import("node:path");
-  const { resolve: resolve40 } = await import("node:path");
-  const resolvedPath = resolve40(filePath);
+  const { resolve: resolve42 } = await import("node:path");
+  const resolvedPath = resolve42(filePath);
   const filename = basename22(resolvedPath);
   const ext = extname3(filename).toLowerCase();
   const mimeType = MIME_TYPES[ext];
@@ -166115,12 +166890,12 @@ async function promptText(question) {
   console.log("  (Enter your response. Type DONE on its own line when finished):\n");
   const rl = createInterface3({ input: process.stdin, output: process.stdout });
   const lines = [];
-  return new Promise((resolve40) => {
+  return new Promise((resolve42) => {
     const askLine = () => {
       rl.question("  ").then((line) => {
         if (line.trim() === "DONE") {
           rl.close();
-          resolve40(lines.join("\n"));
+          resolve42(lines.join("\n"));
         } else {
           lines.push(line);
           askLine();
@@ -166285,7 +167060,7 @@ async function runTaskPlan(initialPlanArg, yesFlag = false, projectName) {
   } catch (err) {
     clearThinking();
     if (err instanceof RateLimitError2) {
-      console.error("\n  Rate limit exceeded. Maximum 5 planning sessions per hour.\n");
+      console.error("\n  Rate limit exceeded. Maximum 1000 planning sessions per hour.\n");
       process.exit(1);
     }
     console.error(`
@@ -166689,7 +167464,7 @@ __export(settings_export_exports, {
   runSettingsExport: () => runSettingsExport
 });
 import { writeFile as writeFile18 } from "node:fs/promises";
-import { resolve as resolve31, join as join62 } from "node:path";
+import { resolve as resolve32, join as join62 } from "node:path";
 async function runSettingsExport(options = {}) {
   const scope = options.scope ?? "both";
   const project = options.projectName ? await resolveProject(options.projectName) : void 0;
@@ -166700,7 +167475,7 @@ async function runSettingsExport(options = {}) {
     const exportData = await exportSettings(store, { scope });
     let targetPath;
     if (outputPath) {
-      targetPath = resolve31(outputPath);
+      targetPath = resolve32(outputPath);
     } else {
       const filename = generateExportFilename();
       targetPath = join62(process.cwd(), filename);
@@ -166749,8 +167524,8 @@ var settings_import_exports = {};
 __export(settings_import_exports, {
   runSettingsImport: () => runSettingsImport
 });
-import { existsSync as existsSync42 } from "node:fs";
-import { resolve as resolve32 } from "node:path";
+import { existsSync as existsSync43 } from "node:fs";
+import { resolve as resolve33 } from "node:path";
 async function runSettingsImport(filePath, options = {}) {
   const scope = options.scope ?? "both";
   const project = options.projectName ? await resolveProject(options.projectName) : void 0;
@@ -166759,8 +167534,8 @@ async function runSettingsImport(filePath, options = {}) {
   const merge = options.merge ?? true;
   const skipConfirm = options.yes ?? false;
   try {
-    const resolvedPath = resolve32(filePath);
-    if (!existsSync42(resolvedPath)) {
+    const resolvedPath = resolve33(filePath);
+    if (!existsSync43(resolvedPath)) {
       console.error(`Error: File not found: ${filePath}`);
       process.exit(1);
     }
@@ -167233,8 +168008,8 @@ var init_backup2 = __esm({
 });
 
 // src/project-resolver.ts
-import { existsSync as existsSync43, statSync as statSync7 } from "node:fs";
-import { basename as basename18, dirname as dirname25, resolve as resolve33, normalize as normalize5 } from "node:path";
+import { existsSync as existsSync44, statSync as statSync7 } from "node:fs";
+import { basename as basename18, dirname as dirname26, resolve as resolve34, normalize as normalize5 } from "node:path";
 import { createInterface as createInterface5 } from "node:readline/promises";
 async function getCentralCore() {
   if (!centralCoreInstance) {
@@ -167251,13 +168026,13 @@ async function getProjectManager() {
   return projectManagerInstance;
 }
 function findKbDir(startPath) {
-  let current = resolve33(startPath);
+  let current = resolve34(startPath);
   for (let i = 0; i < 100; i++) {
-    const dbPath = resolve33(current, ".fusion", "fusion.db");
+    const dbPath = resolve34(current, ".fusion", "fusion.db");
     if (isValidSqliteDatabaseFile(dbPath)) {
       return current;
     }
-    const parent2 = dirname25(current);
+    const parent2 = dirname26(current);
     if (parent2 === current) {
       break;
     }
@@ -167309,7 +168084,7 @@ async function resolveProject2(options = {}) {
         { searchedName: options.project, availableProjects: projects.map((p) => p.name) }
       );
     }
-    if (!existsSync43(match.path)) {
+    if (!existsSync44(match.path)) {
       throw new ProjectResolutionError(
         `Project "${match.name}" is registered but the directory no longer exists: ${match.path}
 
@@ -167320,14 +168095,14 @@ Run \`fn project remove ` + match.name + "` to clean up the registry entry.",
     }
     return createResolvedProject(match);
   }
-  const cwd = options.cwd ? resolve33(options.cwd) : process.cwd();
+  const cwd = options.cwd ? resolve34(options.cwd) : process.cwd();
   const fusionDir = findKbDir(cwd);
   if (fusionDir) {
     const allProjects2 = await central.listProjects();
     const normalizedKbDir = normalize5(fusionDir);
     const match = allProjects2.find((p) => normalize5(p.path) === normalizedKbDir);
     if (match) {
-      if (!existsSync43(match.path)) {
+      if (!existsSync44(match.path)) {
         throw new ProjectResolutionError(
           `Project "${match.name}" is registered but the directory no longer exists: ${match.path}
 
@@ -167392,7 +168167,7 @@ Run \`fn project add ` + fusionDir + "` to register it, or use --project <name>.
   }
   if (allProjects.length === 1) {
     const project = allProjects[0];
-    if (!existsSync43(project.path)) {
+    if (!existsSync44(project.path)) {
       throw new ProjectResolutionError(
         `The only registered project "${project.name}" has a missing directory: ${project.path}
 
@@ -167832,8 +168607,8 @@ __export(project_exports, {
   runProjectSetDefault: () => runProjectSetDefault,
   runProjectShow: () => runProjectShow
 });
-import { resolve as resolve34, isAbsolute as isAbsolute19, relative as relative14, basename as basename19 } from "node:path";
-import { existsSync as existsSync44, statSync as statSync8 } from "node:fs";
+import { resolve as resolve35, isAbsolute as isAbsolute19, relative as relative14, basename as basename19 } from "node:path";
+import { existsSync as existsSync45, statSync as statSync8 } from "node:fs";
 import { createInterface as createInterface7 } from "node:readline/promises";
 function formatDisplayPath(projectPath) {
   const rel = relative14(process.cwd(), projectPath);
@@ -167961,8 +168736,8 @@ async function runProjectAdd(name, path5, options = {}) {
         const pathInput = await rl.question(`  Project path [${defaultPath}]: `);
         projectPath = pathInput.trim() || defaultPath;
       }
-      const absolutePath2 = isAbsolute19(projectPath) ? projectPath : resolve34(process.cwd(), projectPath);
-      if (!existsSync44(absolutePath2)) {
+      const absolutePath2 = isAbsolute19(projectPath) ? projectPath : resolve35(process.cwd(), projectPath);
+      if (!existsSync45(absolutePath2)) {
         console.error(`
   \u2717 Path does not exist: ${projectPath}`);
         rl.close();
@@ -167974,8 +168749,8 @@ async function runProjectAdd(name, path5, options = {}) {
         rl.close();
         process.exit(1);
       }
-      const kbDbPath2 = resolve34(absolutePath2, ".fusion", "fusion.db");
-      if (!existsSync44(kbDbPath2) && !options.force) {
+      const kbDbPath2 = resolve35(absolutePath2, ".fusion", "fusion.db");
+      if (!existsSync45(kbDbPath2) && !options.force) {
         console.log(`
   No fn project found at ${formatDisplayPath(absolutePath2)}`);
         const init = await rl.question("  Initialize fn here first? [Y/n] ");
@@ -168006,8 +168781,8 @@ async function runProjectAdd(name, path5, options = {}) {
       console.error("  Name must be 1-64 characters and contain only: a-z, A-Z, 0-9, _, -\n");
       process.exit(1);
     }
-    const absolutePath = isAbsolute19(projectPath) ? projectPath : resolve34(process.cwd(), projectPath);
-    if (!existsSync44(absolutePath)) {
+    const absolutePath = isAbsolute19(projectPath) ? projectPath : resolve35(process.cwd(), projectPath);
+    if (!existsSync45(absolutePath)) {
       console.error(`
   \u2717 Path does not exist: ${projectPath}
 `);
@@ -168019,8 +168794,8 @@ async function runProjectAdd(name, path5, options = {}) {
 `);
       process.exit(1);
     }
-    const kbDbPath = resolve34(absolutePath, ".fusion", "fusion.db");
-    if (!existsSync44(kbDbPath) && !options.force) {
+    const kbDbPath = resolve35(absolutePath, ".fusion", "fusion.db");
+    if (!existsSync45(kbDbPath) && !options.force) {
       console.error(`
   \u2717 No fn project found at ${formatDisplayPath(absolutePath)}`);
       console.error("  Run `fn init` first to initialize the project.\n");
@@ -168276,10 +169051,10 @@ var init_project = __esm({
 });
 
 // src/commands/skill-installation.ts
-import { cpSync as cpSync2, existsSync as existsSync45, mkdirSync as mkdirSync8 } from "node:fs";
+import { cpSync as cpSync2, existsSync as existsSync46, mkdirSync as mkdirSync8 } from "node:fs";
 import { homedir as homedir10 } from "node:os";
-import { dirname as dirname26, join as join63, resolve as resolve35 } from "node:path";
-import { fileURLToPath as fileURLToPath9 } from "node:url";
+import { dirname as dirname27, join as join63, resolve as resolve36 } from "node:path";
+import { fileURLToPath as fileURLToPath10 } from "node:url";
 function getSupportedSkillInstallTargets(homeDir = process.env.HOME || process.env.USERPROFILE || homedir10()) {
   return [
     { client: "claude", targetDir: join63(homeDir, ".claude", "skills", FUSION_SKILL_NAME2) },
@@ -168288,9 +169063,9 @@ function getSupportedSkillInstallTargets(homeDir = process.env.HOME || process.e
   ];
 }
 function resolveBundledFusionSkillSource() {
-  const here = fileURLToPath9(import.meta.url);
-  const source = resolve35(dirname26(here), "..", "..", "skill", FUSION_SKILL_NAME2);
-  return existsSync45(source) ? source : null;
+  const here = fileURLToPath10(import.meta.url);
+  const source = resolve36(dirname27(here), "..", "..", "skill", FUSION_SKILL_NAME2);
+  return existsSync46(source) ? source : null;
 }
 function installBundledFusionSkill(options = {}) {
   const sourceDir = options.sourceDir ?? resolveBundledFusionSkillSource();
@@ -168308,7 +169083,7 @@ function installBundledFusionSkill(options = {}) {
   }
   const results = targets.map((target) => {
     try {
-      if (existsSync45(target.targetDir)) {
+      if (existsSync46(target.targetDir)) {
         return {
           client: target.client,
           targetDir: target.targetDir,
@@ -168316,7 +169091,7 @@ function installBundledFusionSkill(options = {}) {
           reason: "existing install preserved"
         };
       }
-      mkdirSync8(dirname26(target.targetDir), { recursive: true });
+      mkdirSync8(dirname27(target.targetDir), { recursive: true });
       cpSync2(sourceDir, target.targetDir, { recursive: true });
       return {
         client: target.client,
@@ -168347,17 +169122,17 @@ var init_exports = {};
 __export(init_exports, {
   runInit: () => runInit
 });
-import { existsSync as existsSync46, mkdirSync as mkdirSync9, writeFileSync as writeFileSync3, readFileSync as readFileSync21 } from "node:fs";
-import { join as join64, resolve as resolve36, basename as basename20 } from "node:path";
+import { existsSync as existsSync47, mkdirSync as mkdirSync9, writeFileSync as writeFileSync3, readFileSync as readFileSync22 } from "node:fs";
+import { join as join64, resolve as resolve37, basename as basename20 } from "node:path";
 import { exec as exec12 } from "node:child_process";
 import { promisify as promisify17 } from "node:util";
 async function runInit(options = {}) {
-  const cwd = options.path ? resolve36(options.path) : process.cwd();
+  const cwd = options.path ? resolve37(options.path) : process.cwd();
   const fusionDir = join64(cwd, ".fusion");
   const dbPath = join64(fusionDir, "fusion.db");
-  const hasDbPath = existsSync46(dbPath);
+  const hasDbPath = existsSync47(dbPath);
   const hasValidDb = hasDbPath && isValidSqliteDatabaseFile(dbPath);
-  if (existsSync46(fusionDir) && hasDbPath && hasValidDb) {
+  if (existsSync47(fusionDir) && hasDbPath && hasValidDb) {
     const central2 = new CentralCore();
     await central2.init();
     const existing = await central2.getProjectByPath(cwd);
@@ -168379,7 +169154,7 @@ async function runInit(options = {}) {
     await central2.close();
     return;
   }
-  if (existsSync46(fusionDir) && hasDbPath && !hasValidDb) {
+  if (existsSync47(fusionDir) && hasDbPath && !hasValidDb) {
     throw new Error(
       `Existing database at ${dbPath} is not a valid SQLite database. Restore it from .fusion/backups or move it aside before re-running fn init.`
     );
@@ -168387,7 +169162,7 @@ async function runInit(options = {}) {
   const projectName = options.name ?? await detectProjectName(cwd);
   console.log(`Initializing fn project: "${projectName}"`);
   console.log(`  Path: ${cwd}`);
-  if (!existsSync46(fusionDir)) {
+  if (!existsSync47(fusionDir)) {
     mkdirSync9(fusionDir, { recursive: true });
     console.log(`  \u2713 Created .fusion/ directory`);
   }
@@ -168400,7 +169175,7 @@ async function runInit(options = {}) {
   }
   await addLocalStorageToGitignore(cwd);
   await warnIfQmdMissing();
-  if (!existsSync46(dbPath)) {
+  if (!existsSync47(dbPath)) {
     writeFileSync3(dbPath, "");
     console.log(`  \u2713 Created fusion.db`);
   }
@@ -168450,7 +169225,7 @@ async function runInit(options = {}) {
   }
 }
 async function detectProjectName(dir2) {
-  if (!existsSync46(join64(dir2, ".git"))) {
+  if (!existsSync47(join64(dir2, ".git"))) {
     return basename20(dir2) || "my-project";
   }
   try {
@@ -168472,9 +169247,9 @@ async function detectProjectName(dir2) {
 async function addLocalStorageToGitignore(cwd) {
   const gitignorePath = join64(cwd, ".gitignore");
   let content = "";
-  if (existsSync46(gitignorePath)) {
+  if (existsSync47(gitignorePath)) {
     try {
-      content = readFileSync21(gitignorePath, "utf-8");
+      content = readFileSync22(gitignorePath, "utf-8");
     } catch {
     }
   }
@@ -168514,7 +169289,7 @@ async function initializeGitRepo(cwd) {
   await ensureGitConfig(cwd, "user.name", "Fusion");
   await ensureGitConfig(cwd, "user.email", "noreply@runfusion.ai");
   const gitkeepPath = join64(cwd, ".gitkeep");
-  if (!existsSync46(gitkeepPath)) {
+  if (!existsSync47(gitkeepPath)) {
     writeFileSync3(gitkeepPath, "\n");
   }
   await execAsync11("git add .gitkeep", { cwd, timeout: 1e4 });
@@ -168652,8 +169427,8 @@ var agent_import_exports = {};
 __export(agent_import_exports, {
   runAgentImport: () => runAgentImport
 });
-import { existsSync as existsSync47, mkdirSync as mkdirSync10, readFileSync as readFileSync22, statSync as statSync9, writeFileSync as writeFileSync4 } from "node:fs";
-import { resolve as resolve37 } from "node:path";
+import { existsSync as existsSync48, mkdirSync as mkdirSync10, readFileSync as readFileSync23, statSync as statSync9, writeFileSync as writeFileSync4 } from "node:fs";
+import { resolve as resolve38 } from "node:path";
 function slugifyPathSegment(input) {
   if (!input || typeof input !== "string") {
     return "unnamed";
@@ -168702,16 +169477,16 @@ async function importSkillsToProject(projectPath, skills, companySlug, dryRun) {
     errors: []
   };
   const companyDir = slugifyPathSegment(companySlug ?? "unknown-company");
-  const baseSkillsDir = resolve37(projectPath, "skills", "imported", companyDir);
+  const baseSkillsDir = resolve38(projectPath, "skills", "imported", companyDir);
   for (const skill of skills) {
     if (!skill.name || typeof skill.name !== "string" || skill.name.trim().length === 0) {
       result.errors.push({ name: "(unnamed)", error: "Skill is missing required 'name' field" });
       continue;
     }
     const skillSlug = slugifyPathSegment(skill.name);
-    const skillDir = resolve37(baseSkillsDir, skillSlug);
-    const skillPath = resolve37(skillDir, "SKILL.md");
-    if (existsSync47(skillPath)) {
+    const skillDir = resolve38(baseSkillsDir, skillSlug);
+    const skillPath = resolve38(skillDir, "SKILL.md");
+    if (existsSync48(skillPath)) {
       result.skipped.push(skill.name);
       continue;
     }
@@ -168783,8 +169558,8 @@ function isArchivePath(path5) {
 async function runAgentImport(source, options) {
   const dryRun = options?.dryRun ?? false;
   const skipExisting = options?.skipExisting ?? false;
-  const sourcePath = resolve37(source);
-  if (!existsSync47(sourcePath)) {
+  const sourcePath = resolve38(source);
+  if (!existsSync48(sourcePath)) {
     console.error(`Path not found: ${sourcePath}`);
     process.exit(1);
   }
@@ -168830,7 +169605,7 @@ async function runAgentImport(source, options) {
       isPackageImport = true;
       ({ items: importItems, result } = prepareAgentCompaniesImport(pkg, conversionOptions));
     } else if (sourcePath.endsWith(".md")) {
-      const content = readFileSync22(sourcePath, "utf-8");
+      const content = readFileSync23(sourcePath, "utf-8");
       const { manifest } = parseSingleAgentManifest(content);
       const pkg = {
         company: void 0,
@@ -168922,7 +169697,7 @@ var agent_export_exports = {};
 __export(agent_export_exports, {
   runAgentExport: () => runAgentExport
 });
-import { resolve as resolve38 } from "node:path";
+import { resolve as resolve39 } from "node:path";
 async function getProjectPath4(projectName) {
   if (projectName) {
     const context = await resolveProject(projectName);
@@ -168960,7 +169735,7 @@ async function runAgentExport(outputDir, options) {
     console.error("No agents found to export");
     process.exit(1);
   }
-  const result = await exportAgentsToDirectory(agents, resolve38(outputDir), {
+  const result = await exportAgentsToDirectory(agents, resolve39(outputDir), {
     companyName: options?.companyName,
     companySlug: options?.companySlug
   });
@@ -169179,7 +169954,7 @@ __export(plugin_exports, {
   runPluginList: () => runPluginList,
   runPluginUninstall: () => runPluginUninstall
 });
-import { existsSync as existsSync48 } from "node:fs";
+import { existsSync as existsSync49 } from "node:fs";
 import { join as join65 } from "node:path";
 import { readFile as readFile23 } from "node:fs/promises";
 import * as readline from "node:readline";
@@ -169219,7 +169994,7 @@ async function createPluginLoader(pluginStore, projectName) {
 }
 async function loadManifestFromPath(pluginPath) {
   const manifestPath = join65(pluginPath, "manifest.json");
-  if (!existsSync48(manifestPath)) {
+  if (!existsSync49(manifestPath)) {
     throw new Error(`Plugin manifest not found at: ${manifestPath}`);
   }
   const content = await readFile23(manifestPath, "utf-8");
@@ -169277,7 +170052,7 @@ async function runPluginInstall(source, options) {
     console.error("Please provide a local path to the plugin directory.");
     process.exit(1);
   }
-  if (!existsSync48(source)) {
+  if (!existsSync49(source)) {
     console.error(`Plugin path does not exist: ${source}`);
     process.exit(1);
   }
@@ -169322,14 +170097,14 @@ async function runPluginUninstall(id, options) {
     console.log(`  Uninstall "${plugin4.name}"?`);
     console.log(`  This will stop and remove the plugin.`);
     console.log();
-    const response = await new Promise((resolve40) => {
+    const response = await new Promise((resolve42) => {
       const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout
       });
       rl.question("  Continue? [y/N] ", (answer) => {
         rl.close();
-        resolve40(answer.toLowerCase());
+        resolve42(answer.toLowerCase());
       });
     });
     if (response !== "y" && response !== "yes") {
@@ -169409,7 +170184,7 @@ var plugin_scaffold_exports = {};
 __export(plugin_scaffold_exports, {
   runPluginCreate: () => runPluginCreate
 });
-import { mkdirSync as mkdirSync11, writeFileSync as writeFileSync5, existsSync as existsSync49 } from "node:fs";
+import { mkdirSync as mkdirSync11, writeFileSync as writeFileSync5, existsSync as existsSync50 } from "node:fs";
 import { join as join66 } from "node:path";
 function toTitleCase(str) {
   return str.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
@@ -169544,7 +170319,7 @@ async function runPluginCreate(name, options) {
   }
   const targetDir = options?.output ?? name;
   const targetPath = join66(process.cwd(), targetDir);
-  if (existsSync49(targetPath)) {
+  if (existsSync50(targetPath)) {
     console.error(`Error: Directory '${targetDir}' already exists.`);
     console.error("Please choose a different name or remove the existing directory.");
     process.exit(1);
@@ -169594,7 +170369,7 @@ __export(skills_exports, {
   runSkillsSearch: () => runSkillsSearch,
   searchSkills: () => searchSkills
 });
-import { spawn as spawn16 } from "node:child_process";
+import { spawn as spawn18 } from "node:child_process";
 async function searchSkills(query, limit = 10) {
   const url = `${SKILLS_API_BASE}/api/search?q=${encodeURIComponent(query)}&limit=${limit}`;
   try {
@@ -169672,14 +170447,14 @@ async function runSkillsInstall(args, options) {
     npxArgs.push("--skill", options.skill);
   }
   npxArgs.push("-y", "-a", "pi");
-  const child = spawn16("npx", npxArgs, {
+  const child = spawn18("npx", npxArgs, {
     cwd: process.cwd(),
     stdio: "inherit",
     shell: true
   });
-  const exitCode = await new Promise((resolve40, reject2) => {
+  const exitCode = await new Promise((resolve42, reject2) => {
     child.on("exit", (code) => {
-      resolve40(code ?? 1);
+      resolve42(code ?? 1);
     });
     child.on("error", (err) => {
       reject2(err);
@@ -169712,7 +170487,7 @@ __export(research_exports, {
   runResearchShow: () => runResearchShow
 });
 import { writeFile as writeFile19 } from "node:fs/promises";
-import { join as join67, resolve as resolve39 } from "node:path";
+import { join as join67, resolve as resolve40 } from "node:path";
 async function getStore3(projectName) {
   const project = projectName ? await resolveProject(projectName) : void 0;
   const store = new TaskStore(project?.projectPath ?? process.cwd());
@@ -169868,7 +170643,7 @@ async function runResearchExport(options) {
     }
     const content = format === "json" ? JSON.stringify(run, null, 2) : renderMarkdown(run);
     const ext = format === "json" ? "json" : "md";
-    const outputPath = options.output ? resolve39(options.output) : join67(process.cwd(), `research-${run.id.toLowerCase()}.${ext}`);
+    const outputPath = options.output ? resolve40(options.output) : join67(process.cwd(), `research-${run.id.toLowerCase()}.${ext}`);
     await writeFile19(outputPath, content, "utf8");
     store.getResearchStore().createExport(run.id, format, content);
     if (options.json) {
@@ -169933,21 +170708,21 @@ __export(native_patch_exports, {
   isTerminalAvailable: () => isTerminalAvailable,
   setupNativeResolution: () => setupNativeResolution
 });
-import { join as join68, basename as basename21, dirname as dirname27 } from "node:path";
-import { existsSync as existsSync50, copyFileSync, mkdirSync as mkdirSync12, symlinkSync as symlinkSync2, rmSync as rmSync5, lstatSync as lstatSync3, readlinkSync as readlinkSync2 } from "node:fs";
+import { join as join68, basename as basename21, dirname as dirname28 } from "node:path";
+import { existsSync as existsSync51, copyFileSync, mkdirSync as mkdirSync12, symlinkSync as symlinkSync2, rmSync as rmSync5, lstatSync as lstatSync3, readlinkSync as readlinkSync2 } from "node:fs";
 import { tmpdir as tmpdir4 } from "node:os";
 function findStagedNativeDir2() {
-  const platform3 = process.platform === "darwin" ? "darwin" : process.platform === "linux" ? "linux" : process.platform === "win32" ? "win32" : "unknown";
+  const platform4 = process.platform === "darwin" ? "darwin" : process.platform === "linux" ? "linux" : process.platform === "win32" ? "win32" : "unknown";
   const arch = process.arch === "arm64" ? "arm64" : process.arch === "x64" ? "x64" : "unknown";
-  const prebuildName = `${platform3}-${arch}`;
-  const execDir = dirname27(process.execPath);
+  const prebuildName = `${platform4}-${arch}`;
+  const execDir = dirname28(process.execPath);
   const nextToBinary = join68(execDir, "runtime", prebuildName);
-  if (existsSync50(join68(nextToBinary, "pty.node"))) {
+  if (existsSync51(join68(nextToBinary, "pty.node"))) {
     return nextToBinary;
   }
   if (process.env.FUSION_RUNTIME_DIR) {
     const envPath = join68(process.env.FUSION_RUNTIME_DIR, prebuildName);
-    if (existsSync50(join68(envPath, "pty.node"))) {
+    if (existsSync51(join68(envPath, "pty.node"))) {
       return envPath;
     }
   }
@@ -169957,11 +170732,11 @@ function cleanupStaleBunfsLinks() {
   if (process.platform === "win32") return;
   const bunfsRoot = "/$bunfs/root";
   try {
-    if (existsSync50(bunfsRoot)) {
+    if (existsSync51(bunfsRoot)) {
       const stats = lstatSync3(bunfsRoot);
       if (stats.isSymbolicLink()) {
         const target = readlinkSync2(bunfsRoot);
-        if (target.includes("fn-bunfs-") && !existsSync50(target)) {
+        if (target.includes("fn-bunfs-") && !existsSync51(target)) {
           rmSync5(bunfsRoot);
           console.log("[fn-native-patch] Cleaned up stale /$bunfs/root symlink");
         }
@@ -169989,14 +170764,14 @@ function setupNativeResolution() {
     mkdirSync12(platformDir, { recursive: true });
     const ptyNodeDest = join68(platformDir, "pty.node");
     copyFileSync(join68(nativeDir, "pty.node"), ptyNodeDest);
-    if (existsSync50(join68(nativeDir, "spawn-helper"))) {
+    if (existsSync51(join68(nativeDir, "spawn-helper"))) {
       copyFileSync(join68(nativeDir, "spawn-helper"), join68(platformDir, "spawn-helper"));
     }
     process.env.FUSION_FAKE_BUNFS_ROOT = tmpRoot;
     if (process.platform !== "win32") {
       const bunfsRoot = "/$bunfs/root";
       try {
-        if (existsSync50(bunfsRoot)) {
+        if (existsSync51(bunfsRoot)) {
           const stats = lstatSync3(bunfsRoot);
           if (stats.isSymbolicLink()) {
             rmSync5(bunfsRoot);
@@ -170019,7 +170794,7 @@ function setupNativeResolution() {
 function cleanupNativeResolution() {
   if (bunfsSymlinkPath && process.platform !== "win32") {
     try {
-      if (existsSync50(bunfsSymlinkPath)) {
+      if (existsSync51(bunfsSymlinkPath)) {
         const stats = lstatSync3(bunfsSymlinkPath);
         if (stats.isSymbolicLink()) {
           rmSync5(bunfsSymlinkPath);
@@ -170065,11 +170840,12 @@ var init_native_patch = __esm({
 });
 
 // src/bin.ts
-import { existsSync as existsSync51, mkdtempSync as mkdtempSync2, readFileSync as readFileSync23, symlinkSync as symlinkSync3, writeFileSync as writeFileSync6 } from "node:fs";
-import { createRequire as createRequire6 } from "node:module";
-import { join as join69, dirname as dirname28 } from "node:path";
+import { existsSync as existsSync52, mkdtempSync as mkdtempSync2, readFileSync as readFileSync24, symlinkSync as symlinkSync3, writeFileSync as writeFileSync6 } from "node:fs";
+import { createRequire as createRequire7 } from "node:module";
+import { join as join69, dirname as dirname29, resolve as resolve41 } from "node:path";
 import { tmpdir as tmpdir5 } from "node:os";
 import { performance as performance3 } from "node:perf_hooks";
+import { fileURLToPath as fileURLToPath11 } from "node:url";
 var isBunBinary3 = typeof Bun !== "undefined" && !!Bun.embeddedFiles;
 function configurePiPackage() {
   if (process.env.PI_PACKAGE_DIR) {
@@ -170082,13 +170858,13 @@ function configurePiPackage() {
     type: "module"
   };
   try {
-    const require4 = createRequire6(import.meta.url);
+    const require4 = createRequire7(import.meta.url);
     const piPackagePath = require4.resolve("@mariozechner/pi-coding-agent/package.json");
-    const piPackageDir = dirname28(piPackagePath);
-    packageJson = JSON.parse(readFileSync23(piPackagePath, "utf-8"));
+    const piPackageDir = dirname29(piPackagePath);
+    packageJson = JSON.parse(readFileSync24(piPackagePath, "utf-8"));
     for (const entry of ["dist", "docs", "examples", "README.md", "CHANGELOG.md"]) {
       const source = join69(piPackageDir, entry);
-      if (existsSync51(source)) {
+      if (existsSync52(source)) {
         symlinkSync3(source, join69(tmp, entry));
       }
     }
@@ -170107,8 +170883,8 @@ setInterval(() => {
   performance3.clearMarks();
 }, 3e4).unref();
 function loadEnvFile(path5) {
-  if (!existsSync51(path5)) return;
-  const contents = readFileSync23(path5, "utf-8");
+  if (!existsSync52(path5)) return;
+  const contents = readFileSync24(path5, "utf-8");
   for (const rawLine of contents.split(/\r?\n/)) {
     const line = rawLine.trim();
     if (!line || line.startsWith("#")) continue;
@@ -170419,8 +171195,36 @@ function getFlagValueNumber(args, flag) {
   const parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : void 0;
 }
+function readOwnCliVersion() {
+  let currentDir;
+  try {
+    currentDir = dirname29(fileURLToPath11(import.meta.url));
+  } catch {
+    return void 0;
+  }
+  for (let i = 0; i < 8; i += 1) {
+    const pkgPath = resolve41(currentDir, "package.json");
+    if (existsSync52(pkgPath)) {
+      try {
+        const parsed = JSON.parse(readFileSync24(pkgPath, "utf-8"));
+        if (parsed.name === "@runfusion/fusion" && typeof parsed.version === "string") {
+          return parsed.version;
+        }
+      } catch {
+      }
+    }
+    const parentDir = resolve41(currentDir, "..");
+    if (parentDir === currentDir) break;
+    currentDir = parentDir;
+  }
+  return void 0;
+}
 async function main() {
   const { cleanedArgs: args, projectName } = extractGlobalProjectFlag(process.argv.slice(2));
+  if (args.includes("--version") || args.includes("-v")) {
+    console.log(readOwnCliVersion() ?? "unknown");
+    process.exit(0);
+  }
   if (args.includes("--help") || args.includes("-h")) {
     console.log(HELP);
     process.exit(0);