@runfusion/fusion 0.17.2 → 0.18.1

package/dist/extension.js

@@ -2771,7 +2771,7 @@ var init_db = __esm({
     "use strict";
     init_sqlite_adapter();
     init_types();
-    SCHEMA_VERSION = 59;
+    SCHEMA_VERSION = 60;
     SCHEMA_SQL = `
 -- Tasks table with JSON columns for nested data
 CREATE TABLE IF NOT EXISTS tasks (
@@ -2839,6 +2839,7 @@ CREATE TABLE IF NOT EXISTS tasks (
   missionId TEXT,
   sliceId TEXT,
   assignedAgentId TEXT,
+  pausedByAgentId TEXT,
   assigneeUserId TEXT,
   sourceType TEXT,
   sourceAgentId TEXT,
@@ -4636,6 +4637,12 @@ This means a caller passed a .fusion directory where a project root was expected
             this.db.exec(`CREATE INDEX IF NOT EXISTS idxInsightRunEventsRunIdSeq ON project_insight_run_events(runId, seq)`);
           });
         }
+        if (version < 60) {
+          this.applyMigration(60, () => {
+            this.addColumnIfMissing("tasks", "pausedByAgentId", "TEXT");
+            this.db.exec(`CREATE INDEX IF NOT EXISTS idxTasksPausedByAgentId ON tasks(pausedByAgentId)`);
+          });
+        }
       }
       /**
        * Run a single migration step inside a transaction and bump the version.
@@ -10542,50 +10549,40 @@ ${feature.acceptanceCriteria}`);
         }
       }
       // ── ID Generators ───────────────────────────────────────────────────
-      generateMissionId() {
-        const timestamp = Date.now();
+      idSequence = 0;
+      generateId(prefix) {
+        const timestamp = Date.now().toString(36).toUpperCase();
+        this.idSequence += 1;
+        const sequence = this.idSequence.toString(36).toUpperCase().padStart(4, "0");
         const random = Math.random().toString(36).substring(2, 6).toUpperCase();
-        return `M-${timestamp.toString(36).toUpperCase()}-${random}`;
+        return `${prefix}-${timestamp}-${sequence}-${random}`;
+      }
+      generateMissionId() {
+        return this.generateId("M");
       }
       generateMilestoneId() {
-        const timestamp = Date.now();
-        const random = Math.random().toString(36).substring(2, 6).toUpperCase();
-        return `MS-${timestamp.toString(36).toUpperCase()}-${random}`;
+        return this.generateId("MS");
       }
       generateSliceId() {
-        const timestamp = Date.now();
-        const random = Math.random().toString(36).substring(2, 6).toUpperCase();
-        return `SL-${timestamp.toString(36).toUpperCase()}-${random}`;
+        return this.generateId("SL");
       }
       generateFeatureId() {
-        const timestamp = Date.now();
-        const random = Math.random().toString(36).substring(2, 6).toUpperCase();
-        return `F-${timestamp.toString(36).toUpperCase()}-${random}`;
+        return this.generateId("F");
       }
       generateMissionEventId() {
-        const timestamp = Date.now();
-        const random = Math.random().toString(36).substring(2, 6).toUpperCase();
-        return `ME-${timestamp.toString(36).toUpperCase()}-${random}`;
+        return this.generateId("ME");
       }
       generateAssertionId() {
-        const timestamp = Date.now();
-        const random = Math.random().toString(36).substring(2, 6).toUpperCase();
-        return `CA-${timestamp.toString(36).toUpperCase()}-${random}`;
+        return this.generateId("CA");
       }
       generateValidatorRunId() {
-        const timestamp = Date.now();
-        const random = Math.random().toString(36).substring(2, 6).toUpperCase();
-        return `VR-${timestamp.toString(36).toUpperCase()}-${random}`;
+        return this.generateId("VR");
       }
       generateFailureId() {
-        const timestamp = Date.now();
-        const random = Math.random().toString(36).substring(2, 6).toUpperCase();
-        return `VF-${timestamp.toString(36).toUpperCase()}-${random}`;
+        return this.generateId("VF");
       }
       generateLineageId() {
-        const timestamp = Date.now();
-        const random = Math.random().toString(36).substring(2, 6).toUpperCase();
-        return `FL-${timestamp.toString(36).toUpperCase()}-${random}`;
+        return this.generateId("FL");
       }
     };
   }
@@ -32645,6 +32642,7 @@ var init_store = __esm({
           missionId: row.missionId || void 0,
           sliceId: row.sliceId || void 0,
           assignedAgentId: row.assignedAgentId || void 0,
+          pausedByAgentId: row.pausedByAgentId || void 0,
           assigneeUserId: row.assigneeUserId || void 0,
           nodeId: row.nodeId || void 0,
           effectiveNodeId: row.effectiveNodeId || void 0,
@@ -32909,6 +32907,7 @@ ${recentText}` : void 0
           "missionId",
           "sliceId",
           "assignedAgentId",
+          "pausedByAgentId",
           "assigneeUserId",
           "nodeId",
           "effectiveNodeId",
@@ -33021,6 +33020,7 @@ ${outcome}`;
           "missionId",
           "sliceId",
           "assignedAgentId",
+          "pausedByAgentId",
           "assigneeUserId",
           "nodeId",
           "effectiveNodeId",
@@ -33071,9 +33071,9 @@ ${outcome}`;
         dependencies, steps, log, attachments, steeringComments,
         comments, workflowStepResults, prInfo, issueInfo,
         sourceIssueProvider, sourceIssueRepository, sourceIssueExternalIssueId, sourceIssueNumber, sourceIssueUrl,
-        mergeDetails, breakIntoSubtasks, enabledWorkflowSteps, modifiedFiles, missionId, sliceId, assignedAgentId, assigneeUserId, nodeId, effectiveNodeId, effectiveNodeSource, sourceType, sourceAgentId, sourceRunId, sourceSessionId, sourceMessageId, sourceParentTaskId, sourceMetadata, checkedOutBy, checkedOutAt
+        mergeDetails, breakIntoSubtasks, enabledWorkflowSteps, modifiedFiles, missionId, sliceId, assignedAgentId, pausedByAgentId, assigneeUserId, nodeId, effectiveNodeId, effectiveNodeSource, sourceType, sourceAgentId, sourceRunId, sourceSessionId, sourceMessageId, sourceParentTaskId, sourceMetadata, checkedOutBy, checkedOutAt
       ) VALUES (
-        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+        ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
       )
       ON CONFLICT(id) DO UPDATE SET
         title = excluded.title,
@@ -33142,6 +33142,7 @@ ${outcome}`;
         missionId = excluded.missionId,
         sliceId = excluded.sliceId,
         assignedAgentId = excluded.assignedAgentId,
+        pausedByAgentId = excluded.pausedByAgentId,
         assigneeUserId = excluded.assigneeUserId,
         nodeId = excluded.nodeId,
         effectiveNodeId = excluded.effectiveNodeId,
@@ -33223,6 +33224,7 @@ ${outcome}`;
           task.missionId ?? null,
           task.sliceId ?? null,
           task.assignedAgentId ?? null,
+          task.pausedByAgentId ?? null,
           task.assigneeUserId ?? null,
           task.nodeId ?? null,
           task.effectiveNodeId ?? null,
@@ -34340,6 +34342,23 @@ ${newTask.description}
         const matches = [...activeMatches, ...archiveMatches];
         return limit >= 0 ? matches.slice(0, limit) : matches;
       }
+      async getTasksByAssignedAgent(agentId, options) {
+        const whereClauses = ["assignedAgentId = ?"];
+        const params = [agentId];
+        if (options?.pausedOnly) {
+          whereClauses.push("paused = 1");
+        }
+        if (options?.excludeArchived) {
+          whereClauses.push(`"column" != 'archived'`);
+        }
+        const selectClause = this.getTaskSelectClause(false);
+        const rows = this.db.prepare(`
+      SELECT ${selectClause} FROM tasks
+      WHERE ${whereClauses.join(" AND ")}
+      ORDER BY createdAt ASC
+    `).all(...params);
+        return rows.map((row) => this.rowToTask(row));
+      }
       async selectNextTaskForAgent(agentId) {
         const tasks = await this.listTasks({ slim: true });
         if (tasks.length === 0) {
@@ -34577,6 +34596,11 @@ ${newTask.description}
           } else if (updates.assignedAgentId !== void 0) {
             task.assignedAgentId = updates.assignedAgentId;
           }
+          if (updates.pausedByAgentId === null) {
+            task.pausedByAgentId = void 0;
+          } else if (updates.pausedByAgentId !== void 0) {
+            task.pausedByAgentId = updates.pausedByAgentId;
+          }
           if (updates.assigneeUserId === null) {
             task.assigneeUserId = void 0;
           } else if (updates.assigneeUserId !== void 0) {
@@ -34815,14 +34839,21 @@ ${newTask.description}
        * Pause or unpause a task. Paused tasks are excluded from all automated
        * agent and scheduler interaction. Logs the action and emits `task:updated`.
        */
-      async pauseTask(id, paused, runContext) {
+      async pauseTask(id, paused, runContext, agentOptions) {
         return this.withTaskLock(id, async () => {
           const dir = this.taskDir(id);
           const task = await this.readTaskJson(dir);
           if (!task.log) {
             task.log = [];
           }
+          const previousPausedByAgentId = task.pausedByAgentId;
           task.paused = paused || void 0;
+          if (paused && agentOptions?.pausedByAgentId) {
+            task.pausedByAgentId = agentOptions.pausedByAgentId;
+          }
+          if (!paused) {
+            task.pausedByAgentId = void 0;
+          }
           if (task.column === "in-progress" || task.column === "in-review") {
             task.status = paused ? "paused" : void 0;
           }
@@ -34830,7 +34861,7 @@ ${newTask.description}
           task.updatedAt = now;
           const logEntry = {
             timestamp: now,
-            action: paused ? "Task paused" : "Task unpaused"
+            action: paused ? agentOptions?.pausedByAgentId ? `Task paused (agent ${agentOptions.pausedByAgentId} paused)` : "Task paused" : previousPausedByAgentId ? `Task unpaused (agent ${previousPausedByAgentId} resumed)` : "Task unpaused"
           };
           if (runContext) {
             logEntry.runContext = runContext;
@@ -39981,10 +40012,17 @@ var init_docker_client = __esm({
         }
         return this.createDockerInstance(hostConfig);
       }
-      async getContainerInfo(containerId) {
+      async getContainerInfo(containerId, hostConfig) {
         try {
-          const docker = await this.getInstance();
+          const docker = await this.getDockerInstance(hostConfig);
           const inspect = await docker.getContainer(containerId).inspect();
+          const ports = Object.entries(inspect.NetworkSettings?.Ports ?? {}).reduce((acc, [key, value]) => {
+            const binding = Array.isArray(value) && value.length > 0 ? value[0] : void 0;
+            if (binding?.HostPort) {
+              acc[key] = binding.HostPort;
+            }
+            return acc;
+          }, {});
           return {
             id: inspect.Id,
             name: (inspect.Name ?? "").replace(/^\//, ""),
@@ -39996,8 +40034,12 @@ var init_docker_client = __esm({
               paused: Boolean(inspect.State?.Paused),
               restarting: Boolean(inspect.State?.Restarting),
               dead: Boolean(inspect.State?.Dead),
-              error: inspect.State?.Error || void 0
-            }
+              error: inspect.State?.Error || void 0,
+              exitCode: typeof inspect.State?.ExitCode === "number" ? inspect.State.ExitCode : void 0,
+              startedAt: inspect.State?.StartedAt || void 0,
+              finishedAt: inspect.State?.FinishedAt || void 0
+            },
+            ports
           };
         } catch (error) {
           const message = toErrorMessage(error);
@@ -40007,6 +40049,18 @@ var init_docker_client = __esm({
           throw error;
         }
       }
+      async getContainerLogs(containerId, hostConfig, options) {
+        const docker = await this.getDockerInstance(hostConfig);
+        const stream = await docker.getContainer(containerId).logs({
+          stdout: true,
+          stderr: true,
+          tail: options?.tail ?? 100
+        });
+        if (Buffer.isBuffer(stream)) {
+          return stream.toString("utf8");
+        }
+        return String(stream ?? "");
+      }
       async getInstance() {
         if (!this.dockerInstance) {
           this.dockerInstance = await this.createDockerInstance(this.defaultHostConfig);
@@ -54525,6 +54579,9 @@ function normalizePattern(pattern) {
 function isExclusionPattern(pattern) {
   return pattern.startsWith("-");
 }
+function bareSkillName(name) {
+  return name.replace(/\/SKILL\.md$/i, "");
+}
 function resolveSessionSkills(context) {
   const { requestedSkillNames } = context;
   const projectRootDir = resolveProjectRoot(context.projectRootDir);
@@ -54618,25 +54675,40 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
     const hasRequestedNames = Boolean(requestedSkillNames && requestedSkillNames.length > 0);
     const hasExcluded = excludedSkillPaths.size > 0;
     let filteredSkills;
+    const skillNameMatches = (skill, pattern) => bareSkillName(skill.name).toLowerCase() === bareSkillName(pattern).toLowerCase() || skill.filePath === pattern;
+    const isExcluded = (skill) => {
+      for (const ep of excludedSkillPaths) {
+        if (skillNameMatches(skill, ep)) return true;
+      }
+      return false;
+    };
+    const isAllowed = (skill) => {
+      for (const ap of allowedSkillPaths) {
+        if (skillNameMatches(skill, ap)) return true;
+      }
+      return false;
+    };
     if (hasRequestedNames) {
-      const requestedNamesLower = new Set(requestedSkillNames.map((n) => n.toLowerCase()));
+      const requestedBareNamesLower = new Set(requestedSkillNames.map((n) => bareSkillName(n).toLowerCase()));
       filteredSkills = base.skills.filter(
-        (skill) => requestedNamesLower.has(skill.name.toLowerCase()) && !excludedSkillPaths.has(skill.filePath)
+        (skill) => requestedBareNamesLower.has(bareSkillName(skill.name).toLowerCase()) && !isExcluded(skill)
       );
     } else if (hasPatterns) {
       filteredSkills = base.skills.filter(
-        (skill) => allowedSkillPaths.has(skill.filePath) && !excludedSkillPaths.has(skill.filePath)
+        (skill) => isAllowed(skill) && !isExcluded(skill)
       );
     } else if (hasExcluded) {
-      filteredSkills = base.skills.filter((skill) => !excludedSkillPaths.has(skill.filePath));
+      filteredSkills = base.skills.filter((skill) => !isExcluded(skill));
     } else {
       filteredSkills = base.skills;
     }
     const newDiagnostics = [];
     const purpose = sessionPurpose ? ` [${sessionPurpose}]` : "";
-    const discoveredPaths = new Set(base.skills.map((s) => s.filePath));
+    const discoveredBareNames = new Set(base.skills.map((s) => bareSkillName(s.name).toLowerCase()));
+    const discoveredFilePaths = new Set(base.skills.map((s) => s.filePath));
+    const hasDiscoveredMatch = (pattern) => discoveredBareNames.has(bareSkillName(pattern).toLowerCase()) || discoveredFilePaths.has(pattern);
     for (const excludedPath of excludedSkillPaths) {
-      if (discoveredPaths.has(excludedPath)) {
+      if (hasDiscoveredMatch(excludedPath)) {
         newDiagnostics.push({
           type: "warning",
           message: `Skill at '${excludedPath}' exists but is disabled by project execution settings${purpose}`,
@@ -54645,7 +54717,7 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
       }
     }
     for (const allowedPath of allowedSkillPaths) {
-      if (!discoveredPaths.has(allowedPath)) {
+      if (!hasDiscoveredMatch(allowedPath)) {
         newDiagnostics.push({
           type: "warning",
           message: `Configured skill pattern '${allowedPath}' not found in discovered skills${purpose}`,
@@ -54654,9 +54726,9 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
       }
     }
     if (requestedSkillNames) {
-      const discoveredNamesLower = new Set(base.skills.map((s) => s.name.toLowerCase()));
+      const discoveredBareNamesLower = new Set(base.skills.map((s) => bareSkillName(s.name).toLowerCase()));
       for (const requestedName of requestedSkillNames) {
-        if (!discoveredNamesLower.has(requestedName.toLowerCase()) && !isBuiltInFallbackRequest(requestedName)) {
+        if (!discoveredBareNamesLower.has(bareSkillName(requestedName).toLowerCase()) && !isBuiltInFallbackRequest(requestedName)) {
           const purpose2 = sessionPurpose ? ` [${sessionPurpose}]` : "";
           newDiagnostics.push({
             type: "warning",
@@ -55010,6 +55082,11 @@ async function promptSessionAndCheck(session, prompt, options) {
         piLog.warn(`pi state error \u2014 failed to inspect transcript: ${inspectErr instanceof Error ? inspectErr.message : String(inspectErr)}`);
       }
     }
+    if (/Provider finish_reason:\s*repeat\b/i.test(stateError)) {
+      piLog.warn(`pi state error \u2014 treating provider finish_reason=repeat as soft stop: ${stateError}`);
+      clearSessionStateError(session);
+      return;
+    }
     throw new Error(stateError);
   }
 }
@@ -58191,9 +58268,18 @@ function normalizeAgentSkills(metadataSkills) {
         name = namedEntry.trim();
       }
     }
-    if (name && name.length > 0 && !seen.has(name)) {
-      seen.add(name);
-      result.push(name);
+    if (name && name.length > 0) {
+      if (name.includes("::")) {
+        const idPath = name.split("::").pop();
+        const parts = idPath.replace(/\\/g, "/").split("/").filter(Boolean);
+        if (parts.length >= 2) {
+          name = parts.slice(-2).join("/");
+        }
+      }
+      if (!seen.has(name)) {
+        seen.add(name);
+        result.push(name);
+      }
     }
   }
   return result;
@@ -68816,20 +68902,26 @@ The tool prevents your session from being killed by the inactivity watchdog duri
         if (from !== "in-review" && from !== "done") {
           return task;
         }
-        const hasMergeEvidence = Boolean(task.mergeDetails) || (task.mergeRetries ?? 0) > 0 || (task.verificationFailureCount ?? 0) > 0 || task.status === "merging" || task.status === "merging-pr";
+        const hasMergeEvidence = Boolean(task.mergeDetails) || (task.mergeRetries ?? 0) > 0 || (task.verificationFailureCount ?? 0) > 0 || task.status === "merging" || task.status === "merging-pr" || task.status === "merging-fix";
         if (!hasMergeEvidence) {
           return task;
         }
         return this.cleanupMergeStateForReverification(
           task,
-          `Task returned to in-progress from ${from} column \u2014 resetting verification steps and merge state for re-verification`
+          `Task returned to in-progress from ${from} column \u2014 resetting verification steps and merge state for re-verification`,
+          {
+            // Keep deterministic merge-verification bounce budget across remediation
+            // cycles. Status may be cleared by intermediate paths, so the counter is
+            // the canonical signal once a bounce has started.
+            preserveVerificationFailureCount: (task.verificationFailureCount ?? 0) > 0
+          }
         );
       }
-      async cleanupMergeStateForReverification(task, logMessage) {
+      async cleanupMergeStateForReverification(task, logMessage, options) {
         await this.store.updateTask(task.id, {
           mergeDetails: null,
           mergeRetries: 0,
-          verificationFailureCount: 0,
+          verificationFailureCount: options?.preserveVerificationFailureCount ? task.verificationFailureCount ?? 0 : 0,
           workflowStepResults: []
         });
         const refreshedTask = await this.store.getTask(task.id);
@@ -69424,7 +69516,7 @@ The tool prevents your session from being killed by the inactivity watchdog duri
         };
         const audit = createRunAuditor(this.store, engineRunContext);
         const activeColumns = /* @__PURE__ */ new Set(["in-progress", "in-review", "done"]);
-        const activeMergeStatuses = /* @__PURE__ */ new Set(["merging", "merging-pr"]);
+        const activeMergeStatuses = /* @__PURE__ */ new Set(["merging", "merging-pr", "merging-fix"]);
         const isActiveTask = activeColumns.has(task.column) || activeMergeStatuses.has(task.status ?? "");
         if (!isActiveTask) {
           const tasksDir = join36(this.store.getFusionDir(), "tasks");
@@ -69763,7 +69855,9 @@ The tool prevents your session from being killed by the inactivity watchdog duri
                           `${failedType} command \`${failedCommand}\` failed (exit ${failedResult.exitCode}):
 ${summary}`,
                           `Verification (${failedType})`,
-                          `Deterministic verification failed (${failedType})`
+                          `Deterministic verification failed (${failedType})`,
+                          true,
+                          true
                         );
                         return;
                       }
@@ -69809,7 +69903,9 @@ ${summary}`,
                           `${failedType} command \`${failedCommand}\` failed (exit ${failedResult.exitCode}) after ${maxFixRetries} fix attempts:
 ${summary}`,
                           `Verification (${failedType})`,
-                          `Deterministic verification failed after ${maxFixRetries} fix attempts`
+                          `Deterministic verification failed after ${maxFixRetries} fix attempts`,
+                          true,
+                          true
                         );
                         return;
                       }
@@ -71498,7 +71594,7 @@ ${failureContext.output.slice(0, VERIFICATION_LOG_MAX_CHARS)}
        * Injects failure feedback into PROMPT.md, resets steps, clears session,
        * and schedules a move to todo → in-progress after the executing guard clears.
        */
-      async sendTaskBackForFix(task, worktreePath, failureFeedback, stepName, reason, preserveResumeState = true) {
+      async sendTaskBackForFix(task, worktreePath, failureFeedback, stepName, reason, preserveResumeState = true, mergeVerificationFailure = false) {
         const taskId = task.id;
         this.clearCompletedTaskWatchdog(taskId);
         await this.store.addTaskComment(
@@ -71517,7 +71613,7 @@ Please fix the issues so the verification can pass on the next attempt.`,
         const updatedTask = await this.store.getTask(taskId);
         await this.reopenLastStepForRevision(taskId, updatedTask);
         await this.store.updateTask(taskId, {
-          status: null,
+          status: mergeVerificationFailure ? "merging-fix" : null,
           error: null,
           sessionFile: null,
           workflowStepRetries: 0
@@ -79886,14 +79982,15 @@ var init_self_healing = __esm({
     execAsync7 = promisify9(exec9);
     APPROVED_TRIAGE_RECOVERY_GRACE_MS = 6e4;
     ORPHANED_EXECUTION_RECOVERY_GRACE_MS = 6e4;
-    ACTIVE_MERGE_STATUSES = /* @__PURE__ */ new Set(["merging", "merging-pr"]);
+    ACTIVE_MERGE_STATUSES = /* @__PURE__ */ new Set(["merging", "merging-pr", "merging-fix"]);
     NON_TERMINAL_STEP_STATUSES2 = /* @__PURE__ */ new Set(["pending", "in-progress"]);
     GHOST_REVIEW_PRESERVED_STATUSES = /* @__PURE__ */ new Set([
       "failed",
       "awaiting-user-review",
       "awaiting-approval",
       "merging",
-      "merging-pr"
+      "merging-pr",
+      "merging-fix"
     ]);
     ORPHANED_WITH_WORKTREE_GRACE_MS = 3e5;
     MAX_TASK_DONE_RETRIES = 3;
@@ -80616,7 +80713,7 @@ var init_self_healing = __esm({
        *
        * Preserved statuses (skipped):
        * - `awaiting-user-review`, `awaiting-approval`: explicit human handoff
-       * - `merging`, `merging-pr`: handled by `recoverInterruptedMergingTasks`
+       * - `merging`, `merging-pr`, `merging-fix`: handled by `recoverInterruptedMergingTasks`
        *
        * Rate-limiting comes from the `updatedAt >= taskStuckTimeoutMs` gate —
        * each kick refreshes `updatedAt`, so a task that re-enters review and gets
@@ -86232,7 +86329,7 @@ ${detail}`
                     "agent"
                   );
                   await store.updateTask(taskId, {
-                    status: null,
+                    status: "merging-fix",
                     mergeRetries: 0,
                     error: null,
                     verificationFailureCount: nextBounces
@@ -86240,10 +86337,10 @@ ${detail}`
                   await store.moveTask(taskId, "in-progress");
                   await store.logEntry(
                     taskId,
-                    `Deterministic ${failedKind} verification failed (${nextBounces}/${cap}) \u2014 moved back to in-progress for remediation`
+                    `Deterministic ${failedKind} verification failed (${nextBounces}/${cap}) \u2014 moved back to in-progress with status=merging-fix for remediation`
                   );
                   runtimeLog.log(
-                    `Auto-merge: ${taskId} deterministic ${failedKind} verification failed (${nextBounces}/${cap}) \u2014 moved to in-progress`
+                    `Auto-merge: ${taskId} deterministic ${failedKind} verification failed (${nextBounces}/${cap}) \u2014 moved to in-progress with status=merging-fix`
                   );
                 } catch {
                   runtimeLog.error(
@@ -97230,10 +97327,18 @@ var init_claude_cli_probe = __esm({
   }
 });
 
+// ../../plugins/fusion-plugin-droid-runtime/dist/probe.js
+var init_probe3 = __esm({
+  "../../plugins/fusion-plugin-droid-runtime/dist/probe.js"() {
+    "use strict";
+  }
+});
+
 // ../dashboard/src/droid-cli-probe.ts
 var init_droid_cli_probe = __esm({
   "../dashboard/src/droid-cli-probe.ts"() {
     "use strict";
+    init_probe3();
   }
 });
 
@@ -103962,9 +104067,12 @@ async function getResearchAvailability(store) {
   }
   const backend = resolved.searchProvider ?? settings.researchWebSearchProvider;
   const configured = backend === "searxng" ? Boolean(settings.researchSearxngUrl) : backend === "brave" ? Boolean(settings.researchBraveApiKey) : backend === "google" ? Boolean(settings.researchGoogleSearchApiKey && settings.researchGoogleSearchCx) : backend === "tavily" ? Boolean(settings.researchTavilyApiKey) : false;
-  if (!configured && !resolved.searchProvider) {
+  if (!backend) {
     return { ok: false, code: "provider-unavailable", message: "Research provider is not configured. Set research provider credentials in Settings." };
   }
+  if (!configured) {
+    return { ok: false, code: "missing-credentials", message: `Missing credentials for ${backend}. Add provider keys in Authentication and verify Research defaults.` };
+  }
   return { ok: true };
 }
 function toResearchRunDetails(run) {
@@ -104355,12 +104463,13 @@ Path: .fusion/tasks/${params.id}/attachments/${attachment.filename}`
   pi.registerTool({
     name: "fn_task_retry",
     label: "fn: Retry Task",
-    description: "Retry a failed task \u2014 clears the error state and moves it back to the todo column for re-execution.",
-    promptSnippet: "Retry a failed Fusion task (clears error, moves to todo)",
+    description: "Retry a failed task \u2014 clears the error state. Tasks in other columns move to todo; tasks in in-review stay in-place for auto-merge retry.",
+    promptSnippet: "Retry a failed Fusion task (clears error, moves to todo or stays in in-review)",
     promptGuidelines: [
-      "Use when a task has failed and needs to be retried from the beginning",
-      "Only tasks in 'failed' state can be retried",
-      "The task will be moved to the todo column with error state cleared"
+      "Use when a task has failed and needs to be retried",
+      "Only tasks in 'failed' or 'stuck-killed' state can be retried",
+      "Tasks in 'in-review' stay in in-review \u2014 only the error/retry state is cleared, and the auto-merge system re-attempts",
+      "Tasks in other columns are moved to the todo column with error state cleared"
     ],
     parameters: Type8.Object({
       id: Type8.String({ description: "Task ID to retry (e.g. FN-001). Must be in 'failed' state." })
@@ -104384,6 +104493,14 @@ Path: .fusion/tasks/${params.id}/attachments/${attachment.filename}`
           details: { taskId: params.id, currentStatus: task.status }
         };
       }
+      if (task.column === "in-review") {
+        await store.updateTask(params.id, { status: null, error: null, stuckKillCount: 0, mergeRetries: 0 });
+        await store.logEntry(params.id, "Retry requested via Fusion extension (in-review retry, mergeRetries reset)");
+        return {
+          content: [{ type: "text", text: `Retried ${params.id} \u2192 in-review (merge retry state cleared, task stays in in-review)` }],
+          details: { taskId: params.id, newColumn: "in-review" }
+        };
+      }
       await store.updateTask(params.id, { status: null, error: null });
       await store.moveTask(params.id, "todo");
       await store.logEntry(params.id, "Retry requested via Fusion extension", "Task reset to todo for retry");
@@ -104875,7 +104992,7 @@ Planning session completed. Task ${taskId} is now in planning and will be auto-p
   pi.registerTool({
     name: "fn_research_cancel",
     label: "fn: Cancel Research Run",
-    description: "Cancel a research run.",
+    description: "Cancel an in-flight research run. Terminal runs return INVALID_TRANSITION.",
     parameters: Type8.Object({ id: Type8.String({ description: "Research run ID" }) }),
     async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
       const store = await getStore2(ctx.cwd);
@@ -104887,6 +105004,17 @@ Planning session completed. Task ${taskId} is now in planning and will be auto-p
           details: { runId: params.id, status: "missing", summary: null, findings: [], citations: [], error: "not found", setup: null }
         };
       }
+      if (!["queued", "running", "cancelling", "retry_waiting"].includes(run.status)) {
+        return {
+          content: [{ type: "text", text: `Research run ${params.id} cannot be cancelled from status ${run.status}.` }],
+          isError: true,
+          details: {
+            ...toResearchRunDetails(run),
+            error: "invalid transition",
+            setup: { code: "INVALID_TRANSITION", message: "Cancel is only available for queued/running/cancelling/retry_waiting runs." }
+          }
+        };
+      }
       const updated = researchStore.requestCancellation(params.id);
       return {
         content: [{ type: "text", text: `Requested cancellation for research run ${params.id} (status: ${updated.status}).` }],
@@ -104894,6 +105022,41 @@ Planning session completed. Task ${taskId} is now in planning and will be auto-p
       };
     }
   });
+  pi.registerTool({
+    name: "fn_research_retry",
+    label: "fn: Retry Research Run",
+    description: "Retry a failed research run when lifecycle marks it retryable.",
+    parameters: Type8.Object({ id: Type8.String({ description: "Research run ID" }) }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const store = await getStore2(ctx.cwd);
+      const researchStore = store.getResearchStore();
+      const run = researchStore.getRun(params.id);
+      if (!run) {
+        return {
+          content: [{ type: "text", text: `Research run ${params.id} not found.` }],
+          isError: true,
+          details: { runId: params.id, status: "missing", summary: null, findings: [], citations: [], error: "not found", setup: null }
+        };
+      }
+      const isRetryExhausted = run.status === "retry_exhausted" || run.lifecycle?.errorCode === "RETRY_EXHAUSTED";
+      if (run.status !== "failed" && run.status !== "timed_out" || run.lifecycle?.retryable === false || isRetryExhausted) {
+        return {
+          content: [{ type: "text", text: `Research run ${params.id} is not retryable from status ${run.status}.` }],
+          isError: true,
+          details: {
+            ...toResearchRunDetails(run),
+            error: "not retryable",
+            setup: { code: isRetryExhausted ? "RETRY_EXHAUSTED" : "INVALID_TRANSITION", message: "Retry is only available for failed/timed_out retryable runs." }
+          }
+        };
+      }
+      const retryRun = researchStore.createRetryRun(params.id);
+      return {
+        content: [{ type: "text", text: `Created retry run ${retryRun.id} from ${params.id}.` }],
+        details: toResearchRunDetails(retryRun)
+      };
+    }
+  });
   pi.registerTool({
     name: "fn_insight_list",
     label: "fn: List Insights",
@@ -105590,6 +105753,278 @@ Status: ${updated.status}`
       };
     }
   });
+  pi.registerTool({
+    name: "fn_list_agents",
+    label: "fn: List Agents",
+    description: "List all available agents in the system. Shows each agent's name, role, state, personality (soul), and current assignment. Use this to discover which agents exist and what they specialize in before delegating work.",
+    promptSnippet: "List all available Fusion agents",
+    promptGuidelines: [
+      "Use fn_list_agents to discover which agents exist before delegating work",
+      "Filter by role or state to narrow results",
+      "Ephemeral/runtime agents are excluded by default"
+    ],
+    parameters: Type8.Object({
+      role: Type8.Optional(
+        Type8.String({ description: "Filter by agent role/capability (e.g., 'executor', 'reviewer', 'qa')" })
+      ),
+      state: Type8.Optional(
+        Type8.String({ description: "Filter by agent state (e.g., 'idle', 'active', 'running')" })
+      ),
+      includeEphemeral: Type8.Optional(
+        Type8.Boolean({ description: "Include ephemeral/runtime agents (default: false)" })
+      )
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const { AgentStore: AgentStore2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+      const agentStore = new AgentStore2({ rootDir: getFusionDir(ctx.cwd) });
+      await agentStore.init();
+      const filter = {};
+      if (params.role) filter.role = params.role;
+      if (params.state) filter.state = params.state;
+      if (params.includeEphemeral !== void 0) filter.includeEphemeral = params.includeEphemeral;
+      const agents = await agentStore.listAgents(filter);
+      if (agents.length === 0) {
+        return {
+          content: [{ type: "text", text: "No agents found matching the specified filters." }],
+          details: { agents: [], count: 0 }
+        };
+      }
+      const lines = agents.map((agent) => {
+        const parts = [
+          `ID: ${agent.id}`,
+          `Name: ${agent.name}`,
+          `Role: ${agent.role}`,
+          `State: ${agent.state}`
+        ];
+        if (agent.title) parts.push(`Title: ${agent.title}`);
+        if (agent.soul) parts.push(`Soul: ${agent.soul.slice(0, 200)}`);
+        if (agent.instructionsText) {
+          const snippet = agent.instructionsText.slice(0, 100);
+          parts.push(`Custom Instructions: ${snippet}${agent.instructionsText.length > 100 ? "\u2026" : ""}`);
+        }
+        if (agent.taskId) parts.push(`Current Task: ${agent.taskId}`);
+        return parts.join("\n");
+      });
+      return {
+        content: [{ type: "text", text: `Available agents (${agents.length}):
+
+${lines.join("\n\n")}` }],
+        details: { agents, count: agents.length }
+      };
+    }
+  });
+  pi.registerTool({
+    name: "fn_delegate_task",
+    label: "fn: Delegate Task",
+    description: "Create a new task and assign it to a specific agent for execution. The task goes to 'todo' and will be picked up by the target agent on their next heartbeat cycle. Use fn_list_agents first to find available agents and their capabilities.",
+    promptSnippet: "Delegate a task to a specific Fusion agent",
+    promptGuidelines: [
+      "Use fn_list_agents first to find available agents and their capabilities",
+      "The task is created in 'todo' and assigned to the target agent",
+      "Cannot delegate to ephemeral/runtime agents",
+      "Optionally specify dependencies on other tasks"
+    ],
+    parameters: Type8.Object({
+      agent_id: Type8.String({ description: "The agent ID to delegate work to" }),
+      description: Type8.String({ description: "What needs to be done" }),
+      dependencies: Type8.Optional(
+        Type8.Array(Type8.String(), { description: 'Task IDs this new task depends on (e.g. ["KB-001"]' })
+      )
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const agentError = await validateAssignableAgentId(ctx.cwd, params.agent_id);
+      if (agentError) {
+        return {
+          content: [{ type: "text", text: `ERROR: ${agentError}` }],
+          isError: true,
+          details: { error: agentError }
+        };
+      }
+      const { AgentStore: AgentStore2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+      const agentStore = new AgentStore2({ rootDir: getFusionDir(ctx.cwd) });
+      await agentStore.init();
+      const agent = await agentStore.getAgent(params.agent_id);
+      const store = await getStore2(ctx.cwd);
+      const task = await store.createTask({
+        description: params.description,
+        dependencies: params.dependencies,
+        column: "todo",
+        assignedAgentId: params.agent_id,
+        source: { sourceType: "api" }
+      });
+      const deps = task.dependencies.length ? ` (depends on: ${task.dependencies.join(", ")})` : "";
+      return {
+        content: [{
+          type: "text",
+          text: `Delegated to ${agent.name} (${agent.id}): Created ${task.id}${deps}. The task will be picked up by ${agent.name} on their next heartbeat cycle.`
+        }],
+        details: { taskId: task.id, agentId: agent.id, agentName: agent.name }
+      };
+    }
+  });
+  pi.registerTool({
+    name: "fn_agent_show",
+    label: "fn: Show Agent",
+    description: "Show detailed information about a single agent, including their role, state, position in the org hierarchy (reports-to, direct reports), skills, and current assignment.",
+    promptSnippet: "Show details of a specific Fusion agent",
+    promptGuidelines: [
+      "Use to get full details about a specific agent",
+      "Provide agent ID or a resolvable name",
+      "Shows the agent's position in the org hierarchy"
+    ],
+    parameters: Type8.Object({
+      id: Type8.String({ description: "Agent ID or resolvable name" })
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const { AgentStore: AgentStore2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+      const agentStore = new AgentStore2({ rootDir: getFusionDir(ctx.cwd) });
+      await agentStore.init();
+      const agent = await agentStore.resolveAgent(params.id);
+      if (!agent) {
+        return {
+          content: [{ type: "text", text: `Agent '${params.id}' not found` }],
+          isError: true,
+          details: { error: "Agent not found" }
+        };
+      }
+      const directReports = await agentStore.getAgentsByReportsTo(agent.id);
+      const parts = [
+        `ID: ${agent.id}`,
+        `Name: ${agent.name}`,
+        `Role: ${agent.role}`,
+        `State: ${agent.state}`
+      ];
+      if (agent.title) parts.push(`Title: ${agent.title}`);
+      if (agent.icon) parts.push(`Icon: ${agent.icon}`);
+      if (agent.reportsTo) {
+        const manager = await agentStore.getAgent(agent.reportsTo);
+        if (manager) {
+          parts.push(`Reports To: ${manager.name} (${manager.id})`);
+        } else {
+          parts.push(`Reports To: ${agent.reportsTo}`);
+        }
+      }
+      if (directReports.length > 0) {
+        parts.push(`Direct Reports: ${directReports.map((r) => `${r.name} (${r.id})`).join(", ")}`);
+      }
+      if (agent.taskId) parts.push(`Current Task: ${agent.taskId}`);
+      if (agent.instructionsText) {
+        const snippet = agent.instructionsText.slice(0, 100);
+        parts.push(`Custom Instructions: ${snippet}${agent.instructionsText.length > 100 ? "\u2026" : ""}`);
+      }
+      if (agent.soul) {
+        const snippet = agent.soul.slice(0, 200);
+        parts.push(`Soul: ${snippet}${agent.soul.length > 200 ? "\u2026" : ""}`);
+      }
+      if (agent.metadata?.skills) {
+        parts.push(`Skills: ${JSON.stringify(agent.metadata.skills)}`);
+      }
+      return {
+        content: [{ type: "text", text: parts.join("\n") }],
+        details: {
+          agent,
+          directReports: directReports.map((r) => ({ id: r.id, name: r.name, role: r.role }))
+        }
+      };
+    }
+  });
+  pi.registerTool({
+    name: "fn_agent_org_chart",
+    label: "fn: Agent Org Chart",
+    description: "Show the organizational tree of agents, displaying the role hierarchy. Optionally filter to a subtree rooted at a specific agent.",
+    promptSnippet: "Show the Fusion agent org chart",
+    promptGuidelines: [
+      "Use to understand the team structure and reporting hierarchy",
+      "Optionally specify a root agent to see only their subtree",
+      "Ephemeral/runtime agents are excluded by default"
+    ],
+    parameters: Type8.Object({
+      root_agent_id: Type8.Optional(
+        Type8.String({ description: "If provided, show only the subtree rooted at this agent" })
+      ),
+      include_ephemeral: Type8.Optional(
+        Type8.Boolean({ description: "Include ephemeral/runtime agents (default: false)" })
+      )
+    }),
+    async execute(_toolCallId, params, _signal, _onUpdate, ctx) {
+      const { AgentStore: AgentStore2 } = await Promise.resolve().then(() => (init_src(), src_exports));
+      const agentStore = new AgentStore2({ rootDir: getFusionDir(ctx.cwd) });
+      await agentStore.init();
+      const includeEphemeral = params.include_ephemeral ?? false;
+      if (params.root_agent_id) {
+        const rootAgent = await agentStore.resolveAgent(params.root_agent_id);
+        if (!rootAgent) {
+          return {
+            content: [{ type: "text", text: `Agent '${params.root_agent_id}' not found` }],
+            isError: true,
+            details: { error: "Root agent not found" }
+          };
+        }
+        const fullTree = await agentStore.getOrgTree({ includeEphemeral });
+        const findSubtree = (nodes) => {
+          for (const node of nodes) {
+            if (node.agent.id === rootAgent.id) return node;
+            const found = findSubtree(node.children);
+            if (found) return found;
+          }
+          return null;
+        };
+        const subtree = findSubtree(fullTree);
+        if (!subtree) {
+          return {
+            content: [{
+              type: "text",
+              text: `${rootAgent.icon ?? "\u{1F916}"} ${rootAgent.name} (${rootAgent.role}) \u2014 ${rootAgent.state}${rootAgent.taskId ? ` [${rootAgent.taskId}]` : ""}`
+            }],
+            details: { tree: [{ agent: rootAgent, children: [] }] }
+          };
+        }
+        const lines2 = [];
+        const renderNode2 = (node, indent) => {
+          const a = node.agent;
+          lines2.push(
+            `${indent}${a.icon ?? "\u{1F916}"} ${a.name} (${a.role}) \u2014 ${a.state}${a.taskId ? ` [${a.taskId}]` : ""}`
+          );
+          for (const child of node.children) {
+            renderNode2(child, indent + "  ");
+          }
+        };
+        renderNode2(subtree, "");
+        return {
+          content: [{ type: "text", text: `Agent Org Tree (subtree: ${rootAgent.name}):
+${lines2.join("\n")}` }],
+          details: { tree: [subtree] }
+        };
+      }
+      const tree = await agentStore.getOrgTree({ includeEphemeral });
+      if (tree.length === 0) {
+        return {
+          content: [{ type: "text", text: "No agents found." }],
+          details: { tree: [], count: 0 }
+        };
+      }
+      const lines = [];
+      let count = 0;
+      const renderNode = (node, indent) => {
+        const a = node.agent;
+        lines.push(
+          `${indent}${a.icon ?? "\u{1F916}"} ${a.name} (${a.role}) \u2014 ${a.state}${a.taskId ? ` [${a.taskId}]` : ""}`
+        );
+        count++;
+        for (const child of node.children) {
+          renderNode(child, indent + "  ");
+        }
+      };
+      for (const root of tree) {
+        renderNode(root, "");
+      }
+      return {
+        content: [{ type: "text", text: `Agent Org Tree (${count} agents):
+${lines.join("\n")}` }],
+        details: { tree, count }
+      };
+    }
+  });
   pi.registerTool({
     name: "fn_skills_search",
     label: "FN: Search Skills",