@runfusion/fusion 0.12.0 → 0.14.0

package/dist/extension.js

@@ -79,6 +79,7 @@ var init_settings_schema = __esm({
       showGitHubStarButton: true,
       modelOnboardingComplete: void 0,
       useClaudeCli: void 0,
+      useDroidCli: void 0,
       // Global baseline lanes for per-role model selection
       executionGlobalProvider: void 0,
       executionGlobalModelId: void 0,
@@ -1006,11 +1007,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 {
@@ -2704,7 +2734,7 @@ var init_db = __esm({
     "use strict";
     init_sqlite_adapter();
     init_types();
-    SCHEMA_VERSION = 55;
+    SCHEMA_VERSION = 58;
     SCHEMA_SQL = `
 -- Tasks table with JSON columns for nested data
 CREATE TABLE IF NOT EXISTS tasks (
@@ -4388,6 +4418,44 @@ CREATE INDEX IF NOT EXISTS idxTodoItemsSortOrder ON todo_items(listId, sortOrder
             this.db.exec(`CREATE INDEX IF NOT EXISTS idxResearchExportsRunId ON research_exports(runId)`);
           });
         }
+        if (version < 56) {
+          this.applyMigration(56, () => {
+            if (this.hasTable("chat_sessions")) {
+              this.addColumnIfMissing("chat_sessions", "cliSessionFile", "TEXT");
+            }
+          });
+        }
+        if (version < 57) {
+          this.applyMigration(57, () => {
+            if (this.hasTable("ai_sessions")) {
+              this.addColumnIfMissing("ai_sessions", "archived", "INTEGER DEFAULT 0");
+              this.db.exec(
+                "CREATE INDEX IF NOT EXISTS idxAiSessionsArchived ON ai_sessions(archived)"
+              );
+            }
+          });
+        }
+        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.
@@ -4651,7 +4719,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 {
@@ -4812,7 +4880,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(),
@@ -5049,14 +5117,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));
@@ -5072,7 +5142,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");
       }
       /**
@@ -5081,7 +5152,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);
@@ -5100,7 +5171,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));
         });
       }
       /**
@@ -5122,7 +5194,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;
       }
@@ -5145,7 +5217,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 ?? "");
@@ -6106,8 +6178,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(path2) {
+        try {
+          await access(path2, fsConstants.F_OK);
+          return true;
+        } catch {
+          return false;
+        }
       }
       validateBundleFilePath(filePath) {
         if (typeof filePath !== "string") {
@@ -35839,6 +35990,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 };
@@ -36096,6 +36261,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((resolve19) => {
+    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);
+      resolve19({ exitCode: null, stdout, stderr: stderr || err.message });
+    });
+    child.on("close", (exitCode) => {
+      clearTimeout(timer);
+      resolve19({ 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) {
@@ -38004,7 +38248,7 @@ function sanitizeTitle(raw) {
   const firstLine = raw.split(/\r?\n/).map((l) => l.trim()).find((l) => l.length > 0);
   if (!firstLine) return null;
   let title = firstLine.replace(/^[-*]\s+/, "").replace(/^["'`]+|["'`]+$/g, "").trim();
-  title = title.replace(/^(?:title|subject|here(?:'s| is)(?: the)? title|generated title)\s*[:\-]\s*/i, "").trim();
+  title = title.replace(/^(?:title|subject|here(?:'s| is)(?: the)? title|generated title)\s*[:-]\s*/i, "").trim();
   title = title.replace(/\*\*([^*]+)\*\*/g, "$1").replace(/__([^_]+)__/g, "$1").replace(/(?<![*\w])\*([^*]+)\*(?![*\w])/g, "$1").replace(/(?<![_\w])_([^_]+)_(?![_\w])/g, "$1");
   title = title.replace(/[.!?,;:]+$/, "").trim();
   if (!title) return null;
@@ -49952,7 +50196,8 @@ var init_chat_store = __esm({
           modelProvider: row.modelProvider ?? null,
           modelId: row.modelId ?? null,
           createdAt: row.createdAt,
-          updatedAt: row.updatedAt
+          updatedAt: row.updatedAt,
+          cliSessionFile: row.cliSessionFile ?? null
         };
       }
       /**
@@ -49989,7 +50234,8 @@ var init_chat_store = __esm({
           modelProvider: input.modelProvider ?? null,
           modelId: input.modelId ?? null,
           createdAt: now,
-          updatedAt: now
+          updatedAt: now,
+          cliSessionFile: null
         };
         this.db.prepare(`
       INSERT INTO chat_sessions (id, agentId, title, status, projectId, modelProvider, modelId, createdAt, updatedAt)
@@ -50147,6 +50393,21 @@ var init_chat_store = __esm({
       archiveSession(id) {
         return this.updateSession(id, { status: "archived" });
       }
+      /**
+       * Persist the pi/Claude CLI session file path for a chat. Called once,
+       * after the SessionManager for the chat first creates its on-disk file,
+       * so subsequent turns can reopen it via SessionManager.open.
+       *
+       * Does not bump updatedAt or emit events — this is internal plumbing,
+       * not a user-visible state change.
+       *
+       * @param id - Session ID
+       * @param cliSessionFile - Absolute path to the session file, or null to clear
+       */
+      setCliSessionFile(id, cliSessionFile) {
+        this.db.prepare("UPDATE chat_sessions SET cliSessionFile = ? WHERE id = ?").run(cliSessionFile, id);
+        this.db.bumpLastModified();
+      }
       /**
        * Delete a chat session and all its messages.
        * Messages are cascade-deleted via foreign key constraint.
@@ -50366,6 +50627,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,
@@ -50477,6 +50742,7 @@ __export(src_exports, {
   createInsightExtractionAutomation: () => createInsightExtractionAutomation,
   createMemoryDreamsAutomation: () => createMemoryDreamsAutomation,
   dailyMemoryPath: () => dailyMemoryPath,
+  detectFnBinary: () => detectFnBinary,
   detectLegacyData: () => detectLegacyData,
   diffConfigSnapshots: () => diffConfigSnapshots,
   discoverPiExtensions: () => discoverPiExtensions,
@@ -50598,6 +50864,7 @@ __export(src_exports, {
   readProjectMemoryWithBackend: () => readProjectMemoryWithBackend,
   readWorkingMemory: () => readWorkingMemory,
   reconcileClaudeCliPaths: () => reconcileClaudeCliPaths,
+  reconcileDroidCliPaths: () => reconcileDroidCliPaths,
   refreshQmdProjectMemoryIndex: () => refreshQmdProjectMemoryIndex,
   registerMemoryBackend: () => registerMemoryBackend,
   renderMemoryAuditMarkdown: () => renderMemoryAuditMarkdown,
@@ -50687,6 +50954,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();
@@ -52673,6 +52941,21 @@ function resolveVendoredClaudeCliEntry() {
     return null;
   }
 }
+function resolveVendoredDroidCliEntry() {
+  try {
+    const require_ = createRequire2(import.meta.url);
+    const pkgJsonPath = require_.resolve("@fusion/droid-cli/package.json");
+    const pkgJson = JSON.parse(readFileSync8(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 path2 = resolve11(dirname8(pkgJsonPath), entry);
+    return existsSync20(path2) ? path2 : null;
+  } catch {
+    return null;
+  }
+}
 async function registerExtensionProviders(cwd, modelRegistry) {
   try {
     const agentDir = getPackageManagerAgentDir();
@@ -52688,8 +52971,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")
     );
@@ -54346,14 +54634,25 @@ async function getAgentMemoryWindow(rootDir, agentMemory, path2, 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",
@@ -54362,7 +54661,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: [{
@@ -54715,7 +55014,7 @@ ${lines.join("\n\n")}` }],
     }
   };
 }
-function createDelegateTaskTool(agentStore, taskStore) {
+function createDelegateTaskTool(agentStore, taskStore, options) {
   return {
     name: "fn_delegate_task",
     label: "Delegate Task",
@@ -54735,13 +55034,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: [{
@@ -57568,7 +57867,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,
@@ -58107,7 +58406,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,
@@ -58121,7 +58420,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: [
@@ -58549,7 +58848,7 @@ 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";
@@ -58564,7 +58863,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,
@@ -63300,10 +63599,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),
@@ -63714,7 +64013,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";
@@ -63747,7 +64046,7 @@ async function runVerificationCommand2(opts) {
   const stdoutBuf = { head: "", tail: "", totalBytes: 0 };
   const stderrBuf = { head: "", tail: "", totalBytes: 0 };
   return new Promise((resolve19) => {
-    const child = spawn3(command, {
+    const child = spawn4(command, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"],
       env: { ...process.env },
@@ -66035,7 +66334,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 ? [
@@ -66729,7 +67028,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);
@@ -71664,7 +71963,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";
@@ -71854,6 +72153,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" }))
     });
@@ -71893,13 +72218,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.
@@ -72598,9 +72916,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));
@@ -72623,22 +72941,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) {
@@ -72699,7 +73022,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 {
@@ -72732,6 +73055,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.",
                   "",
@@ -72823,6 +73148,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.",
@@ -72982,7 +73309,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) => {
@@ -73009,7 +73336,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));
@@ -80711,7 +81038,7 @@ var init_provider_adapters = __esm({
 
 // ../engine/src/remote-access/tunnel-process-manager.ts
 import { EventEmitter as EventEmitter23 } 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();
@@ -80802,7 +81129,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 };
@@ -81176,6 +81503,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();
@@ -81870,6 +82198,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;
@@ -81877,6 +82247,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;
@@ -81884,7 +82271,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) {
@@ -82354,12 +82743,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(
@@ -82375,14 +82761,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(
@@ -82438,14 +82817,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)}`
@@ -82475,14 +82847,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)}`
@@ -83075,7 +83440,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. */
@@ -83117,10 +83482,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
@@ -83130,6 +83496,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);
       }
@@ -83137,12 +83504,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");
       }
       /**
@@ -83696,25 +84072,21 @@ async function ensureNtfyHelpersReady() {
   if (planningNtfyHelpers) {
     return;
   }
-  try {
-    const engine = await Promise.resolve().then(() => (init_src2(), src_exports2));
-    const hasNotificationService = "NotificationService" in engine && typeof engine.NotificationService === "function";
-    const hasAllHelpers = "isNtfyEventEnabled" in engine && "buildNtfyClickUrl" in engine && "sendNtfyNotification" in engine && typeof engine.isNtfyEventEnabled === "function" && typeof engine.buildNtfyClickUrl === "function" && typeof engine.sendNtfyNotification === "function";
-    if (!hasAllHelpers) {
-      return;
-    }
-    planningNtfyHelpers = {
-      isNtfyEventEnabled: engine.isNtfyEventEnabled,
-      buildNtfyClickUrl: engine.buildNtfyClickUrl,
-      sendNtfyNotification: engine.sendNtfyNotification
-    };
-    if (hasNotificationService) {
-      diagnostics.info(
-        "NotificationService abstraction detected in engine",
-        { operation: "notification-service-detection" }
-      );
-    }
-  } catch {
+  const hasNotificationService = "NotificationService" in src_exports2 && typeof NotificationService === "function";
+  const hasAllHelpers = "isNtfyEventEnabled" in src_exports2 && "buildNtfyClickUrl" in src_exports2 && "sendNtfyNotification" in src_exports2 && typeof isNtfyEventEnabled === "function" && typeof buildNtfyClickUrl === "function" && typeof sendNtfyNotification === "function";
+  if (!hasAllHelpers) {
+    return;
+  }
+  planningNtfyHelpers = {
+    isNtfyEventEnabled,
+    buildNtfyClickUrl,
+    sendNtfyNotification
+  };
+  if (hasNotificationService) {
+    diagnostics.info(
+      "NotificationService abstraction detected in engine",
+      { operation: "notification-service-detection" }
+    );
   }
 }
 function safeParseJson(text, fallback, options) {
@@ -84504,6 +84876,7 @@ var init_planning = __esm({
     init_sse_buffer();
     init_ai_session_diagnostics();
     init_src2();
+    init_src2();
     createFnAgent4 = createFnAgent2;
     diagnostics = createSessionDiagnostics("planning");
     PLANNING_SYSTEM_PROMPT = `You are a planning assistant for the fn task board system.
@@ -84565,7 +84938,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();
@@ -85188,7 +85561,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) {
@@ -85298,7 +85671,7 @@ async function invokeHermesCli(prompt, settings, resumeSessionId, signal) {
     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
     });
@@ -85511,7 +85884,7 @@ var init_dist = __esm({
 });
 
 // ../../plugins/fusion-plugin-openclaw-runtime/dist/pi-module.js
-import { spawn as spawn6 } from "node:child_process";
+import { spawn as spawn7 } from "node:child_process";
 import { randomUUID as randomUUID12 } from "node:crypto";
 function asString(v) {
   return typeof v === "string" && v.trim() !== "" ? v.trim() : void 0;
@@ -85588,7 +85961,7 @@ async function promptCli(session, message, config, callbacks, signal) {
   cb.onToolStart?.("openclaw.agent", { sessionId: session.sessionId });
   return new Promise((resolve19, reject) => {
     let settled = false;
-    const child = spawn6(config.binaryPath, args, {
+    const child = spawn7(config.binaryPath, args, {
       stdio: ["ignore", "pipe", "pipe"]
     });
     const hardKill = setTimeout(() => {
@@ -85739,7 +86112,7 @@ var init_runtime_adapter2 = __esm({
 });
 
 // ../../plugins/fusion-plugin-openclaw-runtime/dist/probe.js
-import { spawn as spawn7 } from "node:child_process";
+import { spawn as spawn8 } from "node:child_process";
 async function probeOpenClawBinary(opts = {}) {
   const startedAt = Date.now();
   const binary = opts.binaryPath ?? "openclaw";
@@ -85750,7 +86123,7 @@ async function probeOpenClawBinary(opts = {}) {
       resolvePromise({ ...partial, probeDurationMs: Date.now() - startedAt });
     };
     let settled = false;
-    const child = spawn7(resolvedPath ?? binary, ["--version"], {
+    const child = spawn8(resolvedPath ?? binary, ["--version"], {
       stdio: ["ignore", "pipe", "pipe"]
     });
     const timer = setTimeout(() => {
@@ -85811,7 +86184,7 @@ async function probeOpenClawBinary(opts = {}) {
 async function tryResolveBinaryPath(binary) {
   return new Promise((resolvePromise) => {
     const which = process.platform === "win32" ? "where" : "which";
-    const child = spawn7(which, [binary], { stdio: ["ignore", "pipe", "ignore"] });
+    const child = spawn8(which, [binary], { stdio: ["ignore", "pipe", "ignore"] });
     let out = "";
     child.stdout?.on("data", (chunk) => {
       out += chunk.toString("utf-8");
@@ -92400,7 +92773,7 @@ var init_register_git_github = __esm({
 });
 
 // ../dashboard/src/terminal.ts
-import { spawn as spawn8 } from "node:child_process";
+import { spawn as spawn9 } from "node:child_process";
 import { randomUUID as randomUUID13 } from "node:crypto";
 import { EventEmitter as EventEmitter29 } from "node:events";
 function extractBaseCommand(command) {
@@ -92562,7 +92935,7 @@ var init_terminal = __esm({
           return { sessionId: "", error: validation.error };
         }
         const sessionId = randomUUID13();
-        const childProcess = spawn8(command, [], {
+        const childProcess = spawn9(command, [], {
           cwd,
           shell: true,
           stdio: ["pipe", "pipe", "pipe"],
@@ -92836,6 +93209,7 @@ var init_register_agent_core_routes = __esm({
     "use strict";
     init_src();
     init_api_error();
+    init_src2();
   }
 });
 
@@ -92848,10 +93222,13 @@ var init_register_agent_runtime_routes = __esm({
 });
 
 // ../dashboard/src/routes/register-agent-reflection-rating-routes.ts
+var AgentReflectionServiceBinding;
 var init_register_agent_reflection_rating_routes = __esm({
   "../dashboard/src/routes/register-agent-reflection-rating-routes.ts"() {
     "use strict";
     init_api_error();
+    init_src2();
+    AgentReflectionServiceBinding = "AgentReflectionService" in src_exports2 && typeof AgentReflectionService === "function" ? AgentReflectionService : void 0;
   }
 });
 
@@ -92994,12 +93371,20 @@ var init_claude_cli_probe = __esm({
   }
 });
 
+// ../dashboard/src/droid-cli-probe.ts
+var init_droid_cli_probe = __esm({
+  "../dashboard/src/droid-cli-probe.ts"() {
+    "use strict";
+  }
+});
+
 // ../dashboard/src/routes/register-auth-routes.ts
 var init_register_auth_routes = __esm({
   "../dashboard/src/routes/register-auth-routes.ts"() {
     "use strict";
     init_src();
     init_claude_cli_probe();
+    init_droid_cli_probe();
     init_api_error();
     init_usage();
     init_project_store_resolver();
@@ -93274,7 +93659,7 @@ function remapSpawnError(err, bin) {
   return err instanceof Error ? err : new Error(String(err));
 }
 async function spawnPaperclipCliJson(args, opts) {
-  const { spawn: spawn11 } = await import("node:child_process");
+  const { spawn: spawn12 } = await import("node:child_process");
   const bin = opts.cliBinaryPath ?? "paperclipai";
   const fullArgs = [...args, "--json"];
   if (opts.cliConfigPath) {
@@ -93285,7 +93670,7 @@ async function spawnPaperclipCliJson(args, opts) {
   return new Promise((resolve19, reject) => {
     let child;
     try {
-      child = spawn11(bin, fullArgs, { stdio: ["ignore", "pipe", "pipe"] });
+      child = spawn12(bin, fullArgs, { stdio: ["ignore", "pipe", "pipe"] });
     } catch (err) {
       reject(remapSpawnError(err, bin));
       return;
@@ -93797,6 +94182,25 @@ var init_register_runtime_provider_routes = __esm({
   }
 });
 
+// ../dashboard/src/cli-package-version.ts
+var init_cli_package_version = __esm({
+  "../dashboard/src/cli-package-version.ts"() {
+    "use strict";
+  }
+});
+
+// ../dashboard/src/routes/register-fn-binary-routes.ts
+var MAX_OUTPUT_BYTES2;
+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();
+    MAX_OUTPUT_BYTES2 = 64 * 1024;
+  }
+});
+
 // ../dashboard/src/update-check.ts
 var DAY_MS;
 var init_update_check = __esm({
@@ -93806,13 +94210,6 @@ var init_update_check = __esm({
   }
 });
 
-// ../dashboard/src/cli-package-version.ts
-var init_cli_package_version = __esm({
-  "../dashboard/src/cli-package-version.ts"() {
-    "use strict";
-  }
-});
-
 // ../dashboard/src/routes/register-update-check-routes.ts
 var init_register_update_check_routes = __esm({
   "../dashboard/src/routes/register-update-check-routes.ts"() {
@@ -93860,6 +94257,7 @@ var init_insights_routes = __esm({
   "../dashboard/src/insights-routes.ts"() {
     "use strict";
     init_api_error();
+    init_src2();
   }
 });
 
@@ -93997,6 +94395,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();
@@ -97725,6 +98124,7 @@ var init_terminal_websocket_diagnostics = __esm({
 
 // ../dashboard/src/chat.ts
 import { EventEmitter as EventEmitter30 } from "node:events";
+import { SessionManager as SessionManager3 } from "@mariozechner/pi-coding-agent";
 var defaultDiagnostics, _diagnostics, diagnostics7, RATE_LIMIT_WINDOW_MS6, MAX_REFERENCED_FILE_SIZE, ChatStreamManager, chatStreamManager;
 var init_chat = __esm({
   "../dashboard/src/chat.ts"() {
@@ -97732,6 +98132,7 @@ var init_chat = __esm({
     init_src();
     init_sse_buffer();
     init_src2();
+    init_src2();
     defaultDiagnostics = {
       log(message, ...args) {
         console.log(`[chat] ${message}`, ...args);
@@ -99322,7 +99723,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(`
@@ -99479,7 +99880,7 @@ __export(skills_exports, {
   runSkillsSearch: () => runSkillsSearch,
   searchSkills: () => searchSkills
 });
-import { spawn as spawn9 } from "node:child_process";
+import { spawn as spawn10 } from "node:child_process";
 async function searchSkills(query, limit = 10) {
   const url = `${SKILLS_API_BASE}/api/search?q=${encodeURIComponent(query)}&limit=${limit}`;
   try {
@@ -99557,7 +99958,7 @@ async function runSkillsInstall(args, options) {
     npxArgs.push("--skill", options.skill);
   }
   npxArgs.push("-y", "-a", "pi");
-  const child = spawn9("npx", npxArgs, {
+  const child = spawn10("npx", npxArgs, {
     cwd: process.cwd(),
     stdio: "inherit",
     shell: true
@@ -99594,7 +99995,7 @@ import { StringEnum } from "@mariozechner/pi-ai";
 import { resolve as resolve18, basename as basename11, extname as extname3, join as join41 } from "node:path";
 import { readFile as readFile18 } from "node:fs/promises";
 import { existsSync as existsSync31 } from "node:fs";
-import { spawn as spawn10 } from "node:child_process";
+import { spawn as spawn11 } from "node:child_process";
 var MIME_TYPES2 = {
   ".png": "image/png",
   ".jpg": "image/jpeg",
@@ -101403,7 +101804,7 @@ Status: ${updated.status}`
         npxArgs.push("--skill", params.skill);
       }
       npxArgs.push("-y", "-a", "pi");
-      const child = spawn10("npx", npxArgs, {
+      const child = spawn11("npx", npxArgs, {
         cwd: resolveProjectRoot(ctx.cwd),
         stdio: "pipe",
         shell: true
@@ -101485,7 +101886,7 @@ Status: ${updated.status}`
         return;
       }
       const port = trimmed ? parseInt(trimmed, 10) || 4040 : 4040;
-      const child = spawn10("fn", ["dashboard", "--port", String(port)], {
+      const child = spawn11("fn", ["dashboard", "--port", String(port)], {
         cwd: resolveProjectRoot(ctx.cwd),
         stdio: ["ignore", "pipe", "pipe"],
         detached: false,