@indigoai-us/hq-cli 5.345.58 → 5.345.59

package/dist/lib/lanes/story-ledger.js

@@ -9,7 +9,8 @@ const LOCK_TIMEOUT_MS = 10_000;
 const LOCK_STALE_MS = 60_000;
 const LOCK_RETRY_MS = 10;
 const STORY_STATES = ["todo", "in_progress", "review", "waiting", "blocked", "done", "dropped"];
-const MANAGER_OWNED_STATES = new Set(["review", "done", "dropped"]);
+const LEAD_CONTROLLED_STATES = new Set(["waiting", "blocked", "dropped"]);
+const STORY_STATE_ORDER = ["todo", "in_progress", "review", "done"];
 const TERMINAL_STATES = new Set(["done", "failed", "interrupted", "cancelled", "killed"]);
 function projectFocusOverrides(value) {
     if (value === undefined)
@@ -561,6 +562,13 @@ function validPriorQuestions(value, storyId) {
     }
     return value;
 }
+function canonicalStoryState(value) {
+    if (value === "in_review" || value === "verification")
+        return "review";
+    return typeof value === "string" && STORY_STATES.includes(value)
+        ? value
+        : undefined;
+}
 function setLaneStatusFields(story, lane, laneStoryStatus, isCurrentAttribution) {
     const laneStatus = story.lane_status;
     if (laneStatus !== undefined && !isJsonObject(laneStatus)) {
@@ -615,29 +623,31 @@ function setLaneStatusFields(story, lane, laneStoryStatus, isCurrentAttribution)
     else {
         delete story.pending_questions;
     }
-    if (story.state === "in_review" || story.state === "verification") {
-        story.state = "review";
-    }
-    if (MANAGER_OWNED_STATES.has(String(story.state))) {
-        // A manager decision always wins over lane-derived status.
-    }
-    else if (blockers.length > 0) {
-        story.state = "blocked";
-    }
-    else if (laneStoryStatus === "review") {
-        story.state = "review";
-    }
-    else if (laneStoryStatus === "done") {
+    const currentState = canonicalStoryState(story.state) ?? canonicalStoryState(story.status);
+    const currentStates = currentState === undefined ? [] : [currentState];
+    const laneProgressState = laneStoryStatus === "review"
+        ? "review"
+        : laneStoryStatus === "done"
+            ? "done"
+            : laneStoryStatus === "in_progress" || lane.state === "queued" || lane.state === "running" || lane.state === "awaiting_input"
+                ? "in_progress"
+                : undefined;
+    const currentProgressState = STORY_STATE_ORDER.reduce((highest, state) => currentStates.includes(state) || laneProgressState === state ? state : highest, undefined);
+    const laneManagedBlocked = isJsonObject(laneStatus) && isJsonObject(laneStatus.saved);
+    const leadControlledState = currentStates.find((state) => LEAD_CONTROLLED_STATES.has(state) && !(state === "blocked" && laneManagedBlocked));
+    if (currentStates.includes("done"))
         story.state = "done";
+    else if (leadControlledState !== undefined)
+        story.state = leadControlledState;
+    else if (blockers.length > 0 && currentProgressState !== "review" && currentProgressState !== "done") {
+        story.state = "blocked";
     }
-    else if (laneStoryStatus === "in_progress" || lane.state === "queued" || lane.state === "running" || lane.state === "awaiting_input") {
-        story.state = "in_progress";
+    else if (currentProgressState !== undefined) {
+        story.state = currentProgressState;
     }
     else if (saved !== undefined && story.state === "blocked") {
-        const previous = saved.state;
-        story.state = typeof previous === "string" && STORY_STATES.includes(previous)
-            ? previous
-            : "in_progress";
+        const previous = canonicalStoryState(saved.state);
+        story.state = previous ?? "in_progress";
     }
     if (typeof story.state === "string" && STORY_STATES.includes(story.state)) {
         story.status = story.state;

package/dist/lib/lanes/types.js

@@ -236,7 +236,7 @@ export const LANE_FIELD_WRITERS = {
     priority: ["command"], worker: ["creator", "command"], worker_path: ["creator", "command"], worker_pack: ["creator", "command"], worker_profile: ["creator", "command"], worker_profile_hash: ["creator", "command", "spawn"], registry_worker: ["creator", "command", "spawn"], registry_worker_approval_history: ["command", "watcher", "reconcile"], worker_profile_repin_history: ["command"], worker_profile_ignored: ["creator", "command", "spawn"], worker_policy_delivery: ["command", "spawn"],
     keep_alive: ["creator", "command"], keep_alive_standing: ["command"], keep_alive_opted_in_at: ["creator", "command"], keep_alive_blocked_reason: ["command", "reconcile"], keep_alive_resume_count: ["command", "reconcile", "spawn"], keep_alive_history: ["reconcile"], keep_alive_blocked_resume_streak: ["reconcile", "spawn", "watcher"], keep_alive_last_resume_at: ["command", "reconcile", "spawn"], keep_alive_next_eligible_at: ["command", "reconcile", "spawn"], keep_alive_exhausted_at: ["command", "reconcile", "spawn"], loop_mode: ["creator"],
     provider: ["creator", "command"], provider_source: ["creator", "command"], account: ["creator", "spawn", "command", "watcher", "reconcile"], account_source: ["creator", "command"], profile_settings_pinned: ["command"], account_selection: ["creator", "command"], admission_accounts: ["creator", "command"], account_history: ["command", "spawn", "watcher", "reconcile"], failed_resume_history: ["command"], fallback_question_cancellation_failures: ["command"], pending_resume: ["command", "spawn", "watcher", "reconcile"], placement_default: ["creator"], host: ["creator", "command"], origin_host: ["creator"], origin_host_source: ["creator"],
-    version: ["creator"], created_at: ["creator"], updated_at: ["creator"], ended_at: ["reconcile"], envelope_summary: ["reconcile"], attribution_history: ["command", "watcher", "reconcile"], story_switch_pending: ["command", "watcher", "reconcile"], story_switch_unacknowledged: ["watcher", "reconcile"],
+    version: ["creator"], created_at: ["creator"], updated_at: ["creator"], ended_at: ["reconcile"], envelope_summary: ["reconcile"], attribution_history: ["command", "watcher", "reconcile"], story_switch_pending: ["command", "watcher", "reconcile"], story_switch_unacknowledged: ["command", "watcher", "reconcile"],
     last_envelope: ["watcher", "reconcile"], model: ["creator", "spawn", "command"], model_source: ["creator", "spawn", "command"], effort: ["creator", "spawn", "command"], effort_source: ["creator", "spawn", "command"], fast_mode: ["spawn"],
     last_message_at: ["creator", "command"], status_gate: ["spawn", "watcher"], status_gate_history: ["watcher", "reconcile"], blocker_freshness_state: ["watcher"], kr_freshness_state: ["watcher"], last_compaction: ["spawn"], story_complete: ["watcher", "reconcile"], story_complete_reason: ["watcher", "reconcile"], story_status: ["watcher", "reconcile"],
     overdue: ["reconcile"], overdue_at: ["reconcile"], last_host_report_at: ["watcher", "spawn", "reconcile"], stalled: ["watcher"], stalled_at: ["watcher"], stalled_reason: ["watcher"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cli",
-  "version": "5.345.58",
+  "version": "5.345.59",
   "description": "HQ by Indigo management CLI — modules and cloud sync",
   "main": "dist/index.js",
   "bin": {