@kaddo/cli 3.59.0 → 3.60.0

package/dist/index.js

@@ -8918,6 +8918,7 @@ function buildDeliveryState(dir) {
     refined_draft_work_items: wis.filter((w) => w.lifecycle === "draft" && w.rawFrontmatter.refined_by).length,
     refined_draft_ids: wis.filter((w) => w.lifecycle === "draft" && w.rawFrontmatter.refined_by).map((w) => w.id),
     ready_work_items: byState("ready"),
+    ready_work_item_ids: wis.filter((w) => w.lifecycle === "ready").map((w) => w.id),
     in_progress_work_items: byState("in-progress"),
     blocked_work_items: byState("blocked"),
     total_work_items: total,
@@ -9043,63 +9044,42 @@ function resolveNextStep(dir, now = /* @__PURE__ */ new Date()) {
   const st = buildDeliveryState(dir);
   const secondary = buildSecondaryRecommendations(st);
   const roadmap = roadmapSignal(dir);
-  if (roadmap !== "has-candidates" && st.draft_work_items > 0) {
-    if (st.refined_draft_work_items > 0) {
-      const ids = st.refined_draft_ids;
-      const single = ids.length === 1;
-      return {
-        id: "review-work-item",
-        phase: "Active Delivery",
-        label: single ? `Review ${ids[0]} and mark it ready for implementation.` : "Review refined draft Work Items and mark one ready for implementation.",
-        command: single ? `kaddo ready ${ids[0]}` : "kaddo ready <WI-ID>",
-        mcpAction: "kaddo_mark_work_item_ready",
-        ...single ? { target: ids[0], mcpArgs: { id: ids[0] } } : { targets: ids },
-        reason: single ? `${ids[0]} is a refined draft Work Item awaiting human review.` : `There are ${ids.length} refined draft Work Items awaiting human review.`,
-        ...secondary.length ? { secondary } : {}
-      };
-    }
-    return {
-      id: "refine-work-item",
-      phase: "Active Delivery",
-      label: "Refine the existing draft Work Item with the work-item-agent.",
-      agent: "work-item-agent",
-      skill: "work-item-refinement",
-      reason: `There ${st.draft_work_items === 1 ? "is" : "are"} ${st.draft_work_items} draft Work Item${st.draft_work_items === 1 ? "" : "s"}. Refine before defining roadmap candidates.`,
-      ...secondary.length ? { secondary } : {}
-    };
-  }
-  if (roadmap !== "has-candidates") {
-    return { id: "roadmap", phase: "Planning", label: "Use roadmap-agent to define roadmap candidates (`kaddo roadmap`).", command: "kaddo roadmap", agent: "roadmap-agent", target: "knowledge/delivery/roadmap.md", reason: "The roadmap has no candidates yet." };
-  }
-  if (st.total_work_items === 0) {
-    return {
-      id: "create-work-item",
-      phase: "Delivery Preparation",
-      label: "Run `kaddo create --from roadmap` to materialize the first Work Item.",
-      command: "kaddo create --from roadmap",
-      reason: "The roadmap has candidates but no Work Item exists yet.",
-      ...secondary.length ? { secondary } : {}
-    };
-  }
   const adapters = st.adapters_installed;
   if (st.ready_work_items > 0) {
+    const ids = st.ready_work_item_ids;
+    const single = ids.length === 1;
+    const sec = [...secondary];
+    if (roadmap !== "has-candidates" && st.remaining_work_item_candidates === 0) {
+      sec.push({
+        id: "roadmap",
+        label: "Roadmap has no candidates. Consider running `kaddo roadmap` after handling ready Work Items.",
+        command: "kaddo roadmap",
+        agent: "roadmap-agent",
+        reason: "The roadmap has no candidates yet, but ready Work Items exist."
+      });
+    }
     if (adapters === 0) {
       return {
-        id: "install-adapter",
+        id: "prepare-implementation",
         phase: "Active Delivery",
-        label: "Install or configure an adapter before implementation (`kaddo adapters list`).",
+        label: single ? `Prepare implementation for ${ids[0]}.` : "Prepare implementation for ready Work Items.",
         command: "kaddo adapters list",
-        reason: `${st.ready_work_items} Work Item(s) are ready but no adapter is installed.`,
-        ...secondary.length ? { secondary } : {}
+        agent: "implementation-agent",
+        skill: "implementation-planning",
+        ...single ? { target: ids[0] } : { targets: ids },
+        reason: single ? `${ids[0]} is ready for implementation but no adapter is installed.` : `There are ${ids.length} ready Work Items awaiting implementation but no adapter is installed.`,
+        ...sec.length ? { secondary: sec } : {}
       };
     }
     return {
-      id: "implement",
+      id: "implement-work-item",
       phase: "Active Delivery",
-      label: "Use the implementation-agent or your installed adapter to plan implementation.",
+      label: single ? `Use implementation-agent to implement ${ids[0]}.` : "Use implementation-agent to implement ready Work Items.",
       agent: "implementation-agent",
-      reason: `${st.ready_work_items} Work Item(s) are ready and an adapter is installed.`,
-      ...secondary.length ? { secondary } : {}
+      skill: "implementation-planning",
+      ...single ? { target: ids[0] } : { targets: ids },
+      reason: single ? `${ids[0]} is ready for implementation.` : `There are ${ids.length} ready Work Items awaiting implementation.`,
+      ...sec.length ? { secondary: sec } : {}
     };
   }
   if (st.in_progress_work_items > 0) {
@@ -9112,6 +9092,20 @@ function resolveNextStep(dir, now = /* @__PURE__ */ new Date()) {
       ...secondary.length ? { secondary } : {}
     };
   }
+  if (st.refined_draft_work_items > 0) {
+    const ids = st.refined_draft_ids;
+    const single = ids.length === 1;
+    return {
+      id: "review-work-item",
+      phase: "Active Delivery",
+      label: single ? `Review ${ids[0]} and mark it ready for implementation.` : "Review refined draft Work Items and mark one ready for implementation.",
+      command: single ? `kaddo ready ${ids[0]}` : "kaddo ready <WI-ID>",
+      mcpAction: "kaddo_mark_work_item_ready",
+      ...single ? { target: ids[0], mcpArgs: { id: ids[0] } } : { targets: ids },
+      reason: single ? `${ids[0]} is a refined draft Work Item awaiting human review.` : `There are ${ids.length} refined draft Work Items awaiting human review.`,
+      ...secondary.length ? { secondary } : {}
+    };
+  }
   if (st.draft_work_items > 0) {
     return {
       id: "refine-work-item",
@@ -9119,7 +9113,7 @@ function resolveNextStep(dir, now = /* @__PURE__ */ new Date()) {
       label: "Refine the existing draft Work Item with the work-item-agent.",
       agent: "work-item-agent",
       skill: "work-item-refinement",
-      reason: `There ${st.draft_work_items === 1 ? "is" : "are"} ${st.draft_work_items} draft Work Item${st.draft_work_items === 1 ? "" : "s"} and no Work Item is ready.`,
+      reason: `There ${st.draft_work_items === 1 ? "is" : "are"} ${st.draft_work_items} draft Work Item${st.draft_work_items === 1 ? "" : "s"}. Refine before defining roadmap candidates.`,
       ...secondary.length ? { secondary } : {}
     };
   }
@@ -9133,6 +9127,19 @@ function resolveNextStep(dir, now = /* @__PURE__ */ new Date()) {
       ...secondary.length ? { secondary } : {}
     };
   }
+  if (roadmap !== "has-candidates") {
+    return { id: "roadmap", phase: "Planning", label: "Use roadmap-agent to define roadmap candidates (`kaddo roadmap`).", command: "kaddo roadmap", agent: "roadmap-agent", target: "knowledge/delivery/roadmap.md", reason: "The roadmap has no candidates yet." };
+  }
+  if (st.total_work_items === 0) {
+    return {
+      id: "create-work-item",
+      phase: "Delivery Preparation",
+      label: "Run `kaddo create --from roadmap` to materialize the first Work Item.",
+      command: "kaddo create --from roadmap",
+      reason: "The roadmap has candidates but no Work Item exists yet.",
+      ...secondary.length ? { secondary } : {}
+    };
+  }
   if (st.remaining_work_item_candidates > 0) {
     return {
       id: "materialize-more-work-items",
@@ -9864,7 +9871,9 @@ function mapNextStepId(id) {
     "refine-capabilities": "discover-capabilities",
     "refine-current-state": "describe-architecture",
     "refine-codebase": "describe-architecture",
-    "review-work-item": "refine-work-item"
+    "review-work-item": "refine-work-item",
+    "prepare-implementation": "prepare-implementation",
+    "implement-work-item": "prepare-implementation"
   };
   return MAP[id] ?? id;
 }
@@ -11534,11 +11543,11 @@ function renderUnderstand(plan) {
           outputs.push("- Refined Work Item content.");
         if (rec.id === "create-work-item")
           outputs.push("- A new Work Item under `knowledge/delivery/work-items/`.");
-        if (rec.id === "implement")
+        if (rec.id === "implement" || rec.id === "implement-work-item")
           outputs.push("- Implementation plan or code changes guided by the Work Item.");
         if (rec.id === "guard")
           outputs.push("- Updated knowledge artifacts reflecting recent code changes.");
-        if (rec.id === "install-adapter")
+        if (rec.id === "install-adapter" || rec.id === "prepare-implementation")
           outputs.push("- An adapter configured and injected (`kaddo adapters list`).");
         if (outputs.length > 0) {
           parts.push("The LLM should produce:\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaddo/cli",
-  "version": "3.59.0",
+  "version": "3.60.0",
   "description": "Knowledge Driven Development toolkit",
   "license": "MIT",
   "repository": {