karajan-code 1.47.0 → 1.48.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karajan-code",
-  "version": "1.47.0",
+  "version": "1.48.0",
   "description": "Local multi-agent coding orchestrator with TDD, SonarQube, and code review pipeline",
   "type": "module",
   "license": "AGPL-3.0",

package/src/hu/store.js

@@ -90,7 +90,9 @@ export function updateStoryStatus(batch, storyId, status, extra = {}) {
   const story = batch.stories.find(s => s.id === storyId);
   if (!story) throw new Error(`Story ${storyId} not found`);
   story.status = status;
-  story.updated_at = new Date().toISOString();
+  const now = new Date().toISOString();
+  story.statusChangedAt = now;
+  story.updated_at = now;
   Object.assign(story, extra);
   return story;
 }

package/src/orchestrator/hu-sub-pipeline.js

@@ -114,13 +114,30 @@ async function runSingleHu({ storyId, batch, batchSessionId, runIterationFn, emi
 
   updateStoryStatus(batch, story.id, HU_STATUS.CODING);
   await saveHuBatch(batchSessionId, batch);
+  emitProgress(emitter, makeEvent("hu:status-change", { ...eventBase, stage: "hu-sub-pipeline" }, {
+    message: `HU ${story.id} status → coding`,
+    detail: { huId: story.id, status: HU_STATUS.CODING, timestamp: new Date().toISOString() }
+  }));
 
   try {
     const iterResult = await runIterationFn(huTask);
     const approved = Boolean(iterResult?.approved);
 
+    // --- Transition to reviewing (post-coder, pre-reviewer evaluation) ---
+    updateStoryStatus(batch, story.id, HU_STATUS.REVIEWING);
+    await saveHuBatch(batchSessionId, batch);
+    emitProgress(emitter, makeEvent("hu:status-change", { ...eventBase, stage: "hu-sub-pipeline" }, {
+      message: `HU ${story.id} status → reviewing`,
+      detail: { huId: story.id, status: HU_STATUS.REVIEWING, timestamp: new Date().toISOString() }
+    }));
+
     if (approved) {
       updateStoryStatus(batch, story.id, HU_STATUS.DONE);
+      await saveHuBatch(batchSessionId, batch);
+      emitProgress(emitter, makeEvent("hu:status-change", { ...eventBase, stage: "hu-sub-pipeline" }, {
+        message: `HU ${story.id} status → done`,
+        detail: { huId: story.id, status: HU_STATUS.DONE, timestamp: new Date().toISOString() }
+      }));
       emitProgress(emitter, makeEvent("hu:end", { ...eventBase, stage: "hu-sub-pipeline" }, {
         status: "ok",
         message: `HU ${story.id} completed successfully`,
@@ -129,6 +146,11 @@ async function runSingleHu({ storyId, batch, batchSessionId, runIterationFn, emi
       return { huId: story.id, approved: true, result: iterResult };
     } else {
       updateStoryStatus(batch, story.id, HU_STATUS.FAILED);
+      await saveHuBatch(batchSessionId, batch);
+      emitProgress(emitter, makeEvent("hu:status-change", { ...eventBase, stage: "hu-sub-pipeline" }, {
+        message: `HU ${story.id} status → failed`,
+        detail: { huId: story.id, status: HU_STATUS.FAILED, timestamp: new Date().toISOString() }
+      }));
       emitProgress(emitter, makeEvent("hu:end", { ...eventBase, stage: "hu-sub-pipeline" }, {
         status: "fail",
         message: `HU ${story.id} failed`,
@@ -138,6 +160,11 @@ async function runSingleHu({ storyId, batch, batchSessionId, runIterationFn, emi
     }
   } catch (err) {
     updateStoryStatus(batch, story.id, HU_STATUS.FAILED);
+    await saveHuBatch(batchSessionId, batch);
+    emitProgress(emitter, makeEvent("hu:status-change", { ...eventBase, stage: "hu-sub-pipeline" }, {
+      message: `HU ${story.id} status → failed`,
+      detail: { huId: story.id, status: HU_STATUS.FAILED, timestamp: new Date().toISOString() }
+    }));
     emitProgress(emitter, makeEvent("hu:end", { ...eventBase, stage: "hu-sub-pipeline" }, {
       status: "fail",
       message: `HU ${story.id} threw: ${err.message}`,

package/src/orchestrator.js

@@ -523,6 +523,10 @@ async function becariaIncrementalPush({ config, session, gitCtx, task, logger, r
   const pushResult = await incrementalPush({ gitCtx, task, logger, session });
   if (!pushResult) return;
 
+  // Accumulate commits for PG card lifecycle tracking
+  const { accumulateCommit } = await import("./planning-game/pipeline-adapter.js");
+  for (const c of pushResult.commits) accumulateCommit(session, c);
+
   session.becaria_commits = [...(session.becaria_commits ?? []), ...pushResult.commits];
   await saveSession(session);
 
@@ -539,6 +543,10 @@ async function becariaCreateEarlyPr({ config, session, emitter, eventBase, gitCt
   const earlyPr = await earlyPrCreation({ gitCtx, task, logger, session, stageResults });
   if (!earlyPr) return;
 
+  // Accumulate commits for PG card lifecycle tracking
+  const { accumulateCommit } = await import("./planning-game/pipeline-adapter.js");
+  for (const c of earlyPr.commits) accumulateCommit(session, c);
+
   session.becaria_pr_number = earlyPr.prNumber;
   session.becaria_pr_url = earlyPr.prUrl;
   session.becaria_commits = earlyPr.commits;
@@ -740,6 +748,13 @@ async function handlePostLoopStages({ config, session, emitter, eventBase, coder
 
 async function finalizeApprovedSession({ config, gitCtx, task, logger, session, stageResults, emitter, eventBase, budgetSummary, pgCard, pgProject, review, i }) {
   const gitResult = await finalizeGitAutomation({ config, gitCtx, task, logger, session, stageResults });
+
+  // Accumulate final commits for PG card lifecycle tracking
+  if (gitResult?.commits?.length) {
+    const { accumulateCommit } = await import("./planning-game/pipeline-adapter.js");
+    for (const c of gitResult.commits) accumulateCommit(session, c);
+  }
+
   if (stageResults.planner?.ok) {
     stageResults.planner.completedSteps = [...(stageResults.planner.steps ?? [])];
   }

package/src/planning-game/pipeline-adapter.js

@@ -94,6 +94,7 @@ export async function handlePgDecomposition({ triageResult, pgTaskId, pgProject,
 
 /**
  * Mark PG card as "To Validate" on approved session completion.
+ * Merges commits from gitResult and session.pg_commits (accumulated during pipeline).
  */
 export async function markPgCardToValidate({ pgCard, pgProject, config, session, gitResult, logger }) {
   if (!pgCard || !pgProject) return;
@@ -101,9 +102,21 @@ export async function markPgCardToValidate({ pgCard, pgProject, config, session,
   try {
     const { updateCard } = await import("./client.js");
     const { buildCompletionUpdates } = await import("./adapter.js");
+
+    // Merge commits: session.pg_commits (accumulated) + gitResult.commits (final)
+    const accumulatedCommits = session.pg_commits || [];
+    const finalCommits = gitResult?.commits || [];
+    const seenHashes = new Set(accumulatedCommits.map(c => c.hash));
+    const mergedCommits = [...accumulatedCommits];
+    for (const c of finalCommits) {
+      if (!seenHashes.has(c.hash)) {
+        mergedCommits.push(c);
+      }
+    }
+
     const pgUpdates = buildCompletionUpdates({
       approved: true,
-      commits: gitResult?.commits || [],
+      commits: mergedCommits,
       startDate: session.pg_card?.startDate || session.created_at,
       codeveloper: config.planning_game?.codeveloper || null
     });
@@ -156,6 +169,25 @@ export function buildHuStoriesFromPgCard(pgCard) {
   return [{ id: storyId, text: storyText }];
 }
 
+/**
+ * Accumulate a commit into the session's pg_commits array.
+ * Called after each successful commitAll during the iteration loop.
+ * Best-effort: never throws.
+ *
+ * @param {object} session - Pipeline session (mutated)
+ * @param {{ hash: string, message: string, date?: string, author?: string }} commitInfo
+ */
+export function accumulateCommit(session, commitInfo) {
+  if (!session || !commitInfo?.hash) return;
+  if (!session.pg_commits) session.pg_commits = [];
+  session.pg_commits.push({
+    hash: commitInfo.hash,
+    message: commitInfo.message || "",
+    date: commitInfo.date || new Date().toISOString(),
+    author: commitInfo.author || "BecarIA"
+  });
+}
+
 // --- Internal helpers ---
 
 async function markPgCardInProgress({ pgTaskId, pgProject, config, logger }) {