npm - @runfusion/fusion - Versions diffs - 0.0.5 → 0.0.6 - Mend

@runfusion/fusion 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/bin.js +244 -98
package/dist/client/assets/{index-9GdD09x7.css → index-CYkQfLYV.css} +1 -1
package/dist/client/assets/index-zTogbMzz.js +1241 -0
package/dist/client/index.html +2 -2
package/dist/extension.js +145 -82
package/package.json +1 -1
package/dist/client/assets/index-wtVkS5Qz.js +0 -1241

package/dist/client/index.html CHANGED Viewed

@@ -78,11 +78,11 @@
         }
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-wtVkS5Qz.js"></script>
+    <script type="module" crossorigin src="/assets/index-zTogbMzz.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-K0fH_qHe.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-xterm-DzcZoU0P.js">
     <link rel="stylesheet" crossorigin href="/assets/vendor-xterm-LZoznX6r.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-9GdD09x7.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-CYkQfLYV.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/extension.js CHANGED Viewed

@@ -133,6 +133,8 @@ var init_settings_schema = __esm({
       defaultPresetBySize: {},
       autoResolveConflicts: true,
       smartConflictResolution: true,
+      worktreeRebaseBeforeMerge: true,
+      worktreeRebaseRemote: "",
       strictScopeEnforcement: false,
       buildRetryCount: 0,
       verificationFixRetries: 1,
@@ -30548,6 +30550,7 @@ ${newTask.description}
             }
           }
           if (updates.steps !== void 0) task.steps = updates.steps;
+          if (updates.currentStep !== void 0) task.currentStep = updates.currentStep;
           if (updates.status === null) {
             task.status = void 0;
           } else if (updates.status !== void 0) {
@@ -53420,6 +53423,71 @@ async function aiMergeTask(store, rootDir, taskId, options = {}) {
       mergerLog.warn(`${taskId}: unable to verify/checkout main branch \u2014 proceeding on current HEAD`);
     }
   }
+  if (settings.worktreeRebaseBeforeMerge !== false) {
+    try {
+      let remote = settings.worktreeRebaseRemote?.trim();
+      if (!remote) {
+        try {
+          const { stdout: mainBranchOut } = await execAsync2(
+            "git rev-parse --abbrev-ref HEAD",
+            { cwd: rootDir, encoding: "utf-8" }
+          );
+          const mainBranch = mainBranchOut.trim();
+          const { stdout: configuredRemote } = await execAsync2(
+            `git config --get branch.${mainBranch}.remote`,
+            { cwd: rootDir, encoding: "utf-8" }
+          ).catch(() => ({ stdout: "" }));
+          remote = configuredRemote.trim();
+        } catch {
+        }
+      }
+      if (!remote) {
+        try {
+          const { stdout: remotesOut } = await execAsync2("git remote", {
+            cwd: rootDir,
+            encoding: "utf-8"
+          });
+          const remotes = remotesOut.trim().split(/\s+/).filter(Boolean);
+          if (remotes.length === 1) {
+            remote = remotes[0];
+          } else if (remotes.includes("origin")) {
+            remote = "origin";
+          }
+        } catch {
+        }
+      }
+      if (!remote) {
+        mergerLog.log(`${taskId}: no remote resolvable \u2014 skipping pre-merge rebase`);
+      } else {
+        mergerLog.log(`${taskId}: fetching ${remote} before merge`);
+        await execAsync2(`git fetch "${remote}"`, { cwd: rootDir });
+        try {
+          const { stdout: mainBranchOut } = await execAsync2(
+            "git rev-parse --abbrev-ref HEAD",
+            { cwd: rootDir, encoding: "utf-8" }
+          );
+          const mainBranch = mainBranchOut.trim();
+          const remoteRef = `${remote}/${mainBranch}`;
+          if (worktreePath) {
+            await execAsync2(`git rebase "${remoteRef}"`, { cwd: worktreePath });
+            mergerLog.log(`${taskId}: rebased ${branch} onto ${remoteRef}`);
+          } else {
+            mergerLog.warn(`${taskId}: no worktreePath \u2014 skipping task branch rebase`);
+          }
+        } catch (rebaseErr) {
+          const msg = rebaseErr instanceof Error ? rebaseErr.message : String(rebaseErr);
+          mergerLog.warn(`${taskId}: pre-merge rebase failed (${msg}) \u2014 aborting rebase and falling through to smart/AI merge`);
+          if (worktreePath) {
+            await execAsync2("git rebase --abort", { cwd: worktreePath }).catch(() => {
+            });
+          }
+        }
+      }
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      mergerLog.warn(`${taskId}: pre-merge rebase pipeline failed (${msg}) \u2014 proceeding without rebase`);
+    }
+  }
   let commitLog = "";
   let diffStat = "";
   try {
@@ -55936,19 +56004,6 @@ import { existsSync as existsSync25 } from "node:fs";
 import { readFile as readFile14, writeFile as writeFile11 } from "node:fs/promises";
 import { Type as Type4 } from "@mariozechner/pi-ai";
 import { ModelRegistry as ModelRegistry2, SessionManager as SessionManager2 } from "@mariozechner/pi-coding-agent";
-function determineRevisionResetStart(steps, feedback) {
-  const total = steps.length;
-  if (total === 0) return 0;
-  const skipPreflight = /preflight/i.test(steps[0].name);
-  const firstCandidate = skipPreflight ? 1 : 0;
-  if (firstCandidate >= total) return total;
-  const fb = feedback.toLowerCase();
-  for (let i = firstCandidate; i < total; i++) {
-    const tokens = steps[i].name.toLowerCase().match(/[a-z][a-z]{4,}/g) ?? [];
-    if (tokens.some((t) => fb.includes(t))) return i;
-  }
-  return firstCandidate;
-}
 function truncateWorkflowScriptOutput2(output) {
   if (output.length <= WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS2) return output;
   return `... output truncated to last ${WORKFLOW_SCRIPT_OUTPUT_MAX_CHARS2} characters ...
@@ -58265,35 +58320,23 @@ Take a different approach. Do NOT repeat the rejected strategy. Re-read the step
       }
       /**
        * Handle a workflow step revision request.
-       *
-       * This method:
-       * 1. Updates PROMPT.md with "Workflow Revision Instructions" section
-       * 2. Resets task execution state (all steps reset to pending)
-       * 3. Schedules fresh execution to run after current guard unwinds
-       *
-       * The task stays in "in-progress" and is scheduled for a fresh executor pass.
+       *
+       * Re-opens ONLY the last step so the executor has exactly one pending slot
+       * to re-enter through. All earlier done steps stay done — the agent reads
+       * the injected feedback from PROMPT.md and applies an in-place fix rather
+       * than redoing any completed step.
        */
       async handleWorkflowRevisionRequest(task, worktreePath, feedback, stepName) {
         executorLog.log(`${task.id}: workflow revision requested by step "${stepName}"`);
         const updatedTask = await this.store.getTask(task.id);
-        const resetStart = determineRevisionResetStart(updatedTask.steps, feedback);
-        const targetStepName = resetStart < updatedTask.steps.length ? updatedTask.steps[resetStart].name : null;
-        const resetSummary = resetStart >= updatedTask.steps.length ? "no steps to reset" : `resetting steps ${resetStart + 1}\u2013${updatedTask.steps.length} (starting at "${targetStepName}")`;
+        const reopen = await this.reopenLastStepForRevision(task.id, updatedTask);
+        const reopenSummary = reopen ? `re-opening Step ${reopen.index + 1} ("${reopen.name}") for in-place fix` : "no step to re-open (none were completed)";
         await this.store.logEntry(
           task.id,
-          `Workflow step "${stepName}" requested revision \u2014 ${resetSummary}`,
+          `Workflow step "${stepName}" requested revision \u2014 ${reopenSummary}`,
           feedback
         );
-        await this.injectWorkflowRevisionInstructions(task, feedback, {
-          resetStart,
-          targetStepName,
-          totalSteps: updatedTask.steps.length
-        });
-        for (let i = resetStart; i < updatedTask.steps.length; i++) {
-          if (updatedTask.steps[i].status !== "pending") {
-            await this.store.updateStep(task.id, i, "pending");
-          }
-        }
+        await this.injectWorkflowRevisionInstructions(task, feedback);
         await this.store.updateTask(task.id, {
           status: null,
           sessionFile: null
@@ -58315,12 +58358,36 @@ Take a different approach. Do NOT repeat the rejected strategy. Re-read the step
           }
         }, 0);
       }
+      /**
+       * Re-open the last non-pending step so a revision/failure handler gives the
+       * executor exactly one pending slot to re-enter through. Returns the index
+       * and name of the step that was flipped to `pending`, or null when there
+       * was nothing to re-open.
+       */
+      async reopenLastStepForRevision(taskId, task) {
+        const steps = task.steps;
+        if (steps.length === 0) return null;
+        let targetIndex = -1;
+        for (let i = steps.length - 1; i >= 0; i--) {
+          if (steps[i].status !== "pending") {
+            targetIndex = i;
+            break;
+          }
+        }
+        if (targetIndex === -1) {
+          await this.store.updateTask(taskId, { currentStep: 0 });
+          return null;
+        }
+        await this.store.updateStep(taskId, targetIndex, "pending");
+        await this.store.updateTask(taskId, { currentStep: targetIndex });
+        return { index: targetIndex, name: steps[targetIndex].name };
+      }
       /**
        * Inject or update the "Workflow Revision Instructions" section in PROMPT.md.
        * This section contains feedback from workflow steps that requested revisions.
        * The section is replaced entirely to avoid accumulation of old feedback.
        */
-      async injectWorkflowRevisionInstructions(task, feedback, scope) {
+      async injectWorkflowRevisionInstructions(task, feedback) {
         const promptPath = join32(this.store.getFusionDir(), "tasks", task.id, "PROMPT.md");
         let content;
         try {
@@ -58329,14 +58396,7 @@ Take a different approach. Do NOT repeat the rejected strategy. Re-read the step
           executorLog.warn(`${task.id}: PROMPT.md not found at ${promptPath}, skipping revision injection`);
           return;
         }
-        let scopeLine;
-        if (scope && scope.targetStepName && scope.resetStart < scope.totalSteps) {
-          scopeLine = `Re-execution starts at **Step ${scope.resetStart + 1} ("${scope.targetStepName}")**. Earlier steps remain done \u2014 do not re-run them unless the feedback explicitly calls them out.`;
-        } else if (scope && scope.resetStart >= scope.totalSteps) {
-          scopeLine = "No steps were reset; apply the feedback as an in-place fix and call task_done() when complete.";
-        } else {
-          scopeLine = "Address the feedback above by making the necessary code changes, then mark all affected steps as done and call task_done() when complete.";
-        }
+        const scopeLine = "All prior steps remain **done**. Apply the feedback above as an in-place fix (make the necessary code changes, commit, and call `task_done()` when complete). Do **not** re-run or re-plan any earlier step unless the feedback explicitly calls it out.";
         const revisionSectionHeader = "## Workflow Revision Instructions";
         const revisionSectionContent = `${revisionSectionHeader}
@@ -58395,11 +58455,7 @@ ${feedback}
         });
         await this.injectWorkflowStepFailureInstructions(task, failureFeedback, stepName, retryCount);
         const updatedTask = await this.store.getTask(task.id);
-        for (let i = 0; i < updatedTask.steps.length; i++) {
-          if (updatedTask.steps[i].status !== "pending") {
-            await this.store.updateStep(task.id, i, "pending");
-          }
-        }
+        await this.reopenLastStepForRevision(task.id, updatedTask);
         await this.store.updateTask(task.id, {
           status: null,
           sessionFile: null
@@ -58443,11 +58499,7 @@ Please fix the issues so the verification can pass on the next attempt.`,
         );
         await this.injectWorkflowStepFailureInstructions(task, failureFeedback, stepName, MAX_WORKFLOW_STEP_RETRIES);
         const updatedTask = await this.store.getTask(taskId);
-        for (let i = 0; i < updatedTask.steps.length; i++) {
-          if (updatedTask.steps[i].status !== "pending") {
-            await this.store.updateStep(taskId, i, "pending");
-          }
-        }
+        await this.reopenLastStepForRevision(taskId, updatedTask);
         await this.store.updateTask(taskId, {
           status: null,
           error: null,
@@ -64246,6 +64298,12 @@ async function getHeartbeatMemorySettings(taskStore) {
   }
   return maybeGetSettings.call(taskStore);
 }
+function isTickableState(state) {
+  return state === "active" || state === "running";
+}
+function isHeartbeatManaged(agent) {
+  return !isEphemeralAgent(agent);
+}
 var HEARTBEAT_SYSTEM_PROMPT, HEARTBEAT_NO_TASK_SYSTEM_PROMPT, heartbeatDoneParams, HeartbeatMonitor, HeartbeatTriggerScheduler;
 var init_agent_heartbeat = __esm({
   "../engine/src/agent-heartbeat.ts"() {
@@ -65482,10 +65540,6 @@ ${taskDetail.prompt}` : "No PROMPT.md available.",
        * @param config - Per-agent heartbeat config
        */
       registerAgent(agentId, config) {
-        if (config.enabled === false) {
-          heartbeatLog.log(`Skipping timer registration for ${agentId} (disabled)`);
-          return;
-        }
         let rawIntervalMs = config.heartbeatIntervalMs;
         let usingDefaultInterval = false;
         if (!rawIntervalMs || typeof rawIntervalMs !== "number" || !Number.isFinite(rawIntervalMs) || rawIntervalMs <= 0) {
@@ -65575,8 +65629,8 @@ ${taskDetail.prompt}` : "No PROMPT.md available.",
         this.assignedListener = async (agent, taskId) => {
           if (!this.running) return;
           try {
-            if (agent.runtimeConfig?.enabled === false) {
-              heartbeatLog.log(`Assignment trigger skipped for ${agent.id} (heartbeat disabled)`);
+            if (!isHeartbeatManaged(agent) || !isTickableState(agent.state)) {
+              heartbeatLog.log(`Assignment trigger skipped for ${agent.id} (state=${agent.state})`);
               return;
             }
             const activeRun = await this.store.getActiveHeartbeatRun(agent.id);
@@ -65645,9 +65699,21 @@ ${taskDetail.prompt}` : "No PROMPT.md available.",
       watchAgentLifecycle() {
         if (this.updatedListener || this.deletedListener) return;
         this.updatedListener = (agent) => {
-          if (agent.state === "terminated" || agent.runtimeConfig?.enabled === false) {
+          if (!isHeartbeatManaged(agent) || !isTickableState(agent.state)) {
             this.unregisterAgent(agent.id);
+            return;
           }
+          if (this.timers.has(agent.id)) {
+            return;
+          }
+          const rc = agent.runtimeConfig ?? {};
+          this.registerAgent(agent.id, {
+            heartbeatIntervalMs: rc.heartbeatIntervalMs,
+            maxConcurrentRuns: rc.maxConcurrentRuns
+          });
+          heartbeatLog.log(
+            `State-driven registration: ${agent.id} is ${agent.state} \u2014 timer armed`
+          );
         };
         this.deletedListener = (agentId) => {
           this.unregisterAgent(agentId);
@@ -65678,8 +65744,8 @@ ${taskDetail.prompt}` : "No PROMPT.md available.",
             this.unregisterAgent(agentId);
             return;
           }
-          if (agent.state === "terminated" || agent.runtimeConfig?.enabled === false) {
-            heartbeatLog.log(`Timer tick skipped for ${agentId} (disabled or terminated)`);
+          if (!isHeartbeatManaged(agent) || !isTickableState(agent.state)) {
+            heartbeatLog.log(`Timer tick skipped for ${agentId} (state=${agent.state})`);
             this.unregisterAgent(agentId);
             return;
           }
@@ -67884,13 +67950,13 @@ var init_in_process_runtime = __esm({
               this.taskStore
             );
             this.triggerScheduler.start();
+            const isTickable = (agent) => !isEphemeralAgent(agent) && (agent.state === "active" || agent.state === "running");
             this.agentCreatedListener = (agent) => {
               if (!this.triggerScheduler) return;
+              if (!isTickable(agent)) return;
               const rc = agent.runtimeConfig;
-              if (rc?.enabled === false) return;
               this.triggerScheduler.registerAgent(agent.id, {
                 heartbeatIntervalMs: rc?.heartbeatIntervalMs,
-                enabled: rc?.enabled,
                 maxConcurrentRuns: rc?.maxConcurrentRuns
               });
               runtimeLog.log(`Registered new agent ${agent.id} for heartbeat triggers`);
@@ -67898,18 +67964,17 @@ var init_in_process_runtime = __esm({
             this.agentStore.on("agent:created", this.agentCreatedListener);
             this.agentUpdatedListener = (agent) => {
               if (!this.triggerScheduler) return;
-              const rc = agent.runtimeConfig;
-              if (rc?.enabled === false) {
+              if (!isTickable(agent)) {
                 this.triggerScheduler.unregisterAgent(agent.id);
-                runtimeLog.log(`Unregistered agent ${agent.id} from heartbeat triggers (disabled)`);
-              } else {
-                this.triggerScheduler.registerAgent(agent.id, {
-                  heartbeatIntervalMs: rc?.heartbeatIntervalMs,
-                  enabled: rc?.enabled,
-                  maxConcurrentRuns: rc?.maxConcurrentRuns
-                });
-                runtimeLog.log(`Re-registered agent ${agent.id} for heartbeat triggers`);
+                runtimeLog.log(`Unregistered agent ${agent.id} from heartbeat triggers (state=${agent.state})`);
+                return;
               }
+              const rc = agent.runtimeConfig;
+              this.triggerScheduler.registerAgent(agent.id, {
+                heartbeatIntervalMs: rc?.heartbeatIntervalMs,
+                maxConcurrentRuns: rc?.maxConcurrentRuns
+              });
+              runtimeLog.log(`Re-registered agent ${agent.id} for heartbeat triggers (state=${agent.state})`);
             };
             this.agentStore.on("agent:updated", this.agentUpdatedListener);
             this.ephemeralTerminationListener = (agentId, from, to) => {
@@ -67944,15 +68009,13 @@ var init_in_process_runtime = __esm({
               const agents = await this.agentStore.listAgents();
               let registeredCount = 0;
               for (const agent of agents) {
+                if (!isTickable(agent)) continue;
                 const rc = agent.runtimeConfig;
-                if (rc?.enabled !== false) {
-                  this.triggerScheduler.registerAgent(agent.id, {
-                    heartbeatIntervalMs: rc?.heartbeatIntervalMs,
-                    enabled: rc?.enabled,
-                    maxConcurrentRuns: rc?.maxConcurrentRuns
-                  });
-                  registeredCount++;
-                }
+                this.triggerScheduler.registerAgent(agent.id, {
+                  heartbeatIntervalMs: rc?.heartbeatIntervalMs,
+                  maxConcurrentRuns: rc?.maxConcurrentRuns
+                });
+                registeredCount++;
               }
               if (agents.length > 0) {
                 runtimeLog.log(`Registered ${registeredCount} of ${agents.length} agents for heartbeat triggers`);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@runfusion/fusion",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "license": "MIT",
   "description": "Fusion CLI: HTTP API server, daemon, dashboard launcher, and task tooling for the Fusion AI coding agent.",
   "homepage": "https://github.com/Runfusion/Fusion#readme",