fifony 0.1.39 → 0.1.40

package/dist/{chunk-DWMY2HBG.js → chunk-LYAI5RPK.js}

@@ -1,6 +1,6 @@
 import {
   enqueue
-} from "./chunk-AVSRIV47.js";
+} from "./chunk-3QL4QAQ5.js";
 import {
   ISSUE_STATE_MACHINE_ID,
   computeMetrics,
@@ -8,6 +8,7 @@ import {
   findIssueStateMachineTransitionPath,
   getDirtyEventIds,
   getDirtyIssueIds,
+  getIssueResourceStateApi,
   getIssueStateMachinePlugin,
   getMetrics,
   hasDirtyState,
@@ -24,7 +25,7 @@ import {
   snapshotAndClearDirtyEventIds,
   snapshotAndClearDirtyIssueIds,
   snapshotAndClearDirtyIssuePlanIds
-} from "./chunk-WBOBY75G.js";
+} from "./chunk-UXXUTDGV.js";
 import {
   ADAPTERS,
   assertIssueHasGitWorktree,
@@ -52,9 +53,10 @@ import {
   parseDiffStats,
   prepareWorkspace,
   readCodexConfig,
+  rebaseWorktree,
   runCommandWithTimeout,
   runHook
-} from "./chunk-UNYIR5AK.js";
+} from "./chunk-O3FGX4J6.js";
 import {
   logger
 } from "./chunk-DVU3CXWA.js";
@@ -79,7 +81,7 @@ import {
   toStringArray,
   toStringValue,
   withRetryBackoff
-} from "./chunk-T2YJOZ6N.js";
+} from "./chunk-EPY5TTQK.js";
 import {
   ATTACHMENTS_ROOT,
   COMPLETED_STATES,
@@ -289,10 +291,10 @@ import {
   mkdirSync as mkdirSync8,
   readdirSync as readdirSync4,
   readFileSync as readFileSync11,
-  writeFileSync as writeFileSync12
+  writeFileSync as writeFileSync13
 } from "fs";
 import { homedir as homedir3 } from "os";
-import { basename as basename4, dirname as dirname2, join as join17, relative as relativePath, resolve as resolve2 } from "path";
+import { basename as basename4, dirname as dirname2, join as join18, relative as relativePath, resolve as resolve2 } from "path";
 
 // src/persistence/plugins/api-runtime-context.ts
 var context = null;
@@ -494,6 +496,19 @@ function tryParseJsonOutput(output) {
   }
   return null;
 }
+function extractUsageArrays(obj) {
+  if (!obj) return {};
+  const toArr = (v) => {
+    if (!Array.isArray(v) || v.length === 0) return void 0;
+    return v.filter((s) => typeof s === "string" && s.length > 0);
+  };
+  return {
+    toolsUsed: toArr(obj.tools_used ?? obj.toolsUsed),
+    skillsUsed: toArr(obj.skills_used ?? obj.skillsUsed),
+    agentsUsed: toArr(obj.agents_used ?? obj.agentsUsed),
+    commandsRun: toArr(obj.commands_run ?? obj.commandsRun)
+  };
+}
 function readAgentDirective(workspacePath, output, success) {
   const fallbackStatus = success ? "done" : "failed";
   const resultFile = join(workspacePath, "result.json");
@@ -512,9 +527,26 @@ function readAgentDirective(workspacePath, output, success) {
       status: normalizeAgentDirectiveStatus(jsonOutput.status, fallbackStatus),
       summary: toStringValue(jsonOutput.summary) || toStringValue(jsonOutput.message) || "",
       nextPrompt: toStringValue(jsonOutput.nextPrompt) || toStringValue(jsonOutput.next_prompt) || "",
-      tokenUsage
+      tokenUsage,
+      ...extractUsageArrays(jsonOutput)
     };
   }
+  const codeBlocks = [...output.matchAll(/```(?:json)?\s*([\s\S]*?)\s*```/gi)].map((m) => m[1].trim()).reverse();
+  for (const block of codeBlocks) {
+    try {
+      const parsed = JSON.parse(block);
+      if (parsed?.status) {
+        return {
+          status: normalizeAgentDirectiveStatus(parsed.status, fallbackStatus),
+          summary: toStringValue(parsed.summary) || toStringValue(parsed.message) || "",
+          nextPrompt: toStringValue(parsed.nextPrompt) || toStringValue(parsed.next_prompt) || "",
+          tokenUsage,
+          ...extractUsageArrays(parsed)
+        };
+      }
+    } catch {
+    }
+  }
   if (existsSync(resultFile)) {
     try {
       const parsed = JSON.parse(readFileSync(resultFile, "utf8"));
@@ -531,7 +563,7 @@ function readAgentDirective(workspacePath, output, success) {
   );
   const summary = toStringValue(resultPayload.summary) || toStringValue(resultPayload.message) || extractOutputMarker(output, "FIFONY_SUMMARY");
   const nextPrompt = toStringValue(resultPayload.nextPrompt) || toStringValue(resultPayload.next_prompt) || "";
-  return { status, summary, nextPrompt, tokenUsage };
+  return { status, summary, nextPrompt, tokenUsage, ...extractUsageArrays(resultPayload) };
 }
 
 // src/agents/pid-manager.ts
@@ -1348,6 +1380,10 @@ ${previousOutput.slice(-maxOutputChars)}` : previousOutput;
     }
     addEvent(state, issue.id, "info", parts.join(" "));
   }
+  if (directive.toolsUsed?.length) issue.toolsUsed = [.../* @__PURE__ */ new Set([...issue.toolsUsed ?? [], ...directive.toolsUsed])];
+  if (directive.skillsUsed?.length) issue.skillsUsed = [.../* @__PURE__ */ new Set([...issue.skillsUsed ?? [], ...directive.skillsUsed])];
+  if (directive.agentsUsed?.length) issue.agentsUsed = [.../* @__PURE__ */ new Set([...issue.agentsUsed ?? [], ...directive.agentsUsed])];
+  if (directive.commandsRun?.length) issue.commandsRun = [.../* @__PURE__ */ new Set([...issue.commandsRun ?? [], ...directive.commandsRun])];
   session.turns.push({
     turn: turnIndex,
     role: provider.role,
@@ -1362,7 +1398,11 @@ ${previousOutput.slice(-maxOutputChars)}` : previousOutput;
     directiveStatus: directive.status,
     directiveSummary: directive.summary,
     nextPrompt: directive.nextPrompt,
-    tokenUsage: directive.tokenUsage
+    tokenUsage: directive.tokenUsage,
+    toolsUsed: directive.toolsUsed,
+    skillsUsed: directive.skillsUsed,
+    agentsUsed: directive.agentsUsed,
+    commandsRun: directive.commandsRun
   });
   session.lastCode = lastCode;
   session.lastOutput = lastOutput;
@@ -2453,7 +2493,7 @@ function generatePlanInBackground(issue, config, _workflowDefinition, callbacks,
     applyUsage(issue, usage);
     applySuggestions(issue, plan);
     try {
-      const { savePlanForIssue: savePlanForIssue2 } = await import("./store-3YSID6N2.js");
+      const { savePlanForIssue: savePlanForIssue2 } = await import("./store-FNUWCFOX.js");
       await savePlanForIssue2(issue.id, plan, issue.planVersion);
     } catch {
     }
@@ -2490,7 +2530,7 @@ function refinePlanInBackground(issue, feedback, config, _workflowDefinition, ca
     applyUsage(issue, usage);
     applySuggestions(issue, plan);
     try {
-      const { savePlanForIssue: savePlanForIssue2 } = await import("./store-3YSID6N2.js");
+      const { savePlanForIssue: savePlanForIssue2 } = await import("./store-FNUWCFOX.js");
       await savePlanForIssue2(issue.id, plan, issue.planVersion);
     } catch {
     }
@@ -2768,7 +2808,7 @@ async function runPlanningJob(state, issue) {
     issue.plan = plan;
     issue.planVersion = Math.max(issue.planVersion ?? 0, 1);
     try {
-      const { savePlanForIssue: savePlanForIssue2 } = await import("./store-3YSID6N2.js");
+      const { savePlanForIssue: savePlanForIssue2 } = await import("./store-FNUWCFOX.js");
       await savePlanForIssue2(issue.id, plan, issue.planVersion);
       logger.debug({ issueId: issue.id, planVersion: issue.planVersion }, "[Agent] Plan saved to issue_plans resource");
     } catch (err) {
@@ -3004,7 +3044,7 @@ async function runIssueOnce(state, issue, running) {
     const { workspacePath, promptText, promptFile } = await prepareWorkspace(issue, state, state.config.defaultBranch);
     container.issueRepository.markDirty(issue.id);
     try {
-      const { getIssueStateResource: getIssueStateResource2 } = await import("./store-3YSID6N2.js");
+      const { getIssueStateResource: getIssueStateResource2 } = await import("./store-FNUWCFOX.js");
       const res = getIssueStateResource2();
       if (res) {
         await res.patch(issue.id, {
@@ -3043,13 +3083,6 @@ async function runIssueOnce(state, issue, running) {
     state.metrics = computeMetrics(state.issues);
     state.updatedAt = now();
     await container.persistencePort.persistState(state);
-    if (issue.state === "Reviewing") {
-      try {
-        const { enqueue: enqueue2 } = await import("./queue-workers-5JOCROD6.js");
-        await enqueue2(issue, "review");
-      } catch {
-      }
-    }
   }
 }
 
@@ -3134,9 +3167,122 @@ async function cancelIssueCommand(input, deps) {
   deps.eventStore.addEvent(issue.id, "manual", `Manual cancel requested for ${issue.id}.`);
 }
 
+// src/commands/delete-issue.command.ts
+async function deleteIssueCommand(input) {
+  const { issue, state } = input;
+  const pidInfo = issue.workspacePath ? readAgentPid(issue.workspacePath) : null;
+  if (pidInfo) {
+    try {
+      process.kill(-pidInfo.pid, "SIGTERM");
+      logger.info({ pid: pidInfo.pid, issueId: issue.id }, "[Delete] Sent SIGTERM to agent process group");
+    } catch {
+      try {
+        process.kill(pidInfo.pid, "SIGTERM");
+      } catch {
+      }
+    }
+  }
+  try {
+    await cleanWorkspace(issue.id, issue, state);
+  } catch (error) {
+    logger.warn({ issueId: issue.id, err: String(error) }, "[Delete] Workspace cleanup failed (continuing)");
+  }
+  const idx = state.issues.findIndex((i) => i.id === issue.id);
+  if (idx >= 0) state.issues.splice(idx, 1);
+  state.events = state.events.filter((e) => e.issueId !== issue.id);
+  try {
+    const fsmApi = getIssueResourceStateApi();
+    if (fsmApi?.delete) await fsmApi.delete(issue.id);
+  } catch (error) {
+    logger.debug({ issueId: issue.id, err: String(error) }, "[Delete] FSM state cleanup (non-critical)");
+  }
+  try {
+    const resource = getIssueStateResource();
+    if (resource && typeof resource.delete === "function") {
+      await resource.delete(issue.id);
+    }
+  } catch (error) {
+    logger.debug({ issueId: issue.id, err: String(error) }, "[Delete] s3db record cleanup (non-critical)");
+  }
+  logger.info({ issueId: issue.id, identifier: issue.identifier }, "[Delete] Issue deleted");
+}
+
 // src/commands/merge-workspace.command.ts
 import { existsSync as existsSync7 } from "fs";
+import { execSync as execSync3 } from "child_process";
+
+// src/domains/merge-conflict-resolver.ts
 import { execSync as execSync2 } from "child_process";
+import { mkdtempSync as mkdtempSync3, writeFileSync as writeFileSync8, rmSync as rmSync4 } from "fs";
+import { join as join12 } from "path";
+import { tmpdir as tmpdir3 } from "os";
+async function resolveConflictsWithAgent(options) {
+  const { issue, conflictFiles, provider, model, targetRoot } = options;
+  const startMs = Date.now();
+  const adapter = ADAPTERS[provider];
+  if (!adapter) {
+    return { resolved: false, resolvedFiles: [], output: `No adapter for provider "${provider}"`, provider, durationMs: 0, resolvedAt: now() };
+  }
+  const command = adapter.buildCommand({ model });
+  if (!command) {
+    return { resolved: false, resolvedFiles: [], output: `Adapter returned empty command for "${provider}"`, provider, durationMs: 0, resolvedAt: now() };
+  }
+  const prompt = await renderPrompt("merge-conflict-resolver", {
+    issueIdentifier: issue.identifier,
+    title: issue.title,
+    description: issue.description || "",
+    baseBranch: issue.baseBranch || "main",
+    featureBranch: issue.branchName || "unknown",
+    conflictFiles
+  });
+  const tempDir = mkdtempSync3(join12(tmpdir3(), "fifony-conflict-"));
+  const promptFile = join12(tempDir, "fifony-conflict-prompt.md");
+  writeFileSync8(promptFile, `${prompt}
+`, "utf8");
+  let output = "";
+  try {
+    output = await runPlanningProcess({
+      command,
+      tempDir: targetRoot,
+      // agent runs in TARGET_ROOT where conflict markers exist
+      promptFile,
+      provider
+    });
+  } catch (err) {
+    output = String(err);
+    logger.error({ err, issueId: issue.id }, "[ConflictResolver] Agent process failed");
+  } finally {
+    rmSync4(tempDir, { recursive: true, force: true });
+  }
+  let remainingConflicts = [];
+  try {
+    const unmerged = execSync2("git diff --name-only --diff-filter=U", { cwd: targetRoot, encoding: "utf8" }).trim();
+    remainingConflicts = unmerged ? unmerged.split("\n").filter(Boolean) : [];
+  } catch {
+  }
+  const resolved = remainingConflicts.length === 0;
+  const resolvedFiles = resolved ? conflictFiles : conflictFiles.filter((f) => !remainingConflicts.includes(f));
+  const durationMs = Date.now() - startMs;
+  logger.info({
+    issueId: issue.id,
+    resolved,
+    resolvedFiles,
+    remainingConflicts,
+    durationMs,
+    provider
+  }, "[ConflictResolver] Resolution attempt complete");
+  return {
+    resolved,
+    resolvedFiles,
+    output: output.slice(-2e3),
+    // tail for debugging
+    provider,
+    durationMs,
+    resolvedAt: now()
+  };
+}
+
+// src/commands/merge-workspace.command.ts
 async function mergeWorkspaceCommand(input, deps) {
   const { issue, state, squashAlreadyApplied } = input;
   if (!["Approved", "Reviewing", "PendingDecision"].includes(issue.state)) {
@@ -3155,7 +3301,7 @@ async function mergeWorkspaceCommand(input, deps) {
   }
   if (issue.branchName && issue.baseBranch) {
     try {
-      const stat = execSync2(
+      const stat = execSync3(
         `git diff --stat "${issue.baseBranch}"..."${issue.branchName}"`,
         { encoding: "utf8", cwd: TARGET_ROOT, stdio: "pipe", maxBuffer: 512e3, timeout: 1e4 }
       );
@@ -3172,11 +3318,28 @@ async function mergeWorkspaceCommand(input, deps) {
       throw new Error(`Validation gate failed (${validation.command}): ${validation.output.slice(0, 500)}`);
     }
   }
+  if (!squashAlreadyApplied && issue.worktreePath && issue.baseBranch) {
+    try {
+      const rebase = rebaseWorktree(issue);
+      issue.rebaseResult = { success: rebase.success, conflictFiles: rebase.conflictFiles, rebasedAt: now() };
+      deps.issueRepository.markDirty(issue.id);
+      if (rebase.success) {
+        deps.eventStore.addEvent(issue.id, "info", `Auto-rebase onto ${issue.baseBranch} succeeded \u2014 branch is up to date.`);
+        logger.info({ issueId: issue.id, baseBranch: issue.baseBranch }, "[Merge] Auto-rebase succeeded");
+      } else {
+        const files = rebase.conflictFiles.join(", ");
+        deps.eventStore.addEvent(issue.id, "error", `Auto-rebase onto ${issue.baseBranch} failed \u2014 ${rebase.conflictFiles.length} conflict(s): ${files}. Proceeding with direct merge attempt.`);
+        logger.warn({ issueId: issue.id, conflictFiles: rebase.conflictFiles }, "[Merge] Auto-rebase failed, will attempt direct merge");
+      }
+    } catch (err) {
+      logger.warn({ issueId: issue.id, err: String(err) }, "[Merge] Auto-rebase threw unexpectedly, skipping");
+    }
+  }
   let result;
   if (squashAlreadyApplied) {
     try {
-      execSync2("git add -A", { cwd: TARGET_ROOT, stdio: "pipe", timeout: 1e4 });
-      execSync2(
+      execSync3("git add -A", { cwd: TARGET_ROOT, stdio: "pipe", timeout: 1e4 });
+      execSync3(
         `git commit -m "fifony: merge ${issue.identifier}"`,
         { cwd: TARGET_ROOT, stdio: "pipe", timeout: 1e4 }
       );
@@ -3188,26 +3351,89 @@ async function mergeWorkspaceCommand(input, deps) {
     result = { copied: [], deleted: [], skipped: [], conflicts: [] };
   } else {
     try {
-      const indexStatus = execSync2("git diff --cached --name-only", { cwd: TARGET_ROOT, encoding: "utf8", stdio: "pipe" }).trim();
-      const wtStatus = execSync2("git diff --name-only", { cwd: TARGET_ROOT, encoding: "utf8", stdio: "pipe" }).trim();
+      const indexStatus = execSync3("git diff --cached --name-only", { cwd: TARGET_ROOT, encoding: "utf8", stdio: "pipe" }).trim();
+      const wtStatus = execSync3("git diff --name-only", { cwd: TARGET_ROOT, encoding: "utf8", stdio: "pipe" }).trim();
       if (indexStatus && !wtStatus) {
-        execSync2("git reset --hard HEAD", { cwd: TARGET_ROOT, stdio: "pipe" });
+        execSync3("git reset --hard HEAD", { cwd: TARGET_ROOT, stdio: "pipe" });
         logger.info({ issueId: issue.id }, "[Command] Cleared residual squash from index before merge");
       }
     } catch {
     }
-    const mergeResult = mergeWorkspace(issue);
+    const mergeResult = mergeWorkspace(
+      issue,
+      /* abortOnConflict */
+      false
+    );
     result = mergeResult;
+    if (result.conflicts.length > 0) {
+      deps.eventStore.addEvent(issue.id, "info", `Merge conflicts in ${result.conflicts.length} file(s): ${result.conflicts.join(", ")}. Attempting agent-based resolution...`);
+      logger.info({ issueId: issue.id, conflicts: result.conflicts }, "[Merge] Conflicts detected \u2014 spawning agent to resolve");
+      try {
+        const { provider, model } = await resolvePlanStageConfig(state.config);
+        const resolution = await resolveConflictsWithAgent({
+          issue,
+          conflictFiles: result.conflicts,
+          provider,
+          model,
+          targetRoot: TARGET_ROOT
+        });
+        if (resolution.resolved) {
+          try {
+            execSync3("git add -A", { cwd: TARGET_ROOT, stdio: "pipe", timeout: 1e4 });
+            execSync3(
+              `git commit --no-edit`,
+              { cwd: TARGET_ROOT, stdio: "pipe", timeout: 1e4 }
+            );
+            result.conflicts = [];
+            deps.eventStore.addEvent(issue.id, "info", `Agent (${resolution.provider}) resolved ${resolution.resolvedFiles.length} conflict(s) in ${Math.round(resolution.durationMs / 1e3)}s.`);
+            logger.info({ issueId: issue.id, provider: resolution.provider, durationMs: resolution.durationMs }, "[Merge] Agent resolved all conflicts \u2014 merge committed");
+          } catch (commitErr) {
+            try {
+              execSync3("git merge --abort", { cwd: TARGET_ROOT, stdio: "pipe" });
+            } catch {
+            }
+            deps.eventStore.addEvent(issue.id, "error", `Agent resolved conflicts but merge commit failed: ${String(commitErr)}`);
+            logger.error({ issueId: issue.id, err: String(commitErr) }, "[Merge] Commit after conflict resolution failed");
+          }
+        } else {
+          try {
+            execSync3("git merge --abort", { cwd: TARGET_ROOT, stdio: "pipe" });
+          } catch {
+          }
+          deps.eventStore.addEvent(issue.id, "error", `Agent-based conflict resolution failed (${resolution.provider}, ${Math.round(resolution.durationMs / 1e3)}s). ${resolution.resolvedFiles.length}/${result.conflicts.length} files resolved.`);
+          logger.warn({ issueId: issue.id, resolvedFiles: resolution.resolvedFiles, provider: resolution.provider }, "[Merge] Agent failed to resolve all conflicts");
+        }
+        issue.mergeResult = {
+          ...issue.mergeResult,
+          conflictResolution: {
+            resolved: resolution.resolved,
+            provider: resolution.provider,
+            resolvedFiles: resolution.resolvedFiles,
+            durationMs: resolution.durationMs,
+            output: resolution.output.slice(-500),
+            resolvedAt: resolution.resolvedAt
+          }
+        };
+      } catch (err) {
+        try {
+          execSync3("git merge --abort", { cwd: TARGET_ROOT, stdio: "pipe" });
+        } catch {
+        }
+        deps.eventStore.addEvent(issue.id, "error", `Agent conflict resolution threw: ${String(err)}`);
+        logger.error({ issueId: issue.id, err: String(err) }, "[Merge] Conflict resolution threw unexpectedly");
+      }
+    }
   }
   issue.mergeResult = {
     copied: result.copied.length,
     deleted: result.deleted.length,
     skipped: result.skipped.length,
     conflicts: result.conflicts.length,
-    conflictFiles: result.conflicts.length > 0 ? result.conflicts : void 0
+    conflictFiles: result.conflicts.length > 0 ? result.conflicts : void 0,
+    ...issue.mergeResult?.conflictResolution ? { conflictResolution: issue.mergeResult.conflictResolution } : {}
   };
   if (result.conflicts.length > 0) {
-    deps.eventStore.addEvent(issue.id, "error", `Merge conflicts: ${result.conflicts.join(", ")}`);
+    deps.eventStore.addEvent(issue.id, "error", `Merge aborted \u2014 ${result.conflicts.length} conflict(s) remain: ${result.conflicts.join(", ")}`);
     await deps.persistencePort.persistState(state);
     return result;
   }
@@ -3229,7 +3455,7 @@ async function mergeWorkspaceCommand(input, deps) {
 }
 
 // src/commands/push-workspace.command.ts
-import { execFileSync, execSync as execSync3 } from "child_process";
+import { execFileSync, execSync as execSync4 } from "child_process";
 function isGhAvailable() {
   try {
     execFileSync("gh", ["--version"], { stdio: "pipe", timeout: 5e3 });
@@ -3240,7 +3466,7 @@ function isGhAvailable() {
 }
 function getCompareUrl(branchName, baseBranch) {
   try {
-    const remote = execSync3("git remote get-url origin", { cwd: TARGET_ROOT, encoding: "utf8", stdio: "pipe" }).trim();
+    const remote = execSync4("git remote get-url origin", { cwd: TARGET_ROOT, encoding: "utf8", stdio: "pipe" }).trim();
     const cleanRemote = remote.replace(/\.git$/, "");
     return `${cleanRemote}/compare/${baseBranch}...${branchName}`;
   } catch {
@@ -3275,8 +3501,8 @@ async function pushWorkspaceCommand(input, deps) {
   assertIssueHasGitWorktree(issue, "push");
   if (issue.testApplied) {
     try {
-      execSync3("git reset --hard HEAD", { cwd: TARGET_ROOT, stdio: "pipe", timeout: 15e3 });
-      execSync3("git clean -fd", { cwd: TARGET_ROOT, stdio: "pipe", timeout: 15e3 });
+      execSync4("git reset --hard HEAD", { cwd: TARGET_ROOT, stdio: "pipe", timeout: 15e3 });
+      execSync4("git clean -fd", { cwd: TARGET_ROOT, stdio: "pipe", timeout: 15e3 });
       issue.testApplied = false;
       deps.eventStore.addEvent(issue.id, "info", "Auto-reverted test squash before push.");
       logger.info({ issueId: issue.id }, "[Push] Auto-reverted test squash before push");
@@ -3303,7 +3529,7 @@ async function pushWorkspaceCommand(input, deps) {
   const planSummary = issue.plan?.summary ?? issue.title;
   let diffStat = "";
   try {
-    diffStat = execSync3(
+    diffStat = execSync4(
       `git diff --stat "${issue.baseBranch}"..."${issue.branchName}"`,
       { cwd: TARGET_ROOT, encoding: "utf8", maxBuffer: 512e3, timeout: 1e4, stdio: "pipe" }
     ).trim();
@@ -3318,7 +3544,7 @@ ${diffStat || "No diff stats available"}
 \`\`\`
 
 *Automated by fifony*`;
-  execSync3(`git push -u origin "${issue.branchName}"`, { cwd: TARGET_ROOT, stdio: "pipe" });
+  execSync4(`git push -u origin "${issue.branchName}"`, { cwd: TARGET_ROOT, stdio: "pipe" });
   const prBase = state.config.prBaseBranch || issue.baseBranch;
   const ghAvailable = isGhAvailable();
   let prUrl;
@@ -3506,6 +3732,27 @@ async function cancelIssue(c) {
   await persistState(context2.state);
   return { body: { ok: true, issue } };
 }
+async function deleteIssue(c) {
+  const context2 = getApiRuntimeContextOrThrow();
+  const issueId = getIssueId(c);
+  if (!issueId) {
+    return { status: 400, body: { ok: false, error: "Issue id is required." } };
+  }
+  const issue = findIssue(context2.state, issueId);
+  if (!issue) {
+    return { status: 404, body: { ok: false, error: "Issue not found" } };
+  }
+  if (issue.state === "Running" || issue.state === "Reviewing") {
+    return { status: 409, body: { ok: false, error: `Cannot delete issue in state ${issue.state}. Cancel it first.` } };
+  }
+  try {
+    await deleteIssueCommand({ issue, state: context2.state });
+    await persistState(context2.state);
+    return { body: { ok: true, id: issueId } };
+  } catch (error) {
+    return { status: 500, body: { ok: false, error: error instanceof Error ? error.message : String(error) } };
+  }
+}
 async function approveAndMerge(c) {
   const context2 = getApiRuntimeContextOrThrow();
   const issueId = getIssueId(c);
@@ -3668,6 +3915,13 @@ var issues_resource_default = {
         return c.json(result.body, result.status);
       }
       return result.body;
+    },
+    "POST /:id/delete": async (c) => {
+      const result = await deleteIssue(c);
+      if (result.status) {
+        return c.json(result.body, result.status);
+      }
+      return result.body;
     }
   }
 };
@@ -4064,7 +4318,7 @@ function hasTerminalQueue(state) {
 import { execFile as execFile2 } from "child_process";
 import { promisify } from "util";
 import { existsSync as existsSync8, readFileSync as readFileSync6, readdirSync as readdirSync2, realpathSync } from "fs";
-import { join as join12, dirname } from "path";
+import { join as join13, dirname } from "path";
 import { homedir as homedir2 } from "os";
 import { env } from "process";
 var execFileAsync = promisify(execFile2);
@@ -4096,7 +4350,7 @@ function resolveCodexHomeCandidates() {
   ]);
   const candidates = [...homePaths, ...direct].filter(Boolean).flatMap((candidate) => {
     if (candidate.endsWith("/.codex") || candidate.endsWith("/codex")) return [candidate];
-    return [join12(candidate, ".codex"), join12(candidate, "codex")];
+    return [join13(candidate, ".codex"), join13(candidate, "codex")];
   });
   return [...new Set(candidates)];
 }
@@ -4109,11 +4363,11 @@ function resolveCodexDir() {
   return null;
 }
 function findLatestCodexDb(codexDir) {
-  const explicit = join12(codexDir, "state_5.sqlite");
+  const explicit = join13(codexDir, "state_5.sqlite");
   if (existsSync8(explicit)) return explicit;
   const candidates = readdirSync2(codexDir).filter((name) => name.startsWith("state_") && name.endsWith(".sqlite")).sort().reverse();
   if (candidates.length === 0) return null;
-  return join12(codexDir, candidates[0]);
+  return join13(codexDir, candidates[0]);
 }
 function computeNextMonday() {
   const now2 = /* @__PURE__ */ new Date();
@@ -4174,10 +4428,10 @@ function resolveClaudePlanKey(displayName) {
 }
 async function collectClaudeUsage() {
   const home = homedir2();
-  const claudeDir = join12(home, ".claude");
+  const claudeDir = join13(home, ".claude");
   if (!existsSync8(claudeDir)) return null;
   const available = await whichExists("claude");
-  const projectsDir = join12(claudeDir, "projects");
+  const projectsDir = join13(claudeDir, "projects");
   let totalInputTokens = 0;
   let totalOutputTokens = 0;
   let totalSessions = 0;
@@ -4201,7 +4455,7 @@ async function collectClaudeUsage() {
       const projectDirs = readdirSync2(projectsDir, { withFileTypes: true });
       for (const dir of projectDirs) {
         if (!dir.isDirectory()) continue;
-        const projectPath = join12(projectsDir, dir.name);
+        const projectPath = join13(projectsDir, dir.name);
         let sessionFiles;
         try {
           sessionFiles = readdirSync2(projectPath).filter((f) => f.endsWith(".jsonl"));
@@ -4209,7 +4463,7 @@ async function collectClaudeUsage() {
           continue;
         }
         for (const file of sessionFiles) {
-          const filePath = join12(projectPath, file);
+          const filePath = join13(projectPath, file);
           let content;
           try {
             content = readFileSync6(filePath, "utf8");
@@ -4277,7 +4531,7 @@ async function collectClaudeUsage() {
   let plan = "pro";
   let resetInfo = "Weekly reset (every Monday 00:00 UTC)";
   let currentModel = "";
-  const settingsPath = join12(claudeDir, "settings.json");
+  const settingsPath = join13(claudeDir, "settings.json");
   if (existsSync8(settingsPath)) {
     try {
       const settings = JSON.parse(readFileSync6(settingsPath, "utf8"));
@@ -4401,7 +4655,7 @@ function aggregateCodexSessionUsageFromJsonl(lines) {
   };
 }
 function collectCodexSessionUsagesFromJsonl(codexDir) {
-  const sessionsDir = join12(codexDir, "sessions");
+  const sessionsDir = join13(codexDir, "sessions");
   if (!existsSync8(sessionsDir)) return [];
   const stack = [sessionsDir];
   const usageByFile = [];
@@ -4417,7 +4671,7 @@ function collectCodexSessionUsagesFromJsonl(codexDir) {
       continue;
     }
     for (const entry of entries) {
-      const next = join12(current, entry.name);
+      const next = join13(current, entry.name);
       if (entry.isDirectory()) {
         stack.push(next);
         continue;
@@ -4440,7 +4694,7 @@ async function collectCodexUsage() {
   if (!codexDir) return null;
   const available = await whichExists("codex");
   const models = [];
-  const modelsCachePath = join12(codexDir, "models_cache.json");
+  const modelsCachePath = join13(codexDir, "models_cache.json");
   let currentModel = "";
   if (existsSync8(modelsCachePath)) {
     try {
@@ -4455,7 +4709,7 @@ async function collectCodexUsage() {
     } catch {
     }
   }
-  const configPath = join12(codexDir, "config.toml");
+  const configPath = join13(codexDir, "config.toml");
   if (existsSync8(configPath)) {
     try {
       const configContent = readFileSync6(configPath, "utf8");
@@ -4718,7 +4972,7 @@ function aggregateGeminiSessionUsageFromJson(content) {
   };
 }
 function collectGeminiSessionUsages() {
-  const geminiTmp = join12(homedir2(), ".gemini", "tmp");
+  const geminiTmp = join13(homedir2(), ".gemini", "tmp");
   if (!existsSync8(geminiTmp)) return [];
   const usages = [];
   let entries = [];
@@ -4729,7 +4983,7 @@ function collectGeminiSessionUsages() {
   }
   for (const profile of entries) {
     if (!profile.isDirectory()) continue;
-    const chatsDir = join12(geminiTmp, profile.name, "chats");
+    const chatsDir = join13(geminiTmp, profile.name, "chats");
     if (!existsSync8(chatsDir)) continue;
     let sessions = [];
     try {
@@ -4738,7 +4992,7 @@ function collectGeminiSessionUsages() {
       continue;
     }
     for (const sessionFile of sessions) {
-      const sessionPath = join12(chatsDir, sessionFile);
+      const sessionPath = join13(chatsDir, sessionFile);
       try {
         const usage = aggregateGeminiSessionUsageFromJson(readFileSync6(sessionPath, "utf8"));
         if (usage.totalTokens > 0) usages.push(usage);
@@ -4759,7 +5013,7 @@ async function collectGeminiUsage() {
   } catch {
   }
   let account = null;
-  const accountsPath = join12(homedir2(), ".gemini", "google_accounts.json");
+  const accountsPath = join13(homedir2(), ".gemini", "google_accounts.json");
   if (existsSync8(accountsPath)) {
     try {
       const data = JSON.parse(readFileSync6(accountsPath, "utf8"));
@@ -4777,7 +5031,7 @@ async function collectGeminiUsage() {
   try {
     const { stdout: binPath } = await execFileAsync("which", ["gemini"], { encoding: "utf8", timeout: 3e3 });
     const realBin = realpathSync(binPath.trim());
-    const modelsPath = join12(dirname(dirname(realBin)), "node_modules", "@google", "gemini-cli-core", "dist", "src", "config", "models.js");
+    const modelsPath = join13(dirname(dirname(realBin)), "node_modules", "@google", "gemini-cli-core", "dist", "src", "config", "models.js");
     if (existsSync8(modelsPath)) {
       const content = readFileSync6(modelsPath, "utf8");
       const regex = /export const ([A-Z0-9_]+)\s*=\s*'(gemini-[^']+)';/g;
@@ -4797,7 +5051,7 @@ async function collectGeminiUsage() {
   } catch {
   }
   let currentModel = "";
-  const settingsPath = join12(homedir2(), ".gemini", "settings.json");
+  const settingsPath = join13(homedir2(), ".gemini", "settings.json");
   if (existsSync8(settingsPath)) {
     try {
       const settings = JSON.parse(readFileSync6(settingsPath, "utf8"));
@@ -4930,10 +5184,10 @@ async function collectProviderUsage(providerName) {
 }
 
 // src/routes/state.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync6, writeFileSync as writeFileSync8 } from "fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync6, writeFileSync as writeFileSync9 } from "fs";
 import { randomUUID } from "crypto";
-import { execSync as execSync4 } from "child_process";
-import { basename as basename2, extname, join as join13 } from "path";
+import { execSync as execSync5 } from "child_process";
+import { basename as basename2, extname, join as join14 } from "path";
 
 // src/commands/approve-plan.command.ts
 async function approvePlanCommand(input, deps) {
@@ -5112,7 +5366,7 @@ function registerStateRoutes(app, state) {
       if (!issueId) return c.json({ ok: false, error: "Issue id is required." }, 400);
       const issue = findIssue(state, issueId);
       if (!issue) return c.json({ ok: false, error: "Issue not found." }, 404);
-      const { dryMerge } = await import("./workspace-ZD5H6YOL.js");
+      const { dryMerge } = await import("./workspace-AOHHNWL5.js");
       const result = dryMerge(issue);
       return c.json({ ok: true, ...result });
     } catch (error) {
@@ -5127,8 +5381,8 @@ function registerStateRoutes(app, state) {
       if (!issueId) return c.json({ ok: false, error: "Issue id is required." }, 400);
       const issue = findIssue(state, issueId);
       if (!issue) return c.json({ ok: false, error: "Issue not found." }, 404);
-      const { rebaseWorktree } = await import("./workspace-ZD5H6YOL.js");
-      const result = rebaseWorktree(issue);
+      const { rebaseWorktree: rebaseWorktree2 } = await import("./workspace-AOHHNWL5.js");
+      const result = rebaseWorktree2(issue);
       if (result.success) {
         addEvent(state, issue.id, "info", `Branch ${issue.branchName} rebased onto ${issue.baseBranch}.`);
       }
@@ -5149,7 +5403,7 @@ function registerStateRoutes(app, state) {
         throw new Error("No branch name found for this issue.");
       }
       try {
-        execSync4(
+        execSync5(
           `git merge --squash "${issue.branchName}"`,
           { encoding: "utf8", cwd: TARGET_ROOT, stdio: "pipe", timeout: 3e4 }
         );
@@ -5166,8 +5420,8 @@ function registerStateRoutes(app, state) {
     logger.info({ issueId: parseIssue(c) }, "[API] POST /api/issues/:id/revert-try");
     return mutateIssueState(state, c, async (issue) => {
       try {
-        execSync4("git reset --hard HEAD", { cwd: TARGET_ROOT, stdio: "pipe", timeout: 15e3 });
-        execSync4("git clean -fd", { cwd: TARGET_ROOT, stdio: "pipe", timeout: 15e3 });
+        execSync5("git reset --hard HEAD", { cwd: TARGET_ROOT, stdio: "pipe", timeout: 15e3 });
+        execSync5("git clean -fd", { cwd: TARGET_ROOT, stdio: "pipe", timeout: 15e3 });
       } catch (err) {
         const msg = err.stderr || err.stdout || String(err);
         throw new Error(`git reset/clean failed: ${msg}`);
@@ -5210,15 +5464,15 @@ function registerStateRoutes(app, state) {
       if (!Array.isArray(payload.files) || payload.files.length === 0) {
         return c.json({ ok: false, error: "No files provided." }, 400);
       }
-      const issueAttachDir = join13(ATTACHMENTS_ROOT, issue.id);
+      const issueAttachDir = join14(ATTACHMENTS_ROOT, issue.id);
       mkdirSync6(issueAttachDir, { recursive: true });
       const newPaths = [];
       for (const file of payload.files) {
         if (typeof file.data !== "string" || !file.name) continue;
         const safeExt = extname(file.name).replace(/[^a-z0-9.]/gi, "").slice(0, 10) || ".bin";
         const safeName = `${randomUUID()}${safeExt}`;
-        const dest = join13(issueAttachDir, safeName);
-        writeFileSync8(dest, Buffer.from(file.data, "base64"));
+        const dest = join14(issueAttachDir, safeName);
+        writeFileSync9(dest, Buffer.from(file.data, "base64"));
         newPaths.push(dest);
       }
       issue.images = [...issue.images ?? [], ...newPaths];
@@ -5238,7 +5492,7 @@ function registerStateRoutes(app, state) {
       const filename = c.req.param?.("filename") ?? c.req.params?.filename ?? "";
       if (!filename) return c.json({ ok: false, error: "Filename is required." }, 400);
       const safeName = basename2(filename);
-      const filePath = join13(ATTACHMENTS_ROOT, issueId, safeName);
+      const filePath = join14(ATTACHMENTS_ROOT, issueId, safeName);
       if (!existsSync9(filePath)) return c.json({ ok: false, error: "Image not found." }, 404);
       const ext = extname(safeName).toLowerCase();
       const mimeMap = {
@@ -5263,7 +5517,7 @@ function registerStateRoutes(app, state) {
     const issue = findIssue(state, issueId);
     if (!issue) return c.json({ ok: false, error: "Issue not found." }, 404);
     try {
-      const { getIssueTransitionHistory } = await import("./issue-state-machine-TEIICCAA.js");
+      const { getIssueTransitionHistory } = await import("./issue-state-machine-KOZE5JWX.js");
       const limit = parseInt(c.req.query("limit") ?? "50", 10);
       const offset = parseInt(c.req.query("offset") ?? "0", 10);
       const transitions = await getIssueTransitionHistory(issue.id, { limit, offset });
@@ -5274,7 +5528,7 @@ function registerStateRoutes(app, state) {
   });
   app.get("/api/state-machine/transitions", async (c) => {
     try {
-      const { getStateMachineTransitions } = await import("./issue-state-machine-TEIICCAA.js");
+      const { getStateMachineTransitions } = await import("./issue-state-machine-KOZE5JWX.js");
       return c.json({ ok: true, transitions: getStateMachineTransitions() });
     } catch (error) {
       return c.json({ ok: false, error: error instanceof Error ? error.message : String(error) }, 500);
@@ -5282,7 +5536,7 @@ function registerStateRoutes(app, state) {
   });
   app.get("/api/state-machine/visualize", async (c) => {
     try {
-      const { visualizeStateMachine } = await import("./issue-state-machine-TEIICCAA.js");
+      const { visualizeStateMachine } = await import("./issue-state-machine-KOZE5JWX.js");
       const dot = visualizeStateMachine();
       if (!dot) return c.json({ ok: false, error: "Visualization not available." }, 404);
       return c.json({ ok: true, dot });
@@ -5299,10 +5553,10 @@ function registerStateRoutes(app, state) {
 
 // src/agents/planning/issue-enhancer.ts
 import { env as env2 } from "process";
-import { existsSync as existsSync10, mkdtempSync as mkdtempSync3, readFileSync as readFileSync7, rmSync as rmSync4, writeFileSync as writeFileSync9 } from "fs";
+import { existsSync as existsSync10, mkdtempSync as mkdtempSync4, readFileSync as readFileSync7, rmSync as rmSync5, writeFileSync as writeFileSync10 } from "fs";
 import { spawn as spawn2 } from "child_process";
-import { tmpdir as tmpdir3 } from "os";
-import { join as join14 } from "path";
+import { tmpdir as tmpdir4 } from "os";
+import { join as join15 } from "path";
 async function buildPrompt2(field, title, description, issueType, images) {
   const context2 = {
     title: title || "(empty)",
@@ -5320,13 +5574,29 @@ function parseEnhancerOutput(raw, expectedField) {
   if (!text) {
     throw new Error("AI provider returned an empty response.");
   }
-  const candidates = extractJsonObjects(
-    text.match(/```(?:json)?\s*([\s\S]*?)\s*```/i)?.[1]?.trim() ?? text
-  );
+  const codeBlocks = [...text.matchAll(/```(?:json)?\s*([\s\S]*?)\s*```/gi)].map((m) => m[1].trim()).reverse();
+  for (const block of codeBlocks) {
+    for (const candidate of extractJsonObjects(block)) {
+      const value = parseCandidate(candidate, expectedField);
+      if (value) return value;
+    }
+  }
+  const sourceText = codeBlocks[0] ?? text;
+  const candidates = extractJsonObjects(sourceText);
   for (const candidate of candidates) {
     const value = parseCandidate(candidate, expectedField);
     if (value) return value;
   }
+  const fieldRe = /\{\s*"field"/g;
+  const starts = [];
+  let fm;
+  while ((fm = fieldRe.exec(sourceText)) !== null) starts.push(fm.index);
+  for (let i = starts.length - 1; i >= 0; i--) {
+    for (const candidate of extractJsonObjects(sourceText.slice(starts[i]))) {
+      const value = parseCandidate(candidate, expectedField);
+      if (value) return value;
+    }
+  }
   const cleanedRaw = text.trim();
   const trimmed = cleanedRaw.replace(/^\"|\"$/g, "").trim();
   if (trimmed) {
@@ -5349,7 +5619,7 @@ function parseCandidate(raw, expectedField) {
     const parsed = JSON.parse(candidate);
     const value = typeof parsed.value === "string" ? parsed.value.trim() : typeof parsed.text === "string" ? parsed.text.trim() : "";
     const field = parsed.field;
-    const isPlaceholder = /^\.{2,}$/.test(value);
+    const isPlaceholder = /^\.{2,}$/.test(value) || /^<REPLACE_/.test(value) || /^your improved /i.test(value);
     if (value && !isPlaceholder && (!field || field === expectedField)) {
       return value;
     }
@@ -5378,13 +5648,13 @@ function readProviderOutput(resultFile, fallback) {
   return fallback;
 }
 async function runProviderCommand(command, provider, prompt, title, description, field, timeoutMs, images) {
-  const tempDir = mkdtempSync3(join14(tmpdir3(), "fifony-enhance-"));
-  const promptFile = join14(tempDir, "fifony-enhance-prompt.md");
-  const issuePayloadFile = join14(tempDir, "fifony-issue.json");
-  const resultFile = join14(tempDir, "fifony-result.txt");
-  writeFileSync9(promptFile, `${prompt}
+  const tempDir = mkdtempSync4(join15(tmpdir4(), "fifony-enhance-"));
+  const promptFile = join15(tempDir, "fifony-enhance-prompt.md");
+  const issuePayloadFile = join15(tempDir, "fifony-issue.json");
+  const resultFile = join15(tempDir, "fifony-result.txt");
+  writeFileSync10(promptFile, `${prompt}
 `, "utf8");
-  writeFileSync9(issuePayloadFile, JSON.stringify({ title, description, field }, null, 2), "utf8");
+  writeFileSync10(issuePayloadFile, JSON.stringify({ title, description, field }, null, 2), "utf8");
   let effectiveCommand = command;
   if (provider === "codex" && images?.length) {
     const imageFlags = images.map((p) => `--image "${p}"`).join(" ");
@@ -5408,7 +5678,7 @@ async function runProviderCommand(command, provider, prompt, title, description,
     let timeout = false;
     const child = spawn2(effectiveCommand, {
       shell: true,
-      cwd: tempDir,
+      cwd: TARGET_ROOT,
       env: spawnEnv
     });
     if (child.stdin) child.stdin.end();
@@ -5424,22 +5694,25 @@ async function runProviderCommand(command, provider, prompt, title, description,
     }, Math.max(timeoutMs, 1e3));
     child.on("error", () => {
       clearTimeout(timer);
-      rmSync4(tempDir, { recursive: true, force: true });
+      rmSync5(tempDir, { recursive: true, force: true });
       reject(new Error("Could not execute AI command."));
     });
     child.on("close", (code) => {
       clearTimeout(timer);
       if (timeout) {
-        rmSync4(tempDir, { recursive: true, force: true });
+        rmSync5(tempDir, { recursive: true, force: true });
         reject(new Error(`Enhance command timeout after ${Date.now() - startedAt}ms.`));
         return;
       }
       const commandOutput = readProviderOutput(resultFile, output);
-      rmSync4(tempDir, { recursive: true, force: true });
+      rmSync5(tempDir, { recursive: true, force: true });
       if (code !== 0) {
-        const providerOutput = appendFileTail(commandOutput, "", 12e3);
-        const reason = providerOutput.trim() ? ` Enhance command output: ${providerOutput.slice(0, 1200)}` : "";
-        reject(new Error(`Enhance command failed (exit ${code ?? "unknown"}).${reason}`));
+        if (commandOutput.trim()) {
+          logger.warn({ exitCode: code, provider }, `[Enhance] Provider exited ${code} but produced output \u2014 attempting to use it`);
+          resolve3(commandOutput);
+          return;
+        }
+        reject(new Error(`Enhance command failed (exit ${code ?? "unknown"}) with no output.`));
         return;
       }
       resolve3(commandOutput);
@@ -5452,7 +5725,7 @@ async function enhanceIssueField(payload, config, _workflowDefinition) {
   const description = typeof payload.description === "string" ? payload.description.trim() : "";
   const issueType = typeof payload.issueType === "string" ? payload.issueType.trim() : void 0;
   const images = Array.isArray(payload.images) ? payload.images.filter((p) => typeof p === "string") : void 0;
-  const { provider: selectedProvider, model: planModel } = await resolvePlanStageConfig(config);
+  const { provider: selectedProvider, model: selectedModel } = await resolvePlanStageConfig(config);
   const providers = detectAvailableProviders();
   const isAvailable = providers.some((p) => p.name === selectedProvider && p.available);
   if (!isAvailable) {
@@ -5473,7 +5746,7 @@ async function enhanceIssueField(payload, config, _workflowDefinition) {
     additionalProperties: false
   });
   const command = adapter.buildCommand({
-    model: planModel,
+    model: selectedModel,
     imagePaths: images,
     jsonSchema: selectedProvider === "claude" ? ENHANCE_JSON_SCHEMA : void 0,
     noToolAccess: selectedProvider === "claude"
@@ -5492,7 +5765,7 @@ async function enhanceIssueField(payload, config, _workflowDefinition) {
     config.commandTimeoutMs,
     images
   );
-  logger.info({ provider: selectedProvider, model: planModel, field, rawOutput: output.slice(0, 2e3) }, "Enhance raw output");
+  logger.info({ provider: selectedProvider, model: selectedModel, field, rawOutput: output.slice(0, 2e3) }, "Enhance raw output");
   const value = parseEnhancerOutput(output, field);
   logger.info({ provider: selectedProvider, field, parsedValue: value.slice(0, 500) }, "Enhance parsed value");
   return { field, value, provider: selectedProvider };
@@ -5815,8 +6088,8 @@ function registerScanningRoutes(app, state) {
 }
 
 // src/agents/claude-md-manager.ts
-import { existsSync as existsSync11, readFileSync as readFileSync8, writeFileSync as writeFileSync10 } from "fs";
-import { join as join15 } from "path";
+import { existsSync as existsSync11, readFileSync as readFileSync8, writeFileSync as writeFileSync11 } from "fs";
+import { join as join16 } from "path";
 var BLOCK_START = "<!-- FIFONY:START \u2014 managed by fifony, do not edit manually -->";
 var BLOCK_END = "<!-- FIFONY:END -->";
 var BLOCK_PATTERN = /<!-- FIFONY:START[^>]*-->[\s\S]*?<!-- FIFONY:END -->/;
@@ -5847,7 +6120,7 @@ function buildManagedBlock(skills, agents, commands) {
 }
 function updateClaudeMdManagedBlock(targetRoot, skills, agents, commands) {
   if (skills.length === 0 && agents.length === 0 && commands.length === 0) return;
-  const claudeMdPath = join15(targetRoot, "CLAUDE.md");
+  const claudeMdPath = join16(targetRoot, "CLAUDE.md");
   const newBlock = buildManagedBlock(skills, agents, commands);
   let existing = "";
   if (existsSync11(claudeMdPath)) {
@@ -5866,7 +6139,7 @@ ${newBlock}
 `;
   }
   if (updated === existing) return;
-  writeFileSync10(claudeMdPath, updated, "utf8");
+  writeFileSync11(claudeMdPath, updated, "utf8");
 }
 
 // src/routes/catalog.ts
@@ -5995,7 +6268,7 @@ function registerReferenceRepositoryRoutes(app) {
 }
 
 // src/routes/misc.ts
-import { execSync as execSync5 } from "child_process";
+import { execSync as execSync6 } from "child_process";
 import {
   appendFileSync,
   closeSync,
@@ -6006,13 +6279,13 @@ import {
   readFileSync as readFileSync9,
   readSync,
   statSync,
-  writeFileSync as writeFileSync11
+  writeFileSync as writeFileSync12
 } from "fs";
 import { randomUUID as randomUUID2 } from "crypto";
-import { basename as basename3, extname as extname2, join as join16 } from "path";
+import { basename as basename3, extname as extname2, join as join17 } from "path";
 function registerMiscRoutes(app, state) {
   app.get("/api/queue/stats", async (c) => {
-    const { getQueueStats } = await import("./queue-workers-5JOCROD6.js");
+    const { getQueueStats } = await import("./queue-workers-ZEZHDX7M.js");
     return c.json(await getQueueStats());
   });
   app.post("/api/issues/:id/push", async (c) => {
@@ -6178,7 +6451,7 @@ function registerMiscRoutes(app, state) {
       let raw = "";
       if (issue.branchName && issue.baseBranch) {
         try {
-          raw = execSync5(
+          raw = execSync6(
             `git diff --no-color "${issue.baseBranch}"..."${issue.branchName}"`,
             { encoding: "utf8", maxBuffer: 4 * 1024 * 1024, timeout: 15e3, cwd: TARGET_ROOT, stdio: "pipe" }
           );
@@ -6190,7 +6463,7 @@ function registerMiscRoutes(app, state) {
           return c.json({ ok: true, files: [], diff: "", message: "Source root not found." });
         }
         try {
-          raw = execSync5(
+          raw = execSync6(
             `git diff --no-index --no-color -- "${SOURCE_ROOT}" "${wp}"`,
             { encoding: "utf8", maxBuffer: 4 * 1024 * 1024, timeout: 15e3 }
           );
@@ -6259,7 +6532,7 @@ function registerMiscRoutes(app, state) {
       if (!branchName || !/^[a-zA-Z0-9/_.-]+$/.test(branchName)) {
         return c.json({ ok: false, error: "Invalid branch name." }, 400);
       }
-      execSync5(`git checkout -b "${branchName}"`, { cwd: TARGET_ROOT, stdio: "pipe" });
+      execSync6(`git checkout -b "${branchName}"`, { cwd: TARGET_ROOT, stdio: "pipe" });
       state.config.defaultBranch = branchName;
       await persistState(state);
       return c.json({ ok: true, defaultBranch: branchName });
@@ -6275,9 +6548,9 @@ function registerMiscRoutes(app, state) {
       }
       let created = false;
       try {
-        execSync5(`git checkout "${branchName}"`, { cwd: TARGET_ROOT, stdio: "pipe" });
+        execSync6(`git checkout "${branchName}"`, { cwd: TARGET_ROOT, stdio: "pipe" });
       } catch {
-        execSync5(`git checkout -b "${branchName}"`, { cwd: TARGET_ROOT, stdio: "pipe" });
+        execSync6(`git checkout -b "${branchName}"`, { cwd: TARGET_ROOT, stdio: "pipe" });
         created = true;
       }
       state.config.defaultBranch = branchName;
@@ -6300,7 +6573,7 @@ function registerMiscRoutes(app, state) {
   });
   app.get("/api/gitignore/status", async (c) => {
     try {
-      const gitignorePath = join16(TARGET_ROOT, ".gitignore");
+      const gitignorePath = join17(TARGET_ROOT, ".gitignore");
       if (!existsSync12(gitignorePath)) {
         return c.json({ exists: false, hasFifony: false });
       }
@@ -6315,9 +6588,9 @@ function registerMiscRoutes(app, state) {
   });
   app.post("/api/gitignore/add", async (c) => {
     try {
-      const gitignorePath = join16(TARGET_ROOT, ".gitignore");
+      const gitignorePath = join17(TARGET_ROOT, ".gitignore");
       if (!existsSync12(gitignorePath)) {
-        writeFileSync11(gitignorePath, "# Fifony state directory\n.fifony/\n", "utf-8");
+        writeFileSync12(gitignorePath, "# Fifony state directory\n.fifony/\n", "utf-8");
         return c.json({ ok: true, created: true });
       }
       const content = readFileSync9(gitignorePath, "utf-8");
@@ -6345,11 +6618,11 @@ function registerMiscRoutes(app, state) {
       if (!issue) return c.json({ ok: false, error: "Issue not found." }, 404);
       const wp = issue.workspacePath;
       if (!wp) return c.json({ ok: true, files: [] });
-      const outputsDir = join16(wp, "outputs");
+      const outputsDir = join17(wp, "outputs");
       if (!existsSync12(outputsDir)) return c.json({ ok: true, files: [] });
       const entries = readdirSync3(outputsDir).filter((f) => f.endsWith(".stdout.log")).map((f) => {
         try {
-          const s = statSync(join16(outputsDir, f));
+          const s = statSync(join17(outputsDir, f));
           return { name: f, size: s.size };
         } catch {
           return { name: f, size: 0 };
@@ -6374,7 +6647,7 @@ function registerMiscRoutes(app, state) {
       }
       const wp = issue.workspacePath;
       if (!wp) return c.json({ ok: false, error: "No workspace found." }, 404);
-      const filePath = join16(wp, "outputs", safeName);
+      const filePath = join17(wp, "outputs", safeName);
       if (!existsSync12(filePath)) return c.json({ ok: false, error: "Output file not found." }, 404);
       const content = readFileSync9(filePath, "utf8");
       return new Response(content, { headers: { "Content-Type": "text/plain; charset=utf-8" } });
@@ -6389,15 +6662,15 @@ function registerMiscRoutes(app, state) {
         return c.json({ ok: false, error: "No files provided." }, 400);
       }
       const uploadId = randomUUID2();
-      const uploadDir = join16(ATTACHMENTS_ROOT, "temp", uploadId);
+      const uploadDir = join17(ATTACHMENTS_ROOT, "temp", uploadId);
       mkdirSync7(uploadDir, { recursive: true });
       const paths = [];
       for (const file of payload.files) {
         if (typeof file.data !== "string" || !file.name) continue;
         const safeExt = extname2(file.name).replace(/[^a-z0-9.]/gi, "").slice(0, 10) || ".bin";
         const safeName = `${randomUUID2()}${safeExt}`;
-        const dest = join16(uploadDir, safeName);
-        writeFileSync11(dest, Buffer.from(file.data, "base64"));
+        const dest = join17(uploadDir, safeName);
+        writeFileSync12(dest, Buffer.from(file.data, "base64"));
         paths.push(dest);
       }
       return c.json({ ok: true, paths, uploadId });
@@ -6781,6 +7054,16 @@ async function loadPersistedState() {
     if (record2?.state && typeof record2.state === "object") {
       const state = record2.state;
       if (Array.isArray(state.issues) && state.issues.length > 0) {
+        for (const issue of state.issues) {
+          try {
+            const current = await getCurrentPlanForIssue(issue.id);
+            if (current) {
+              issue.plan = current.plan;
+            }
+          } catch (err) {
+            logger.warn({ issueId: issue.id, err: String(err) }, "[Store] Failed to hydrate plan on load");
+          }
+        }
         return state;
       }
       logger.warn("Runtime state blob has no issues, attempting recovery from issue resource...");
@@ -7051,7 +7334,7 @@ function resolveProjectMetadata(settings, targetRoot) {
   };
 }
 function scanProjectFiles(targetRoot) {
-  const check = (rel) => existsSync14(join17(targetRoot, rel));
+  const check = (rel) => existsSync14(join18(targetRoot, rel));
   const files = {
     claudeMd: check("CLAUDE.md"),
     claudeDir: check(".claude"),
@@ -7072,7 +7355,7 @@ function scanProjectFiles(targetRoot) {
   };
   const existingAgents = [];
   for (const agentDir of [".claude/agents", ".codex/agents"]) {
-    const fullPath = join17(targetRoot, agentDir);
+    const fullPath = join18(targetRoot, agentDir);
     if (!existsSync14(fullPath)) continue;
     try {
       const entries = readdirSync4(fullPath);
@@ -7086,12 +7369,12 @@ function scanProjectFiles(targetRoot) {
   }
   const existingSkills = [];
   for (const skillDir of [".claude/skills", ".codex/skills"]) {
-    const fullPath = join17(targetRoot, skillDir);
+    const fullPath = join18(targetRoot, skillDir);
     if (!existsSync14(fullPath)) continue;
     try {
       const entries = readdirSync4(fullPath);
       for (const entry of entries) {
-        const skillFile = join17(fullPath, entry, "SKILL.md");
+        const skillFile = join18(fullPath, entry, "SKILL.md");
         if (existsSync14(skillFile)) {
           existingSkills.push(entry);
         }
@@ -7100,7 +7383,7 @@ function scanProjectFiles(targetRoot) {
     }
   }
   let readmeExcerpt = "";
-  const readmePath = join17(targetRoot, "README.md");
+  const readmePath = join18(targetRoot, "README.md");
   if (existsSync14(readmePath)) {
     try {
       const content = readFileSync11(readmePath, "utf8");
@@ -7110,7 +7393,7 @@ function scanProjectFiles(targetRoot) {
   }
   let packageName = "";
   let packageDescription = "";
-  const pkgPath = join17(targetRoot, "package.json");
+  const pkgPath = join18(targetRoot, "package.json");
   if (existsSync14(pkgPath)) {
     try {
       const pkg = JSON.parse(readFileSync11(pkgPath, "utf8"));
@@ -7255,9 +7538,9 @@ function collectAgentArtifacts(agentsDir, usedNames, out) {
   const parent = slugify(basename4(dirname2(agentsDir)));
   const entries = collectDirectoryEntries(agentsDir);
   for (const entry of entries) {
-    const itemPath = join17(agentsDir, entry.name);
+    const itemPath = join18(agentsDir, entry.name);
     if (entry.isDirectory()) {
-      const nestedAgentSpec = join17(itemPath, "AGENT.md");
+      const nestedAgentSpec = join18(itemPath, "AGENT.md");
       if (existsSync14(nestedAgentSpec)) {
         const name2 = uniqueSuffix(`${parent}__${slugify(entry.name)}`, usedNames);
         out.push({ kind: "agent", sourcePath: nestedAgentSpec, targetName: name2 });
@@ -7279,9 +7562,9 @@ function collectSkillArtifacts(skillsDir, usedNames, out) {
   const parent = slugify(basename4(dirname2(skillsDir)));
   const entries = collectDirectoryEntries(skillsDir);
   for (const entry of entries) {
-    const itemPath = join17(skillsDir, entry.name);
+    const itemPath = join18(skillsDir, entry.name);
     if (entry.isDirectory()) {
-      const skillFile = join17(itemPath, "SKILL.md");
+      const skillFile = join18(itemPath, "SKILL.md");
       if (existsSync14(skillFile)) {
         const name = uniqueSuffix(`${parent}__${slugify(entry.name)}`, usedNames);
         out.push({ kind: "skill", sourcePath: skillFile, targetName: name });
@@ -7309,7 +7592,7 @@ function collectStandardArtifacts(repoPath) {
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
       if (SKIP_DIRS.has(entry.name)) continue;
-      const childPath = join17(state.path, entry.name);
+      const childPath = join18(state.path, entry.name);
       if (entry.name === "agents") {
         collectAgentArtifacts(childPath, agentsUsed, artifacts);
       }
@@ -7337,13 +7620,13 @@ function collectAgencyArtifacts(repoPath) {
         if (SKIP_DIRS.has(entry.name) || AGENCY_AGENTS_EXCLUDED_DIRS.has(entry.name)) {
           continue;
         }
-        queue.push({ path: join17(state.path, entry.name), depth: state.depth + 1 });
+        queue.push({ path: join18(state.path, entry.name), depth: state.depth + 1 });
         continue;
       }
-      if (!isMarkdownFile(entry.name, "readme.md") || !isReferenceFrontMatterFile(join17(state.path, entry.name))) {
+      if (!isMarkdownFile(entry.name, "readme.md") || !isReferenceFrontMatterFile(join18(state.path, entry.name))) {
         continue;
       }
-      const itemPath = join17(state.path, entry.name);
+      const itemPath = join18(state.path, entry.name);
       const targetName = uniqueSuffix(buildRelativeArtifactName(repoPath, itemPath), agentsUsed);
       artifacts.push({
         kind: "agent",
@@ -7357,12 +7640,12 @@ function collectAgencyArtifacts(repoPath) {
 function collectImpeccableArtifacts(repoPath) {
   const skillsUsed = /* @__PURE__ */ new Set();
   const artifacts = [];
-  const sourceSkills = join17(repoPath, "source", "skills");
+  const sourceSkills = join18(repoPath, "source", "skills");
   if (existsSync14(sourceSkills)) {
     collectSkillArtifacts(sourceSkills, skillsUsed, artifacts);
     return artifacts;
   }
-  const claudeSkills = join17(repoPath, ".claude", "skills");
+  const claudeSkills = join18(repoPath, ".claude", "skills");
   if (existsSync14(claudeSkills)) {
     collectSkillArtifacts(claudeSkills, skillsUsed, artifacts);
   }
@@ -7389,7 +7672,7 @@ function getReferenceRepositoriesRoot() {
 }
 function listReferenceRepositories() {
   return DEFAULT_REFERENCE_REPOSITORIES.map((repo) => {
-    const path = join17(REPOSITORY_ROOT, repo.id);
+    const path = join18(REPOSITORY_ROOT, repo.id);
     const status = {
       id: repo.id,
       name: repo.name,
@@ -7401,7 +7684,7 @@ function listReferenceRepositories() {
     if (!status.present) {
       return status;
     }
-    if (!existsSync14(join17(path, ".git"))) {
+    if (!existsSync14(join18(path, ".git"))) {
       status.error = "Path exists but is not a git repo";
       return status;
     }
@@ -7433,7 +7716,7 @@ function syncReferenceRepositories(repositoryId) {
   }
   const results = [];
   for (const repo of selected) {
-    const target = join17(root, repo.id);
+    const target = join18(root, repo.id);
     const candidates = [repo.url, ...repo.fallbackUrls ?? []];
     if (!existsSync14(target)) {
       let cloneError;
@@ -7462,7 +7745,7 @@ function syncReferenceRepositories(repositoryId) {
       }
       continue;
     }
-    if (!existsSync14(join17(target, ".git"))) {
+    if (!existsSync14(join18(target, ".git"))) {
       results.push({
         id: repo.id,
         path: target,
@@ -7497,14 +7780,14 @@ function importReferenceArtifacts(repositoryId, workspaceRoot, options) {
   if (!repository) {
     throw new Error(`Unknown reference repository: ${repositoryId}`);
   }
-  const localPath = join17(REPOSITORY_ROOT, repository.id);
+  const localPath = join18(REPOSITORY_ROOT, repository.id);
   if (!existsSync14(localPath)) {
     throw new Error(`Repository not synced yet: ${repository.id}. Run 'fifony onboarding sync --repository ${repository.id}' first.`);
   }
   const basePath = resolve2(workspaceRoot);
-  const targetBase = options.importToGlobal ? join17(homedir3(), ".codex") : join17(basePath, ".codex");
-  const agentsDir = join17(targetBase, "agents");
-  const skillsDir = join17(targetBase, "skills");
+  const targetBase = options.importToGlobal ? join18(homedir3(), ".codex") : join18(basePath, ".codex");
+  const agentsDir = join18(targetBase, "agents");
+  const skillsDir = join18(targetBase, "skills");
   const artifacts = collectArtifacts(localPath, repository.id);
   const filtered = options.kind === "all" ? artifacts : artifacts.filter((artifact) => artifact.kind === options.kind.slice(0, -1));
   const summary = {
@@ -7530,7 +7813,7 @@ function importReferenceArtifacts(repositoryId, workspaceRoot, options) {
     try {
       const source = readFileSync11(artifact.sourcePath, "utf8");
       if (artifact.kind === "agent") {
-        const target = join17(agentsDir, `${artifact.targetName}.md`);
+        const target = join18(agentsDir, `${artifact.targetName}.md`);
         if (!options.overwrite && existsSync14(target)) {
           summary.skippedAgents.push(artifact.targetName);
           continue;
@@ -7539,11 +7822,11 @@ function importReferenceArtifacts(repositoryId, workspaceRoot, options) {
           summary.importedAgents.push(artifact.targetName);
           continue;
         }
-        writeFileSync12(target, source, "utf8");
+        writeFileSync13(target, source, "utf8");
         summary.importedAgents.push(artifact.targetName);
       } else {
-        const targetDir = join17(skillsDir, artifact.targetName);
-        const target = join17(targetDir, "SKILL.md");
+        const targetDir = join18(skillsDir, artifact.targetName);
+        const target = join18(targetDir, "SKILL.md");
         if (!options.overwrite && existsSync14(target)) {
           summary.skippedSkills.push(artifact.targetName);
           continue;
@@ -7553,7 +7836,7 @@ function importReferenceArtifacts(repositoryId, workspaceRoot, options) {
           continue;
         }
         mkdirSync8(targetDir, { recursive: true });
-        writeFileSync12(target, source, "utf8");
+        writeFileSync13(target, source, "utf8");
         summary.importedSkills.push(artifact.targetName);
       }
     } catch (error) {
@@ -7939,4 +8222,4 @@ export {
   syncReferenceRepositories,
   importReferenceArtifacts
 };
-//# sourceMappingURL=chunk-DWMY2HBG.js.map
+//# sourceMappingURL=chunk-LYAI5RPK.js.map