agent-shim 8.39.0 → 8.41.0

package/dist/cli.cjs

@@ -63708,7 +63708,7 @@ function registerIdentityCommand(program2, deps) {
 // package.json
 var package_default = {
   name: "agent-shim",
-  version: "8.39.0",
+  version: "8.41.0",
   description: "A profile manager and launcher for Claude Code that lets one person run multiple logins from one machine while controlling what gets shared between them.",
   license: "MIT",
   author: "Joseph Mearman <joseph@mearman.co.uk>",
@@ -65215,12 +65215,7 @@ function rankNamedPool(input2, poolName, stack, sticky) {
       }
       continue;
     }
-    if (input2.pools[nestedName] === void 0) {
-      throw new PoolGraphError(`Pool "${poolName}" member "${poolMemberIdentity(entry)}" names a pool that is not defined.`);
-    }
-    if (childStack.includes(nestedName)) {
-      throw new PoolGraphError(`Pool "${poolName}" member "${poolMemberIdentity(entry)}" closes a cycle: ${[...childStack.slice(childStack.indexOf(nestedName)), nestedName].join(" -> ")}. A pool cannot nest itself, directly or through another pool.`);
-    }
+    assertNestable(input2.pools, poolName, poolMemberIdentity(entry), nestedName, childStack);
     const nested = nestedMember(input2, nestedName, childStack, sticky);
     members2.push(typeof entry === "string" ? nested.member : { ...nested.member, policy: entry.when });
     missing.push(...nested.missing);
@@ -65234,6 +65229,14 @@ function rankNamedPool(input2, poolName, stack, sticky) {
   });
   return { ranking, missing };
 }
+function assertNestable(pools, poolName, member, nestedName, childStack) {
+  if (pools[nestedName] === void 0) {
+    throw new PoolGraphError(`Pool "${poolName}" member "${member}" names a pool that is not defined.`);
+  }
+  if (childStack.includes(nestedName)) {
+    throw new PoolGraphError(`Pool "${poolName}" member "${member}" closes a cycle: ${[...childStack.slice(childStack.indexOf(nestedName)), nestedName].join(" -> ")}. A pool cannot nest itself, directly or through another pool.`);
+  }
+}
 function nestedMember(input2, nestedName, childStack, sticky) {
   const nested = rankNamedPool(input2, nestedName, childStack, sticky);
   const pick2 = nested.ranking.pick;
@@ -65316,6 +65319,46 @@ function collectPoolPick(params) {
   };
 }
 
+// src/launchSelection.ts
+function selectLaunch(params, loaded) {
+  const { paths, cwd } = params;
+  const selections = readDirectorySelections(loaded);
+  const decidedIdentity = decideIdentity({
+    env: params.env,
+    argv0Identity: params.identity,
+    directoryPinnedIdentity: selections.identity,
+    readActiveIdentityFile: () => {
+      const raw = realFsPort.readFileUtf8(paths.activeIdentityFile);
+      if (raw === void 0) {
+        return void 0;
+      }
+      const trimmed = raw.trim();
+      return trimmed === "" ? void 0 : trimmed;
+    }
+  });
+  let poolPick;
+  if (decidedIdentity.pool !== void 0) {
+    const pools = loaded.globalConfig?.pools ?? {};
+    if (pools[decidedIdentity.pool] === void 0) {
+      throw new PoolNotFoundError(decidedIdentity.pool);
+    }
+    poolPick = collectPoolPick({ paths, fs: realFsPort, usageFs: realFarmFs, poolName: decidedIdentity.pool, pools, directory: cwd, nowMs: Date.now() });
+  }
+  const identity = poolPick?.pick === void 0 ? decidedIdentity : { ...decidedIdentity, name: poolPick.pick };
+  const loadedIdentity = identity.name === void 0 ? void 0 : loadIdentity(paths.identitiesDir, identity.name, realFsPort);
+  const configProfile = decideConfigProfile({
+    env: params.env,
+    ...params.configProfile === void 0 ? {} : { cliFlagConfigProfile: params.configProfile },
+    directoryRuleConfigProfile: selections.configProfile,
+    identityDefaultConfigProfile: loadedIdentity?.config.defaultConfigProfile,
+    globalDefaultConfigProfile: loaded.globalConfig?.defaultConfigProfile
+  });
+  return {
+    selection: { identity, ...poolPick === void 0 ? {} : { poolPick }, configProfile },
+    ...loadedIdentity === void 0 ? {} : { identityConfig: loadedIdentity.config }
+  };
+}
+
 // src/realCredentialCache.ts
 var import_node_child_process3 = require("node:child_process");
 var import_node_fs9 = __toESM(require("node:fs"), 1);
@@ -66088,37 +66131,9 @@ function collectCheckReport(params) {
   const read = cosmiconfigReader();
   const classification = loadClassification(paths);
   const loaded = loadCascadeInput({ paths, home, cwd, read });
-  const selections = readDirectorySelections(loaded);
   const git = resolveGitBranch(realRunPort, cwd);
-  const decidedIdentity = decideIdentity({
-    env: params.env,
-    argv0Identity: params.identity,
-    directoryPinnedIdentity: selections.identity,
-    readActiveIdentityFile: () => {
-      const raw = realFsPort.readFileUtf8(paths.activeIdentityFile);
-      if (raw === void 0) {
-        return void 0;
-      }
-      const trimmed = raw.trim();
-      return trimmed === "" ? void 0 : trimmed;
-    }
-  });
-  let poolPick;
-  if (decidedIdentity.pool !== void 0) {
-    const pools = loaded.globalConfig?.pools ?? {};
-    if (pools[decidedIdentity.pool] === void 0) {
-      throw new PoolNotFoundError(decidedIdentity.pool);
-    }
-    poolPick = collectPoolPick({ paths, fs: realFsPort, usageFs: realFarmFs, poolName: decidedIdentity.pool, pools, directory: cwd, nowMs: Date.now() });
-  }
-  const identityDecision = poolPick?.pick === void 0 ? decidedIdentity : { ...decidedIdentity, name: poolPick.pick };
-  const loadedIdentity = identityDecision.name === void 0 ? void 0 : loadIdentity(paths.identitiesDir, identityDecision.name, realFsPort);
-  const configProfileDecision = decideConfigProfile({
-    env: params.env,
-    directoryRuleConfigProfile: selections.configProfile,
-    identityDefaultConfigProfile: loadedIdentity?.config.defaultConfigProfile,
-    globalDefaultConfigProfile: loaded.globalConfig?.defaultConfigProfile
-  });
+  const { selection, identityConfig } = selectLaunch({ paths, cwd, env: params.env, ...params.identity === void 0 ? {} : { identity: params.identity } }, loaded);
+  const { identity: identityDecision, poolPick, configProfile: configProfileDecision } = selection;
   const cascade = loadCascadeInput({
     paths,
     home,
@@ -66149,7 +66164,7 @@ function collectCheckReport(params) {
     ...poolPick === void 0 ? {} : { poolPick },
     ...configProfileDecision.name === void 0 ? {} : { configProfileName: configProfileDecision.name },
     configProfileSource: configProfileDecision.source,
-    ...loadedIdentity === void 0 ? {} : { identity: loadedIdentity.config },
+    ...identityConfig === void 0 ? {} : { identity: identityConfig },
     settingsFiles,
     run: realRunPort,
     credentialCache: realCredentialCacheEnv(paths),
@@ -93736,7 +93751,13 @@ function resolvePoolLaunch(params) {
     if (pick2 !== void 0) {
       recordStickyPick(params.usageFs, params.paths.usagePicksFile, params.cwd, pick2.identity, nowMs);
       const move = movedOff === void 0 ? "" : `moved off ${movedOff.identity} (${movedOff.reason}); `;
-      return { ok: true, identity: pick2.identity, explanation: `pool ${poolName}: ${move}${pick2.reasons.slice(0, REASONS_LOGGED).join("; ")}` };
+      return {
+        ok: true,
+        identity: pick2.identity,
+        explanation: `pool ${poolName}: ${move}${pick2.reasons.slice(0, REASONS_LOGGED).join("; ")}`,
+        reasons: pick2.reasons,
+        ...movedOff === void 0 ? {} : { movedOff }
+      };
     }
     if (earliestReturn === void 0) {
       return { ok: false, message: `agent-shim: no member of pool "${poolName}" can be picked.` };
@@ -94082,7 +94103,11 @@ function pickFromPool(decided, params, parsedArgv) {
     log.error(resolution.message);
     return proc.exit(1);
   }
-  return { identityDecision: { ...decided, name: resolution.identity }, poolExplanation: resolution.explanation };
+  return {
+    identityDecision: { ...decided, name: resolution.identity },
+    poolExplanation: resolution.explanation,
+    poolPick: { name: decided.pool, reasons: resolution.reasons, ...resolution.movedOff === void 0 ? {} : { movedOff: resolution.movedOff } }
+  };
 }
 function prepareLaunch(params) {
   const { paths, fs: fs20, proc, log } = params;
@@ -94108,7 +94133,7 @@ function prepareLaunch(params) {
       return trimmed === "" ? void 0 : trimmed;
     }
   });
-  const { identityDecision, poolExplanation } = pickFromPool(decidedIdentity, params, parsedArgv);
+  const { identityDecision, poolExplanation, poolPick } = pickFromPool(decidedIdentity, params, parsedArgv);
   const farmIdentity = configDirEscapeHatchApplies ? void 0 : identityDecision.name;
   const farm = farmIdentity === void 0 ? void 0 : params.farm;
   if (farm !== void 0 && farmIdentity !== void 0) {
@@ -94322,7 +94347,18 @@ function prepareLaunch(params) {
       registered();
     }
   };
-  return { bin: discovered.path, args: finalArgv, env: finalEnv, release, markChildStarted: updateCheck.markChildStarted };
+  const configDir = finalEnv.CLAUDE_CONFIG_DIR;
+  const decision = {
+    identitySource: identityDecision.source,
+    configDirEscapeHatch: identityDecision.configDirEscapeHatch,
+    configProfileSource: configProfileDecision.source,
+    ...identityDecision.name === void 0 ? {} : { identity: identityDecision.name },
+    ...poolPick === void 0 ? {} : { pool: poolPick },
+    ...configDir === void 0 || configDir === "" ? {} : { configDir },
+    ...configProfileDecision.name === void 0 ? {} : { configProfile: configProfileDecision.name },
+    ...resolvedProvider === void 0 ? {} : { provider: resolvedProvider.name }
+  };
+  return { bin: discovered.path, args: finalArgv, env: finalEnv, release, markChildStarted: updateCheck.markChildStarted, decision };
 }
 function runLauncher(params) {
   const plan = prepareLaunch(params);