opencode-swarm 6.86.3 → 6.86.5

package/dist/cli/index.js

@@ -14230,11 +14230,17 @@ async function readLedgerEvents(directory) {
     const lines = content.trim().split(`
 `).filter((line) => line.trim() !== "");
     const events = [];
+    let skippedCount = 0;
     for (const line of lines) {
       try {
         const event = JSON.parse(line);
         events.push(event);
-      } catch {}
+      } catch {
+        skippedCount++;
+      }
+    }
+    if (skippedCount > 0) {
+      console.warn(`[ledger] Skipped ${skippedCount} malformed line(s) in plan-ledger.jsonl`);
     }
     events.sort((a, b) => a.seq - b.seq);
     return events;
@@ -14331,10 +14337,13 @@ async function takeSnapshotEvent(directory, plan, options) {
   }, { planHashAfter: options?.planHashAfter });
 }
 async function replayFromLedger(directory, _options) {
-  const events = await readLedgerEvents(directory);
+  const { events, truncated, badSuffix } = await readLedgerEventsWithIntegrity(directory);
   if (events.length === 0) {
     return null;
   }
+  if (truncated && badSuffix !== null) {
+    await quarantineLedgerSuffix(directory, badSuffix);
+  }
   const targetPlanId = events[0].plan_id;
   const relevantEvents = events.filter((e) => e.plan_id === targetPlanId);
   {
@@ -14455,6 +14464,46 @@ function applyEventToPlan(plan, event) {
       throw new Error(`applyEventToPlan: unhandled event type "${event.event_type}" at seq ${event.seq}`);
   }
 }
+async function readLedgerEventsWithIntegrity(directory) {
+  const ledgerPath = getLedgerPath(directory);
+  if (!fs.existsSync(ledgerPath)) {
+    return { events: [], truncated: false, badSuffix: null };
+  }
+  try {
+    const content = fs.readFileSync(ledgerPath, "utf8");
+    const lines = content.split(`
+`);
+    const events = [];
+    let truncated = false;
+    let badSuffix = null;
+    for (let i = 0;i < lines.length; i++) {
+      const line = lines[i];
+      if (line.trim() === "") {
+        continue;
+      }
+      try {
+        const event = JSON.parse(line);
+        events.push(event);
+      } catch {
+        truncated = true;
+        badSuffix = lines.slice(i).join(`
+`);
+        break;
+      }
+    }
+    events.sort((a, b) => a.seq - b.seq);
+    return { events, truncated, badSuffix };
+  } catch {
+    return { events: [], truncated: false, badSuffix: null };
+  }
+}
+async function quarantineLedgerSuffix(directory, badSuffix) {
+  try {
+    const quarantinePath = path2.join(directory, ".swarm", "plan-ledger.quarantine");
+    fs.writeFileSync(quarantinePath, badSuffix, "utf8");
+    console.warn(`[ledger] Corrupted suffix quarantined to ${path2.relative(directory, quarantinePath)}`);
+  } catch {}
+}
 async function loadLastApprovedPlan(directory, expectedPlanId) {
   const events = await readLedgerEvents(directory);
   if (events.length === 0) {
@@ -44379,7 +44428,9 @@ ${error93 instanceof Error ? error93.message : String(error93)}`;
 }
 
 // src/commands/rollback.ts
+init_plan_schema();
 init_utils2();
+init_ledger();
 import * as fs21 from "fs";
 import * as path32 from "path";
 async function handleRollbackCommand(directory, args) {
@@ -44436,9 +44487,16 @@ async function handleRollbackCommand(directory, args) {
     return `Error: Checkpoint for phase ${targetPhase} is empty. Cannot rollback.`;
   }
   const swarmDir = validateSwarmPath(directory, "");
+  const EXCLUDE_FILES = new Set([
+    "plan-ledger.jsonl",
+    "plan-ledger.quarantine"
+  ]);
   const successes = [];
   const failures = [];
   for (const file3 of checkpointFiles) {
+    if (EXCLUDE_FILES.has(file3) || file3.startsWith("plan-ledger.archived-")) {
+      continue;
+    }
     const src = path32.join(checkpointDir, file3);
     const dest = path32.join(swarmDir, file3);
     try {
@@ -44449,7 +44507,41 @@ async function handleRollbackCommand(directory, args) {
     }
   }
   if (failures.length > 0) {
-    return `Rollback partially completed. Successfully restored ${successes.length} files: ${successes.join(", ") || "none"}. Failed on ${failures.length} files: ${failures.map((f) => f.file).join(", ")}. Check permissions and disk space.`;
+    return [
+      `Rollback partially completed. Successfully restored ${successes.length} files.`,
+      `Failed on ${failures.length} files:`,
+      ...failures.map((f) => `  - ${f.file}: ${f.error}`),
+      "",
+      "Some files could not be restored. The .swarm/ directory may be in an inconsistent state.",
+      "Check permissions and disk space, then retry the rollback."
+    ].join(`
+`);
+  }
+  const existingLedgerPath = path32.join(swarmDir, "plan-ledger.jsonl");
+  if (fs21.existsSync(existingLedgerPath)) {
+    fs21.unlinkSync(existingLedgerPath);
+  }
+  try {
+    const planJsonPath = path32.join(swarmDir, "plan.json");
+    if (fs21.existsSync(planJsonPath)) {
+      const planRaw = fs21.readFileSync(planJsonPath, "utf-8");
+      const plan = PlanSchema.parse(JSON.parse(planRaw));
+      const planId = `${plan.swarm}-${plan.title}`.replace(/[^a-zA-Z0-9-_]/g, "_");
+      const planHash = computePlanHash(plan);
+      await initLedger(directory, planId, planHash, plan);
+      await appendLedgerEvent(directory, {
+        event_type: "plan_rebuilt",
+        source: "rollback",
+        plan_id: planId
+      });
+    }
+  } catch (initError) {
+    return [
+      `Rollback restored files but failed to initialize ledger: ${initError instanceof Error ? initError.message : String(initError)}`,
+      "The .swarm/plan.json has been restored but the ledger may be out of sync.",
+      "Run /swarm reset-session to reinitialize the ledger."
+    ].join(`
+`);
   }
   const eventsPath = validateSwarmPath(directory, "events.jsonl");
   const rollbackEvent = {

package/dist/index.js

@@ -16158,11 +16158,17 @@ async function readLedgerEvents(directory) {
     const lines = content.trim().split(`
 `).filter((line) => line.trim() !== "");
     const events = [];
+    let skippedCount = 0;
     for (const line of lines) {
       try {
         const event = JSON.parse(line);
         events.push(event);
-      } catch {}
+      } catch {
+        skippedCount++;
+      }
+    }
+    if (skippedCount > 0) {
+      console.warn(`[ledger] Skipped ${skippedCount} malformed line(s) in plan-ledger.jsonl`);
     }
     events.sort((a, b) => a.seq - b.seq);
     return events;
@@ -16259,10 +16265,13 @@ async function takeSnapshotEvent(directory, plan, options) {
   }, { planHashAfter: options?.planHashAfter });
 }
 async function replayFromLedger(directory, _options) {
-  const events = await readLedgerEvents(directory);
+  const { events, truncated, badSuffix } = await readLedgerEventsWithIntegrity(directory);
   if (events.length === 0) {
     return null;
   }
+  if (truncated && badSuffix !== null) {
+    await quarantineLedgerSuffix(directory, badSuffix);
+  }
   const targetPlanId = events[0].plan_id;
   const relevantEvents = events.filter((e) => e.plan_id === targetPlanId);
   {
@@ -16383,6 +16392,46 @@ function applyEventToPlan(plan, event) {
       throw new Error(`applyEventToPlan: unhandled event type "${event.event_type}" at seq ${event.seq}`);
   }
 }
+async function readLedgerEventsWithIntegrity(directory) {
+  const ledgerPath = getLedgerPath(directory);
+  if (!fs4.existsSync(ledgerPath)) {
+    return { events: [], truncated: false, badSuffix: null };
+  }
+  try {
+    const content = fs4.readFileSync(ledgerPath, "utf8");
+    const lines = content.split(`
+`);
+    const events = [];
+    let truncated = false;
+    let badSuffix = null;
+    for (let i2 = 0;i2 < lines.length; i2++) {
+      const line = lines[i2];
+      if (line.trim() === "") {
+        continue;
+      }
+      try {
+        const event = JSON.parse(line);
+        events.push(event);
+      } catch {
+        truncated = true;
+        badSuffix = lines.slice(i2).join(`
+`);
+        break;
+      }
+    }
+    events.sort((a, b) => a.seq - b.seq);
+    return { events, truncated, badSuffix };
+  } catch {
+    return { events: [], truncated: false, badSuffix: null };
+  }
+}
+async function quarantineLedgerSuffix(directory, badSuffix) {
+  try {
+    const quarantinePath = path4.join(directory, ".swarm", "plan-ledger.quarantine");
+    fs4.writeFileSync(quarantinePath, badSuffix, "utf8");
+    console.warn(`[ledger] Corrupted suffix quarantined to ${path4.relative(directory, quarantinePath)}`);
+  } catch {}
+}
 async function loadLastApprovedPlan(directory, expectedPlanId) {
   const events = await readLedgerEvents(directory);
   if (events.length === 0) {
@@ -53249,9 +53298,16 @@ async function handleRollbackCommand(directory, args2) {
     return `Error: Checkpoint for phase ${targetPhase} is empty. Cannot rollback.`;
   }
   const swarmDir = validateSwarmPath(directory, "");
+  const EXCLUDE_FILES = new Set([
+    "plan-ledger.jsonl",
+    "plan-ledger.quarantine"
+  ]);
   const successes = [];
   const failures = [];
   for (const file3 of checkpointFiles) {
+    if (EXCLUDE_FILES.has(file3) || file3.startsWith("plan-ledger.archived-")) {
+      continue;
+    }
     const src = path40.join(checkpointDir, file3);
     const dest = path40.join(swarmDir, file3);
     try {
@@ -53262,7 +53318,41 @@ async function handleRollbackCommand(directory, args2) {
     }
   }
   if (failures.length > 0) {
-    return `Rollback partially completed. Successfully restored ${successes.length} files: ${successes.join(", ") || "none"}. Failed on ${failures.length} files: ${failures.map((f) => f.file).join(", ")}. Check permissions and disk space.`;
+    return [
+      `Rollback partially completed. Successfully restored ${successes.length} files.`,
+      `Failed on ${failures.length} files:`,
+      ...failures.map((f) => `  - ${f.file}: ${f.error}`),
+      "",
+      "Some files could not be restored. The .swarm/ directory may be in an inconsistent state.",
+      "Check permissions and disk space, then retry the rollback."
+    ].join(`
+`);
+  }
+  const existingLedgerPath = path40.join(swarmDir, "plan-ledger.jsonl");
+  if (fs28.existsSync(existingLedgerPath)) {
+    fs28.unlinkSync(existingLedgerPath);
+  }
+  try {
+    const planJsonPath = path40.join(swarmDir, "plan.json");
+    if (fs28.existsSync(planJsonPath)) {
+      const planRaw = fs28.readFileSync(planJsonPath, "utf-8");
+      const plan = PlanSchema.parse(JSON.parse(planRaw));
+      const planId = `${plan.swarm}-${plan.title}`.replace(/[^a-zA-Z0-9-_]/g, "_");
+      const planHash = computePlanHash(plan);
+      await initLedger(directory, planId, planHash, plan);
+      await appendLedgerEvent(directory, {
+        event_type: "plan_rebuilt",
+        source: "rollback",
+        plan_id: planId
+      });
+    }
+  } catch (initError) {
+    return [
+      `Rollback restored files but failed to initialize ledger: ${initError instanceof Error ? initError.message : String(initError)}`,
+      "The .swarm/plan.json has been restored but the ledger may be out of sync.",
+      "Run /swarm reset-session to reinitialize the ledger."
+    ].join(`
+`);
   }
   const eventsPath = validateSwarmPath(directory, "events.jsonl");
   const rollbackEvent = {
@@ -53280,7 +53370,9 @@ async function handleRollbackCommand(directory, args2) {
   return `Rolled back to phase ${targetPhase}: ${checkpoint2.label || "no label"}`;
 }
 var init_rollback = __esm(() => {
+  init_plan_schema();
   init_utils2();
+  init_ledger();
 });
 
 // src/commands/simulate.ts
@@ -63247,7 +63339,7 @@ init_schema();
 init_state();
 init_utils();
 init_utils2();
-import { renameSync as renameSync11, unlinkSync as unlinkSync7 } from "fs";
+import { renameSync as renameSync11, unlinkSync as unlinkSync8 } from "fs";
 import * as nodePath2 from "path";
 function createAgentActivityHooks(config3, directory) {
   if (config3.hooks?.agent_activity === false) {
@@ -63324,7 +63416,7 @@ async function doFlush(directory) {
       renameSync11(tempPath, path46);
     } catch (writeError) {
       try {
-        unlinkSync7(tempPath);
+        unlinkSync8(tempPath);
       } catch {}
       throw writeError;
     }
@@ -85525,6 +85617,17 @@ init_state();
 function slugify2(str) {
   return str.replace(/[^a-zA-Z0-9_-]/g, "_").replace(/_+/g, "_");
 }
+function extractJsonArray(text) {
+  const trimmed = text.trim();
+  const fenceMatch = trimmed.match(/```(?:json)?\s*\n?([\s\S]*?)\n?```/);
+  if (fenceMatch)
+    return fenceMatch[1].trim();
+  const start2 = trimmed.search(/\[\s*[{["0-9\]tfn]/);
+  const end = trimmed.lastIndexOf("]");
+  if (start2 !== -1 && end > start2)
+    return trimmed.slice(start2, end + 1);
+  return trimmed;
+}
 async function generateMutants(files, ctx) {
   if (!ctx) {
     console.warn("[generateMutants] No ToolContext \u2014 cannot call LLM; returning empty patch set");
@@ -85569,9 +85672,9 @@ Return a JSON array where each element has:
 - id: unique string like "mut-001"
 - mutationType: one of: ${mutationTypes}
 - patch: unified diff format (--- a/file\\n+++ a/file\\n@@ ... @@\\n-old\\n+new)
-- Generate 5-10 mutations per function
+- Generate 3-5 mutations per function
 
-Return ONLY valid JSON array, no markdown, no explanation.`;
+Return ONLY a valid JSON array. No markdown, no code fences, no explanation. Start your response with [ and end with ].`;
     const promptResult = await client.session.prompt({
       path: { id: ephemeralSessionId },
       body: {
@@ -85589,9 +85692,11 @@ Return ONLY valid JSON array, no markdown, no explanation.`;
 `);
     let parsed;
     try {
-      parsed = JSON.parse(rawText);
+      parsed = JSON.parse(extractJsonArray(rawText));
     } catch (error93) {
-      console.warn(`[generateMutants] Failed to parse LLM response as MutationPatch[]: ${error93 instanceof Error ? error93.message : String(error93)}; returning empty patch set`);
+      const msg = error93 instanceof Error ? error93.message : String(error93);
+      const hint = msg.includes("EOF") || msg.includes("Unexpected end") ? " (response appears truncated \u2014 LLM may have hit an output token limit)" : "";
+      console.warn(`[generateMutants] Failed to parse LLM response as MutationPatch[]: ${msg}${hint}; returning empty patch set`);
       return [];
     }
     if (!Array.isArray(parsed) || parsed.length === 0) {
@@ -85804,7 +85909,7 @@ import * as path95 from "path";
 
 // src/mutation/engine.ts
 import { spawnSync as spawnSync3 } from "child_process";
-import { unlinkSync as unlinkSync12, writeFileSync as writeFileSync18 } from "fs";
+import { unlinkSync as unlinkSync13, writeFileSync as writeFileSync18 } from "fs";
 import * as path94 from "path";
 
 // src/mutation/equivalence.ts
@@ -86038,7 +86143,7 @@ async function executeMutation(patch, testCommand, _testFiles, workingDir) {
         revertError = new Error(`Failed to revert mutation ${patch.id}: ${revertErr}. Working tree may be dirty.`);
       }
       try {
-        unlinkSync12(patchFile);
+        unlinkSync13(patchFile);
       } catch (_unlinkErr) {}
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "opencode-swarm",
-	"version": "6.86.3",
+	"version": "6.86.5",
 	"description": "Architect-centric agentic swarm plugin for OpenCode - hub-and-spoke orchestration with SME consultation, code generation, and QA review",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",