@indigoai-us/hq-cli 5.278.0 → 5.279.0

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## [Unreleased]
 
+## [5.279.0] — 2026-09-29
+
+### Fixed
+
+- Claude keep-alive resumes use the same account selection as manual resumes,
+  including profile pins and the optional recent-use tiebreak. If no eligible
+  account can be selected, the lane resumes on its current account and records
+  the failure.
+
 ## [5.278.0] — 2026-09-29
 
 ### Changed

package/dist/commands/lanes.js

@@ -5534,12 +5534,12 @@ async function prepareAccountMove(ctx, lane, input) {
     const at = now.toISOString();
     const from = lane.account ?? null;
     // The capacity decision and the record write run under the target
-    // account's admission lock, the same serialization lane creation uses. A
-    // slot is taken by a running lane or by a lane another move has already
-    // pointed at the account whose spawn has not claimed it yet
-    // (`pending_resume` set by this write, cleared by the claim), so two moves
-    // into one free slot cannot both start.
-    return withLaneAdmissionLock(hqRoot, lane.provider, async () => {
+    // account's admission lock, or while reconcile holds all provider
+    // admission locks. A slot is taken by a running lane or a lane another move
+    // has pointed at its target account but whose spawn has not claimed it yet
+    // (`pending_resume` is set by this write and cleared by the claim), so two
+    // moves into one free slot cannot both start.
+    const writeMove = async () => {
         const admission = input.deferTurnStart
             ? undefined
             : await assessLaneAdmission(ctx, lane, {
@@ -5602,7 +5602,10 @@ async function prepareAccountMove(ctx, lane, input) {
             return next;
         }), input.grantContext);
         return { lane: moved, from, to: target, copy, queued };
-    }, ctx.sleep);
+    };
+    return input.admissionLocksHeld
+        ? writeMove()
+        : withLaneAdmissionLock(hqRoot, lane.provider, writeMove, ctx.sleep);
 }
 async function selectAutomaticClaudeResumeAccount(ctx, lane, workerProfile, options = {}) {
     if (lane.provider !== "claude")
@@ -6993,6 +6996,93 @@ async function runReconcile(ctx, opts, recoverQueuedMessages) {
         recoverQueuedMessages,
         mesh: ctx.mesh,
         env: ctx.env,
+        prepareKeepAliveClaudeResume: async (lane) => {
+            const recoveredLane = laneWithRecoveredProviderSession(hqRoot, lane);
+            const pendingModel = recoveredLane.pending_settings?.model;
+            const selectionLane = pendingModel === undefined
+                ? recoveredLane
+                : { ...recoveredLane, model: pendingModel, model_source: undefined };
+            let automatic;
+            try {
+                automatic = await selectAutomaticClaudeResumeAccount(ctx, selectionLane, undefined, {
+                    repairUnavailableAccount: true,
+                });
+            }
+            catch (err) {
+                return {
+                    lane: recoveredLane,
+                    selectionFailure: err instanceof LanesError
+                        ? `${err.error}: ${err.message}`
+                        : err instanceof Error
+                            ? err.message
+                            : String(err),
+                };
+            }
+            if (automatic === undefined)
+                return { lane: recoveredLane };
+            const { selection } = automatic;
+            if (opts.dryRun) {
+                return {
+                    lane: {
+                        ...selectionLane,
+                        account: selection.account,
+                        account_selection: selection,
+                        ...(pendingModel !== undefined
+                            ? { model: pendingModel, model_source: "cli" }
+                            : automatic.preservedModel !== undefined
+                                ? { model: automatic.preservedModel, model_source: "preserved" }
+                                : {}),
+                    },
+                };
+            }
+            let latest;
+            try {
+                latest = readLane(hqRoot, lane.lane_id);
+            }
+            catch (err) {
+                throw new LanesError("keep_alive_account_selection_lane_unreadable", `Cannot re-read lane ${lane.lane_id} before applying Claude account selection: ${err instanceof Error ? err.message : String(err)}`, { lane_id: lane.lane_id });
+            }
+            if (latest.version !== lane.version ||
+                latest.state !== lane.state ||
+                latest.keep_alive !== true ||
+                latest.keep_alive_opted_in_at !== lane.keep_alive_opted_in_at ||
+                latest.provider_session_id !== lane.provider_session_id ||
+                latest.last_resume?.session_id !== lane.last_resume?.session_id)
+                return { lane: latest };
+            if (selection.account === lane.account) {
+                return { lane: persistClaudeAccountSelection(hqRoot, recoveredLane, selection) };
+            }
+            try {
+                const moved = await prepareAccountMove(ctx, recoveredLane, {
+                    account: selection.account,
+                    cliModel: pendingModel,
+                    accountHistoryReason: "keep_alive_resume",
+                    ...(pendingModel === undefined && automatic.preservedModel !== undefined
+                        ? { preservedModel: automatic.preservedModel }
+                        : {}),
+                    deferTurnStart: true,
+                    admissionLocksHeld: true,
+                    accountSelection: selection,
+                });
+                return { lane: moved.lane };
+            }
+            catch (err) {
+                let latest;
+                try {
+                    latest = readLane(hqRoot, lane.lane_id);
+                }
+                catch (readErr) {
+                    return {
+                        lane,
+                        selectionFailure: `account move failed: ${err instanceof Error ? err.message : String(err)}; lane re-read failed: ${readErr instanceof Error ? readErr.message : String(readErr)}`,
+                    };
+                }
+                return {
+                    lane: latest,
+                    selectionFailure: `account move failed: ${err instanceof LanesError ? `${err.error}: ${err.message}` : err instanceof Error ? err.message : String(err)}`,
+                };
+            }
+        },
     });
     printJson(summary);
     if (!summary.ok) {

package/dist/lib/lanes/reconcile.d.ts

@@ -92,6 +92,11 @@ export interface ReconcileDeps {
     meshEmitTimeoutMs?: number;
     /** Fresh keep-alive eligibility read; injected to exercise opt-in changes before queueing. */
     readKeepAliveRecheckLane?: (hqRoot: string, laneId: string) => LaneRecord;
+    /** Reuse the command's Claude resume selection and session-move path for keep-alive. */
+    prepareKeepAliveClaudeResume?: (lane: LaneRecord) => Promise<{
+        lane: LaneRecord;
+        selectionFailure?: string;
+    }>;
     /** Process-table snapshot seam for the opt-in runaway-search guard. */
     runawayToolProcessLister?: () => readonly RunawayProcessInfo[];
     /** Test seam: prevent real process signals while exercising the guard. */

package/dist/lib/lanes/reconcile.js

@@ -1001,7 +1001,7 @@ export async function runPassBody(hqRoot, deps) {
     await withAllLaneAdmissionLocks(hqRoot, async () => {
         const freshLanes = loadLaneRecords(hqRoot, summary);
         const freshQuestions = loadQuestionRecords(hqRoot, summary);
-        resumeKeepAlive(hqRoot, freshLanes, freshQuestions, summary, startDeps, now, keepAliveFlagByCompany, supersessionLineageAwareByCompany);
+        await resumeKeepAlive(hqRoot, freshLanes, freshQuestions, summary, startDeps, now, keepAliveFlagByCompany, supersessionLineageAwareByCompany);
         const drainLanes = loadLaneRecords(hqRoot, summary);
         await admitQueued(hqRoot, drainLanes, summary, startDeps, now);
         await resumeAwaiting(hqRoot, drainLanes, freshQuestions, summary, startDeps);
@@ -1723,7 +1723,7 @@ function latestEnvelopeMtimeMs(hqRoot, lane, ref) {
         throw new LanesError("keep_alive_envelope_timestamp_unavailable", `Cannot stat latest envelope for lane ${lane.lane_id}: ${err instanceof Error ? err.message : String(err)}`, { lane_id: lane.lane_id, path: filePath });
     }
 }
-function resumeKeepAlive(hqRoot, lanes, questions, summary, deps, now, flagByCompany, supersessionLineageAwareByCompany) {
+async function resumeKeepAlive(hqRoot, lanes, questions, summary, deps, now, flagByCompany, supersessionLineageAwareByCompany) {
     const nowMs = now.getTime();
     const nowIso = now.toISOString();
     const config = loadLanesConfig(hqRoot);
@@ -2108,6 +2108,44 @@ function resumeKeepAlive(hqRoot, lanes, questions, summary, deps, now, flagByCom
             });
             continue;
         }
+        const seniorId = current.senior.kind === "lane" ? current.senior.id : undefined;
+        if (seniorId !== undefined) {
+            let grantPreflight;
+            try {
+                grantPreflight = withHireGrantAdmission(hqRoot, seniorId, (snapshot) => {
+                    const latestLane = readLane(hqRoot, current.lane_id);
+                    if (latestLane.version !== current.version ||
+                        latestLane.state !== current.state ||
+                        latestLane.keep_alive !== true ||
+                        latestLane.keep_alive_opted_in_at !== current.keep_alive_opted_in_at ||
+                        latestLane.senior.kind !== "lane" ||
+                        latestLane.senior.id !== seniorId)
+                        return { kind: "stale" };
+                    const refusal = terminalChildResumeHireGrantError(latestLane, snapshot);
+                    return refusal === null
+                        ? { kind: "eligible" }
+                        : { kind: "refused", error: refusal.error, message: refusal.message };
+                });
+            }
+            catch (err) {
+                markDirty(summary, {
+                    kind: "lane",
+                    id: current.lane_id,
+                    why: `keep-alive hire admission preflight failed: ${err instanceof Error ? err.message : String(err)}`,
+                });
+                continue;
+            }
+            if (grantPreflight.kind === "stale")
+                continue;
+            if (grantPreflight.kind === "refused") {
+                summary.skipped.push({
+                    kind: "lane",
+                    id: current.lane_id,
+                    why: `keep_alive_hire_admission: ${grantPreflight.error}: ${grantPreflight.message}`,
+                });
+                continue;
+            }
+        }
         const resumedFrom = current.state === "done" ? "done" : "interrupted";
         const resumeText = resumedFrom === "interrupted"
             ? LEAD_LANE_KEEP_ALIVE_INTERRUPTED_RESUME_TEXT
@@ -2118,6 +2156,114 @@ function resumeKeepAlive(hqRoot, lanes, questions, summary, deps, now, flagByCom
         if (carriesAnsweredQuestions && !deps.dryRun) {
             writeAnsweredQuestions(hqRoot, current, questions);
         }
+        let accountSelectionFailure;
+        if (current.provider === "claude" && deps.prepareKeepAliveClaudeResume !== undefined) {
+            const optInBeforePreparation = current.keep_alive_opted_in_at;
+            let preparedLane;
+            try {
+                const prepared = await deps.prepareKeepAliveClaudeResume(current);
+                preparedLane = prepared.lane;
+                accountSelectionFailure = prepared.selectionFailure;
+            }
+            catch (err) {
+                // Account balancing is best-effort for keep-alive. A failure to read
+                // balance inputs must not prevent the existing session from resuming.
+                try {
+                    preparedLane = readLane(hqRoot, current.lane_id);
+                }
+                catch (readErr) {
+                    markDirty(summary, {
+                        kind: "lane",
+                        id: current.lane_id,
+                        why: `keep-alive account selection failed and lane could not be re-read: ${readErr instanceof Error ? readErr.message : String(readErr)}`,
+                    });
+                    continue;
+                }
+                accountSelectionFailure = err instanceof Error ? err.message : String(err);
+            }
+            const preparedSessionId = preparedLane.provider_session_id ?? preparedLane.last_resume?.session_id;
+            if (preparedLane.state !== initialState ||
+                preparedLane.keep_alive !== true ||
+                !laneRunsHere(preparedLane, deps.host) ||
+                preparedSessionId !== currentSessionId)
+                continue;
+            let latest;
+            try {
+                latest = deps.dryRun
+                    ? (deps.readKeepAliveRecheckLane?.(hqRoot, current.lane_id) ?? readLane(hqRoot, current.lane_id))
+                    : readLane(hqRoot, current.lane_id);
+            }
+            catch (err) {
+                markDirty(summary, {
+                    kind: "lane",
+                    id: current.lane_id,
+                    why: `keep-alive eligibility recheck failed after account selection: ${err instanceof Error ? err.message : String(err)}`,
+                });
+                continue;
+            }
+            if (latest.state !== initialState || !laneRunsHere(latest, deps.host))
+                continue;
+            if (latest.keep_alive !== true) {
+                recordKeepAliveSkip(hqRoot, latest, "not_opted_in", summary, deps);
+                continue;
+            }
+            if (latest.keep_alive_opted_in_at !== optInBeforePreparation) {
+                summary.skipped.push({
+                    kind: "lane",
+                    id: latest.lane_id,
+                    why: "keep_alive_eligibility_changed_during_account_selection",
+                });
+                continue;
+            }
+            const latestSessionId = latest.provider_session_id ?? latest.last_resume?.session_id;
+            if (latestSessionId !== currentSessionId)
+                continue;
+            let latestEligibilityAtMs;
+            if (initialState === "done") {
+                const envelope = readLatestEnvelopeRecord(hqRoot, latest.lane_id);
+                if (!envelope || envelope.envelope.decision !== "done")
+                    continue;
+                if (doneKeepAliveVerdict(latest, envelope.envelope, latest.keep_alive_standing === true && hasPendingKeepAliveWork(hqRoot, latest, questions)) !== "eligible")
+                    continue;
+                try {
+                    latestEligibilityAtMs = latestEnvelopeMtimeMs(hqRoot, latest, envelope.ref);
+                }
+                catch (err) {
+                    markDirty(summary, {
+                        kind: "lane",
+                        id: latest.lane_id,
+                        why: `keep-alive envelope timestamp unavailable after account selection: ${err instanceof Error ? err.message : String(err)}`,
+                    });
+                    continue;
+                }
+            }
+            else {
+                latestEligibilityAtMs = Date.parse(latest.interrupted_at ?? "");
+            }
+            const latestOptedInAtMs = Date.parse(latest.keep_alive_opted_in_at ?? "");
+            if (!Number.isFinite(latestEligibilityAtMs) || !Number.isFinite(latestOptedInAtMs))
+                continue;
+            if (latestEligibilityAtMs <= latestOptedInAtMs) {
+                recordKeepAliveSkip(hqRoot, latest, initialState === "done" ? "envelope_before_opt_in" : "interruption_before_opt_in", summary, deps);
+                continue;
+            }
+            current = deps.dryRun ? preparedLane : latest;
+        }
+        if (accountSelectionFailure !== undefined) {
+            summary.skipped.push({
+                kind: "lane",
+                id: current.lane_id,
+                why: `keep_alive_account_selection_failed: ${accountSelectionFailure}`,
+            });
+            if (!deps.dryRun) {
+                recordKeepAliveEvent(hqRoot, current.lane_id, summary, {
+                    event: "keep_alive_account_selection_failed",
+                    at: nowIso,
+                    account: current.account ?? null,
+                    reason: accountSelectionFailure,
+                });
+            }
+        }
         const queue = (expectedSeniorId) => casLaneIf(hqRoot, current.lane_id, (latestLane) => latestLane.version === current.version &&
             latestLane.state === current.state &&
             latestLane.keep_alive === true &&
@@ -2145,7 +2291,6 @@ function resumeKeepAlive(hqRoot, lanes, questions, summary, deps, now, flagByCom
             keep_alive_exhausted_at: undefined,
             keep_alive_blocked_reason: undefined,
         }), deps.dryRun);
-        const seniorId = current.senior.kind === "lane" ? current.senior.id : undefined;
         let queued;
         if (seniorId) {
             try {

package/dist/lib/lanes/types.d.ts

@@ -500,9 +500,8 @@ export interface LaneRecord {
     /** Eligible accounts for a queue entry created without an explicit account. */
     admission_accounts?: string[];
     /**
-     * Every operator move of the lane's session to another account of the
-     * same provider (`hq lanes resume|message --account`), newest last, capped
-     * like the other histories.
+     * Moves of the lane's session to another account of the same provider,
+     * newest last and capped like the other histories.
      */
     account_history?: AccountHistoryEntry[];
     /** Bounded audit history for explicitly authorized resumes from failed. */
@@ -665,7 +664,7 @@ export interface AccountHistoryEntry {
     from: string | null;
     to: string;
     at: string;
-    reason: "first_assignment" | "model_change" | "usage_limit" | "account_unavailable" | "recorded_account_logged_out" | "load_balance" | "operator_move";
+    reason: "first_assignment" | "model_change" | "usage_limit" | "account_unavailable" | "recorded_account_logged_out" | "load_balance" | "keep_alive_resume" | "operator_move";
 }
 export interface FailedResumeHistoryEntry {
     at: string;

package/package.json

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