very-happy-cli 0.2.191 → 0.2.192

package/dist/{runClaude-CBEpYO4S.cjs → runClaude-D6U1Z575.cjs}

@@ -1,58 +1,61 @@
 'use strict';
 
 var os = require('node:os');
-var sessionLock = require('./sessionLock-BmLA2S8K.cjs');
-var persistence = require('./persistence-A2NeERZJ.cjs');
-var startupSessionCreate = require('./startupSessionCreate-CcF7rGGB.cjs');
+var sessionLock = require('./sessionLock-BDtSzzKS.cjs');
+var persistence = require('./persistence-B4ttN-fR.cjs');
+var startupSessionCreate = require('./startupSessionCreate-B3ND-917.cjs');
 var node_crypto = require('node:crypto');
-var api = require('./api-BBxZ7y2z.cjs');
-var logger = require('./logger-Ct2zvaq0.cjs');
-var createSessionMetadata = require('./createSessionMetadata-Cf78KHtt.cjs');
-var _package = require('./package-9n7wd2dT.cjs');
-var index = require('./index-CLUHaPU8.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-oqTupStc.cjs');
+var api = require('./api-hMDsC6Wg.cjs');
+var logger = require('./logger-8su64lqR.cjs');
+var createSessionMetadata = require('./createSessionMetadata-DwdD_uVo.cjs');
+var _package = require('./package-iuLlSiSF.cjs');
+var index = require('./index-BzAYnYct.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-BFShzF55.cjs');
 var forkBackfill = require('./forkBackfill-8eLDeS73.cjs');
-var configuration = require('./configuration-DfPBa-9d.cjs');
-var providerBinding = require('./providerBinding-B-Qbx9W2.cjs');
-var controlClient = require('./controlClient-C13_pSKG.cjs');
-var machineMetadata = require('./machineMetadata-DDCVWb_x.cjs');
+var configuration = require('./configuration-CXEVKAyF.cjs');
+var wrapperAccount = require('./wrapperAccount-DzoGqS2b.cjs');
+var store = require('./store-DV__wCvP.cjs');
+var controlClient = require('./controlClient-j7p5p3_7.cjs');
+var machineMetadata = require('./machineMetadata-DYXt3p6u.cjs');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var path = require('node:path');
 var permissionMode = require('./permissionMode-CrV-XuMs.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var promises = require('node:fs/promises');
-var attachmentContent = require('./attachmentContent-BO2njyza.cjs');
+var attachmentContent = require('./attachmentContent-BEeT2J5n.cjs');
 var transcriptCursor = require('./transcriptCursor-DcXGLeSc.cjs');
 var startupPlan = require('./startupPlan-BLMbfQIH.cjs');
+var reconnectEnv = require('./reconnectEnv-B31lY4nR.cjs');
 require('./cliUpdate-DsKXPFYp.cjs');
 require('node:fs');
 require('./processTreeSnapshot-mDbnuojn.cjs');
 require('node:child_process');
 require('zod');
 require('axios');
-require('./lidState-C9_DoF9i.cjs');
+require('./lidState-DqoN7zH4.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
-require('./pushNotifications-23YSd-0l.cjs');
+require('./pushNotifications-BqFoLye2.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('./limits-C-a7gr04.cjs');
-require('./time-Cy0a-7YX.cjs');
-require('./registerCommonHandlers-D1MiSfcB.cjs');
+require('./time-CaUlWSNJ.cjs');
+require('./registerCommonHandlers-m6pxxf2J.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
 require('@paralleldrive/cuid2');
-require('./sync-Ba8N6xba.cjs');
+require('./sync-_2lsZ1U2.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('chalk');
 require('node:util');
+require('./claudeAccountEnv-BOBpJ3k8.cjs');
 require('./detectCLI-BuYR_Qxe.cjs');
 require('fs');
-require('./localHappyAgentAuth-CCjUvOfi.cjs');
+require('./localHappyAgentAuth-BnGCpHRX.cjs');
 require('tweetnacl');
 require('./fsMkdir-0K3yENml.cjs');
 require('url');
@@ -63,7 +66,7 @@ const CLAUDE_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
 function restoredClaudeEffort(effort) {
   return CLAUDE_EFFORTS.includes(effort ?? "") ? effort : void 0;
 }
-const importRunClaudeDeps = () => Promise.resolve().then(function () { return require('./runClaudeDeps-CYuozSC6.cjs'); });
+const importRunClaudeDeps = () => Promise.resolve().then(function () { return require('./runClaudeDeps-Dkofokgb.cjs'); });
 async function runClaude(credentials, options = {}) {
   logger.logger.debug(`[CLAUDE] ===== CLAUDE MODE STARTING =====`);
   logger.logger.debug(`[CLAUDE] This is the Claude agent, NOT Gemini`);
@@ -73,11 +76,13 @@ async function runClaude(credentials, options = {}) {
     prewarmSpawnEnv[key] = process.env[key];
     delete process.env[key];
   }
+  const spawnAccountId = process.env[store.SPAWN_ACCOUNT_ENV] || void 0;
+  delete process.env[store.SPAWN_ACCOUNT_ENV];
   const workingDirectory = process.cwd();
   const isAssistantVariant = process.env.HAPPY_SESSION_VARIANT === "assistant";
   if (isAssistantVariant) {
     try {
-      const { bootstrapAssistantHome } = await Promise.resolve().then(function () { return require('./bootstrap-sly4qPPY.cjs'); });
+      const { bootstrapAssistantHome } = await Promise.resolve().then(function () { return require('./bootstrap-DsZGc69k.cjs'); });
       await bootstrapAssistantHome();
     } catch (error) {
       logger.logger.debug("[START] Assistant home bootstrap failed:", error);
@@ -97,8 +102,9 @@ async function runClaude(credentials, options = {}) {
     }
     return depsLoadPromise;
   };
+  const reconnectEnv$1 = reconnectEnv.takeReconnectEnv();
   const reconnectRequested = Boolean(
-    process.env.HAPPY_RECONNECT_SESSION_ID && process.env.HAPPY_RECONNECT_ENCRYPTION_KEY && process.env.HAPPY_RECONNECT_ENCRYPTION_VARIANT
+    reconnectEnv$1.HAPPY_RECONNECT_SESSION_ID && reconnectEnv$1.HAPPY_RECONNECT_ENCRYPTION_KEY && reconnectEnv$1.HAPPY_RECONNECT_ENCRYPTION_VARIANT
   );
   const startupPlan$1 = startupPlan.planClaudeStartup({ startedBy: options.startedBy, reconnect: reconnectRequested });
   api.connectionState.setBackend("Claude");
@@ -152,7 +158,7 @@ async function runClaude(credentials, options = {}) {
     // a brand-new session cannot pick a PDF until after sending once.
     attachmentKinds: [...attachmentContent.CLAUDE_ATTACHMENT_KINDS],
     queueCancellation: true,
-    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, sessionLock.AUTO_RESTART_CAPABILITY, index.PROJECT_SESSION_CAPABILITY, index.RUN_INTENT_CAPABILITY, index.CLAUDE_CONFIG_MODEL_CAPABILITY],
+    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", index.PROMPT_QUEUE_CAPABILITY, forkBackfill.FORK_BACKFILL_CAPABILITY, persistence.HIBERNATION_CAPABILITY, sessionLock.AUTO_RESTART_CAPABILITY, index.PROJECT_SESSION_CAPABILITY, index.RUN_INTENT_CAPABILITY, index.CLAUDE_CONFIG_MODEL_CAPABILITY, index.AGENT_PROFILE_SESSION_CAPABILITY],
     // B-849b: this session's model / thinking choice (wrapper is the sole
     // writer; a reconnect keeps the server copy). A spawn-time model is a choice.
     modelIntent: options.model ?? null,
@@ -178,12 +184,12 @@ async function runClaude(credentials, options = {}) {
     // B-586: linked git worktree → branch shown in the session list.
     ...createSessionMetadata.sessionWorktreeMetadata(workingDirectory)
   };
-  const reconnectSessionId = process.env.HAPPY_RECONNECT_SESSION_ID;
-  const reconnectKeyBase64 = process.env.HAPPY_RECONNECT_ENCRYPTION_KEY;
-  const reconnectVariant = process.env.HAPPY_RECONNECT_ENCRYPTION_VARIANT;
-  const reconnectSeq = process.env.HAPPY_RECONNECT_SEQ;
-  const reconnectMetadataVersion = process.env.HAPPY_RECONNECT_METADATA_VERSION;
-  const reconnectAgentStateVersion = process.env.HAPPY_RECONNECT_AGENT_STATE_VERSION;
+  const reconnectSessionId = reconnectEnv$1.HAPPY_RECONNECT_SESSION_ID;
+  const reconnectKeyBase64 = reconnectEnv$1.HAPPY_RECONNECT_ENCRYPTION_KEY;
+  const reconnectVariant = reconnectEnv$1.HAPPY_RECONNECT_ENCRYPTION_VARIANT;
+  const reconnectSeq = reconnectEnv$1.HAPPY_RECONNECT_SEQ;
+  const reconnectMetadataVersion = reconnectEnv$1.HAPPY_RECONNECT_METADATA_VERSION;
+  const reconnectAgentStateVersion = reconnectEnv$1.HAPPY_RECONNECT_AGENT_STATE_VERSION;
   let response;
   if (reconnectSessionId && reconnectKeyBase64 && reconnectVariant) {
     logger.logger.debug(`[START] Reconnecting to existing session ${reconnectSessionId}`);
@@ -202,7 +208,7 @@ async function runClaude(credentials, options = {}) {
   }
   if (!response) {
     let offlineSessionId = null;
-    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal-1vuTFcL8.cjs'); });
+    const { claudeLocal } = await Promise.resolve().then(function () { return require('./claudeLocal-BMf9t4Fa.cjs'); });
     const { createSessionScanner: createSessionScanner2 } = await loadDeps();
     const reconnection = api.startOfflineReconnection({
       serverUrl: configuration.configuration.serverUrl,
@@ -439,19 +445,22 @@ async function runClaude(credentials, options = {}) {
     }
   });
   options = { ...options, claudeEnvVars: { ...options.claudeEnvVars, VH_PEER_SESSION_ID: response.id } };
-  let providerPinnedModel;
+  let account;
   try {
-    const provider = providerBinding.loadSessionProvider(configuration.configuration.happyHomeDir, response.id);
-    if (provider) {
-      providerBinding.applyProviderEnv(process.env, provider);
-      options = { ...options, model: provider.model };
-      providerPinnedModel = provider.model;
-      logger.logger.debug(`[START] B-794 provider binding: profile=${provider.profile} model=${provider.model} baseUrl=${provider.baseUrl}`);
-    }
+    account = wrapperAccount.loadWrapperAccount(configuration.configuration.happyHomeDir, response.id, spawnAccountId);
   } catch (error) {
     const reason = error instanceof Error ? error.message : String(error);
-    logger.logger.debug(`[START] B-794 provider binding failed: ${reason}`);
-    session.sendSessionEvent({ type: "message", message: `Provider binding ignored: ${reason}` });
+    logger.logger.debug(`[START] B-850a account resolution failed: ${reason}`);
+    account = spawnAccountId ? { profile: { id: spawnAccountId, label: spawnAccountId, kind: "unknown", status: "unavailable", reason: "error" }, settings: {}, unavailable: true, notices: [`Account "${spawnAccountId}" could not be loaded: ${reason}`], cleanup: () => {
+    } } : { profile: null, settings: {}, unavailable: false, notices: [], cleanup: () => {
+    } };
+  }
+  const providerPinnedModel = account.pinnedModel;
+  if (providerPinnedModel) options = { ...options, model: providerPinnedModel };
+  logger.logger.debug(`[START] B-850a account: ${account.profile ? `${account.profile.id} ${account.profile.kind} ${account.profile.status}` : "machine login"}`);
+  session.updateMetadata((current) => ({ ...current, agentProfile: account.profile }));
+  for (const notice of account.notices) {
+    session.sendSessionEvent({ type: "message", message: notice, kind: account.unavailable ? "agent-profile-unavailable" : "agent-profile-warning" });
   }
   const initialScannerSessionId = forkClaudeSessionId ?? (metadata.claudeSessionId ?? null);
   const transcriptPathHints = new transcriptCursor.TranscriptPathHints();
@@ -501,7 +510,7 @@ async function runClaude(credentials, options = {}) {
     }
   });
   logger.logger.debug(`[START] Hook server started on port ${hookServer.port}`);
-  const hookSettingsPath = generateHookSettingsFile(hookServer.port);
+  const hookSettingsPath = generateHookSettingsFile(hookServer.port, void 0, account.settings);
   logger.logger.debug(`[START] Generated hook settings file: ${hookSettingsPath}`);
   const logPath = logger.logger.logFilePath;
   logger.logger.infoDeveloper(`Session: ${response.id}`);
@@ -572,7 +581,7 @@ async function runClaude(credentials, options = {}) {
     getModel: () => currentModel,
     cwd: workingDirectory,
     getEnv: () => options.claudeEnvVars,
-    settingsPath: writeSideQuestionSettingsFile(configuration.configuration.happyHomeDir),
+    settingsPath: writeSideQuestionSettingsFile(configuration.configuration.happyHomeDir, account.settings),
     // B-482: in remote mode the launcher parks the live Query's /btw entry
     // on the session while the Query is alive; local mode never sets it.
     getLiveQuery: () => currentSession?.getSideQuestionLive() ?? null
@@ -609,6 +618,7 @@ async function runClaude(credentials, options = {}) {
     startedBy: options.startedBy,
     startingMode: options.startingMode,
     claudeArgs: options.claudeArgs,
+    reconnect: reconnectRequested,
     setting: settings?.claudePrewarm
   };
   const prewarmCtx = () => ({ sandboxEnabled, isAssistantVariant, staleModeSnapshot: false, pinnedModel: providerPinnedModel });
@@ -626,6 +636,7 @@ async function runClaude(credentials, options = {}) {
   let userMessageSeen = false;
   const prewarmTagFiles = /* @__PURE__ */ new Set();
   const createPrewarm = () => {
+    if (account.unavailable) return null;
     const eligibility = claudePrewarmEligibility({
       ...prewarmSessionInput,
       env: { ...process.env, ...prewarmSpawnEnv },
@@ -652,7 +663,7 @@ async function runClaude(credentials, options = {}) {
     const tag = prewarmHookGate.newTag();
     let tagHookSettingsPath;
     try {
-      tagHookSettingsPath = generateHookSettingsFile(hookServer.port, tag);
+      tagHookSettingsPath = generateHookSettingsFile(hookServer.port, tag, account.settings);
     } catch (error) {
       slot.release();
       logger.logger.debug(formatPrewarmLine("skipped", "hook-settings"));
@@ -701,6 +712,11 @@ async function runClaude(credentials, options = {}) {
   });
   session.onUserMessage(async (message) => {
     userMessageSeen = true;
+    if (account.unavailable && account.profile) {
+      if (message.localKey) session.sendQueueCancelReason([message.localKey], "failed");
+      session.sendSessionEvent({ type: "message", message: account.notices[0] ?? `Account "${account.profile.label}" is unavailable.`, kind: "agent-profile-unavailable" });
+      return;
+    }
     if (message?.content?.text) {
       titleGenerator.maybeGenerate(message.content.text);
       boardAnalyzer.noteUserMessage(message.content.text);
@@ -854,6 +870,7 @@ async function runClaude(credentials, options = {}) {
       happyServer.stop();
       hookServer.stop();
       cleanupHookSettingsFile(hookSettingsPath);
+      account.cleanup();
       await remoteScanner.cleanup();
       logger.logger.debug("[START] Cleanup complete, exiting");
       await terminateSurvivors(wrapperTree);
@@ -999,6 +1016,7 @@ async function runClaude(credentials, options = {}) {
   logger.logger.debug("Stopped Happy MCP server");
   hookServer.stop();
   cleanupHookSettingsFile(hookSettingsPath);
+  account.cleanup();
   logger.logger.debug("Stopped Hook server and cleaned up settings file");
   process.exit(exitCode);
 }

package/dist/{runClaude-C3rii_S6.mjs → runClaude-DRKtAGTm.mjs}

@@ -1,56 +1,59 @@
 import os from 'node:os';
-import { A as AUTO_RESTART_CAPABILITY, c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, t as takeAutoRestartedEvent, e as exitCursorStamp } from './sessionLock-G2PMqvsh.mjs';
-import { r as readSettings, H as HIBERNATION_CAPABILITY, a as resolveCheckMs, l as latchKeepAwake, e as evaluateWrapperIdle } from './persistence-Cpw4yJs8.mjs';
-import { c as createSessionForStartup, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-BtR4iYEC.mjs';
+import { A as AUTO_RESTART_CAPABILITY, c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, t as takeAutoRestartedEvent, e as exitCursorStamp } from './sessionLock-Dl6i7IgA.mjs';
+import { r as readSettings, H as HIBERNATION_CAPABILITY, a as resolveCheckMs, l as latchKeepAwake, e as evaluateWrapperIdle } from './persistence-DWcHe035.mjs';
+import { c as createSessionForStartup, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-CDdaLaMq.mjs';
 import { randomUUID } from 'node:crypto';
-import { c as connectionState, A as ApiClient, s as startOfflineReconnection } from './api-jfeMRg5R.mjs';
-import { l as logger } from './logger-GcbI0eg2.mjs';
-import { s as spawnOriginTags, a as sessionWorktreeMetadata } from './createSessionMetadata-B0eT_Kfj.mjs';
-import { p as packageJson } from './package-BsUHyqWe.mjs';
-import { P as PROMPT_QUEUE_CAPABILITY, a as PROJECT_SESSION_CAPABILITY, R as RUN_INTENT_CAPABILITY, C as CLAUDE_CONFIG_MODEL_CAPABILITY, r as restoredEffort, b as restoredModel } from './index-Bq8NKSCF.mjs';
-import { D as DEFAULT_CLAUDE_PERMISSION_MODE, r as registerRunIntentRpc, a as recordRunIntents, w as withoutEffort } from './defaultPermissionMode-m6z2QVyP.mjs';
+import { c as connectionState, A as ApiClient, s as startOfflineReconnection } from './api-_LeBScjg.mjs';
+import { l as logger } from './logger-Fd_rNvgd.mjs';
+import { s as spawnOriginTags, a as sessionWorktreeMetadata } from './createSessionMetadata-oyaTZm1b.mjs';
+import { p as packageJson } from './package-6KkRAops.mjs';
+import { P as PROMPT_QUEUE_CAPABILITY, a as PROJECT_SESSION_CAPABILITY, R as RUN_INTENT_CAPABILITY, C as CLAUDE_CONFIG_MODEL_CAPABILITY, A as AGENT_PROFILE_SESSION_CAPABILITY, r as restoredEffort, b as restoredModel } from './index-DYD3GM1m.mjs';
+import { D as DEFAULT_CLAUDE_PERMISSION_MODE, r as registerRunIntentRpc, a as recordRunIntents, w as withoutEffort } from './defaultPermissionMode-Lt3PUCwY.mjs';
 import { F as FORK_BACKFILL_CAPABILITY, p as publishForkBackfillWhenCommitted } from './forkBackfill-DYIjlN1Z.mjs';
-import { c as configuration } from './configuration-ECqXu34R.mjs';
-import { l as loadSessionProvider, a as applyProviderEnv } from './providerBinding-CYubGg-Z.mjs';
-import { n as notifyDaemonSessionStarted, c as checkDaemonHibernation } from './controlClient-ClI7A0qE.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-CXRmFNOV.mjs';
+import { c as configuration } from './configuration-IhRiLDVe.mjs';
+import { l as loadWrapperAccount } from './wrapperAccount-DXlD3bsO.mjs';
+import { S as SPAWN_ACCOUNT_ENV } from './store--XN-7MS0.mjs';
+import { n as notifyDaemonSessionStarted, c as checkDaemonHibernation } from './controlClient-8ILulwjc.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-1HIIC7Bc.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { resolve, join } from 'node:path';
 import { a as applySandboxPermissionPolicy, r as resolveInitialClaudePermissionMode, m as mapToClaudeMode, b as reconcilePublishedPermissionMode } from './permissionMode-CH4FoZfU.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
 import { readFile } from 'node:fs/promises';
-import { C as CLAUDE_ATTACHMENT_KINDS, s as stripAttachmentManifest } from './attachmentContent-Dm_RIs5L.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, s as stripAttachmentManifest } from './attachmentContent-CyptLIfq.mjs';
 import { T as TranscriptPathHints } from './transcriptCursor-B7T_gkQ0.mjs';
 import { p as planClaudeStartup } from './startupPlan-DFMyNgAs.mjs';
+import { t as takeReconnectEnv } from './reconnectEnv-DeSvHl3q.mjs';
 import './cliUpdate-Y34VGe9Y.mjs';
 import 'node:fs';
 import './processTreeSnapshot-CuLJDNC-.mjs';
 import 'node:child_process';
 import 'zod';
 import 'axios';
-import './lidState-CD81ryTy.mjs';
+import './lidState-CZOXXdzv.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
 import 'socket.io-client';
-import './pushNotifications-XAM8__Pg.mjs';
+import './pushNotifications-DkQ0yvFs.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './limits-DIo7rEBR.mjs';
-import './time-D0jvDRhn.mjs';
-import './registerCommonHandlers-DRRfinzK.mjs';
+import './time-bzmet4s5.mjs';
+import './registerCommonHandlers-yQ7Ru-l0.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'cross-spawn';
 import '@paralleldrive/cuid2';
-import './sync-C0PRuTMj.mjs';
+import './sync-JoEZKRo8.mjs';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import 'chalk';
 import 'node:util';
+import './claudeAccountEnv-ON24i0qv.mjs';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-Cg-m1lwm.mjs';
+import './localHappyAgentAuth-YHxDZ4x4.mjs';
 import 'tweetnacl';
 import './fsMkdir-DumgLTzR.mjs';
 import 'url';
@@ -61,7 +64,7 @@ const CLAUDE_EFFORTS = ["low", "medium", "high", "xhigh", "max"];
 function restoredClaudeEffort(effort) {
   return CLAUDE_EFFORTS.includes(effort ?? "") ? effort : void 0;
 }
-const importRunClaudeDeps = () => import('./runClaudeDeps-DlVfMG4F.mjs');
+const importRunClaudeDeps = () => import('./runClaudeDeps-BheVcIlD.mjs');
 async function runClaude(credentials, options = {}) {
   logger.debug(`[CLAUDE] ===== CLAUDE MODE STARTING =====`);
   logger.debug(`[CLAUDE] This is the Claude agent, NOT Gemini`);
@@ -71,11 +74,13 @@ async function runClaude(credentials, options = {}) {
     prewarmSpawnEnv[key] = process.env[key];
     delete process.env[key];
   }
+  const spawnAccountId = process.env[SPAWN_ACCOUNT_ENV] || void 0;
+  delete process.env[SPAWN_ACCOUNT_ENV];
   const workingDirectory = process.cwd();
   const isAssistantVariant = process.env.HAPPY_SESSION_VARIANT === "assistant";
   if (isAssistantVariant) {
     try {
-      const { bootstrapAssistantHome } = await import('./bootstrap-rLaL3kTa.mjs');
+      const { bootstrapAssistantHome } = await import('./bootstrap-DaZ0Np7X.mjs');
       await bootstrapAssistantHome();
     } catch (error) {
       logger.debug("[START] Assistant home bootstrap failed:", error);
@@ -95,8 +100,9 @@ async function runClaude(credentials, options = {}) {
     }
     return depsLoadPromise;
   };
+  const reconnectEnv = takeReconnectEnv();
   const reconnectRequested = Boolean(
-    process.env.HAPPY_RECONNECT_SESSION_ID && process.env.HAPPY_RECONNECT_ENCRYPTION_KEY && process.env.HAPPY_RECONNECT_ENCRYPTION_VARIANT
+    reconnectEnv.HAPPY_RECONNECT_SESSION_ID && reconnectEnv.HAPPY_RECONNECT_ENCRYPTION_KEY && reconnectEnv.HAPPY_RECONNECT_ENCRYPTION_VARIANT
   );
   const startupPlan = planClaudeStartup({ startedBy: options.startedBy, reconnect: reconnectRequested });
   connectionState.setBackend("Claude");
@@ -150,7 +156,7 @@ async function runClaude(credentials, options = {}) {
     // a brand-new session cannot pick a PDF until after sending once.
     attachmentKinds: [...CLAUDE_ATTACHMENT_KINDS],
     queueCancellation: true,
-    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY, AUTO_RESTART_CAPABILITY, PROJECT_SESSION_CAPABILITY, RUN_INTENT_CAPABILITY, CLAUDE_CONFIG_MODEL_CAPABILITY],
+    capabilities: ["claude-steer-v1", "claude-live-permission-v1", "claude-live-permission-v2", "claude-btw-v1", "claude-runtime-controls-v1", "claude-opus-5-5-v1", PROMPT_QUEUE_CAPABILITY, FORK_BACKFILL_CAPABILITY, HIBERNATION_CAPABILITY, AUTO_RESTART_CAPABILITY, PROJECT_SESSION_CAPABILITY, RUN_INTENT_CAPABILITY, CLAUDE_CONFIG_MODEL_CAPABILITY, AGENT_PROFILE_SESSION_CAPABILITY],
     // B-849b: this session's model / thinking choice (wrapper is the sole
     // writer; a reconnect keeps the server copy). A spawn-time model is a choice.
     modelIntent: options.model ?? null,
@@ -176,12 +182,12 @@ async function runClaude(credentials, options = {}) {
     // B-586: linked git worktree → branch shown in the session list.
     ...sessionWorktreeMetadata(workingDirectory)
   };
-  const reconnectSessionId = process.env.HAPPY_RECONNECT_SESSION_ID;
-  const reconnectKeyBase64 = process.env.HAPPY_RECONNECT_ENCRYPTION_KEY;
-  const reconnectVariant = process.env.HAPPY_RECONNECT_ENCRYPTION_VARIANT;
-  const reconnectSeq = process.env.HAPPY_RECONNECT_SEQ;
-  const reconnectMetadataVersion = process.env.HAPPY_RECONNECT_METADATA_VERSION;
-  const reconnectAgentStateVersion = process.env.HAPPY_RECONNECT_AGENT_STATE_VERSION;
+  const reconnectSessionId = reconnectEnv.HAPPY_RECONNECT_SESSION_ID;
+  const reconnectKeyBase64 = reconnectEnv.HAPPY_RECONNECT_ENCRYPTION_KEY;
+  const reconnectVariant = reconnectEnv.HAPPY_RECONNECT_ENCRYPTION_VARIANT;
+  const reconnectSeq = reconnectEnv.HAPPY_RECONNECT_SEQ;
+  const reconnectMetadataVersion = reconnectEnv.HAPPY_RECONNECT_METADATA_VERSION;
+  const reconnectAgentStateVersion = reconnectEnv.HAPPY_RECONNECT_AGENT_STATE_VERSION;
   let response;
   if (reconnectSessionId && reconnectKeyBase64 && reconnectVariant) {
     logger.debug(`[START] Reconnecting to existing session ${reconnectSessionId}`);
@@ -200,7 +206,7 @@ async function runClaude(credentials, options = {}) {
   }
   if (!response) {
     let offlineSessionId = null;
-    const { claudeLocal } = await import('./claudeLocal-Bgb5GGsq.mjs');
+    const { claudeLocal } = await import('./claudeLocal-B1ZVtryl.mjs');
     const { createSessionScanner: createSessionScanner2 } = await loadDeps();
     const reconnection = startOfflineReconnection({
       serverUrl: configuration.serverUrl,
@@ -437,19 +443,22 @@ async function runClaude(credentials, options = {}) {
     }
   });
   options = { ...options, claudeEnvVars: { ...options.claudeEnvVars, VH_PEER_SESSION_ID: response.id } };
-  let providerPinnedModel;
+  let account;
   try {
-    const provider = loadSessionProvider(configuration.happyHomeDir, response.id);
-    if (provider) {
-      applyProviderEnv(process.env, provider);
-      options = { ...options, model: provider.model };
-      providerPinnedModel = provider.model;
-      logger.debug(`[START] B-794 provider binding: profile=${provider.profile} model=${provider.model} baseUrl=${provider.baseUrl}`);
-    }
+    account = loadWrapperAccount(configuration.happyHomeDir, response.id, spawnAccountId);
   } catch (error) {
     const reason = error instanceof Error ? error.message : String(error);
-    logger.debug(`[START] B-794 provider binding failed: ${reason}`);
-    session.sendSessionEvent({ type: "message", message: `Provider binding ignored: ${reason}` });
+    logger.debug(`[START] B-850a account resolution failed: ${reason}`);
+    account = spawnAccountId ? { profile: { id: spawnAccountId, label: spawnAccountId, kind: "unknown", status: "unavailable", reason: "error" }, settings: {}, unavailable: true, notices: [`Account "${spawnAccountId}" could not be loaded: ${reason}`], cleanup: () => {
+    } } : { profile: null, settings: {}, unavailable: false, notices: [], cleanup: () => {
+    } };
+  }
+  const providerPinnedModel = account.pinnedModel;
+  if (providerPinnedModel) options = { ...options, model: providerPinnedModel };
+  logger.debug(`[START] B-850a account: ${account.profile ? `${account.profile.id} ${account.profile.kind} ${account.profile.status}` : "machine login"}`);
+  session.updateMetadata((current) => ({ ...current, agentProfile: account.profile }));
+  for (const notice of account.notices) {
+    session.sendSessionEvent({ type: "message", message: notice, kind: account.unavailable ? "agent-profile-unavailable" : "agent-profile-warning" });
   }
   const initialScannerSessionId = forkClaudeSessionId ?? (metadata.claudeSessionId ?? null);
   const transcriptPathHints = new TranscriptPathHints();
@@ -499,7 +508,7 @@ async function runClaude(credentials, options = {}) {
     }
   });
   logger.debug(`[START] Hook server started on port ${hookServer.port}`);
-  const hookSettingsPath = generateHookSettingsFile(hookServer.port);
+  const hookSettingsPath = generateHookSettingsFile(hookServer.port, void 0, account.settings);
   logger.debug(`[START] Generated hook settings file: ${hookSettingsPath}`);
   const logPath = logger.logFilePath;
   logger.infoDeveloper(`Session: ${response.id}`);
@@ -570,7 +579,7 @@ async function runClaude(credentials, options = {}) {
     getModel: () => currentModel,
     cwd: workingDirectory,
     getEnv: () => options.claudeEnvVars,
-    settingsPath: writeSideQuestionSettingsFile(configuration.happyHomeDir),
+    settingsPath: writeSideQuestionSettingsFile(configuration.happyHomeDir, account.settings),
     // B-482: in remote mode the launcher parks the live Query's /btw entry
     // on the session while the Query is alive; local mode never sets it.
     getLiveQuery: () => currentSession?.getSideQuestionLive() ?? null
@@ -607,6 +616,7 @@ async function runClaude(credentials, options = {}) {
     startedBy: options.startedBy,
     startingMode: options.startingMode,
     claudeArgs: options.claudeArgs,
+    reconnect: reconnectRequested,
     setting: settings?.claudePrewarm
   };
   const prewarmCtx = () => ({ sandboxEnabled, isAssistantVariant, staleModeSnapshot: false, pinnedModel: providerPinnedModel });
@@ -624,6 +634,7 @@ async function runClaude(credentials, options = {}) {
   let userMessageSeen = false;
   const prewarmTagFiles = /* @__PURE__ */ new Set();
   const createPrewarm = () => {
+    if (account.unavailable) return null;
     const eligibility = claudePrewarmEligibility({
       ...prewarmSessionInput,
       env: { ...process.env, ...prewarmSpawnEnv },
@@ -650,7 +661,7 @@ async function runClaude(credentials, options = {}) {
     const tag = prewarmHookGate.newTag();
     let tagHookSettingsPath;
     try {
-      tagHookSettingsPath = generateHookSettingsFile(hookServer.port, tag);
+      tagHookSettingsPath = generateHookSettingsFile(hookServer.port, tag, account.settings);
     } catch (error) {
       slot.release();
       logger.debug(formatPrewarmLine("skipped", "hook-settings"));
@@ -699,6 +710,11 @@ async function runClaude(credentials, options = {}) {
   });
   session.onUserMessage(async (message) => {
     userMessageSeen = true;
+    if (account.unavailable && account.profile) {
+      if (message.localKey) session.sendQueueCancelReason([message.localKey], "failed");
+      session.sendSessionEvent({ type: "message", message: account.notices[0] ?? `Account "${account.profile.label}" is unavailable.`, kind: "agent-profile-unavailable" });
+      return;
+    }
     if (message?.content?.text) {
       titleGenerator.maybeGenerate(message.content.text);
       boardAnalyzer.noteUserMessage(message.content.text);
@@ -852,6 +868,7 @@ async function runClaude(credentials, options = {}) {
       happyServer.stop();
       hookServer.stop();
       cleanupHookSettingsFile(hookSettingsPath);
+      account.cleanup();
       await remoteScanner.cleanup();
       logger.debug("[START] Cleanup complete, exiting");
       await terminateSurvivors(wrapperTree);
@@ -997,6 +1014,7 @@ async function runClaude(credentials, options = {}) {
   logger.debug("Stopped Happy MCP server");
   hookServer.stop();
   cleanupHookSettingsFile(hookSettingsPath);
+  account.cleanup();
   logger.debug("Stopped Hook server and cleaned up settings file");
   process.exit(exitCode);
 }