@programinglive/dev-workflow-mcp-server 1.8.1 → 1.10.0

package/tools/handler-modules/index.js

@@ -1,14 +1,10 @@
-import { textResponse, isReleaseSatisfied } from "./shared.js";
-import { handleStartTask, handleMarkBugFixed, handleCreateTests, handleSkipTests, handleRunTests, handleCreateDocumentation } from "./workflow-handlers.js";
+import { textResponse, isReleaseSatisfied, isErrorResponse } from "./shared.js";
+import { handleStartTask, handleMarkBugFixed, handleCreateTests, handleSkipTests, handleRunTests, handleCreateDocumentation, handleCreateFeatureFlow } from "./workflow-handlers.js";
 import { handleSkipRelease, handlePerformRelease } from "./release-handlers.js";
 import { handleCommitAndPush, handleCompleteTask, handleForceCompleteTask, handleDropTask } from "./commit-handlers.js";
 import { handleProjectSummary, handleProjectSummaryData, handleProjectSummaryDb, handleViewHistory } from "./summary-handlers.js";
 import { handleGetWorkflowStatus, handleReadyCheck, handleContinueWorkflow, handleRerunWorkflow } from "./status-handlers.js";
-
-function isErrorResponse(response) {
-  const text = response?.content?.[0]?.text || "";
-  return /^\s*[⚠️❌]/u.test(text);
-}
+import { handleListFactoryTasks, handleClaimFactoryTask, handleSyncTaskStatus, handleListFactoryProjects, handleCreateFactoryTask } from "./factory-handlers.js";
 
 function summarizeResponse(label, response) {
   const text = response?.content?.[0]?.text || "";
@@ -84,6 +80,15 @@ async function handleRunFullWorkflow(args, { workflowState, exec, git, utils })
       continue;
     }
 
+    if (!state.featureFlowCreated) {
+      if (!args.mermaidCode || !args.featureFlowDescription) {
+        return textResponse("⚠️ 'run_full_workflow' now requires 'mermaidCode' and 'featureFlowDescription' to support the Mermaid step.");
+      }
+      const resp = await executeStep("create_feature_flow", handleCreateFeatureFlow, [{ mermaidCode: args.mermaidCode, description: args.featureFlowDescription }, workflowState]);
+      if (isErrorResponse(resp)) return resp;
+      continue;
+    }
+
     if (!state.testsCreated) {
       const resp = await executeStep("create_tests", handleCreateTests, [workflowState]);
       if (isErrorResponse(resp)) return resp;
@@ -172,6 +177,8 @@ export async function handleToolCall({
         return handleStartTask(args, workflowState);
       case "mark_bug_fixed":
         return handleMarkBugFixed(args, workflowState);
+      case "create_feature_flow":
+        return handleCreateFeatureFlow(args, workflowState);
       case "create_tests":
         return handleCreateTests(workflowState);
       case "skip_tests":
@@ -210,6 +217,16 @@ export async function handleToolCall({
         return handleRerunWorkflow(workflowState);
       case "run_full_workflow":
         return handleRunFullWorkflow(args, { workflowState, exec, git, utils });
+      case "list_factory_tasks":
+        return handleListFactoryTasks(args);
+      case "list_factory_projects":
+        return handleListFactoryProjects(args);
+      case "create_factory_task":
+        return handleCreateFactoryTask(args);
+      case "claim_factory_task":
+        return handleClaimFactoryTask(args, { workflowState });
+      case "sync_task_status":
+        return handleSyncTaskStatus(args);
       default:
         throw new Error(`Unknown tool: ${name}`);
     }

package/tools/handler-modules/shared.js

@@ -21,6 +21,11 @@ export function isReleaseSatisfied(state) {
   return Boolean(state?.released || state?.releaseSkipped);
 }
 
+export function isErrorResponse(response) {
+  const text = response?.content?.[0]?.text || "";
+  return /^\s*[⚠️❌]/u.test(text);
+}
+
 export async function resetToCommitIfWorkingChanges(workflowState, git) {
   if (!workflowState.state.commitAndPushCompleted) {
     return false;
@@ -92,7 +97,7 @@ export function getContinueGuidance(status) {
   switch (status.currentPhase) {
     case "coding": {
       const task = status.taskDescription ? ` "${status.taskDescription}"` : "";
-      return `Finish implementing${task} and then run 'mark_bug_fixed' with a brief summary of the change.`;
+      return `Describe your feature flow with Mermaid using 'create_feature_flow', then finish implementing${task} and run 'mark_bug_fixed' with a brief summary of the change.`;
     }
     case "testing":
       if (!status.testsCreated) {
@@ -127,45 +132,6 @@ export function getContinueGuidance(status) {
   }
 }
 
-export async function handleReadyCheck(workflowState) {
-  const status = workflowState.state;
-  const testsCreatedDone = status.testsSkipped || status.testsCreated;
-  const testsPassedDone = status.testsSkipped || status.testsPassed;
-  const checks = [
-    { name: "Task started", done: status.currentPhase !== "idle" },
-    { name: "Feature/bug fixed", done: status.bugFixed },
-    {
-      name: status.testsSkipped ? "Tests skipped (manual QA documented)" : "Tests created",
-      done: testsCreatedDone,
-    },
-    {
-      name: status.testsSkipped ? "Tests skipped acknowledged" : "Tests passed",
-      done: testsPassedDone,
-    },
-    { name: "Documentation created", done: status.documentationCreated },
-  ];
-
-  const allDone = checks.every((c) => c.done);
-  const checkList = formatChecklist(checks);
-
-  workflowState.state.readyCheckCompleted = allDone;
-  if (allDone) {
-    if (workflowState.state.commitAndPushCompleted) {
-      workflowState.state.currentPhase = isReleaseSatisfied(workflowState.state) ? "ready_to_complete" : "release";
-    } else {
-      workflowState.state.currentPhase = "commit";
-    }
-  }
-  await workflowState.save();
-
-  if (allDone) {
-    return textResponse(
-      `🎉 ALL CHECKS PASSED!\n\n${checkList}\n\n✅ Next actions:\n1. Run 'commit_and_push' (commits and pushes your changes)\n2. Run 'perform_release' (handles versioning, tags, and final push)\n3. Finish with 'complete_task'\n\nTip: Provide the optional 'branch' argument to 'commit_and_push' to push to a non-default branch.\n\nTask: ${status.taskDescription}`
-    );
-  }
-
-  return textResponse(`⚠️ NOT READY TO COMMIT!\n\n${checkList}\n\nPlease complete all steps before committing.`);
-}
 
 export async function loadProjectSummary(workflowState) {
   const summaryPath = path.join(path.dirname(workflowState.stateFile), PROJECT_SUMMARY_FILENAME);
@@ -180,7 +146,7 @@ export async function loadProjectSummary(workflowState) {
   }
 }
 
-export const prdPath = path.join(__dirname, "..", "docs", "product", "PRD.md");
+export const prdPath = path.join(__dirname, "..", "..", "docs", "PRD.md");
 
 export function ensurePrdExists() {
   return existsSync(prdPath);

package/tools/handler-modules/status-handlers.js

@@ -1,15 +1,36 @@
 import { textResponse, formatChecklist, isReleaseSatisfied, getContinueGuidance, resetToCommitIfWorkingChanges } from "./shared.js";
 import { handleCommitAndPush } from "./commit-handlers.js";
 
-export function handleGetWorkflowStatus(workflowState) {
+export async function handleGetWorkflowStatus(workflowState) {
   const status = workflowState.state;
   const nextStep = status ? status.currentPhase : "idle";
 
+  // Deteksi berkas state yang terakhir ditulis proses MCP lain. Tanpa
+  // peringatan ini, agen bisa meng-commit atas nama task orang lain.
+  let sharedWarning = "";
+  try {
+    const disk = await workflowState.readDiskState();
+    if (workflowState.isForeignWrite(disk)) {
+      const owner = disk.owner || {};
+      sharedWarning =
+        `\n\n⚠️ PERINGATAN: berkas state ini terakhir ditulis proses MCP LAIN ` +
+        `(${owner.token || "tanpa-token"}, pid ${owner.pid ?? "?"}).\n` +
+        `   State workflow dipakai bersama antar sesi di mesin ini.\n` +
+        `   Periksa apakah "Task:" di atas benar-benar milik Anda SEBELUM commit_and_push.`;
+      if (disk.currentPhase && disk.currentPhase !== "idle" && disk.taskDescription) {
+        sharedWarning += `\n   Proses itu sedang mengerjakan: "${disk.taskDescription}"`;
+      }
+    }
+  } catch {
+    // Status tetap ditampilkan walau pemeriksaan berkas gagal.
+  }
+
   return textResponse(
     `📊 Current Workflow Status:
 
 Phase: ${status.currentPhase}
 Task: ${status.taskDescription || "(none)"}
+Feature flow: ${status.featureFlowCreated ? "✅" : "❌"}
 Bug fixed: ${status.bugFixed ? "✅" : "❌"}
 Tests created: ${status.testsCreated ? "✅" : "❌"}
 Tests passed: ${status.testsPassed ? "✅" : "❌"}
@@ -18,7 +39,7 @@ Ready check: ${status.readyCheckCompleted ? "✅" : "❌"}
 Commit & push: ${status.commitAndPushCompleted ? "✅" : "❌"}
 Released: ${status.released ? "✅" : "❌"}
 
-Next step: ${nextStep}`
+Next step: ${nextStep}${sharedWarning}`
   );
 }
 
@@ -28,6 +49,7 @@ export async function handleReadyCheck(workflowState) {
   const testsPassedDone = status.testsSkipped || status.testsPassed;
   const checks = [
     { name: "Task started", done: status.currentPhase !== "idle" },
+    { name: "Feature flow described", done: status.featureFlowCreated },
     { name: "Feature/bug fixed", done: status.bugFixed },
     {
       name: status.testsSkipped ? "Tests skipped (manual QA documented)" : "Tests created",
@@ -129,6 +151,6 @@ export async function handleRerunWorkflow(workflowState) {
   await workflowState.save();
 
   return textResponse(
-    `🔄 Rerunning workflow from the start!\n\nTask: ${currentDescription}\nType: ${currentType}\n\nWorkflow Steps:\n1. ✓ Start task (current)\n2. ⏳ Fix/implement the feature\n3. ⏳ Create tests\n4. ⏳ Run tests (must pass!)\n5. ⏳ Create documentation\n6. ⏳ Run 'check_ready_to_commit'\n7. ⏳ Run 'commit_and_push' (commits and pushes)\n8. ⏳ Run 'perform_release' (handles versioning and tags)\n9. ⏳ Complete task\n\n🎯 Be conscious about what you're coding!`
+    `🔄 Rerunning workflow from the start!\n\nTask: ${currentDescription}\nType: ${currentType}\n\nWorkflow Steps:\n1. ✓ Start task (current)\n2. ⏳ Describe feature flow with Mermaid\n3. ⏳ Fix/implement the feature\n4. ⏳ Create tests\n5. ⏳ Run tests (must pass!)\n6. ⏳ Create documentation\n7. ⏳ Run 'check_ready_to_commit'\n8. ⏳ Run 'commit_and_push' (commits and pushes)\n9. ⏳ Run 'perform_release' (handles versioning and tags)\n10. ⏳ Complete task\n\n🎯 Be conscious about what you're coding!`
   );
 }

package/tools/handler-modules/workflow-handlers.js

@@ -1,9 +1,12 @@
-import path from "path";
-import { existsSync } from "fs";
-import { textResponse, isReleaseSatisfied, resetToCommitIfWorkingChanges } from "./shared.js";
+import { textResponse, isReleaseSatisfied, isErrorResponse, ensurePrdExists } from "./shared.js";
 
 export async function handleStartTask(args, workflowState) {
-  workflowState.reset();
+  // Selamatkan dulu pekerjaan yang mungkin tertimpa. Ini menangani dua kasus:
+  //   1. Proses MCP LAIN menulis berkas state setelah kita memuatnya.
+  //   2. Task kita sendiri yang belum selesai lalu diganti task baru.
+  const preservedBeforeSave = await workflowState.reconcileWithDisk();
+  const { archivedTask } = workflowState.reset({ archive: true });
+
   workflowState.state.currentPhase = "coding";
   workflowState.state.taskDescription = args.description;
   workflowState.state.taskType = args.type;
@@ -12,10 +15,34 @@ export async function handleStartTask(args, workflowState) {
   workflowState.state.commitAndPushCompleted = false;
   workflowState.state.lastCommitMessage = "";
   workflowState.state.lastPushBranch = "";
-  await workflowState.save();
+  const reconciled = await workflowState.save();
+
+  const warnings = [];
+  const preservedForeign = reconciled?.preservedTask || preservedBeforeSave?.preservedTask;
+  if (preservedForeign) {
+    warnings.push(
+      `⚠️ Ada task yang SEDANG BERJALAN dari proses agen lain dan hampir tertimpa:\n` +
+        `   "${preservedForeign}"\n` +
+        `   Task itu sudah disimpan ke history sebagai 'interrupted', bukan dihapus.\n` +
+        `   State workflow di mesin ini dipakai bersama antar sesi - periksa sebelum commit.`
+    );
+  }
+  if (archivedTask) {
+    warnings.push(
+      `ℹ️ Task sebelumnya belum selesai dan diganti: "${archivedTask}".\n` +
+        `   Disimpan ke history sebagai 'interrupted'.`
+    );
+  }
+  if (reconciled?.mergedHistory > 0) {
+    warnings.push(
+      `ℹ️ ${reconciled.mergedHistory} entri history dari proses lain digabungkan, tidak ditimpa.`
+    );
+  }
+
+  const warningBlock = warnings.length > 0 ? `\n\n${warnings.join("\n\n")}` : "";
 
   return textResponse(
-    `✅ Task Started: ${args.description}\n\n🎯 Be conscious about what you're coding!\n\nWorkflow Steps:\n1. ✓ Start task (current)\n2. ⏳ Fix/implement the feature\n3. ⏳ Create tests\n4. ⏳ Run tests (must pass!)\n5. ⏳ Create documentation\n6. ⏳ Run 'check_ready_to_commit'\n7. ⏳ Run 'commit_and_push' (commits and pushes)\n8. ⏳ Run 'perform_release' (handles versioning and tags) or 'skip_release' (when no release is needed)\n9. ⏳ Complete task\n\nReminder: Focus on writing clean, maintainable code!`
+    `✅ Task Started: ${args.description}${warningBlock}\n\n🎯 Be conscious about what you're coding!\n\nWorkflow Steps:\n1. ✓ Start task (current)\n2. ⏳ Describe feature flow with Mermaid\n3. ⏳ Fix/implement the feature\n4. ⏳ Create tests\n5. ⏳ Run tests (must pass!)\n6. ⏳ Create documentation\n7. ⏳ Run 'check_ready_to_commit'\n8. ⏳ Run 'commit_and_push' (commits and pushes)\n9. ⏳ Run 'perform_release' (handles versioning and tags) or 'skip_release' (when no release is needed)\n10. ⏳ Complete task\n\nReminder: Focus on writing clean, maintainable code!`
   );
 }
 
@@ -67,6 +94,29 @@ export async function handleMarkBugFixed(args, workflowState) {
   );
 }
 
+export async function handleCreateFeatureFlow(args, workflowState) {
+  if (workflowState.state.currentPhase === "idle") {
+    return textResponse("⚠️ Please start a task first using 'start_task'!");
+  }
+
+  const mermaidCode = typeof args.mermaidCode === "string" ? args.mermaidCode.trim() : "";
+  const description = typeof args.description === "string" ? args.description.trim() : "";
+
+  if (!mermaidCode || !description) {
+    return textResponse("⚠️ Please provide both 'mermaidCode' and 'description' when creating a feature flow.");
+  }
+
+  workflowState.state.featureFlowCreated = true;
+  workflowState.state.mermaidCode = mermaidCode;
+  workflowState.state.featureFlowDescription = description;
+  workflowState.state.readyCheckCompleted = false;
+  await workflowState.save();
+
+  return textResponse(
+    `✅ Feature flow recorded!\n\nDescription: ${description}\n\nNext Steps:\n1. ✓ Start task\n2. ✓ Describe feature flow\n3. ⏳ Fix/implement the feature\n4. ⏳ Create tests\n5. ⏳ Run tests\n6. ⏳ Create documentation\n7. ⏳ Run 'check_ready_to_commit'\n8. ⏳ Run 'commit_and_push'\n9. ⏳ Run 'perform_release'\n10. ⏳ Complete task`
+  );
+}
+
 export async function handleCreateTests(workflowState) {
   if (!workflowState.state.bugFixed) {
     return textResponse("⚠️ Please mark your feature/bug as fixed first using 'mark_bug_fixed'!");
@@ -190,10 +240,7 @@ export async function handleCreateDocumentation(args, workflowState) {
     return textResponse("⚠️ Please ensure tests are passing first! Run 'run_tests' with passed=true.");
   }
 
-  const prdPath = path.join(process.cwd(), "docs", "PRD.md");
-  const prdExists = existsSync(prdPath);
-
-  if (!prdExists) {
+  if (!ensurePrdExists()) {
     return textResponse(
       `⚠️ PRD file not found!\n\nExpected location: docs/PRD.md\n\nPlease create or update the PRD before marking documentation as complete.`
     );

package/vite.config.js

@@ -18,6 +18,12 @@ export default defineConfig({
       },
       external: [
         '@modelcontextprotocol/sdk',
+        // dotenv ships CommonJS only (dist/index.cjs). Bundling it into an ES
+        // module leaks its `require.main === module` guard, which throws
+        // "require is not defined in ES module scope" at startup. Keeping it
+        // external lets Node load it as CJS, which is how it is designed to run.
+        'dotenv',
+        'dotenv/config',
         // Node.js built-in modules
         'node:fs',
         'node:path',

package/workflow-state.js

@@ -14,6 +14,22 @@ const USER_ID_FILENAME = "user-id";
 let cachedUserId = null;
 let cachedUserStateDir = null;
 
+/**
+ * Identitas proses MCP ini.
+ *
+ * MENGAPA ADA
+ * -----------
+ * Berkas state disimpan per USER (`user-id`), bukan per sesi agen. Dua sesi
+ * opencode di mesin yang sama berbagi satu `workflow-state.json`. Akibatnya
+ * sesi B menimpa pekerjaan sesi A tanpa jejak: task A tidak pernah masuk
+ * `history` karena history hanya ditulis saat task DITUTUP.
+ *
+ * Token ini dicap ke setiap penulisan supaya kita bisa mengetahui bahwa isi
+ * berkas di disk terakhir ditulis oleh proses LAIN, lalu menyelamatkan task
+ * yang sedang berjalan itu sebelum kita menimpanya.
+ */
+const PROCESS_TOKEN = `proc-${process.pid}-${Math.random().toString(16).slice(2, 10)}`;
+
 function generateUserId() {
   const timestamp = Date.now().toString(16);
   const randomSuffix = Math.random().toString(16).slice(2, 10);
@@ -447,6 +463,8 @@ export class WorkflowState {
       commitAndPushCompleted: false,
       lastCommitMessage: "",
       lastPushBranch: "",
+      featureFlowCreated: false,
+      featureFlowDescription: "",
       history: [],
       taskType: "",
     };
@@ -500,6 +518,12 @@ export class WorkflowState {
       if (typeof this.state.lastPushBranch !== "string") {
         this.state.lastPushBranch = "";
       }
+      if (typeof this.state.featureFlowCreated !== "boolean") {
+        this.state.featureFlowCreated = false;
+      }
+      if (typeof this.state.featureFlowDescription !== "string") {
+        this.state.featureFlowDescription = "";
+      }
     } catch (error) {
       if (error?.code !== "ENOENT") {
         throw error;
@@ -527,10 +551,119 @@ export class WorkflowState {
   }
 
   async save() {
+    const reconciled = await this.reconcileWithDisk();
+    this.state.owner = {
+      token: PROCESS_TOKEN,
+      pid: process.pid,
+      updatedAt: new Date().toISOString(),
+    };
     await fs.writeFile(this.stateFile, JSON.stringify(this.state, null, 2));
     await ensureCompatibilityLinks(this.stateFile);
     await this.updateProjectSummary();
     await this.syncToDatabase();
+    this.lastReconcile = reconciled;
+    return reconciled;
+  }
+
+  /**
+   * Baca isi berkas state APA ADANYA dari disk (bukan dari memori).
+   * Mengembalikan null kalau belum ada / rusak.
+   */
+  async readDiskState() {
+    try {
+      const data = await fs.readFile(this.stateFile, "utf-8");
+      return JSON.parse(data);
+    } catch {
+      return null;
+    }
+  }
+
+  /** True kalau berkas di disk terakhir ditulis proses MCP lain. */
+  isForeignWrite(diskState) {
+    const token = diskState?.owner?.token;
+    return typeof token === "string" && token.length > 0 && token !== PROCESS_TOKEN;
+  }
+
+  historyKey(entry) {
+    return `${entry?.timestamp || ""}|${entry?.taskDescription || ""}`;
+  }
+
+  mergeDiskHistory(diskState) {
+    if (!diskState || !Array.isArray(diskState.history)) {
+      return 0;
+    }
+    if (!Array.isArray(this.state.history)) {
+      this.state.history = [];
+    }
+    const seen = new Set(this.state.history.map((entry) => this.historyKey(entry)));
+    let added = 0;
+    for (const entry of diskState.history) {
+      const key = this.historyKey(entry);
+      if (!seen.has(key)) {
+        this.state.history.push(entry);
+        seen.add(key);
+        added += 1;
+      }
+    }
+    return added;
+  }
+
+  /**
+   * Rekonsiliasi sebelum menulis: jangan buang pekerjaan proses lain.
+   *
+   * 1. Gabungkan `history` dari disk supaya catatan task lain tidak hilang.
+   * 2. Kalau disk memuat task yang SEDANG BERJALAN milik proses lain, arsipkan
+   *    ke `history` sebagai `interrupted` sebelum kita menimpanya.
+   *
+   * Tanpa langkah 2, task itu lenyap tanpa jejak - itulah bug yang menyebabkan
+   * pekerjaan resize docker-alma tidak pernah muncul di view_history.
+   */
+  async reconcileWithDisk() {
+    const result = { mergedHistory: 0, preservedTask: null, foreignToken: null };
+    const disk = await this.readDiskState();
+    if (!disk) {
+      return result;
+    }
+
+    result.mergedHistory = this.mergeDiskHistory(disk);
+
+    if (!this.isForeignWrite(disk)) {
+      return result;
+    }
+
+    result.foreignToken = disk.owner.token;
+
+    const hasRunningTask =
+      typeof disk.taskDescription === "string" &&
+      disk.taskDescription.trim() !== "" &&
+      disk.currentPhase &&
+      disk.currentPhase !== "idle";
+
+    if (!hasRunningTask) {
+      return result;
+    }
+
+    const alreadyArchived = this.state.history.some(
+      (entry) => entry.interrupted && entry.taskDescription === disk.taskDescription
+    );
+    if (alreadyArchived) {
+      return result;
+    }
+
+    this.state.history.push({
+      taskDescription: disk.taskDescription,
+      taskType: disk.taskType || "other",
+      commitMessage: disk.lastCommitMessage || "",
+      interrupted: true,
+      dropped: true,
+      dropReason:
+        "Ditimpa proses agen lain: state workflow dipakai bersama antar sesi di mesin ini",
+      interruptedAtPhase: disk.currentPhase,
+      interruptedBy: disk.owner.token,
+      timestamp: new Date().toISOString(),
+    });
+    result.preservedTask = disk.taskDescription;
+    return result;
   }
 
   async updateProjectSummary() {
@@ -617,7 +750,43 @@ export class WorkflowState {
     };
   }
 
-  reset() {
+  /**
+   * Reset ke keadaan idle.
+   *
+   * `archive` sengaja OPT-IN (default false). Pemanggil yang sudah menulis
+   * `addToHistory` sendiri - complete_task, force_complete_task, drop_task -
+   * akan menghasilkan entri ganda kalau reset ikut mengarsipkan.
+   *
+   * `start_task` memakai `{ archive: true }` supaya task yang sedang berjalan
+   * tidak lenyap saat diganti task baru.
+   */
+  reset(options = {}) {
+    const archive = options.archive === true;
+    const previous = this.state || {};
+    const history = Array.isArray(previous.history) ? previous.history.slice() : [];
+
+    const hasRunningTask =
+      typeof previous.taskDescription === "string" &&
+      previous.taskDescription.trim() !== "" &&
+      previous.currentPhase &&
+      previous.currentPhase !== "idle";
+
+    let archivedTask = null;
+    if (archive && hasRunningTask) {
+      archivedTask = previous.taskDescription;
+      history.push({
+        taskDescription: previous.taskDescription,
+        taskType: previous.taskType || "other",
+        commitMessage: previous.lastCommitMessage || "",
+        interrupted: true,
+        dropped: true,
+        dropReason:
+          options.reason || "Diganti start_task berikutnya sebelum task selesai",
+        interruptedAtPhase: previous.currentPhase,
+        timestamp: new Date().toISOString(),
+      });
+    }
+
     this.state = {
       currentPhase: "idle",
       taskDescription: "",
@@ -637,8 +806,13 @@ export class WorkflowState {
       commitAndPushCompleted: false,
       lastCommitMessage: "",
       lastPushBranch: "",
-      history: this.state.history,
+      featureFlowCreated: false,
+      featureFlowDescription: "",
+      history,
+      taskType: "",
     };
+
+    return { archivedTask };
   }
 
   addToHistory(entry) {