@indigoai-us/hq-cli 5.203.0 → 5.204.0

package/dist/lib/lanes/spawn.js

@@ -12,6 +12,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import { PROVIDER_HOME_ENV, accountStatus, isLoggedOut, resolveAccount, selectBalancedAccount, } from "./accounts.js";
+import { effectiveAccountHome } from "./account-home.js";
 import { COMPACTION_PROMPT, compactionAfterUsage, compactionDue, compactLaneSession, } from "./compaction.js";
 import { installDrainHook } from "./hooks-install.js";
 import { loadLanesConfig, providerAutoCompactTokens, providerCompactAfterMs, } from "./config.js";
@@ -112,7 +113,7 @@ function accountModelForSpawn(provider, accountId, config, pinnedModel, profileM
         providerModel: config.providers[provider].model,
     });
 }
-function supportsSpawnModel(provider, accountId, config, pinnedModel, profileModel, modelDeps) {
+function supportsSpawnModel(provider, accountId, config, pinnedModel, profileModel, modelDeps, hostname) {
     const account = config.providers[provider].accounts[accountId];
     if (account === undefined)
         return false;
@@ -120,7 +121,7 @@ function supportsSpawnModel(provider, accountId, config, pinnedModel, profileMod
     if (model === undefined)
         return true;
     try {
-        validateLaneModel(provider, model, account.home, modelDeps);
+        validateLaneModel(provider, model, effectiveAccountHome(account, hostname).home, modelDeps);
         return true;
     }
     catch (err) {
@@ -129,7 +130,7 @@ function supportsSpawnModel(provider, accountId, config, pinnedModel, profileMod
         throw err;
     }
 }
-function spawnModelFailure(provider, accountId, config, pinnedModel, profileModel, profileId, modelDeps) {
+function spawnModelFailure(provider, accountId, config, pinnedModel, profileModel, profileId, modelDeps, hostname) {
     const account = config.providers[provider].accounts[accountId];
     if (account === undefined)
         return new LanesError("unknown_account", `Unknown account ${accountId} for ${provider}`, { provider, account: accountId });
@@ -137,7 +138,7 @@ function spawnModelFailure(provider, accountId, config, pinnedModel, profileMode
     if (model === undefined)
         return null;
     try {
-        validateLaneModel(provider, model, account.home, modelDeps);
+        validateLaneModel(provider, model, effectiveAccountHome(account, hostname).home, modelDeps);
         return null;
     }
     catch (err) {
@@ -155,17 +156,18 @@ function spawnModelFailure(provider, accountId, config, pinnedModel, profileMode
     }
 }
 function selectSpawnAccount(input) {
-    const { hqRoot, lane, config, existsSync, accountDeps, modelDeps, pinnedModel, profileModel, currentModelValidated } = input;
+    const { hqRoot, lane, config, existsSync, accountDeps, modelDeps, pinnedModel, profileModel, currentModelValidated, hostname } = input;
     const context = {
         hqRoot,
         existsSync,
         accountDeps,
+        hostname,
         ...(pinnedModel ?? profileModel ? { model: pinnedModel ?? profileModel } : {}),
     };
     if (lane.account === undefined) {
         const modelSpecified = pinnedModel !== undefined || profileModel !== undefined;
         const allowedAccounts = modelSpecified
-            ? Object.keys(config.providers[lane.provider].accounts).filter((id) => supportsSpawnModel(lane.provider, id, config, pinnedModel, profileModel, modelDeps))
+            ? Object.keys(config.providers[lane.provider].accounts).filter((id) => supportsSpawnModel(lane.provider, id, config, pinnedModel, profileModel, modelDeps, hostname))
             : undefined;
         return {
             account: selectBalancedAccount(lane.provider, config, {
@@ -188,6 +190,7 @@ function selectSpawnAccount(input) {
     else {
         const status = accountStatus(lane.provider, lane.account, config, {
             existsSync,
+            hostname,
             ...(accountDeps?.probe ? { probe: accountDeps.probe } : {}),
             ...(accountDeps?.env ? { env: accountDeps.env } : {}),
         });
@@ -200,7 +203,7 @@ function selectSpawnAccount(input) {
                 resolveAccount(lane.provider, lane.account, config, context);
                 const modelFailure = currentModelValidated
                     ? null
-                    : spawnModelFailure(lane.provider, lane.account, config, pinnedModel, profileModel, lane.worker_profile, modelDeps);
+                    : spawnModelFailure(lane.provider, lane.account, config, pinnedModel, profileModel, lane.worker_profile, modelDeps, hostname);
                 if (modelFailure !== null) {
                     reason = "model_change";
                     refusal = modelFailure;
@@ -240,10 +243,11 @@ function selectSpawnAccount(input) {
         .filter(([id, account]) => id !== lane.account && account.enabled)
         .filter(([id]) => accountStatus(lane.provider, id, config, {
         existsSync,
+        hostname,
         ...(accountDeps?.probe ? { probe: accountDeps.probe } : {}),
         ...(accountDeps?.env ? { env: accountDeps.env } : {}),
     }).logged_in === true)
-        .filter(([id]) => supportsSpawnModel(lane.provider, id, config, pinnedModel, profileModel, modelDeps))
+        .filter(([id]) => supportsSpawnModel(lane.provider, id, config, pinnedModel, profileModel, modelDeps, hostname))
         .map(([id]) => id);
     try {
         return {
@@ -345,6 +349,8 @@ export async function retryLaneOnAlternateAccount(hqRoot, lane, reason, writer =
     const config = loadLanesConfig(hqRoot);
     const existsSync = deps.existsSync ?? ((p) => fs.existsSync(p));
     const env = deps.env ?? process.env;
+    const admissionHost = deps.admissionHost ?? resolveAdmissionHost();
+    const hostname = deps.hostname?.trim() || admissionHost.hostname.trim() || resolveAdmissionHost().hostname;
     const modelDeps = {
         ...deps.modelDeps,
         env: deps.modelDeps?.env ?? env,
@@ -353,7 +359,6 @@ export async function retryLaneOnAlternateAccount(hqRoot, lane, reason, writer =
         probe: modelDeps.probe ?? defaultProbe,
         env,
     };
-    const admissionHost = deps.admissionHost ?? resolveAdmissionHost();
     const profile = lane.worker_profile ? loadWorkerProfile(hqRoot, lane.worker_profile) : undefined;
     const profileModel = profile?.meta.provider === lane.provider ? profile.meta.model : undefined;
     const pinnedModel = lane.model_source === undefined || lane.model_source === "cli" ? lane.model : undefined;
@@ -362,15 +367,17 @@ export async function retryLaneOnAlternateAccount(hqRoot, lane, reason, writer =
         .filter(([id, account]) => id !== lane.account && !unavailableAccounts.has(id) && account.enabled)
         .filter(([id]) => accountStatus(lane.provider, id, config, {
         existsSync,
+        hostname,
         ...(accountDeps?.probe ? { probe: accountDeps.probe } : {}),
         ...(accountDeps?.env ? { env: accountDeps.env } : {}),
     }).logged_in === true)
-        .filter(([id]) => supportsSpawnModel(lane.provider, id, config, pinnedModel, profileModel, modelDeps))
+        .filter(([id]) => supportsSpawnModel(lane.provider, id, config, pinnedModel, profileModel, modelDeps, hostname))
         .map(([id]) => id);
     const modelContext = {
         hqRoot,
         existsSync,
         accountDeps,
+        hostname,
         ...(pinnedModel ?? profileModel ? { model: pinnedModel ?? profileModel } : {}),
         allowedAccounts,
     };
@@ -392,7 +399,7 @@ export async function retryLaneOnAlternateAccount(hqRoot, lane, reason, writer =
         : undefined;
     if (source && sessionId) {
         copySessionFiles(planSessionCopy(lane.provider, {
-            sourceHome: source.home,
+            sourceHome: lane.provider_home_at_spawn ?? effectiveAccountHome(source, hostname).home,
             targetHome: target.home,
             cwd: hqRoot,
             sessionId,
@@ -535,6 +542,11 @@ function appendCodexWorkerPolicyDirFlag(provider, args, workerPolicyDir) {
         return [...args, "-c", setting];
     return [...args.slice(0, separator), "-c", setting, ...args.slice(separator)];
 }
+function accountHomeHostname(deps) {
+    return (deps.hostname?.trim() ||
+        deps.admissionHost?.hostname.trim() ||
+        resolveAdmissionHost().hostname);
+}
 export const PID_LIVENESS_DECISIONS = [
     "esrch",
     "starttime_mismatch",
@@ -1527,6 +1539,7 @@ function inferTrigger(lane) {
  */
 export function spawnLaneWorker(hqRoot, lane, deps = {}, launch = {}) {
     const env = deps.env ?? process.env;
+    const hostname = accountHomeHostname(deps);
     const modelDeps = {
         ...deps.modelDeps,
         env: deps.modelDeps?.env ?? env,
@@ -1644,6 +1657,7 @@ export function spawnLaneWorker(hqRoot, lane, deps = {}, launch = {}) {
             pinnedModel,
             profileModel,
             currentModelValidated: deps.currentModelValidated === true,
+            hostname,
         });
     }
     catch (err) {
@@ -1659,7 +1673,7 @@ export function spawnLaneWorker(hqRoot, lane, deps = {}, launch = {}) {
         throw err;
     }
     const resolved = selection.account;
-    const status = accountStatus(lane.provider, resolved.id, config, { existsSync });
+    const status = accountStatus(lane.provider, resolved.id, config, { existsSync, hostname });
     if (isLoggedOut(status)) {
         const failed = markPreSpawnFailure
             ? markSpawnFailure(hqRoot, lane.lane_id, "account_not_logged_in", {
@@ -1677,7 +1691,7 @@ export function spawnLaneWorker(hqRoot, lane, deps = {}, launch = {}) {
             existing.provider_session_id &&
             providerSupportsSessionResume(existing.provider)) {
             copySessionFiles(planSessionCopy(existing.provider, {
-                sourceHome: source.home,
+                sourceHome: existing.provider_home_at_spawn ?? effectiveAccountHome(source, hostname).home,
                 targetHome: resolved.home,
                 cwd: hqRoot,
                 sessionId: existing.provider_session_id,
@@ -1691,7 +1705,7 @@ export function spawnLaneWorker(hqRoot, lane, deps = {}, launch = {}) {
             cwd: hqRoot,
             targetHome: resolved.home,
             registeredHomes: Object.values(config.providers[existing.provider].accounts)
-                .map((account) => account.home),
+                .map((account) => effectiveAccountHome(account, hostname).home),
             providerHomeAtSpawn: existing.provider_home_at_spawn,
         });
     }
@@ -2095,6 +2109,7 @@ export function envelopeRepairMode(provider) {
  */
 export function spawnEnvelopeRepair(hqRoot, lane, input, deps = {}) {
     const env = deps.env ?? process.env;
+    const hostname = accountHomeHostname(deps);
     const existsSync = deps.existsSync ?? ((p) => fs.existsSync(p));
     const spawnProcess = deps.spawnProcess ?? defaultSpawnProcess;
     const proveDetached = deps.proveDetached ?? defaultProveDetached;
@@ -2141,6 +2156,7 @@ export function spawnEnvelopeRepair(hqRoot, lane, input, deps = {}) {
     const resolved = resolveAccount(lane.provider, lane.account, config, {
         hqRoot,
         existsSync,
+        hostname,
         model: pinnedModel ?? profileModel,
     });
     if (profileDefaultsApply && profileModel !== undefined && pinnedModel === undefined) {

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

@@ -645,6 +645,8 @@ export interface LaneEnvelope {
 }
 export interface AccountConfig {
     home: string;
+    /** Optional account home overrides keyed by the owning host's hostname. */
+    hosts?: Record<string, AccountHostHome>;
     enabled: boolean;
     disabled_reason?: string;
     max_running?: number;
@@ -653,6 +655,9 @@ export interface AccountConfig {
     /** Default effort for this account. Beats the provider default; beaten by --effort. */
     effort?: string;
 }
+export interface AccountHostHome {
+    home: string;
+}
 export interface ProviderConfig {
     max_running: number;
     max_queued: number;

package/package.json

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