very-happy-cli 0.2.143 → 0.2.145

package/dist/{index-Bj68y6ee.cjs → index-avfJgX4p.cjs}

@@ -1,11 +1,11 @@
 'use strict';
 
-var AcpBackend = require('./AcpBackend-B8oehrfU.cjs');
-var persistence = require('./limits-B3oVgqBJ.cjs');
-var AcpSessionManager = require('./AcpSessionManager-BomdfyhZ.cjs');
-var api = require('./types-6__wqmmP.cjs');
-var index = require('./index-C510dSUn.cjs');
-var piRuntime = require('./piRuntime-CWE-1W-y.cjs');
+var AcpBackend = require('./AcpBackend-FPv5uXFa.cjs');
+var persistence = require('./limits-DGZB-OVl.cjs');
+var AcpSessionManager = require('./AcpSessionManager-vqLzM219.cjs');
+var index = require('./types-Bqo68u61.cjs');
+var index$1 = require('./index-DhwtFJEe.cjs');
+var piRuntime = require('./piRuntime-DodWS0UI.cjs');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
@@ -34,7 +34,7 @@ require('fs');
 require('node:readline');
 require('@anthropic-ai/sandbox-runtime');
 require('expo-server-sdk');
-require('./agentGuidance-CJSl54ua.cjs');
+require('./agentGuidance-Bd6GEiYp.cjs');
 require('ink');
 require('react');
 require('@anthropic-ai/claude-agent-sdk');
@@ -555,7 +555,7 @@ function resolveRequestedLegacyModelCode(models, requested) {
   }
   return null;
 }
-class GenericAcpPermissionHandler extends index.BasePermissionHandler {
+class GenericAcpPermissionHandler extends index$1.BasePermissionHandler {
   logPrefix;
   constructor(session, agentName) {
     super(session);
@@ -589,17 +589,17 @@ function resolveSessionFlavor(agentName) {
 async function runAcp(opts) {
   const verbose = opts.verbose === true;
   const sessionTag = node_crypto.randomUUID();
-  api.connectionState.setBackend(opts.agentName);
-  const api$1 = await api.ApiClient.create(opts.credentials);
+  index.connectionState.setBackend(opts.agentName);
+  const api = await index.ApiClient.create(opts.credentials);
   const settings = await persistence.readSettings();
   if (!settings?.machineId) {
     throw new Error("No machine ID found in settings");
   }
-  await api$1.getOrCreateMachine({
+  await api.getOrCreateMachine({
     machineId: settings.machineId,
-    metadata: index.initialMachineMetadata
+    metadata: index$1.initialMachineMetadata
   });
-  const { state, metadata } = index.createSessionMetadata({
+  const { state, metadata } = index$1.createSessionMetadata({
     flavor: resolveSessionFlavor(opts.agentName),
     ...process.env.VH_TEAM_OPERATION_ID ? { teamOperationId: process.env.VH_TEAM_OPERATION_ID } : {},
     machineId: settings.machineId,
@@ -607,14 +607,14 @@ async function runAcp(opts) {
     sandbox: settings.sandboxConfig
   });
   metadata.attachmentKinds = [];
-  const response = await api$1.getOrCreateSession({ tag: sessionTag, metadata, state });
+  const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
   if (response) {
     logAcp("muted", `Happy Session ID: ${response.id}`);
   }
   let session;
   let permissionHandler;
-  const { session: initialSession, reconnectionHandle } = index.setupOfflineReconnection({
-    api: api$1,
+  const { session: initialSession, reconnectionHandle } = index$1.setupOfflineReconnection({
+    api,
     sessionTag,
     metadata,
     state,
@@ -629,7 +629,7 @@ async function runAcp(opts) {
   session = initialSession;
   if (response) {
     try {
-      await api.notifyDaemonSessionStarted(response.id, metadata, {
+      await index.notifyDaemonSessionStarted(response.id, metadata, {
         encryptionKey: persistence.encodeBase64(response.encryptionKey),
         encryptionVariant: response.encryptionVariant,
         seq: response.seq,
@@ -643,11 +643,11 @@ async function runAcp(opts) {
   permissionHandler = new GenericAcpPermissionHandler(session, opts.agentName);
   permissionHandler.reset("Previous CLI process exited before responding");
   const streamingEnabled = process.env.HAPPY_SESSION_STREAM_DISABLED !== "1";
-  const streamRelay = new index.StreamRelay({
+  const streamRelay = new index$1.StreamRelay({
     send: (frame) => session.sendStreamFrame(frame)
   });
   const sessionManager = new AcpSessionManager.AcpSessionManager(streamingEnabled ? { stream: streamRelay } : {});
-  const messageQueue = new index.MessageQueue2((mode) => index.hashObject(mode));
+  const messageQueue = new index$1.MessageQueue2((mode) => index$1.hashObject(mode));
   let currentPermissionMode;
   let currentModel;
   let modeSelector = null;
@@ -668,7 +668,7 @@ async function runAcp(opts) {
       return true;
     }
     try {
-      index.writeSessionModeFile(session.sessionId, mode);
+      index$1.writeSessionModeFile(session.sessionId, mode);
     } catch (error) {
       persistence.logger.debug(`[${opts.agentName}] Failed to write session mode file:`, error);
       return false;
@@ -679,7 +679,7 @@ async function runAcp(opts) {
     return true;
   };
   const isAssistantVariant = process.env.HAPPY_SESSION_VARIANT === "assistant";
-  const happyServer = await index.startHappyServer(session, {
+  const happyServer = await index$1.startHappyServer(session, {
     assistant: isAssistantVariant,
     ...opts.agentName === "pi" ? { onContextUsage: (contextUsage) => {
       session.updateAgentState((state2) => ({ ...state2, contextUsage }));
@@ -767,7 +767,7 @@ async function runAcp(opts) {
       return;
     }
     if (permissionModeIsFileBacked()) {
-      const mode = index.normalizeAcpPermissionMode(requestedMode);
+      const mode = index$1.normalizeAcpPermissionMode(requestedMode);
       if (!mode) {
         persistence.logger.debug(`[${opts.agentName}] Ignoring unknown file-backed permission mode request: ${requestedMode}`);
         return;
@@ -1031,8 +1031,8 @@ async function runAcp(opts) {
     sendEnvelopes(sessionManager.mapMessage(msg));
   };
   backend.onMessage(onBackendMessage);
-  const titleGenerator = new index.TitleGenerator(session);
-  index.registerAgentAttachmentDownloads(session);
+  const titleGenerator = new index$1.TitleGenerator(session);
+  index$1.registerAgentAttachmentDownloads(session);
   let userMessageDelivery = Promise.resolve();
   session.onUserMessage((message) => {
     const downloads = session.drainAttachmentsForUserMessage();
@@ -1088,7 +1088,7 @@ async function runAcp(opts) {
       if (!fileBackedModeActive) {
         throw new Error(`${opts.agentName} does not support live permission mode changes`);
       }
-      const mode = typeof request?.mode === "string" ? index.normalizeAcpPermissionMode(request.mode) : null;
+      const mode = typeof request?.mode === "string" ? index$1.normalizeAcpPermissionMode(request.mode) : null;
       if (!mode) {
         throw new Error("Invalid permission mode");
       }
@@ -1098,7 +1098,7 @@ async function runAcp(opts) {
       return { mode };
     }
   );
-  const disposeTermination = index.registerKillSessionHandler(session.rpcHandlerManager, async () => {
+  const disposeTermination = index$1.registerKillSessionHandler(session.rpcHandlerManager, async () => {
     shouldExit = true;
     messageQueue.close();
     clearPendingTurn(new Error("Session terminated"));
@@ -1114,7 +1114,7 @@ async function runAcp(opts) {
     }
     session.updateMetadata((current) => ({
       ...current,
-      attachmentKinds: opts.agentName === "pi" && backend.supportsImageAttachments ? [...index.CLAUDE_ATTACHMENT_KINDS] : []
+      attachmentKinds: opts.agentName === "pi" && backend.supportsImageAttachments ? [...index$1.CLAUDE_ATTACHMENT_KINDS] : []
     }));
     if (permissionModeIsFileBacked()) {
       fileBackedModeActive = true;
@@ -1164,13 +1164,13 @@ async function runAcp(opts) {
         }
         const prompt = todoDiscoverySent ? batch.message : `${batch.message}
 
-${api.BUILTIN_TODO_DISCOVERY}`;
+${index.BUILTIN_TODO_DISCOVERY}`;
         const attachments = batch.attachments ?? [];
-        const staged = attachments.length ? await index.stageClaudeAttachments(attachments, {
+        const staged = attachments.length ? await index$1.stageClaudeAttachments(attachments, {
           happyHomeDir: persistence.configuration.happyHomeDir,
           sessionId: session.sessionId
         }) : [];
-        await backend.sendPrompt(acpSessionId, index.appendStagedAttachmentsToPrompt(prompt, staged), attachments);
+        await backend.sendPrompt(acpSessionId, index$1.appendStagedAttachmentsToPrompt(prompt, staged), attachments);
         todoDiscoverySent = true;
         await turnEnded;
         sendEnvelopes(sessionManager.endTurn(turnCancelled ? "cancelled" : "completed"));
@@ -1208,7 +1208,7 @@ ${api.BUILTIN_TODO_DISCOVERY}`;
     await backend.dispose();
     if (fileBackedPermissionMode) {
       try {
-        index.removeSessionModeFile(session.sessionId);
+        index$1.removeSessionModeFile(session.sessionId);
       } catch (error) {
         persistence.logger.debug(`[${opts.agentName}] Failed to remove session mode file:`, error);
       }

package/dist/{index-DoiG88oX.mjs → index-eBrE-0R1.mjs}

@@ -1,14 +1,14 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
 import os, { homedir, userInfo, tmpdir } from 'node:os';
 import { randomUUID, randomInt, randomBytes, createHash as createHash$1, timingSafeEqual } from 'node:crypto';
-import { o as notifyDaemonSessionEvent, q as getProjectPath, j as BUILTIN_TODO_DISCOVERY, r as initializeSandbox, w as wrapCommand, l as contentLogMetadata, I as InvalidateSync, R as RawJSONLinesSchema, m as delay, t as AsyncLock, S as STREAM_DELTA_MAX_CHARS, M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES, u as notifyDaemonClaudeAuthFailed, v as commandOnPath, c as checkIfDaemonRunningAndCleanupStaleState, x as deriveLocalCliUpdateSummary, y as AGENT_VERSION_SOURCES, z as isClaudeSessionId, C as getLocalHappyAgentCredentialPath, D as readLocalHappyAgentCredentials, E as parseExactVersion, F as compareExactVersions, G as extractCompleteLines, H as decideBackfill, J as parseTerminalHookPayload, K as tmuxArgs, L as scrubTmuxClientEnv, N as decideMirrorBinding, O as MIRROR_BACKFILL_LINES_DEFAULT, P as mirrorLineKey, Q as mirrorLocalId, T as listDaemonSessions, U as stopDaemonSession, V as detectCLIAvailability, W as detectResumeSupport, X as isDaemonRunningCurrentlyInstalledHappyVersion, Y as stopDaemon, Z as TurnActivityTracker, _ as summarizeSpawnSessionForLog, $ as shellescape, A as ApiClient, a0 as fetchCliUpdateState, a1 as resolveCliUpdateCheckInterval, a2 as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, a3 as cleanupDaemonState, i as isValidSessionId, s as spawnDaemonSession, a4 as listVhTerminals, a5 as isValidTerminalId, a6 as readVhTerminal, a7 as sendToVhTerminal, a8 as ContextUsageSchema, a9 as TITLE_PROMPT_PREFIX, aa as BOARD_ANALYZER_PROMPT_PREFIX, h as connectionState, ab as startOfflineReconnection, n as notifyDaemonSessionStarted, d as createEnvelope, ac as CodexAppServerClient } from './types-BG4gFjLL.mjs';
-import { l as logger, E as ensurePrivateDirectory, F as hardenPrivateFile, c as configuration, p as packageJson, f as readSettings, G as readCredentials, v as credentialRelayProblem, o as readDaemonState, g as encodeBase64, H as readSettingsOutcome, I as updateSettings, J as encodeBase64Url, m as decodeBase64, K as writeCredentialsLegacy, L as writeCredentialsDataKey, d as readCredentialsForConfiguredRelay, j as encrypt, r as readPersistedSessions, w as writePrivateFileSync, M as decryptWithDataKey, N as decryptLegacy, O as persistSession, k as decrypt, h as ensurePrivateDirectorySync, P as acquireDaemonLock, Q as deletePersistedSessions, R as writeDaemonState, S as writeSettings, T as releaseDaemonLock, C as CLIPBOARD_TOOL_NAME, a as CLIPBOARD_TOOL_TITLE, b as CLIPBOARD_TOOL_DESCRIPTION, e as CLIPBOARD_MAX_BYTES, U as clearCredentials, V as clearMachineId, W as SandboxConfigSchema, X as getLatestDaemonLog } from './limits-uABU-yq3.mjs';
+import { v as notifyDaemonSessionEvent, w as getProjectPath, o as BUILTIN_TODO_DISCOVERY, x as initializeSandbox, y as wrapCommand, t as contentLogMetadata, I as InvalidateSync, R as RawJSONLinesSchema, u as delay, z as AsyncLock, S as STREAM_DELTA_MAX_CHARS, M as MAX_CHAT_ATTACHMENT_SOURCE_BYTES, C as notifyDaemonClaudeAuthFailed, D as commandOnPath, c as checkIfDaemonRunningAndCleanupStaleState, E as deriveLocalCliUpdateSummary, F as AGENT_VERSION_SOURCES, G as isClaudeSessionId, H as getLocalHappyAgentCredentialPath, J as readLocalHappyAgentCredentials, K as parseExactVersion, L as compareExactVersions, N as extractCompleteLines, O as decideBackfill, P as parseTerminalHookPayload, Q as tmuxArgs, T as scrubTmuxClientEnv, U as decideMirrorBinding, V as MIRROR_BACKFILL_LINES_DEFAULT, W as mirrorLineKey, X as mirrorLocalId, Y as listDaemonSessions, Z as stopDaemonSession, _ as detectCLIAvailability, $ as detectResumeSupport, a0 as refreshAgentHomes, d as describeAgentHome, a1 as isDaemonRunningCurrentlyInstalledHappyVersion, a2 as stopDaemon, a3 as TurnActivityTracker, a4 as summarizeSpawnSessionForLog, a5 as locateClaudeConversation, a6 as agentHomeSpawnEnv, a7 as shellescape, A as ApiClient, a8 as fetchCliUpdateState, a9 as resolveCliUpdateCheckInterval, aa as DEFAULT_CLI_UPDATE_CHECK_INTERVAL_MS, ab as cleanupDaemonState, i as isValidSessionId, s as spawnDaemonSession, ac as listVhTerminals, ad as isValidTerminalId, ae as readVhTerminal, af as sendToVhTerminal, ag as ContextUsageSchema, ah as TITLE_PROMPT_PREFIX, ai as BOARD_ANALYZER_PROMPT_PREFIX, m as connectionState, aj as startOfflineReconnection, n as notifyDaemonSessionStarted, g as createEnvelope, ak as CodexAppServerClient } from './types-BbvxVQF3.mjs';
+import { l as logger, F as ensurePrivateDirectory, G as hardenPrivateFile, c as configuration, p as packageJson, r as readSettings, H as readCredentials, x as credentialRelayProblem, o as readDaemonState, g as encodeBase64, I as readSettingsOutcome, u as updateSettings, J as encodeBase64Url, m as decodeBase64, K as writeCredentialsLegacy, L as writeCredentialsDataKey, e as readCredentialsForConfiguredRelay, j as encrypt, d as readPersistedSessions, w as writePrivateFileSync, M as decryptWithDataKey, N as decryptLegacy, O as persistSession, k as decrypt, h as ensurePrivateDirectorySync, P as acquireDaemonLock, Q as deletePersistedSessions, R as writeDaemonState, S as writeSettings, T as releaseDaemonLock, C as CLIPBOARD_TOOL_NAME, a as CLIPBOARD_TOOL_TITLE, b as CLIPBOARD_TOOL_DESCRIPTION, f as CLIPBOARD_MAX_BYTES, U as clearCredentials, V as clearMachineId, W as SandboxConfigSchema, X as getLatestDaemonLog } from './limits-CzWD9hWU.mjs';
 import spawn$1, { spawn } from 'cross-spawn';
 import path, { join, resolve, basename, isAbsolute, sep, dirname, delimiter, normalize } from 'node:path';
 import { createInterface } from 'node:readline';
 import { existsSync, readFileSync, readdirSync, statSync, mkdirSync, unlinkSync, renameSync, writeFileSync, accessSync, constants, openSync, fsyncSync, closeSync, rmSync as rmSync$1, chmodSync as chmodSync$1 } from 'node:fs';
 import { p as projectPath } from './projectPath-CSpqWdxp.mjs';
-import { f as trimIdent, A as AGENT_GUIDANCE, t as teamScopePath, T as TeamConnectionPreflightError, e as createTeamsClient, P as PREVIEW_TOOL_NAME, R as REPORT_PROGRESS_TOOL_NAME, g as TEAM_TOOL_NAMES, r as registerTeamsTools, a as PREVIEW_TOOL_TITLE, b as PREVIEW_TOOL_DESCRIPTION, h as REPORT_PROGRESS_TOOL_TITLE, i as REPORT_PROGRESS_TOOL_DESCRIPTION } from './agentGuidance-BU4hxm8M.mjs';
+import { f as trimIdent, A as AGENT_GUIDANCE, t as teamScopePath, T as TeamConnectionPreflightError, e as createTeamsClient, P as PREVIEW_TOOL_NAME, R as REPORT_PROGRESS_TOOL_NAME, g as TEAM_TOOL_NAMES, r as registerTeamsTools, a as PREVIEW_TOOL_TITLE, b as PREVIEW_TOOL_DESCRIPTION, h as REPORT_PROGRESS_TOOL_TITLE, i as REPORT_PROGRESS_TOOL_DESCRIPTION } from './agentGuidance-HFHrz3C1.mjs';
 import { readFile, writeFile, rename, unlink, mkdir, symlink, rm, readlink, lstat, stat, open as open$1, appendFile } from 'node:fs/promises';
 import fs, { watch, access } from 'fs/promises';
 import { useStdout, useInput, Box, Text, render } from 'ink';
@@ -5294,6 +5294,16 @@ ${typeLabels[type] || type}:`));
     console.log(chalk.gray("  OS-keychain credentials cannot be verified here; see /docs/configuration#claude-credentials."));
   }
   console.log(chalk.gray("  An external claude command is only needed for native terminal/mirror use."));
+  try {
+    const { resolveAgentHomesForCli } = await import('./agentHome-DBqr8rpv.mjs');
+    const { describeAgentHome } = await import('./types-BbvxVQF3.mjs').then(function (n) { return n.al; });
+    const homes = await resolveAgentHomesForCli();
+    console.log(chalk.green(`\u2713 Claude config dir: ${describeAgentHome(homes.claudeConfigDir)}`));
+    console.log(chalk.green(`\u2713 Codex home: ${describeAgentHome(homes.codexHome)}`));
+    console.log(chalk.gray("  Resolved from settings.json, then your login shell, then the daemon environment; pin with `very-happy agent-home`."));
+  } catch {
+    console.log(chalk.yellow("\u25CB Could not resolve the Claude/Codex home directories"));
+  }
   if (availableAgents.length === 0) {
     console.log(chalk.yellow("\u25CB No external agent command found on this daemon PATH"));
     console.log(chalk.gray("  Codex, Gemini, OpenCode, OpenClaw, and native Claude terminal paths need their local command or gateway."));
@@ -10094,6 +10104,12 @@ async function startDaemon() {
   let cliUpdateStateRef = null;
   let lastHandoverHold = null;
   let claudeCredentialStoreSetting = (await readSettings()).claudeCredentialStore === "file" ? "file" : "auto";
+  try {
+    const homes = await refreshAgentHomes();
+    logger.debug(`[DAEMON RUN] Claude config dir: ${describeAgentHome(homes.claudeConfigDir)}; Codex home: ${describeAgentHome(homes.codexHome)}`);
+  } catch (error) {
+    logger.debug("[DAEMON RUN] agent home resolution failed; using the daemon environment as-is", error);
+  }
   let requestShutdown;
   let resolvesWhenShutdownRequested = new Promise((resolve) => {
     requestShutdown = (source, errorMessage) => {
@@ -10259,7 +10275,8 @@ async function startDaemon() {
       }
     };
     const assistantSpawnGate = createSpawnGate();
-    const spawnSession = (options) => {
+    const spawnSession = async (options) => {
+      await refreshAgentHomes();
       if (assistantSpawnMode(options) !== "claude-singleton") {
         return spawnSessionImpl(options);
       }
@@ -10332,7 +10349,7 @@ async function startDaemon() {
             s.encryptionVariant
           );
           const claudeSessionId = resolveAssistantClaudeSessionId(s.metadata, serverMetadata);
-          const canResumeClaude = !!claudeSessionId && existsSync$1(join$1(getProjectPath(assistantHome()), `${claudeSessionId}.jsonl`));
+          const canResumeClaude = !!claudeSessionId && locateClaudeConversation(assistantHome(), claudeSessionId) !== null;
           return spawnTrackedHappyProcess({
             args: [
               "claude",
@@ -10351,6 +10368,8 @@ async function startDaemon() {
               // B-297: see the resume/restart paths — every spawn carries the
               // credentialStore=file shim, not just fresh sessions (B-276 D8).
               ...claudeAuthServiceRef?.claudeProcessEnvOverrides() ?? {},
+              // B-478: point Claude at the directory the transcript was found in.
+              ...canResumeClaude ? agentHomeSpawnEnv({ workingDirectory: assistantHome(), claudeSessionId }) : {},
               HAPPY_SESSION_VARIANT: "assistant",
               HAPPY_RECONNECT_SESSION_ID: assistantSessionId,
               HAPPY_RECONNECT_ENCRYPTION_KEY: s.encryptionKey,
@@ -10505,6 +10524,7 @@ async function startDaemon() {
               tmuxEnv[key] = value;
             }
           }
+          Object.assign(tmuxEnv, agentHomeSpawnEnv({ workingDirectory: directory, claudeSessionId: options.resumeClaudeSessionId, codexThreadId: options.resumeCodexThreadId }));
           Object.assign(tmuxEnv, extraEnv);
           const tmuxResult = await tmux.spawnInTmux([fullCommand], {
             sessionName: tmuxSessionName,
@@ -10599,6 +10619,9 @@ async function startDaemon() {
             cwd: directory,
             env: {
               ...process.env,
+              // B-478: a fork/duplicate resumes a transcript that may live in
+              // a moved config dir. Explicit environmentVariables still win.
+              ...agentHomeSpawnEnv({ workingDirectory: directory, claudeSessionId: options.resumeClaudeSessionId, codexThreadId: options.resumeCodexThreadId }),
               ...extraEnv
             },
             directoryCreated,
@@ -10749,6 +10772,7 @@ async function startDaemon() {
         gate = createSpawnGate();
         resumeGates.set(happySessionId, gate);
       }
+      await refreshAgentHomes();
       try {
         return await gate.join(() => resumeSessionImpl(happySessionId, options));
       } finally {
@@ -10795,7 +10819,9 @@ async function startDaemon() {
         }
         const precheck = resumePrecheck(metadata, {
           cwdExists: (p) => existsSync$1(p),
-          conversationExists: (cwd, claudeSessionId) => existsSync$1(join$1(getProjectPath(cwd), `${claudeSessionId}.jsonl`))
+          // B-478: also looks in every other Claude config dir the user's shell
+          // or settings point at, not just the one the daemon was started with.
+          conversationExists: (cwd, claudeSessionId) => locateClaudeConversation(cwd, claudeSessionId) !== null
         });
         let freshConversation = false;
         if (!precheck.ok) {
@@ -10826,6 +10852,9 @@ async function startDaemon() {
             // fell back to `auto` reads a different credential store than the
             // fresh one next to it (B-276 D8).
             ...claudeAuthServiceRef?.claudeProcessEnvOverrides() ?? {},
+            // B-478: if the transcript lives in a Claude/Codex home other than
+            // the resolved one, this spawn is pointed there.
+            ...freshConversation ? {} : agentHomeSpawnEnv({ workingDirectory: launch.cwd, claudeSessionId: metadata.claudeSessionId, codexThreadId: metadata.codexThreadId }),
             HAPPY_RECONNECT_SESSION_ID: happySessionId,
             HAPPY_RECONNECT_ENCRYPTION_KEY: encodeBase64(tracked.encryption.encryptionKey),
             HAPPY_RECONNECT_ENCRYPTION_VARIANT: tracked.encryption.encryptionVariant,
@@ -10887,6 +10916,7 @@ async function startDaemon() {
         gate = createSpawnGate();
         resumeGates.set(happySessionId, gate);
       }
+      await refreshAgentHomes();
       try {
         return await gate.replace(() => restartSessionImpl(happySessionId, options));
       } finally {
@@ -10922,7 +10952,9 @@ async function startDaemon() {
         }
         const precheck = resumePrecheck(metadata, {
           cwdExists: (p) => existsSync$1(p),
-          conversationExists: (cwd2, claudeSessionId) => existsSync$1(join$1(getProjectPath(cwd2), `${claudeSessionId}.jsonl`))
+          // B-478: also looks in every other Claude config dir the user's shell
+          // or settings point at, not just the one the daemon was started with.
+          conversationExists: (cwd2, claudeSessionId) => locateClaudeConversation(cwd2, claudeSessionId) !== null
         });
         let args;
         let cwd;
@@ -10957,6 +10989,8 @@ async function startDaemon() {
             // fell back to `auto` reads a different credential store than the
             // fresh one next to it (B-276 D8).
             ...claudeAuthServiceRef?.claudeProcessEnvOverrides() ?? {},
+            // B-478: see resumeSession.
+            ...precheck.ok ? agentHomeSpawnEnv({ workingDirectory: cwd, claudeSessionId: metadata.claudeSessionId, codexThreadId: metadata.codexThreadId }) : {},
             HAPPY_RECONNECT_SESSION_ID: happySessionId,
             HAPPY_RECONNECT_ENCRYPTION_KEY: encodeBase64(tracked.encryption.encryptionKey),
             HAPPY_RECONNECT_ENCRYPTION_VARIANT: tracked.encryption.encryptionVariant,
@@ -12243,13 +12277,27 @@ function registerKillSessionHandler(rpcHandlerManager, killThisHappy, archiveEve
 }
 
 const SIDE_QUESTION_SYSTEM_PROMPT = [
-  "This is a SIDE QUESTION from the user, asked next to the main conversation above.",
-  "Answer it directly in a single response, using the conversation context and your own knowledge.",
-  "Side questions cannot use tools: do not attempt to read files, run commands, or call tools \u2014 if",
-  "the answer would require that, say what you would check and why.",
-  "Do NOT continue, resume, or reference progress on the main task; the main conversation is",
-  "unaffected by this exchange."
+  "A user message wrapped in a side-question system-reminder is a SIDE QUESTION: answer it",
+  "directly in one response from the conversation context, with no tools and no action on the main task."
 ].join(" ");
+const SIDE_QUESTION_REMINDER = [
+  "<system-reminder>This is a side question from the user. You must answer this question directly in a single response.",
+  "",
+  "IMPORTANT CONTEXT:",
+  "- You are a separate, lightweight agent spawned to answer this one question",
+  "- The main agent is NOT interrupted - it continues working independently in the background",
+  "- You share the conversation context but are a completely separate instance",
+  '- Do NOT reference being interrupted or what you were "previously doing" - that framing is incorrect',
+  "",
+  "CRITICAL CONSTRAINTS:",
+  "- You have NO tools available - you cannot read files, run commands, search, or take any actions",
+  "- This is a one-off response - there will be no follow-up turns",
+  "- You can ONLY provide information based on what you already know from the conversation context",
+  `- NEVER say things like "Let me try...", "I'll now...", "Let me check...", or promise to take any action`,
+  "- If you don't know the answer, say so - do not offer to look it up or investigate",
+  "",
+  "Simply answer the question with the information you have.</system-reminder>"
+].join("\n");
 const MAX_HISTORY_CHARS = 2e3;
 function clip(text, max) {
   return text.length > max ? `${text.slice(0, max)}\u2026` : text;
@@ -12257,14 +12305,17 @@ function clip(text, max) {
 function buildSideQuestionPrompt(question, history = []) {
   const trimmed = question.trim();
   const prior = history.filter((h) => h.question.trim() && h.answer.trim()).slice(-12);
-  if (prior.length === 0) return trimmed;
+  const body = `${SIDE_QUESTION_REMINDER}
+
+${trimmed}`;
+  if (prior.length === 0) return body;
   const lines = prior.map((h) => `Q: ${clip(h.question.trim(), MAX_HISTORY_CHARS)}
 A: ${clip(h.answer.trim(), MAX_HISTORY_CHARS)}`);
   return `<earlier-side-questions>
 ${lines.join("\n\n")}
 </earlier-side-questions>
 
-${trimmed}`;
+${body}`;
 }
 function sideQuestionQueryOptions(input) {
   return {
@@ -12285,17 +12336,36 @@ function sideQuestionQueryOptions(input) {
     abort: input.signal
   };
 }
-function textFromAssistant(message) {
-  if (message.type !== "assistant") return "";
+function assistantBlocks(message) {
+  if (message.type !== "assistant") return [];
   const content = message.message?.content;
-  if (!Array.isArray(content)) return "";
-  return content.map((block) => block && typeof block === "object" && block.type === "text" ? String(block.text ?? "") : "").join("");
+  return Array.isArray(content) ? content.filter((b) => Boolean(b) && typeof b === "object") : [];
+}
+function textFromAssistant(message) {
+  return assistantBlocks(message).map((block) => block.type === "text" ? String(block.text ?? "") : "").join("");
+}
+function toolUseFromAssistant(message) {
+  const block = assistantBlocks(message).find((b) => b.type === "tool_use");
+  return block ? String(block.name ?? "a tool") : null;
+}
+function toolAttemptNotice(toolName) {
+  return `(The model tried to call ${toolName} instead of answering directly. Try rephrasing or ask in the main conversation.)`;
+}
+function apiErrorFromSystem(message) {
+  if (message.type !== "system") return null;
+  const m = message;
+  if (m.subtype !== "api_error") return null;
+  if (typeof m.error === "string") return m.error;
+  const detail = m.error?.formatted ?? m.error?.message;
+  return typeof detail === "string" && detail ? detail : "API error";
 }
 async function runSideQuestion(query, input) {
   const options = sideQuestionQueryOptions(input);
   const stream = query({ prompt: buildSideQuestionPrompt(input.question, input.history), options });
   let streamed = "";
   let final = "";
+  let toolAttempt = null;
+  let lastApiError = null;
   let resultSeen = false;
   for await (const message of stream) {
     if (message.type === "stream_event") {
@@ -12314,20 +12384,31 @@ async function runSideQuestion(query, input) {
 ${text}` : text;
         input.onText?.(final);
       }
+      toolAttempt ??= toolUseFromAssistant(message);
+      continue;
+    }
+    if (message.type === "system") {
+      lastApiError = apiErrorFromSystem(message) ?? lastApiError;
       continue;
     }
     if (message.type === "result") {
       resultSeen = true;
       const result = message;
       if (result.subtype !== "success") {
-        const detail = Array.isArray(result.errors) && result.errors.length > 0 ? String(result.errors[0]) : typeof result.result === "string" && result.result ? result.result : result.subtype ?? "unknown";
+        if (toolAttempt && result.subtype === "error_max_turns") break;
+        const detail = Array.isArray(result.errors) && result.errors.length > 0 ? String(result.errors[0]) : typeof result.result === "string" && result.result ? result.result : lastApiError ?? result.subtype ?? "unknown";
         throw new Error(`Side question failed: ${detail}`);
       }
       if (!final && typeof result.result === "string") final = result.result;
     }
   }
   if (input.signal?.aborted) throw new Error("Side question cancelled");
-  if (!resultSeen && !final && !streamed) throw new Error("Side question ended without a result");
+  if (toolAttempt && !final.trim() && !streamed.trim()) {
+    const notice = toolAttemptNotice(toolAttempt);
+    input.onText?.(notice);
+    return { answer: notice, hadContext: Boolean(input.resumeSessionId) };
+  }
+  if (!resultSeen && !final && !streamed) throw new Error(`Side question ended without a result${lastApiError ? `: ${lastApiError}` : ""}`);
   return { answer: final || streamed, hadContext: Boolean(input.resumeSessionId) };
 }
 
@@ -12354,7 +12435,7 @@ function registerSideQuestionHandler(rpc, deps) {
   const retainMs = deps.retainMs ?? SIDE_QUESTION_RETAIN_MS;
   const maxRunMs = deps.maxRunMs ?? SIDE_QUESTION_MAX_RUN_MS;
   const run = deps.run ?? (async (input) => {
-    const { query } = await import('./index-PM_SsRpw.mjs');
+    const { query } = await import('./index-CxK0l_t0.mjs');
     return runSideQuestion(query, input);
   });
   const slots = /* @__PURE__ */ new Map();
@@ -12377,7 +12458,12 @@ function registerSideQuestionHandler(rpc, deps) {
     if (!question) throw new Error("Side question is empty");
     if (question.length > SIDE_QUESTION_MAX_CHARS) throw new Error("Side question is too long");
     prune();
-    if (active) throw new Error("A side question is already running");
+    if (active) {
+      const stale = active;
+      stale.abort.abort("superseded");
+      finish(stale, "cancelled");
+      logger.debug(`[btw] side question ${stale.requestId} superseded by a new ask`);
+    }
     const resumeSessionId = deps.getClaudeSessionId() ?? null;
     const slot = {
       requestId: randomUUID(),
@@ -17599,7 +17685,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "install-terminal-hooks") {
     try {
-      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-BGVQqbgq.mjs');
+      const { installTerminalHooks, parseTerminalHooksArgs, TERMINAL_HOOKS_HELP } = await import('./installTerminalHooks-Dq1MFFDQ.mjs');
       const command = parseTerminalHooksArgs(args.slice(1));
       if (command.action === "help") {
         console.log(TERMINAL_HOOKS_HELP);
@@ -17614,9 +17700,18 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       }
       process.exit(1);
     }
+  } else if (subcommand === "agent-home") {
+    try {
+      const { parseAgentHomeArgs, runAgentHomeCommand } = await import('./agentHome-DBqr8rpv.mjs');
+      await runAgentHomeCommand(parseAgentHomeArgs(args.slice(1)));
+      process.exit(0);
+    } catch (error) {
+      console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
+      process.exit(1);
+    }
   } else if (subcommand === "spawn") {
     try {
-      const { handleSpawnCommand } = await import('./spawn-wkkxEGdF.mjs');
+      const { handleSpawnCommand } = await import('./spawn-Dcetf5Jt.mjs');
       await handleSpawnCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17628,7 +17723,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "sessions") {
     try {
-      const { handleSessionsCommand } = await import('./sessions-DbLubh2N.mjs');
+      const { handleSessionsCommand } = await import('./sessions-CJUEp43_.mjs');
       await handleSessionsCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17640,7 +17735,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "send") {
     try {
-      const { handleSendCommand } = await import('./send-CBrJylJc.mjs');
+      const { handleSendCommand } = await import('./send-CPayvXBm.mjs');
       await handleSendCommand(args.slice(1));
     } catch (error) {
       console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17746,9 +17841,9 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     if (geminiSubcommand === "project" && args[2] === "set" && args[3]) {
       const projectId = args[3];
       try {
-        const { saveGoogleCloudProjectToConfig } = await import('./config-euZ_K5Lo.mjs');
-        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./limits-uABU-yq3.mjs').then(function (n) { return n.Y; });
-        const { ApiClient: ApiClient2 } = await import('./types-BG4gFjLL.mjs').then(function (n) { return n.ad; });
+        const { saveGoogleCloudProjectToConfig } = await import('./config-B9zAvnGT.mjs');
+        const { readCredentialsForConfiguredRelay: readCredentialsForConfiguredRelay2 } = await import('./limits-CzWD9hWU.mjs').then(function (n) { return n.Y; });
+        const { ApiClient: ApiClient2 } = await import('./types-BbvxVQF3.mjs').then(function (n) { return n.am; });
         let userEmail = void 0;
         try {
           const credentials = await readCredentialsForConfiguredRelay2();
@@ -17779,7 +17874,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     }
     if (geminiSubcommand === "project" && args[2] === "get") {
       try {
-        const { readGeminiLocalConfig } = await import('./config-euZ_K5Lo.mjs');
+        const { readGeminiLocalConfig } = await import('./config-B9zAvnGT.mjs');
         const config = readGeminiLocalConfig();
         if (config.googleCloudProject) {
           console.log(`Current Google Cloud Project: ${config.googleCloudProject}`);
@@ -17819,7 +17914,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       process.exit(0);
     }
     try {
-      const { runGemini } = await import('./runGemini-BMlXIaTL.mjs');
+      const { runGemini } = await import('./runGemini-B-It6K8t.mjs');
       let startedBy = void 0;
       for (let i = 1; i < args.length; i++) {
         if (args[i] === "--started-by") {
@@ -17842,7 +17937,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
   } else if (subcommand === "pi") {
     if (args[1] === "--terminal") {
       try {
-        const { runPiTerminal } = await import('./piTerminal-rqKn1_Zy.mjs');
+        const { runPiTerminal } = await import('./piTerminal-BIRroC_N.mjs');
         process.exitCode = await runPiTerminal(args.slice(2));
       } catch (error) {
         console.error(chalk.red("Error:"), error instanceof Error ? error.message : "Unknown error");
@@ -17859,7 +17954,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
       }
     };
     try {
-      const { runAcp, resolveAcpAgentConfig } = await import('./index-ZOMC8Gzn.mjs');
+      const { runAcp, resolveAcpAgentConfig } = await import('./index-BzLZu_aF.mjs');
       const parsed = parsePiRunnerArgs(args.slice(1));
       const resolved = resolveAcpAgentConfig(["pi", ...parsed.passthrough]);
       const { credentials } = await authAndSetupMachineIfNeeded();
@@ -17887,7 +17982,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "acp") {
     try {
-      const { runAcp, resolveAcpAgentConfig } = await import('./index-ZOMC8Gzn.mjs');
+      const { runAcp, resolveAcpAgentConfig } = await import('./index-BzLZu_aF.mjs');
       let startedBy = void 0;
       let verbose = false;
       const acpArgs = [];
@@ -17927,7 +18022,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "openclaw") {
     try {
-      const { runOpenClaw } = await import('./runOpenClaw-CoO5Vp3S.mjs');
+      const { runOpenClaw } = await import('./runOpenClaw-DET6LY2v.mjs');
       let startedBy = void 0;
       let verbose = false;
       let gatewayUrl;
@@ -17978,7 +18073,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "todo") {
     try {
-      const { handleTodoCommand } = await import('./todo-DoLkqdBe.mjs');
+      const { handleTodoCommand } = await import('./todo-CV5fwHg_.mjs');
       await handleTodoCommand(args.slice(1));
     } catch (error) {
       console.error(JSON.stringify({ error: error instanceof Error ? error.message : "Todo command failed" }));
@@ -17987,7 +18082,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "teams") {
     try {
-      const { handleTeamsCommand } = await import('./teams-BTyVFK3P.mjs');
+      const { handleTeamsCommand } = await import('./teams-CW_Zb2Q1.mjs');
       await handleTeamsCommand(args.slice(1));
     } catch (error) {
       console.error(error instanceof Error ? error.message : "Teams command failed");
@@ -17996,7 +18091,7 @@ Conversation history is preserved on the server, but in-flight tool calls are in
     return;
   } else if (subcommand === "mcp" && (args.length === 1 || args.length === 2 && args[1] === "--terminal-tools")) {
     try {
-      const { handleMcpCommand } = await import('./mcp-CfbTQXyh.mjs');
+      const { handleMcpCommand } = await import('./mcp-L1Yq25LB.mjs');
       await handleMcpCommand(args[1] === "--terminal-tools");
     } catch (error) {
       process.stderr.write(`[very-happy mcp] Fatal: ${error instanceof Error ? error.message : String(error)}
@@ -18226,6 +18321,8 @@ ${chalk.bold("Usage:")}
   very-happy install-terminal-hooks
                             Install optional Claude terminal mirror hooks
                             (add --remove to uninstall them)
+  very-happy agent-home        Show or pin where Claude Code / Codex keep their
+                            conversations on this machine (agent-home --help)
   very-happy connect           Connect AI vendor API keys
   very-happy todo              Built-in Todos and official agent skill (todo --help)
   very-happy sandbox           Configure and manage OS-level sandboxing