very-happy-cli 0.2.159 → 0.2.161

package/dist/{runGemini-F-mqx3_K.cjs → runGemini-CSMPkt0p.cjs}

@@ -4,51 +4,78 @@ var ink = require('ink');
 var React = require('react');
 var node_crypto = require('node:crypto');
 var path = require('node:path');
-var index$1 = require('./types-BbvK1Tr_.cjs');
-var persistence = require('./limits-BH5CV5vR.cjs');
-var index = require('./index-rH3DrQ5B.cjs');
-var terminalTitleSuggest = require('./terminalTitleSuggest-Dji8I0Jy.cjs');
-var AcpBackend = require('./AcpBackend-DUYFlyfN.cjs');
-var config = require('./config-DLx-vW3I.cjs');
+var api = require('./api-B2vLMS-z.cjs');
+var logger = require('./logger-Bc8-u1w0.cjs');
+var persistence = require('./persistence-CBNMzSa8.cjs');
+var createSessionMetadata = require('./createSessionMetadata-BRLB9CNO.cjs');
+var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
+var machineMetadata = require('./machineMetadata-BibDMFVx.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-6TC2S3lf.cjs');
+var deterministicJson = require('./deterministicJson-DKDP_mM-.cjs');
+var projectPath = require('./projectPath-ChLhdOyt.cjs');
+var messageBuffer = require('./messageBuffer-fJMH6uY8.cjs');
+var controlClient = require('./controlClient-fEHE85bH.cjs');
+var authRelay = require('./authRelay-BdYkC1Po.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-R7XuR_sj.cjs');
+var AcpBackend = require('./AcpBackend-Ba98QDif.cjs');
+var constants = require('./constants-VJ0N6WuG.cjs');
+var config = require('./config-CYpL1Ahd.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-2R0uH2CI.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-fsVNmCEF.cjs');
 require('axios');
 require('node:events');
 require('socket.io-client');
+require('./attachmentLimits-CzVrqgLR.cjs');
 require('zod');
+require('./index-DA7yINuk.cjs');
+require('@paralleldrive/cuid2');
+require('./limits-C-a7gr04.cjs');
+require('./time-CNRE4ChD.cjs');
+require('./lidState-KHHu1015.cjs');
+require('os');
 require('child_process');
+require('./configuration-v9f8LM9T.cjs');
+require('node:fs');
+require('node:os');
+require('./package-Cl5BEP5x.cjs');
+require('node:fs/promises');
+require('./registerCommonHandlers-BjSV2Skz.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
-require('os');
-require('@paralleldrive/cuid2');
-require('node:fs/promises');
-require('node:os');
-require('node:child_process');
-require('node-pty');
-require('node:fs');
-require('fs');
-require('tweetnacl');
-require('node:readline');
-require('@anthropic-ai/sandbox-runtime');
-require('expo-server-sdk');
+require('./sync-CVk4QERO.cjs');
+require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('chalk');
 require('node:util');
-require('./agentGuidance-BRDN1NoZ.cjs');
-require('@anthropic-ai/claude-agent-sdk');
-require('ps-list');
-require('tmp');
-require('open');
-require('fastify');
-require('fastify-type-provider-zod');
-require('node:module');
+require('tweetnacl');
+require('./detectCLI-DR9ZaN6B.cjs');
+require('fs');
+require('./localHappyAgentAuth-BXiHPXdC.cjs');
+require('./types-CRS-srZK.cjs');
+require('./client-C_axwRry.cjs');
+require('./context-B45vMtSZ.cjs');
+require('./sessionOps-DJdExmBy.cjs');
+require('./resources-JDPugcDq.cjs');
+require('./tools-lMDra4Pv.cjs');
+require('./tools-CsSovyNp.cjs');
+require('./client-DOBWJL3u.cjs');
+require('./peerTools-CIeiy9wn.cjs');
+require('./ids-B6ZC0HGt.cjs');
+require('./remoteSessionClient-BNx78NLb.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
-require('http');
-require('inquirer');
-require('node:url');
-require('node:readline/promises');
+require('./assistantTools-BfA0R3_m.cjs');
+require('./terminals-B_bfC9c2.cjs');
+require('node:child_process');
+require('./terminalTitleSuggest-DhvRFX3H.cjs');
+require('./tmuxSocket-D-Xt6Vn-.cjs');
+require('./bootstrap-CkgIq8N3.cjs');
+require('./agentGuidance-B5NATuFa.cjs');
+require('./trimIdent-4gvk9Wk6.cjs');
+require('./previewPath-B0rBdhy1.cjs');
 require('url');
 require('@agentclientprotocol/sdk');
 
@@ -252,7 +279,7 @@ class GeminiTransport {
     }
     if (toolName === "other" || toolName === "Unknown tool") {
       const inputKeys = input && typeof input === "object" ? Object.keys(input) : [];
-      persistence.logger.debug(
+      logger.logger.debug(
         `[GeminiTransport] Unknown tool pattern - toolCallId: "${toolCallId}", toolName: "${toolName}", inputKeys: [${inputKeys.join(", ")}]. Consider adding a new pattern to GEMINI_TOOL_PATTERNS if this tool appears frequently.`
       );
     }
@@ -263,9 +290,9 @@ const geminiTransport = new GeminiTransport();
 
 function createGeminiBackend(options) {
   const localConfig = config.readGeminiLocalConfig();
-  let apiKey = options.cloudToken || localConfig.token || process.env[index.GEMINI_API_KEY_ENV] || process.env[index.GOOGLE_API_KEY_ENV] || options.apiKey;
+  let apiKey = options.cloudToken || localConfig.token || process.env[constants.GEMINI_API_KEY_ENV] || process.env[constants.GOOGLE_API_KEY_ENV] || options.apiKey;
   if (!apiKey) {
-    persistence.logger.warn(`[Gemini] No API key found. Run 'very-happy connect gemini' to authenticate via Google OAuth, or set ${index.GEMINI_API_KEY_ENV} environment variable.`);
+    logger.logger.warn(`[Gemini] No API key found. Run 'very-happy connect gemini' to authenticate via Google OAuth, or set ${constants.GEMINI_API_KEY_ENV} environment variable.`);
   }
   const geminiCommand = "gemini";
   const model = config.determineGeminiModel(options.model, localConfig);
@@ -276,9 +303,9 @@ function createGeminiBackend(options) {
     const currentEmail = options.currentUserEmail;
     if (!storedEmail || storedEmail === currentEmail) {
       googleCloudProject = localConfig.googleCloudProject;
-      persistence.logger.debug(`[Gemini] Using Google Cloud Project: ${googleCloudProject}${storedEmail ? ` (for ${storedEmail})` : " (global)"}`);
+      logger.logger.debug(`[Gemini] Using Google Cloud Project: ${googleCloudProject}${storedEmail ? ` (for ${storedEmail})` : " (global)"}`);
     } else {
-      persistence.logger.debug(`[Gemini] Skipping stored Google Cloud Project (stored for ${storedEmail}, current user is ${currentEmail || "unknown"})`);
+      logger.logger.debug(`[Gemini] Skipping stored Google Cloud Project (stored for ${storedEmail}, current user is ${currentEmail || "unknown"})`);
     }
   }
   const backendOptions = {
@@ -288,9 +315,9 @@ function createGeminiBackend(options) {
     args: geminiArgs,
     env: {
       ...options.env,
-      ...apiKey ? { [index.GEMINI_API_KEY_ENV]: apiKey, [index.GOOGLE_API_KEY_ENV]: apiKey } : {},
+      ...apiKey ? { [constants.GEMINI_API_KEY_ENV]: apiKey, [constants.GOOGLE_API_KEY_ENV]: apiKey } : {},
       // Pass model via env var - gemini CLI reads GEMINI_MODEL automatically
-      [index.GEMINI_MODEL_ENV]: model,
+      [constants.GEMINI_MODEL_ENV]: model,
       // Pass Google Cloud Project for Workspace accounts
       ...googleCloudProject ? {
         GOOGLE_CLOUD_PROJECT: googleCloudProject,
@@ -310,7 +337,7 @@ function createGeminiBackend(options) {
     }
   };
   const modelSource = config.getGeminiModelSource(options.model, localConfig);
-  persistence.logger.debug("[Gemini] Creating ACP SDK backend with options:", {
+  logger.logger.debug("[Gemini] Creating ACP SDK backend with options:", {
     cwd: backendOptions.cwd,
     command: backendOptions.command,
     args: backendOptions.args,
@@ -469,7 +496,7 @@ const GeminiDisplay = ({ messageBuffer, logPath, currentModel, onExit }) => {
   ));
 };
 
-class GeminiPermissionHandler extends index.BasePermissionHandler {
+class GeminiPermissionHandler extends BasePermissionHandler.BasePermissionHandler {
   currentPermissionMode = "default";
   constructor(session) {
     super(session);
@@ -489,7 +516,7 @@ class GeminiPermissionHandler extends index.BasePermissionHandler {
    */
   setPermissionMode(mode) {
     this.currentPermissionMode = mode;
-    persistence.logger.debug(`${this.getLogPrefix()} Permission mode set to: ${mode}`);
+    logger.logger.debug(`${this.getLogPrefix()} Permission mode set to: ${mode}`);
   }
   /**
    * Check if a tool should be auto-approved based on permission mode
@@ -536,7 +563,7 @@ class GeminiPermissionHandler extends index.BasePermissionHandler {
    */
   async handleToolCall(toolCallId, toolName, input) {
     if (this.shouldAutoApprove(toolName, toolCallId, input)) {
-      persistence.logger.debug(`${this.getLogPrefix()} Auto-approving tool ${toolName} (${toolCallId}) in ${this.currentPermissionMode} mode`);
+      logger.logger.debug(`${this.getLogPrefix()} Auto-approving tool ${toolName} (${toolCallId}) in ${this.currentPermissionMode} mode`);
       this.session.updateAgentState((currentState) => ({
         ...currentState,
         completedRequests: {
@@ -563,12 +590,12 @@ class GeminiPermissionHandler extends index.BasePermissionHandler {
         input
       });
       this.addPendingRequestToState(toolCallId, toolName, input);
-      persistence.logger.debug(`${this.getLogPrefix()} Permission request sent for tool: ${toolName} (${toolCallId}) in ${this.currentPermissionMode} mode`);
+      logger.logger.debug(`${this.getLogPrefix()} Permission request sent for tool: ${toolName} (${toolCallId}) in ${this.currentPermissionMode} mode`);
     });
   }
 }
 
-class GeminiReasoningProcessor extends index.BaseReasoningProcessor {
+class GeminiReasoningProcessor extends BaseReasoningProcessor.BaseReasoningProcessor {
   getToolName() {
     return "GeminiReasoning";
   }
@@ -603,7 +630,7 @@ class GeminiDiffProcessor {
    * Process an fs-edit event and check if it contains diff information
    */
   processFsEdit(path, description, diff) {
-    persistence.logger.debug(`[GeminiDiffProcessor] Processing fs-edit for path: ${path}`);
+    logger.logger.debug(`[GeminiDiffProcessor] Processing fs-edit for path: ${path}`);
     if (diff) {
       this.processDiff(path, diff, description);
     } else {
@@ -619,7 +646,7 @@ class GeminiDiffProcessor {
       const diff = result.diff || result.unified_diff || result.patch;
       const path = result.path || result.file;
       if (diff && path) {
-        persistence.logger.debug(`[GeminiDiffProcessor] Found diff in tool result: ${toolName} (${callId})`);
+        logger.logger.debug(`[GeminiDiffProcessor] Found diff in tool result: ${toolName} (${callId})`);
         this.processDiff(path, diff, result.description);
       } else if (result.changes && typeof result.changes === "object") {
         for (const [filePath, change] of Object.entries(result.changes)) {
@@ -635,7 +662,7 @@ class GeminiDiffProcessor {
   processDiff(path, unifiedDiff, description) {
     const previousDiff = this.previousDiffs.get(path);
     if (previousDiff !== unifiedDiff) {
-      persistence.logger.debug(`[GeminiDiffProcessor] Unified diff changed for ${path}, sending GeminiDiff tool call`);
+      logger.logger.debug(`[GeminiDiffProcessor] Unified diff changed for ${path}, sending GeminiDiff tool call`);
       const callId = node_crypto.randomUUID();
       const toolCall = {
         type: "tool-call",
@@ -660,13 +687,13 @@ class GeminiDiffProcessor {
       this.onMessage?.(toolResult);
     }
     this.previousDiffs.set(path, unifiedDiff);
-    persistence.logger.debug(`[GeminiDiffProcessor] Updated stored diff for ${path}`);
+    logger.logger.debug(`[GeminiDiffProcessor] Updated stored diff for ${path}`);
   }
   /**
    * Reset the processor state (called on task_complete or turn_aborted)
    */
   reset() {
-    persistence.logger.debug("[GeminiDiffProcessor] Resetting diff state");
+    logger.logger.debug("[GeminiDiffProcessor] Resetting diff state");
     this.previousDiffs.clear();
   }
   /**
@@ -759,7 +786,7 @@ class ConversationHistory {
     if (!content.trim()) return;
     const trimmedContent = content.trim();
     if (this.isDuplicate("user", trimmedContent)) {
-      persistence.logger.debug(`[ConversationHistory] Skipping duplicate user message (${trimmedContent.length} chars)`);
+      logger.logger.debug(`[ConversationHistory] Skipping duplicate user message (${trimmedContent.length} chars)`);
       return;
     }
     this.messages.push({
@@ -768,7 +795,7 @@ class ConversationHistory {
       timestamp: Date.now()
     });
     this.trimHistory();
-    persistence.logger.debug(`[ConversationHistory] Added user message (${trimmedContent.length} chars), total: ${this.messages.length}`);
+    logger.logger.debug(`[ConversationHistory] Added user message (${trimmedContent.length} chars), total: ${this.messages.length}`);
   }
   /**
    * Add an assistant response to history
@@ -778,7 +805,7 @@ class ConversationHistory {
     if (!content.trim()) return;
     const trimmedContent = content.trim();
     if (this.isDuplicate("assistant", trimmedContent)) {
-      persistence.logger.debug(`[ConversationHistory] Skipping duplicate assistant message (${trimmedContent.length} chars)`);
+      logger.logger.debug(`[ConversationHistory] Skipping duplicate assistant message (${trimmedContent.length} chars)`);
       return;
     }
     this.messages.push({
@@ -788,7 +815,7 @@ class ConversationHistory {
       model: this.currentModel
     });
     this.trimHistory();
-    persistence.logger.debug(`[ConversationHistory] Added assistant message (${trimmedContent.length} chars), total: ${this.messages.length}`);
+    logger.logger.debug(`[ConversationHistory] Added assistant message (${trimmedContent.length} chars), total: ${this.messages.length}`);
   }
   /**
    * Get the number of messages in history
@@ -807,7 +834,7 @@ class ConversationHistory {
    */
   clear() {
     this.messages = [];
-    persistence.logger.debug("[ConversationHistory] History cleared");
+    logger.logger.debug("[ConversationHistory] History cleared");
   }
   /**
    * Get formatted context for injecting into a new session.
@@ -861,8 +888,8 @@ ${formattedMessages}
 
 async function runGemini(opts) {
   const sessionTag = node_crypto.randomUUID();
-  index$1.connectionState.setBackend("Gemini");
-  const api = await index$1.ApiClient.create(opts.credentials);
+  api.connectionState.setBackend("Gemini");
+  const api$1 = await api.ApiClient.create(opts.credentials);
   const settings = await persistence.readSettings();
   const machineId = settings?.machineId;
   const sandboxConfig = settings?.sandboxConfig;
@@ -870,18 +897,18 @@ async function runGemini(opts) {
     console.error(`[START] No machine ID found in settings, which is unexpected since authAndSetupMachineIfNeeded should have created it. Please report this issue on https://github.com/Mereithhh/very-happy/issues`);
     process.exit(1);
   }
-  persistence.logger.debug(`Using machineId: ${machineId}`);
-  await api.getOrCreateMachine({
+  logger.logger.debug(`Using machineId: ${machineId}`);
+  await api$1.getOrCreateMachine({
     machineId,
-    metadata: index.initialMachineMetadata
+    metadata: machineMetadata.getInitialMachineMetadata()
   });
   let cloudToken = void 0;
   let currentUserEmail = void 0;
   try {
-    const vendorToken = await api.getVendorToken("gemini");
+    const vendorToken = await api$1.getVendorToken("gemini");
     if (vendorToken?.oauth?.access_token) {
       cloudToken = vendorToken.oauth.access_token;
-      persistence.logger.debug("[Gemini] Using OAuth token from Happy cloud");
+      logger.logger.debug("[Gemini] Using OAuth token from Happy cloud");
       if (vendorToken.oauth.id_token) {
         try {
           const parts = vendorToken.oauth.id_token.split(".");
@@ -889,31 +916,31 @@ async function runGemini(opts) {
             const payload = JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
             if (payload.email) {
               currentUserEmail = payload.email;
-              persistence.logger.debug("[Gemini] Cloud identity includes an email claim");
+              logger.logger.debug("[Gemini] Cloud identity includes an email claim");
             }
           }
         } catch {
-          persistence.logger.debug("[Gemini] Failed to decode id_token for email");
+          logger.logger.debug("[Gemini] Failed to decode id_token for email");
         }
       }
     }
   } catch (error) {
-    persistence.logger.debug("[Gemini] Failed to fetch cloud token:", index$1.errorLogMetadata(error));
+    logger.logger.debug("[Gemini] Failed to fetch cloud token:", contentLogMetadata.errorLogMetadata(error));
   }
-  const { state, metadata } = index.createSessionMetadata({
+  const { state, metadata } = createSessionMetadata.createSessionMetadata({
     flavor: "gemini",
     machineId,
     startedBy: opts.startedBy,
     sandbox: sandboxConfig
   });
-  const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
+  const response = await api$1.getOrCreateSession({ tag: sessionTag, metadata, state });
   let session;
   let permissionHandler;
   let isProcessingMessage = false;
   let pendingSessionSwap = null;
   const applyPendingSessionSwap = () => {
     if (pendingSessionSwap) {
-      persistence.logger.debug("[gemini] Applying pending session swap");
+      logger.logger.debug("[gemini] Applying pending session swap");
       session = pendingSessionSwap;
       if (permissionHandler) {
         permissionHandler.updateSession(pendingSessionSwap);
@@ -921,15 +948,15 @@ async function runGemini(opts) {
       pendingSessionSwap = null;
     }
   };
-  const { session: initialSession, reconnectionHandle } = index.setupOfflineReconnection({
-    api,
+  const { session: initialSession, reconnectionHandle } = setupOfflineReconnection.setupOfflineReconnection({
+    api: api$1,
     sessionTag,
     metadata,
     state,
     response,
     onSessionSwap: (newSession) => {
       if (isProcessingMessage) {
-        persistence.logger.debug("[gemini] Session swap requested during message processing - queueing");
+        logger.logger.debug("[gemini] Session swap requested during message processing - queueing");
         pendingSessionSwap = newSession;
       } else {
         session = newSession;
@@ -942,24 +969,24 @@ async function runGemini(opts) {
   session = initialSession;
   if (response) {
     try {
-      persistence.logger.debug(`[START] Reporting session ${response.id} to daemon`);
-      const result = await persistence.notifyDaemonSessionStarted(response.id, metadata, {
-        encryptionKey: persistence.encodeBase64(response.encryptionKey),
+      logger.logger.debug(`[START] Reporting session ${response.id} to daemon`);
+      const result = await controlClient.notifyDaemonSessionStarted(response.id, metadata, {
+        encryptionKey: authRelay.encodeBase64(response.encryptionKey),
         encryptionVariant: response.encryptionVariant,
         seq: response.seq,
         metadataVersion: response.metadataVersion,
         agentStateVersion: response.agentStateVersion
       });
       if (result.error) {
-        persistence.logger.debug(`[START] Failed to report to daemon (may not be running):`, result.error);
+        logger.logger.debug(`[START] Failed to report to daemon (may not be running):`, result.error);
       } else {
-        persistence.logger.debug(`[START] Reported session ${response.id} to daemon`);
+        logger.logger.debug(`[START] Reported session ${response.id} to daemon`);
       }
     } catch (error) {
-      persistence.logger.debug("[START] Failed to report to daemon (may not be running):", error);
+      logger.logger.debug("[START] Failed to report to daemon (may not be running):", error);
     }
   }
-  const messageQueue = new index.MessageQueue2((mode) => index.hashObject({
+  const messageQueue = new registerKillSessionHandler.MessageQueue2((mode) => deterministicJson.hashObject({
     permissionMode: mode.permissionMode,
     model: mode.model
   }));
@@ -978,12 +1005,12 @@ async function runGemini(opts) {
         messagePermissionMode = message.meta.permissionMode;
         currentPermissionMode = messagePermissionMode;
         updatePermissionMode(messagePermissionMode);
-        persistence.logger.debug(`[Gemini] Permission mode updated from user message to: ${currentPermissionMode}`);
+        logger.logger.debug(`[Gemini] Permission mode updated from user message to: ${currentPermissionMode}`);
       } else {
-        persistence.logger.debug(`[Gemini] Invalid permission mode received: ${message.meta.permissionMode}`);
+        logger.logger.debug(`[Gemini] Invalid permission mode received: ${message.meta.permissionMode}`);
       }
     } else {
-      persistence.logger.debug(`[Gemini] User message received with no permission mode override, using current: ${currentPermissionMode ?? "default (effective)"}`);
+      logger.logger.debug(`[Gemini] User message received with no permission mode override, using current: ${currentPermissionMode ?? "default (effective)"}`);
     }
     if (currentPermissionMode === void 0) {
       currentPermissionMode = "default";
@@ -1000,15 +1027,15 @@ async function runGemini(opts) {
         currentModel = messageModel;
         if (previousModel !== messageModel) {
           updateDisplayedModel(messageModel, true);
-          messageBuffer.addMessage(`Model changed to: ${messageModel}`, "system");
-          persistence.logger.debug(`[Gemini] Model changed from ${previousModel} to ${messageModel}`);
+          messageBuffer$1.addMessage(`Model changed to: ${messageModel}`, "system");
+          logger.logger.debug(`[Gemini] Model changed from ${previousModel} to ${messageModel}`);
         }
       }
     }
     const originalUserMessage = message.content.text;
     let fullPrompt = originalUserMessage;
     if (isFirstMessage && message.meta?.appendSystemPrompt) {
-      fullPrompt = message.meta.appendSystemPrompt + "\n\n" + originalUserMessage + "\n\n" + index.CHANGE_TITLE_INSTRUCTION;
+      fullPrompt = message.meta.appendSystemPrompt + "\n\n" + originalUserMessage + "\n\n" + constants.CHANGE_TITLE_INSTRUCTION;
       isFirstMessage = false;
     }
     const mode = {
@@ -1029,7 +1056,7 @@ async function runGemini(opts) {
   const sendReady = () => {
     session.sendSessionEvent({ type: "ready" });
     try {
-      api.push().sendSessionNotification({
+      api$1.push().sendSessionNotification({
         kind: "done",
         metadata: session.getMetadata(),
         data: {
@@ -1039,7 +1066,7 @@ async function runGemini(opts) {
         }
       });
     } catch (pushError) {
-      persistence.logger.debug("[Gemini] Failed to send ready push", pushError);
+      logger.logger.debug("[Gemini] Failed to send ready push", pushError);
     }
   };
   const emitReadyIfIdle = () => {
@@ -1064,7 +1091,7 @@ async function runGemini(opts) {
   let acpSessionId = null;
   let wasSessionCreated = false;
   async function handleAbort() {
-    persistence.logger.debug("[Gemini] Abort requested - stopping current task");
+    logger.logger.debug("[Gemini] Abort requested - stopping current task");
     session.sendAgentMessage("gemini", {
       type: "turn_aborted",
       id: node_crypto.randomUUID()
@@ -1077,17 +1104,17 @@ async function runGemini(opts) {
       if (geminiBackend && acpSessionId) {
         await geminiBackend.cancel(acpSessionId);
       }
-      persistence.logger.debug("[Gemini] Abort completed - session remains active");
+      logger.logger.debug("[Gemini] Abort completed - session remains active");
     } catch (error) {
-      persistence.logger.debug("[Gemini] Error during abort:", error);
+      logger.logger.debug("[Gemini] Error during abort:", error);
     } finally {
       abortController = new AbortController();
     }
   }
   const handleKillSession = async () => {
-    persistence.logger.debug("[Gemini] Kill session requested - terminating process");
+    logger.logger.debug("[Gemini] Kill session requested - terminating process");
     await handleAbort();
-    persistence.logger.debug("[Gemini] Abort completed, proceeding with termination");
+    logger.logger.debug("[Gemini] Abort completed, proceeding with termination");
     try {
       if (session) {
         session.updateMetadata((currentMetadata) => ({
@@ -1105,37 +1132,37 @@ async function runGemini(opts) {
       if (geminiBackend) {
         await geminiBackend.dispose();
       }
-      persistence.logger.debug("[Gemini] Session termination complete, exiting");
+      logger.logger.debug("[Gemini] Session termination complete, exiting");
       process.exit(0);
     } catch (error) {
-      persistence.logger.debug("[Gemini] Error during session termination:", error);
+      logger.logger.debug("[Gemini] Error during session termination:", error);
       process.exit(1);
     }
   };
   session.rpcHandlerManager.registerHandler("abort", handleAbort);
-  index.registerKillSessionHandler(session.rpcHandlerManager, handleKillSession, session);
-  const messageBuffer = new index.MessageBuffer();
+  registerKillSessionHandler.registerKillSessionHandler(session.rpcHandlerManager, handleKillSession, session);
+  const messageBuffer$1 = new messageBuffer.MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
   let inkInstance = null;
   let displayedModel = config.getInitialGeminiModel();
   const localConfig = config.readGeminiLocalConfig();
-  persistence.logger.debug(`[gemini] Initial model setup: env[GEMINI_MODEL_ENV]=${process.env[index.GEMINI_MODEL_ENV] || "not set"}, localConfig=${localConfig.model || "not set"}, displayedModel=${displayedModel}`);
+  logger.logger.debug(`[gemini] Initial model setup: env[GEMINI_MODEL_ENV]=${process.env[constants.GEMINI_MODEL_ENV] || "not set"}, localConfig=${localConfig.model || "not set"}, displayedModel=${displayedModel}`);
   const updateDisplayedModel = (model, saveToConfig = false) => {
     if (model === void 0) {
-      persistence.logger.debug(`[gemini] updateDisplayedModel called with undefined, skipping update`);
+      logger.logger.debug(`[gemini] updateDisplayedModel called with undefined, skipping update`);
       return;
     }
     const oldModel = displayedModel;
     displayedModel = model;
-    persistence.logger.debug(`[gemini] updateDisplayedModel called: oldModel=${oldModel}, newModel=${model}, saveToConfig=${saveToConfig}`);
+    logger.logger.debug(`[gemini] updateDisplayedModel called: oldModel=${oldModel}, newModel=${model}, saveToConfig=${saveToConfig}`);
     if (saveToConfig) {
       config.saveGeminiModelToConfig(model);
     }
     if (hasTTY && oldModel !== model) {
-      persistence.logger.debug(`[gemini] Adding model update message to buffer: [MODEL:${model}]`);
-      messageBuffer.addMessage(`[MODEL:${model}]`, "system");
+      logger.logger.debug(`[gemini] Adding model update message to buffer: [MODEL:${model}]`);
+      messageBuffer$1.addMessage(`[MODEL:${model}]`, "system");
     } else if (hasTTY) {
-      persistence.logger.debug(`[gemini] Model unchanged, skipping update message`);
+      logger.logger.debug(`[gemini] Model unchanged, skipping update message`);
     }
   };
   if (hasTTY) {
@@ -1143,11 +1170,11 @@ async function runGemini(opts) {
     const DisplayComponent = () => {
       const currentModelValue = displayedModel || "gemini-2.5-pro";
       return React.createElement(GeminiDisplay, {
-        messageBuffer,
-        logPath: process.env.DEBUG ? persistence.logger.getLogPath() : void 0,
+        messageBuffer: messageBuffer$1,
+        logPath: process.env.DEBUG ? logger.logger.getLogPath() : void 0,
         currentModel: currentModelValue,
         onExit: async () => {
-          persistence.logger.debug("[gemini]: Exiting agent via Ctrl-C");
+          logger.logger.debug("[gemini]: Exiting agent via Ctrl-C");
           shouldExit = true;
           await handleAbort();
         }
@@ -1158,8 +1185,8 @@ async function runGemini(opts) {
       patchConsole: false
     });
     const initialModelName = displayedModel || "gemini-2.5-pro";
-    persistence.logger.debug(`[gemini] Sending initial model to UI: ${initialModelName}`);
-    messageBuffer.addMessage(`[MODEL:${initialModelName}]`, "system");
+    logger.logger.debug(`[gemini] Sending initial model to UI: ${initialModelName}`);
+    messageBuffer$1.addMessage(`[MODEL:${initialModelName}]`, "system");
   }
   if (hasTTY) {
     process.stdin.resume();
@@ -1168,8 +1195,8 @@ async function runGemini(opts) {
     }
     process.stdin.setEncoding("utf8");
   }
-  const happyServer = await index.startHappyServer(session);
-  const bridgeCommand = path.join(terminalTitleSuggest.projectPath(), "bin", "very-happy-mcp.mjs");
+  const happyServer = await deterministicJson.startHappyServer(session);
+  const bridgeCommand = path.join(projectPath.projectPath(), "bin", "very-happy-mcp.mjs");
   const mcpServers = {
     happy: {
       command: bridgeCommand,
@@ -1198,24 +1225,24 @@ async function runGemini(opts) {
         case "model-output":
           if (msg.textDelta) {
             if (!isResponseInProgress) {
-              messageBuffer.removeLastMessage("system");
-              messageBuffer.addMessage(msg.textDelta, "assistant");
+              messageBuffer$1.removeLastMessage("system");
+              messageBuffer$1.addMessage(msg.textDelta, "assistant");
               isResponseInProgress = true;
-              persistence.logger.debug(`[gemini] Started new response, first chunk length: ${msg.textDelta.length}`);
+              logger.logger.debug(`[gemini] Started new response, first chunk length: ${msg.textDelta.length}`);
             } else {
-              messageBuffer.updateLastMessage(msg.textDelta, "assistant");
-              persistence.logger.debug(`[gemini] Updated response, chunk length: ${msg.textDelta.length}, total accumulated: ${accumulatedResponse.length + msg.textDelta.length}`);
+              messageBuffer$1.updateLastMessage(msg.textDelta, "assistant");
+              logger.logger.debug(`[gemini] Updated response, chunk length: ${msg.textDelta.length}, total accumulated: ${accumulatedResponse.length + msg.textDelta.length}`);
             }
             accumulatedResponse += msg.textDelta;
           }
           break;
         case "status":
           const statusDetail = msg.detail ? typeof msg.detail === "object" ? JSON.stringify(msg.detail) : String(msg.detail) : "";
-          persistence.logger.debug(`[gemini] Status changed: ${msg.status}`, {
-            detail: index$1.contentLogMetadata(statusDetail)
+          logger.logger.debug(`[gemini] Status changed: ${msg.status}`, {
+            detail: contentLogMetadata.contentLogMetadata(statusDetail)
           });
           if (msg.status === "error") {
-            persistence.logger.debug("[gemini] Error status received:", index$1.contentLogMetadata(statusDetail));
+            logger.logger.debug("[gemini] Error status received:", contentLogMetadata.contentLogMetadata(statusDetail));
             session.sendAgentMessage("gemini", {
               type: "turn_aborted",
               id: node_crypto.randomUUID()
@@ -1231,7 +1258,7 @@ async function runGemini(opts) {
               });
               taskStartedSent = true;
             }
-            messageBuffer.addMessage("Thinking...", "system");
+            messageBuffer$1.addMessage("Thinking...", "system");
           } else if (msg.status === "idle" || msg.status === "stopped") {
             reasoningProcessor.complete();
           } else if (msg.status === "error") {
@@ -1254,7 +1281,7 @@ For Google Workspace accounts, run: very-happy gemini project set <project-id>
 Or use a different Google account: very-happy connect gemini
 Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             }
-            messageBuffer.addMessage(`Error: ${errorMessage}`, "status");
+            messageBuffer$1.addMessage(`Error: ${errorMessage}`, "status");
             session.sendAgentMessage("gemini", {
               type: "message",
               message: `Error: ${errorMessage}`
@@ -1265,11 +1292,11 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           hadToolCallInTurn = true;
           const toolArgs = msg.args ? JSON.stringify(msg.args).substring(0, 100) : "";
           const isInvestigationTool = msg.toolName === "codebase_investigator" || typeof msg.toolName === "string" && msg.toolName.includes("investigator");
-          persistence.logger.debug(`[gemini] \u{1F527} Tool call received: ${msg.toolName} (${msg.callId})${isInvestigationTool ? " [INVESTIGATION]" : ""}`);
+          logger.logger.debug(`[gemini] \u{1F527} Tool call received: ${msg.toolName} (${msg.callId})${isInvestigationTool ? " [INVESTIGATION]" : ""}`);
           if (isInvestigationTool && msg.args && typeof msg.args === "object" && "objective" in msg.args) {
-            persistence.logger.debug("[gemini] Investigation objective received:", index$1.contentLogMetadata(msg.args.objective));
+            logger.logger.debug("[gemini] Investigation objective received:", contentLogMetadata.contentLogMetadata(msg.args.objective));
           }
-          messageBuffer.addMessage(`Executing: ${msg.toolName}${toolArgs ? ` ${toolArgs}${toolArgs.length >= 100 ? "..." : ""}` : ""}`, "tool");
+          messageBuffer$1.addMessage(`Executing: ${msg.toolName}${toolArgs ? ` ${toolArgs}${toolArgs.length >= 100 ? "..." : ""}` : ""}`, "tool");
           session.sendAgentMessage("gemini", {
             type: "tool-call",
             name: msg.toolName,
@@ -1281,25 +1308,25 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         case "tool-result":
           if (msg.toolName === "change_title" || msg.callId?.includes("change_title") || msg.toolName === "happy__change_title") {
             changeTitleCompleted = true;
-            persistence.logger.debug("[gemini] change_title completed");
+            logger.logger.debug("[gemini] change_title completed");
           }
           const isError = msg.result && typeof msg.result === "object" && "error" in msg.result;
           const resultText = typeof msg.result === "string" ? msg.result.substring(0, 200) : JSON.stringify(msg.result).substring(0, 200);
           const truncatedResult = resultText + (typeof msg.result === "string" && msg.result.length > 200 ? "..." : "");
           const resultSize = typeof msg.result === "string" ? msg.result.length : JSON.stringify(msg.result).length;
-          persistence.logger.debug(`[gemini] ${isError ? "\u274C" : "\u2705"} Tool result received: ${msg.toolName} (${msg.callId}) - Size: ${resultSize} bytes${isError ? " [ERROR]" : ""}`);
+          logger.logger.debug(`[gemini] ${isError ? "\u274C" : "\u2705"} Tool result received: ${msg.toolName} (${msg.callId}) - Size: ${resultSize} bytes${isError ? " [ERROR]" : ""}`);
           if (!isError) {
             diffProcessor.processToolResult(msg.toolName, msg.result, msg.callId);
           }
           if (isError) {
             const errorMsg = msg.result.error || "Tool call failed";
-            persistence.logger.debug("[gemini] Tool call error received:", index$1.contentLogMetadata(errorMsg));
-            messageBuffer.addMessage(`Error: ${errorMsg}`, "status");
+            logger.logger.debug("[gemini] Tool call error received:", contentLogMetadata.contentLogMetadata(errorMsg));
+            messageBuffer$1.addMessage(`Error: ${errorMsg}`, "status");
           } else {
             if (resultSize > 1e3) {
-              persistence.logger.debug(`[gemini] Large tool result received (${resultSize} bytes)`);
+              logger.logger.debug(`[gemini] Large tool result received (${resultSize} bytes)`);
             }
-            messageBuffer.addMessage(`Result: ${truncatedResult}`, "result");
+            messageBuffer$1.addMessage(`Result: ${truncatedResult}`, "result");
           }
           session.sendAgentMessage("gemini", {
             type: "tool-result",
@@ -1309,7 +1336,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           });
           break;
         case "fs-edit":
-          messageBuffer.addMessage(`File edit: ${msg.description}`, "tool");
+          messageBuffer$1.addMessage(`File edit: ${msg.description}`, "tool");
           diffProcessor.processFsEdit(msg.path || "", msg.description, msg.diff);
           session.sendAgentMessage("gemini", {
             type: "file-edit",
@@ -1330,7 +1357,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           }
           break;
         case "terminal-output":
-          messageBuffer.addMessage(msg.data, "result");
+          messageBuffer$1.addMessage(msg.data, "result");
           session.sendAgentMessage("gemini", {
             type: "terminal-output",
             data: msg.data,
@@ -1351,8 +1378,8 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           const execApprovalMsg = msg;
           const callId = execApprovalMsg.call_id || execApprovalMsg.callId || node_crypto.randomUUID();
           const { call_id, type, ...inputs } = execApprovalMsg;
-          persistence.logger.debug(`[gemini] Exec approval request received: ${callId}`);
-          messageBuffer.addMessage(`Exec approval requested: ${callId}`, "tool");
+          logger.logger.debug(`[gemini] Exec approval request received: ${callId}`);
+          messageBuffer$1.addMessage(`Exec approval requested: ${callId}`, "tool");
           session.sendAgentMessage("gemini", {
             type: "tool-call",
             name: "GeminiBash",
@@ -1368,8 +1395,8 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           const { call_id: patchCallIdVar, type: patchType, auto_approved, changes } = patchBeginMsg;
           const changeCount = changes ? Object.keys(changes).length : 0;
           const filesMsg = changeCount === 1 ? "1 file" : `${changeCount} files`;
-          messageBuffer.addMessage(`Modifying ${filesMsg}...`, "tool");
-          persistence.logger.debug(`[gemini] Patch apply begin: ${patchCallId}, files: ${changeCount}`);
+          messageBuffer$1.addMessage(`Modifying ${filesMsg}...`, "tool");
+          logger.logger.debug(`[gemini] Patch apply begin: ${patchCallId}, files: ${changeCount}`);
           session.sendAgentMessage("gemini", {
             type: "tool-call",
             name: "GeminiPatch",
@@ -1388,12 +1415,12 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           const { call_id: patchEndCallIdVar, type: patchEndType, stdout, stderr, success } = patchEndMsg;
           if (success) {
             const message = stdout || "Files modified successfully";
-            messageBuffer.addMessage(message.substring(0, 200), "result");
+            messageBuffer$1.addMessage(message.substring(0, 200), "result");
           } else {
             const errorMsg = stderr || "Failed to modify files";
-            messageBuffer.addMessage(`Error: ${errorMsg.substring(0, 200)}`, "result");
+            messageBuffer$1.addMessage(`Error: ${errorMsg.substring(0, 200)}`, "result");
           }
-          persistence.logger.debug(`[gemini] Patch apply end: ${patchEndCallId}, success: ${success}`);
+          logger.logger.debug(`[gemini] Patch apply end: ${patchEndCallId}, success: ${success}`);
           session.sendAgentMessage("gemini", {
             type: "tool-result",
             callId: patchEndCallId,
@@ -1411,10 +1438,10 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             const thinkingText = thinkingPayload && typeof thinkingPayload === "object" && "text" in thinkingPayload ? String(thinkingPayload.text || "") : "";
             if (thinkingText) {
               reasoningProcessor.processChunk(thinkingText);
-              persistence.logger.debug("[gemini] Thinking chunk received:", index$1.contentLogMetadata(thinkingText));
+              logger.logger.debug("[gemini] Thinking chunk received:", contentLogMetadata.contentLogMetadata(thinkingText));
               if (!thinkingText.startsWith("**")) {
                 const thinkingPreview = thinkingText.substring(0, 100);
-                messageBuffer.updateLastMessage(`[Thinking] ${thinkingPreview}...`, "system");
+                messageBuffer$1.updateLastMessage(`[Thinking] ${thinkingPreview}...`, "system");
               }
             }
             session.sendAgentMessage("gemini", {
@@ -1434,18 +1461,18 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       let message = pending;
       pending = null;
       if (!message) {
-        persistence.logger.debug("[gemini] Main loop: waiting for messages from queue...");
+        logger.logger.debug("[gemini] Main loop: waiting for messages from queue...");
         const waitSignal = abortController.signal;
         const batch = await messageQueue.waitForMessagesAndGetAsString(waitSignal);
         if (!batch) {
           if (waitSignal.aborted && !shouldExit) {
-            persistence.logger.debug("[gemini] Main loop: wait aborted, continuing...");
+            logger.logger.debug("[gemini] Main loop: wait aborted, continuing...");
             continue;
           }
-          persistence.logger.debug("[gemini] Main loop: no batch received, breaking...");
+          logger.logger.debug("[gemini] Main loop: no batch received, breaking...");
           break;
         }
-        persistence.logger.debug(`[gemini] Main loop: received message from queue (length: ${batch.message.length})`);
+        logger.logger.debug(`[gemini] Main loop: received message from queue (length: ${batch.message.length})`);
         message = batch;
       }
       if (!message) {
@@ -1453,14 +1480,14 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       }
       let injectHistoryContext = false;
       if (wasSessionCreated && currentModeHash && message.hash !== currentModeHash) {
-        persistence.logger.debug("[Gemini] Mode changed \u2013 restarting Gemini session");
-        messageBuffer.addMessage("\u2550".repeat(40), "status");
+        logger.logger.debug("[Gemini] Mode changed \u2013 restarting Gemini session");
+        messageBuffer$1.addMessage("\u2550".repeat(40), "status");
         if (conversationHistory.hasHistory()) {
-          messageBuffer.addMessage(`Switching model (preserving ${conversationHistory.size()} messages of context)...`, "status");
+          messageBuffer$1.addMessage(`Switching model (preserving ${conversationHistory.size()} messages of context)...`, "status");
           injectHistoryContext = true;
-          persistence.logger.debug("[Gemini] Will inject conversation history");
+          logger.logger.debug("[Gemini] Will inject conversation history");
         } else {
-          messageBuffer.addMessage("Starting new Gemini session (mode changed)...", "status");
+          messageBuffer$1.addMessage("Starting new Gemini session (mode changed)...", "status");
         }
         permissionHandler.reset();
         reasoningProcessor.abort();
@@ -1482,13 +1509,13 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         geminiBackend = backendResult.backend;
         setupGeminiMessageHandler(geminiBackend);
         const actualModel = backendResult.model;
-        persistence.logger.debug(`[gemini] Model change - modelToUse=${modelToUse}, actualModel=${actualModel} (from ${backendResult.modelSource})`);
+        logger.logger.debug(`[gemini] Model change - modelToUse=${modelToUse}, actualModel=${actualModel} (from ${backendResult.modelSource})`);
         conversationHistory.setCurrentModel(actualModel);
-        persistence.logger.debug("[gemini] Starting new ACP session with model:", actualModel);
+        logger.logger.debug("[gemini] Starting new ACP session with model:", actualModel);
         const { sessionId } = await geminiBackend.startSession();
         acpSessionId = sessionId;
-        persistence.logger.debug(`[gemini] New ACP session started: ${acpSessionId}`);
-        persistence.logger.debug(`[gemini] Calling updateDisplayedModel with: ${actualModel}`);
+        logger.logger.debug(`[gemini] New ACP session started: ${acpSessionId}`);
+        logger.logger.debug(`[gemini] Calling updateDisplayedModel with: ${actualModel}`);
         updateDisplayedModel(actualModel, false);
         updatePermissionMode(message.mode.permissionMode);
         wasSessionCreated = true;
@@ -1497,7 +1524,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       }
       currentModeHash = message.hash;
       const userMessageToShow = message.mode?.originalUserMessage || message.message;
-      messageBuffer.addMessage(userMessageToShow, "user");
+      messageBuffer$1.addMessage(userMessageToShow, "user");
       isProcessingMessage = true;
       try {
         if (first || !wasSessionCreated) {
@@ -1516,20 +1543,20 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             geminiBackend = backendResult.backend;
             setupGeminiMessageHandler(geminiBackend);
             const actualModel = backendResult.model;
-            persistence.logger.debug(`[gemini] Backend created, model will be: ${actualModel} (from ${backendResult.modelSource})`);
-            persistence.logger.debug(`[gemini] Calling updateDisplayedModel with: ${actualModel}`);
+            logger.logger.debug(`[gemini] Backend created, model will be: ${actualModel} (from ${backendResult.modelSource})`);
+            logger.logger.debug(`[gemini] Calling updateDisplayedModel with: ${actualModel}`);
             updateDisplayedModel(actualModel, false);
             conversationHistory.setCurrentModel(actualModel);
           }
           if (!acpSessionId) {
-            persistence.logger.debug("[gemini] Starting ACP session...");
+            logger.logger.debug("[gemini] Starting ACP session...");
             updatePermissionMode(message.mode.permissionMode);
             const { sessionId } = await geminiBackend.startSession();
             acpSessionId = sessionId;
-            persistence.logger.debug(`[gemini] ACP session started: ${acpSessionId}`);
+            logger.logger.debug(`[gemini] ACP session started: ${acpSessionId}`);
             wasSessionCreated = true;
             currentModeHash = message.hash;
-            persistence.logger.debug(`[gemini] Displaying model in UI: ${displayedModel || "gemini-2.5-pro"}, displayedModel: ${displayedModel}`);
+            logger.logger.debug(`[gemini] Displaying model in UI: ${displayedModel || "gemini-2.5-pro"}, displayedModel: ${displayedModel}`);
           }
         }
         if (!acpSessionId) {
@@ -1548,19 +1575,19 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         if (injectHistoryContext && conversationHistory.hasHistory()) {
           const historyContext = conversationHistory.getContextForNewSession();
           promptToSend = historyContext + promptToSend;
-          persistence.logger.debug(`[gemini] Injected conversation history context (${historyContext.length} chars)`);
+          logger.logger.debug(`[gemini] Injected conversation history context (${historyContext.length} chars)`);
         }
-        persistence.logger.debug("[gemini] Sending prompt to Gemini:", index$1.contentLogMetadata(promptToSend));
+        logger.logger.debug("[gemini] Sending prompt to Gemini:", contentLogMetadata.contentLogMetadata(promptToSend));
         const MAX_RETRIES = 3;
         const RETRY_DELAY_MS = 2e3;
         let lastError = null;
         for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
           try {
             await geminiBackend.sendPrompt(acpSessionId, promptToSend);
-            persistence.logger.debug("[gemini] Prompt sent successfully");
+            logger.logger.debug("[gemini] Prompt sent successfully");
             if (geminiBackend.waitForResponseComplete) {
               await geminiBackend.waitForResponseComplete(12e4);
-              persistence.logger.debug("[gemini] Response complete");
+              logger.logger.debug("[gemini] Response complete");
             }
             break;
           } catch (promptError) {
@@ -1577,7 +1604,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
                 resetTimeMsg = ` Quota resets in ${parts}.`;
               }
               const quotaMsg = `Gemini quota exceeded.${resetTimeMsg} Try using a different model (gemini-2.5-flash-lite) or wait for quota reset.`;
-              messageBuffer.addMessage(quotaMsg, "status");
+              messageBuffer$1.addMessage(quotaMsg, "status");
               session.sendAgentMessage("gemini", { type: "message", message: quotaMsg });
               throw promptError;
             }
@@ -1585,8 +1612,8 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             const isInternalError = errorCode === -32603;
             const isRetryable = isEmptyResponseError || isInternalError;
             if (isRetryable && attempt < MAX_RETRIES) {
-              persistence.logger.debug(`[gemini] Retryable error on attempt ${attempt}/${MAX_RETRIES}:`, index$1.contentLogMetadata(errorDetails));
-              messageBuffer.addMessage(`Gemini returned empty response, retrying (${attempt}/${MAX_RETRIES})...`, "status");
+              logger.logger.debug(`[gemini] Retryable error on attempt ${attempt}/${MAX_RETRIES}:`, contentLogMetadata.contentLogMetadata(errorDetails));
+              messageBuffer$1.addMessage(`Gemini returned empty response, retrying (${attempt}/${MAX_RETRIES})...`, "status");
               await new Promise((resolve2) => setTimeout(resolve2, RETRY_DELAY_MS * attempt));
               continue;
             }
@@ -1594,16 +1621,16 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           }
         }
         if (lastError && MAX_RETRIES > 1) {
-          persistence.logger.debug("[gemini] Prompt succeeded after retries");
+          logger.logger.debug("[gemini] Prompt succeeded after retries");
         }
         if (first) {
           first = false;
         }
       } catch (error) {
-        persistence.logger.debug("[gemini] Error in gemini session:", index$1.errorLogMetadata(error));
+        logger.logger.debug("[gemini] Error in gemini session:", contentLogMetadata.errorLogMetadata(error));
         const isAbortError = error instanceof Error && error.name === "AbortError";
         if (isAbortError) {
-          messageBuffer.addMessage("Aborted by user", "status");
+          messageBuffer$1.addMessage("Aborted by user", "status");
           session.sendSessionEvent({ type: "message", message: "Aborted by user" });
         } else {
           let errorMsg = "Process error occurred";
@@ -1641,7 +1668,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           } else if (error instanceof Error) {
             errorMsg = error.message;
           }
-          messageBuffer.addMessage(errorMsg, "status");
+          messageBuffer$1.addMessage(errorMsg, "status");
           session.sendAgentMessage("gemini", {
             type: "message",
             message: errorMsg
@@ -1658,9 +1685,9 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
           if (options.length > 0) {
             const optionsXml = formatOptionsXml(options);
             finalMessageText = messageText + optionsXml;
-            persistence.logger.debug(`[gemini] Found ${options.length} options in response`);
+            logger.logger.debug(`[gemini] Found ${options.length} options in response`);
           } else if (hasIncompleteOptions(accumulatedResponse)) {
-            persistence.logger.debug(`[gemini] Warning: Incomplete options block detected`);
+            logger.logger.debug(`[gemini] Warning: Incomplete options block detected`);
           }
           const messagePayload = {
             type: "message",
@@ -1668,7 +1695,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
             id: node_crypto.randomUUID(),
             ...options.length > 0 && { options }
           };
-          persistence.logger.debug("[gemini] Sending complete message to mobile:", index$1.contentLogMetadata(finalMessageText));
+          logger.logger.debug("[gemini] Sending complete message to mobile:", contentLogMetadata.contentLogMetadata(finalMessageText));
           session.sendAgentMessage("gemini", messagePayload);
           accumulatedResponse = "";
           isResponseInProgress = false;
@@ -1686,13 +1713,13 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
         emitReadyIfIdle();
         isProcessingMessage = false;
         applyPendingSessionSwap();
-        persistence.logger.debug(`[gemini] Main loop: turn completed, continuing to next iteration (queue size: ${messageQueue.size()})`);
+        logger.logger.debug(`[gemini] Main loop: turn completed, continuing to next iteration (queue size: ${messageQueue.size()})`);
       }
     }
   } finally {
-    persistence.logger.debug("[gemini]: Final cleanup start");
+    logger.logger.debug("[gemini]: Final cleanup start");
     if (reconnectionHandle) {
-      persistence.logger.debug("[gemini]: Cancelling offline reconnection");
+      logger.logger.debug("[gemini]: Cancelling offline reconnection");
       reconnectionHandle.cancel();
     }
     try {
@@ -1700,7 +1727,7 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
       await session.flush();
       await session.close();
     } catch (e) {
-      persistence.logger.debug("[gemini]: Error while closing session", e);
+      logger.logger.debug("[gemini]: Error while closing session", e);
     }
     if (geminiBackend) {
       await geminiBackend.dispose();
@@ -1722,8 +1749,8 @@ Guide: https://goo.gle/gemini-cli-auth-docs#workspace-gca`;
     if (inkInstance) {
       inkInstance.unmount();
     }
-    messageBuffer.clear();
-    persistence.logger.debug("[gemini]: Final cleanup completed");
+    messageBuffer$1.clear();
+    logger.logger.debug("[gemini]: Final cleanup completed");
   }
 }