@letta-ai/letta-code 0.28.4 → 0.28.5

package/letta.js

@@ -3138,6 +3138,29 @@ var init_letta_client = __esm(() => {
   init_error();
 });
 
+// src/auth/oauth-refresh.ts
+async function refreshAccessTokenSingleFlight(refreshToken, deviceId, deviceName, refresh = refreshAccessToken) {
+  const refreshKey = `${refreshToken}\x00${deviceId}`;
+  const existing = inFlightRefreshes.get(refreshKey);
+  if (existing) {
+    return await existing;
+  }
+  const pending = refresh(refreshToken, deviceId, deviceName);
+  inFlightRefreshes.set(refreshKey, pending);
+  try {
+    return await pending;
+  } finally {
+    if (inFlightRefreshes.get(refreshKey) === pending) {
+      inFlightRefreshes.delete(refreshKey);
+    }
+  }
+}
+var inFlightRefreshes;
+var init_oauth_refresh = __esm(() => {
+  init_oauth();
+  inFlightRefreshes = new Map;
+});
+
 // src/agent/agent-id.ts
 function isLocalAgentId(agentId) {
   return agentId.startsWith("agent-local-");
@@ -3846,14 +3869,13 @@ class SettingsManager {
   }
   async getSettingsWithSecureTokens() {
     const baseSettings = this.getSettings();
-    let secureTokens = { ...this.secureTokensCache };
+    const secureTokens = { ...this.secureTokensCache };
     if (!getRuntimeContext()) {
       const secretsAvailable2 = await this.isKeychainAvailable();
       if (secretsAvailable2) {
-        secureTokens = {
-          ...secureTokens,
-          ...await this.getSecureTokens()
-        };
+        const storedTokens = await this.getSecureTokens();
+        secureTokens.apiKey = storedTokens.apiKey ?? secureTokens.apiKey;
+        secureTokens.refreshToken = storedTokens.refreshToken ?? secureTokens.refreshToken;
       }
     }
     const fallbackRefreshToken = !secureTokens.refreshToken && baseSettings.refreshToken ? baseSettings.refreshToken : secureTokens.refreshToken;
@@ -4815,7 +4837,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.28.4",
+    version: "0.28.5",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     packageManager: "bun@1.3.0",
@@ -5113,7 +5135,7 @@ async function getClient() {
       try {
         const deviceId = settingsManager.getOrCreateDeviceId();
         const deviceName = hostname();
-        const tokens = await refreshAccessToken(settings.refreshToken, deviceId, deviceName);
+        const tokens = await refreshAccessTokenSingleFlight(settings.refreshToken, deviceId, deviceName);
         settingsManager.updateSettings({
           env: { LETTA_API_KEY: tokens.access_token },
           refreshToken: tokens.refresh_token || settings.refreshToken,
@@ -5176,6 +5198,7 @@ var SDK_DIAGNOSTIC_MAX_LEN = 400, SDK_DIAGNOSTIC_MAX_LINES = 4, lastSDKDiagnosti
 var init_client2 = __esm(() => {
   init_letta_client();
   init_oauth();
+  init_oauth_refresh();
   init_settings_manager();
   init_error_reporting();
   init_debug();
@@ -5855,6 +5878,7 @@ __export(exports_oauth, {
   requestDeviceCode: () => requestDeviceCode,
   refreshAccessToken: () => refreshAccessToken,
   pollForToken: () => pollForToken,
+  OAuthRefreshError: () => OAuthRefreshError,
   OAUTH_CONFIG: () => OAUTH_CONFIG,
   LETTA_CLOUD_API_URL: () => LETTA_CLOUD_API_URL
 });
@@ -6035,11 +6059,22 @@ async function refreshAccessToken(refreshToken, deviceId, deviceName) {
     });
     if (!response.ok) {
       const error = await response.json();
-      throw new Error(`Failed to refresh access token from ${authHost}: ${error.error_description || error.error}`);
+      throw new OAuthRefreshError(`Failed to refresh access token from ${authHost}: ${error.error_description || error.error}`, {
+        retryable: response.status === 408 || response.status === 429 || response.status >= 500,
+        status: response.status,
+        oauthCode: error.error
+      });
     }
     return await response.json();
   } catch (error) {
-    throw toOAuthActionError("refresh access token", error);
+    if (error instanceof OAuthRefreshError) {
+      throw error;
+    }
+    const actionError = toOAuthActionError("refresh access token", error);
+    throw new OAuthRefreshError(actionError.message, {
+      retryable: true,
+      cause: error
+    });
   }
 }
 async function revokeToken(refreshToken) {
@@ -6125,7 +6160,7 @@ function classifyCredentialValidationError(error) {
   }
   return { ok: false, reason: "unknown", message };
 }
-var LETTA_CLOUD_API_URL = "https://api.letta.com", OAUTH_CONFIG;
+var LETTA_CLOUD_API_URL = "https://api.letta.com", OAUTH_CONFIG, OAuthRefreshError;
 var init_oauth = __esm(() => {
   init_letta_client();
   init_error();
@@ -6136,6 +6171,18 @@ var init_oauth = __esm(() => {
     authBaseUrl: "https://app.letta.com",
     apiBaseUrl: LETTA_CLOUD_API_URL
   };
+  OAuthRefreshError = class OAuthRefreshError extends Error {
+    retryable;
+    status;
+    oauthCode;
+    constructor(message, options) {
+      super(message, { cause: options.cause });
+      this.name = "OAuthRefreshError";
+      this.retryable = options.retryable;
+      this.status = options.status;
+      this.oauthCode = options.oauthCode;
+    }
+  };
 });
 
 // src/backend/backend-mode.ts
@@ -176039,7 +176086,7 @@ function isLocalAgentId2(agentId) {
   return isLocalAgentId(agentId);
 }
 function buildChatUrl(agentId, options3) {
-  const base2 = `${APP_BASE}/chat/${agentId}`;
+  const base2 = `${CHAT_BASE}/chat/${agentId}`;
   const params = new URLSearchParams;
   if (options3?.view) {
     params.set("view", options3.view);
@@ -176066,11 +176113,16 @@ function buildAgentTerminalLink(agentId, options3, label = agentId) {
   const url2 = buildChatUrl(agentId, options3);
   return `\x1B]8;;${url2}\x1B\\${label}\x1B]8;;\x1B\\`;
 }
-function buildAppUrl(path5) {
-  return `${APP_BASE}${path5}`;
+function buildChatWebUrl(path5) {
+  return `${CHAT_BASE}${path5}`;
 }
-var APP_BASE = "https://app.letta.com";
-var init_app_urls = () => {};
+function buildPlatformUrl(path5) {
+  return `${PLATFORM_BASE}${path5}`;
+}
+var CHAT_BASE = "https://chat.letta.com", PLATFORM_BASE = "https://platform.letta.com", LETTA_CHAT_API_KEYS_URL;
+var init_app_urls = __esm(() => {
+  LETTA_CHAT_API_KEYS_URL = `${CHAT_BASE}/preferences/api-keys`;
+});
 
 // src/channels/registry-presentation.ts
 function channelDisplayName2(channelId) {
@@ -368054,6 +368106,13 @@ async function switchCurrentRuntimeWorkingDirectory(workingDirectory) {
   process.env.USER_CWD = workingDirectory;
   updateRuntimeContext({ workingDirectory });
 }
+async function updateToolExecutionContextCwd(executionContextId, workingDirectory) {
+  if (!executionContextId) {
+    return;
+  }
+  const { updateToolExecutionContextWorkingDirectory } = await init_manager4().then(() => exports_manager2);
+  updateToolExecutionContextWorkingDirectory(executionContextId, workingDirectory);
+}
 async function switchConversationWorkingDirectory(params) {
   const { runtime, workingDirectory } = params;
   const agentId = normalizeCwdAgentId(params.agentId);
@@ -368657,13 +368716,10 @@ async function switchSessionToWorktree(params) {
       agentId: runtimeContext.agentId ?? null,
       conversationId: runtimeContext.conversationId
     });
-    return true;
-  }
-  await switchCurrentRuntimeWorkingDirectory(worktreePath);
-  if (params.executionContextId) {
-    const { updateToolExecutionContextWorkingDirectory } = await init_manager4().then(() => exports_manager2);
-    updateToolExecutionContextWorkingDirectory(params.executionContextId, worktreePath);
+  } else {
+    await switchCurrentRuntimeWorkingDirectory(worktreePath);
   }
+  await updateToolExecutionContextCwd(params.executionContextId, worktreePath);
   return true;
 }
 async function resolveWorktreeGitDir(worktreePath) {
@@ -383124,7 +383180,11 @@ function buildSubagentArgs(type3, config3, model, userPrompt, existingAgentId, e
       args.push("--agent", existingAgentId, "--new");
     }
   } else {
-    args.push("--new-agent", "--system", type3);
+    if (options3.systemPromptOverride) {
+      args.push("--new-agent", "--system-custom", options3.systemPromptOverride);
+    } else {
+      args.push("--new-agent", "--system", type3);
+    }
     const subagentTags = [`type:${type3}`];
     if (options3.parentAgentId) {
       subagentTags.push(`parent:${options3.parentAgentId}`);
@@ -383171,7 +383231,7 @@ function buildSubagentArgs(type3, config3, model, userPrompt, existingAgentId, e
   }
   return args;
 }
-async function executeSubagent(type3, config3, model, userPrompt, baseURL, subagentId, isRetry = false, signal, existingAgentId, existingConversationId, maxTurns, parentAgentIdOverride, transcriptPath, memoryScope) {
+async function executeSubagent(type3, config3, model, userPrompt, subagentId, isRetry = false, signal, existingAgentId, existingConversationId, maxTurns, parentAgentIdOverride, transcriptPath, memoryScope, systemPromptOverride) {
   if (signal?.aborted) {
     return {
       agentId: "",
@@ -383199,7 +383259,8 @@ async function executeSubagent(type3, config3, model, userPrompt, baseURL, subag
       backendMode,
       promptTransport: "stdin",
       parentAgentId,
-      extraTools: config3.fork && inheritedChannelContext ? ["MessageChannel"] : undefined
+      extraTools: config3.fork && inheritedChannelContext ? ["MessageChannel"] : undefined,
+      systemPromptOverride
     });
     const launcher = resolveSubagentLauncher(cliArgs);
     const settings3 = await settingsManager.getSettingsWithSecureTokens();
@@ -383314,7 +383375,7 @@ async function executeSubagent(type3, config3, model, userPrompt, baseURL, subag
           agentId: parentAgentIdOverride
         });
         if (primaryModel) {
-          return executeSubagent(type3, config3, primaryModel, userPrompt, baseURL, subagentId, true, signal, undefined, undefined, maxTurns, parentAgentIdOverride, transcriptPath);
+          return executeSubagent(type3, config3, primaryModel, userPrompt, subagentId, true, signal, undefined, undefined, maxTurns, parentAgentIdOverride, transcriptPath);
         }
       }
       const propagatedError = state.finalError?.trim();
@@ -383369,14 +383430,6 @@ async function executeSubagent(type3, config3, model, userPrompt, baseURL, subag
     };
   }
 }
-function getBaseURL() {
-  const settings3 = settingsManager.getSettings();
-  const baseURL = process.env.LETTA_BASE_URL || settings3.env?.LETTA_BASE_URL || "https://api.letta.com";
-  if (baseURL === "https://api.letta.com") {
-    return "https://app.letta.com";
-  }
-  return baseURL;
-}
 function buildDeploySystemReminder(senderAgentName, senderAgentId) {
   return `${SYSTEM_REMINDER_OPEN}
 This task is from "${senderAgentName}" (agent ID: ${senderAgentId}), which deployed you as a subagent inside the Letta Code CLI (docs.letta.com/letta-code).
@@ -383420,7 +383473,7 @@ ${SYSTEM_REMINDER_CLOSE}
 
 `;
 }
-async function spawnSubagent(type3, prompt, userModel, subagentId, signal, existingAgentId, existingConversationId, maxTurns, forkedContext, parentAgentId, transcriptPath, parentConversationId, memoryScope) {
+async function spawnSubagent(type3, prompt, userModel, subagentId, signal, existingAgentId, existingConversationId, maxTurns, forkedContext, parentAgentId, transcriptPath, parentConversationId, memoryScope, systemPromptOverride) {
   const allConfigs = await getAllSubagentConfigs();
   const config3 = allConfigs[type3];
   if (!config3) {
@@ -383459,7 +383512,6 @@ async function spawnSubagent(type3, prompt, userModel, subagentId, signal, exist
     subagentType: type3,
     backendMode
   });
-  const baseURL = getBaseURL();
   let finalPrompt = prompt;
   if (isDeployingExisting && resolvedParentAgentId) {
     try {
@@ -383479,7 +383531,7 @@ async function spawnSubagent(type3, prompt, userModel, subagentId, signal, exist
     });
     updateSubagent(subagentId, { agentURL: forkAgentURL });
   }
-  const result = await executeSubagent(type3, config3, model, finalPrompt, baseURL, subagentId, false, signal, existingAgentId, existingConversationId, maxTurns, resolvedParentAgentId, transcriptPath, memoryScope);
+  const result = await executeSubagent(type3, config3, model, finalPrompt, subagentId, false, signal, existingAgentId, existingConversationId, maxTurns, resolvedParentAgentId, transcriptPath, memoryScope, systemPromptOverride);
   return result;
 }
 var NO_BASE_TOOL_SUBAGENT_TYPES;
@@ -383734,6 +383786,7 @@ function spawnBackgroundSubagentTask(args) {
     prompt,
     description,
     model,
+    systemPromptOverride,
     toolCallId,
     existingAgentId,
     existingConversationId,
@@ -383776,7 +383829,7 @@ function spawnBackgroundSubagentTask(args) {
   backgroundTasks.set(taskId, bgTask);
   writeTaskTranscriptStart(outputFile, description, subagentType);
   const parentAgentIdForSpawn = resolvedParentScope?.agentId;
-  spawnSubagentFn(subagentType, prompt, model, subagentId, abortController.signal, existingAgentId, existingConversationId, maxTurns, forkedContext, parentAgentIdForSpawn, transcriptPath, resolvedParentScope?.conversationId, memoryScope).then(async (result) => {
+  spawnSubagentFn(subagentType, prompt, model, subagentId, abortController.signal, existingAgentId, existingConversationId, maxTurns, forkedContext, parentAgentIdForSpawn, transcriptPath, resolvedParentScope?.conversationId, memoryScope, systemPromptOverride).then(async (result) => {
     bgTask.status = result.success ? "completed" : "failed";
     if (result.error) {
       bgTask.error = result.error;
@@ -393736,16 +393789,16 @@ function toolResultToStoredReturnValue(message) {
     };
   });
 }
-function projectThinkingContent(message, content, contentIndex, date6, agentId, conversationId) {
-  if (content.thinking.length === 0)
+function projectThinkingContent(message, reasoning, contentStartIndex, date6, agentId, conversationId) {
+  if (reasoning.length === 0)
     return;
   return {
-    id: `${message.id}:reasoning:${contentIndex}`,
+    id: `${message.id}:reasoning:${contentStartIndex}`,
     date: date6,
     agent_id: agentId,
     conversation_id: conversationId,
     message_type: "reasoning_message",
-    reasoning: content.thinking
+    reasoning
   };
 }
 function projectToolCallContent(message, content, date6, agentId, conversationId) {
@@ -393815,6 +393868,8 @@ function projectLocalMessageToStoredMessages(message, fallbackAgentId, fallbackC
   const messages = [];
   let pendingTextContent = [];
   let pendingTextStartIndex = -1;
+  let pendingReasoningContent = [];
+  let pendingReasoningStartIndex = -1;
   const flushPendingText = () => {
     if (pendingTextContent.length === 0)
       return;
@@ -393831,29 +393886,46 @@ function projectLocalMessageToStoredMessages(message, fallbackAgentId, fallbackC
     pendingTextContent = [];
     pendingTextStartIndex = -1;
   };
+  const flushPendingReasoning = () => {
+    if (pendingReasoningContent.length > 0) {
+      const reasoningMessage = projectThinkingContent(message, pendingReasoningContent.join(`
+
+`), pendingReasoningStartIndex, date6, agentId, conversationId);
+      if (reasoningMessage)
+        messages.push(reasoningMessage);
+    }
+    pendingReasoningContent = [];
+    pendingReasoningStartIndex = -1;
+  };
   for (let contentIndex = 0;contentIndex < message.content.length; contentIndex++) {
     const content = message.content[contentIndex];
     if (!content)
       continue;
     if (isThinkingContent(content)) {
       flushPendingText();
-      const reasoningMessage = projectThinkingContent(message, content, contentIndex, date6, agentId, conversationId);
-      if (reasoningMessage)
-        messages.push(reasoningMessage);
+      if (content.thinking.length > 0) {
+        if (pendingReasoningStartIndex === -1) {
+          pendingReasoningStartIndex = contentIndex;
+        }
+        pendingReasoningContent.push(content.thinking);
+      }
       continue;
     }
     if (isLocalToolCallContent(content)) {
       flushPendingText();
+      flushPendingReasoning();
       messages.push(projectToolCallContent(message, content, date6, agentId, conversationId));
       continue;
     }
     if (isTextContent(content)) {
+      flushPendingReasoning();
       if (pendingTextStartIndex === -1)
         pendingTextStartIndex = contentIndex;
       pendingTextContent.push({ type: "text", text: content.text });
     }
   }
   flushPendingText();
+  flushPendingReasoning();
   return messages;
 }
 function withProjectedMessageDates(messages, _sourceMessageIndex) {
@@ -397075,8 +397147,8 @@ var init_error_formatter = __esm(() => {
   init_app_urls();
   init_error_context();
   init_zai_errors();
-  LETTA_USAGE_URL = buildAppUrl("/settings/organization/usage");
-  LETTA_AGENTS_URL = buildAppUrl("/projects/default-project/agents");
+  LETTA_USAGE_URL = buildChatWebUrl("/preferences/usage");
+  LETTA_AGENTS_URL = buildPlatformUrl("/projects/default-project/agents");
   CLOUDFLARE_EDGE_5XX_MARKER_PATTERN = /(^|\s)(502|52[0-6])\s*<!doctype html|error code\s*(502|52[0-6])/i;
   CLOUDFLARE_EDGE_5XX_TITLE_PATTERN = /\|\s*(502|52[0-6])\s*:/i;
   CLOUDFLARE_EDGE_5XX_FORMATTED_PATTERN = /\bCloudflare\s+(502|52[0-6])\b/i;
@@ -399301,12 +399373,26 @@ function errorFromAssistantEvent(part) {
     return new Error("Unknown provider stream error");
   return new Error(part.error.errorMessage ?? "Unknown local provider error");
 }
-function otidForContentIndex(otids, prefix, contentIndex) {
-  const existing = otids.get(contentIndex);
+function contentMatchesMessageType(content, messageType) {
+  if (!content || typeof content !== "object" || !("type" in content)) {
+    return false;
+  }
+  return messageType === "assistant_message" ? content.type === "text" : content.type === "thinking";
+}
+function contiguousContentStartIndex(partial4, contentIndex, messageType) {
+  let startIndex = contentIndex;
+  while (startIndex > 0 && contentMatchesMessageType(partial4.content[startIndex - 1], messageType)) {
+    startIndex -= 1;
+  }
+  return startIndex;
+}
+function otidForContentSegment(otids, prefix, contentIndex, partial4, messageType) {
+  const segmentStartIndex = contiguousContentStartIndex(partial4, contentIndex, messageType);
+  const existing = otids.get(segmentStartIndex);
   if (existing)
     return existing;
-  const otid = `${prefix}-${contentIndex}-${randomUUID20()}`;
-  otids.set(contentIndex, otid);
+  const otid = `${prefix}-${segmentStartIndex}-${randomUUID20()}`;
+  otids.set(segmentStartIndex, otid);
   return otid;
 }
 function createProviderLettaStream(events, contextTokensEstimate) {
@@ -399337,7 +399423,7 @@ function createProviderLettaStream(events, contextTokensEstimate) {
           if (part.type === "text_delta") {
             yield {
               message_type: "assistant_message",
-              otid: otidForContentIndex(assistantOtids, "provider-assistant", part.contentIndex),
+              otid: otidForContentSegment(assistantOtids, "provider-assistant", part.contentIndex, part.partial, "assistant_message"),
               content: [{ type: "text", text: part.delta }]
             };
             continue;
@@ -399345,7 +399431,7 @@ function createProviderLettaStream(events, contextTokensEstimate) {
           if (part.type === "thinking_delta") {
             yield {
               message_type: "reasoning_message",
-              otid: otidForContentIndex(reasoningOtids, "provider-reasoning", part.contentIndex),
+              otid: otidForContentSegment(reasoningOtids, "provider-reasoning", part.contentIndex, part.partial, "reasoning_message"),
               reasoning: part.delta
             };
             continue;
@@ -402208,6 +402294,7 @@ __export(exports_oauth2, {
   requestDeviceCode: () => requestDeviceCode2,
   refreshAccessToken: () => refreshAccessToken3,
   pollForToken: () => pollForToken2,
+  OAuthRefreshError: () => OAuthRefreshError2,
   OAUTH_CONFIG: () => OAUTH_CONFIG2,
   LETTA_CLOUD_API_URL: () => LETTA_CLOUD_API_URL2
 });
@@ -402388,11 +402475,22 @@ async function refreshAccessToken3(refreshToken, deviceId, deviceName) {
     });
     if (!response.ok) {
       const error54 = await response.json();
-      throw new Error(`Failed to refresh access token from ${authHost}: ${error54.error_description || error54.error}`);
+      throw new OAuthRefreshError2(`Failed to refresh access token from ${authHost}: ${error54.error_description || error54.error}`, {
+        retryable: response.status === 408 || response.status === 429 || response.status >= 500,
+        status: response.status,
+        oauthCode: error54.error
+      });
     }
     return await response.json();
   } catch (error54) {
-    throw toOAuthActionError2("refresh access token", error54);
+    if (error54 instanceof OAuthRefreshError2) {
+      throw error54;
+    }
+    const actionError = toOAuthActionError2("refresh access token", error54);
+    throw new OAuthRefreshError2(actionError.message, {
+      retryable: true,
+      cause: error54
+    });
   }
 }
 async function revokeToken2(refreshToken) {
@@ -402478,7 +402576,7 @@ function classifyCredentialValidationError2(error54) {
   }
   return { ok: false, reason: "unknown", message };
 }
-var LETTA_CLOUD_API_URL2 = "https://api.letta.com", OAUTH_CONFIG2;
+var LETTA_CLOUD_API_URL2 = "https://api.letta.com", OAUTH_CONFIG2, OAuthRefreshError2;
 var init_oauth4 = __esm(() => {
   init_letta_client();
   init_error();
@@ -402489,6 +402587,18 @@ var init_oauth4 = __esm(() => {
     authBaseUrl: "https://app.letta.com",
     apiBaseUrl: LETTA_CLOUD_API_URL2
   };
+  OAuthRefreshError2 = class OAuthRefreshError2 extends Error {
+    retryable;
+    status;
+    oauthCode;
+    constructor(message, options3) {
+      super(message, { cause: options3.cause });
+      this.name = "OAuthRefreshError";
+      this.retryable = options3.retryable;
+      this.status = options3.status;
+      this.oauthCode = options3.oauthCode;
+    }
+  };
 });
 
 // node_modules/react/cjs/react.development.js
@@ -442898,10 +443008,9 @@ async function prepareReflectionMemoryWorktreeLaunch(params) {
     parentMemoryDir: memoryDir
   });
   try {
-    const parentMemory = await buildParentMemorySnapshot(worktree.worktreeDir);
-    const reflectionPrompt = buildReflectionSubagentPrompt({
+    const reflectionPrompt = params.reflectionPromptOverride ?? buildReflectionSubagentPrompt({
       instruction: params.instruction,
-      parentMemory
+      parentMemory: await buildParentMemorySnapshot(worktree.worktreeDir)
     });
     return { worktree, reflectionPrompt };
   } catch (error54) {
@@ -442982,7 +443091,8 @@ async function launchReflectionSubagent(options3) {
     }
     const { worktree, reflectionPrompt } = await prepareReflectionMemoryWorktreeLaunch({
       agentId,
-      instruction: options3.instruction
+      instruction: options3.instruction,
+      reflectionPromptOverride: options3.reflectionPromptOverride
     });
     preparedWorktree = worktree;
     const { spawnBackgroundSubagentTask: spawnBackgroundSubagentTask2, waitForBackgroundSubagentAgentId: waitForBackgroundSubagentAgentId2 } = await Promise.resolve().then(() => (init_task(), exports_task));
@@ -443001,6 +443111,7 @@ async function launchReflectionSubagent(options3) {
       prompt: reflectionPrompt,
       description,
       model: options3.model,
+      systemPromptOverride: options3.reflectionSystemPromptOverride,
       silentCompletion: true,
       transcriptPath: autoPayload.payloadPath,
       memoryScope: buildReflectionMemoryScope(worktree),
@@ -445421,6 +445532,303 @@ var init_approval = __esm(async () => {
   ]);
 });
 
+// src/websocket/listen-register.ts
+import { createHash as createHash6 } from "node:crypto";
+function deriveListenerInstanceId(surface, connectionName) {
+  const nameHash = createHash6("sha256").update(connectionName).digest("hex").slice(0, 16);
+  return `${surface}-${nameHash}`;
+}
+function isTransientRegistrationError(error54) {
+  if (error54 instanceof RegistrationError) {
+    return error54.statusCode === 0 || error54.statusCode === 429 || error54.statusCode >= 500;
+  }
+  return true;
+}
+function parseRetryAfterMs(value) {
+  if (!value) {
+    return;
+  }
+  const seconds = Number(value);
+  if (Number.isFinite(seconds) && seconds >= 0) {
+    return seconds * 1000;
+  }
+  const dateMs = Date.parse(value);
+  if (Number.isFinite(dateMs)) {
+    return Math.max(0, dateMs - Date.now());
+  }
+  return;
+}
+async function registerWithCloud(opts, fetchImpl = fetch) {
+  const registerUrl = `${opts.serverUrl}/v1/environments/register`;
+  const response = await fetchImpl(registerUrl, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${opts.apiKey}`,
+      "X-Letta-Source": "letta-code"
+    },
+    body: JSON.stringify({
+      deviceId: opts.deviceId,
+      ...opts.listenerInstanceId ? { listenerInstanceId: opts.listenerInstanceId } : {},
+      connectionName: opts.connectionName,
+      metadata: {
+        lettaCodeVersion: getVersion(),
+        os: process.platform,
+        nodeVersion: process.version,
+        environmentMessageProtocol: "v2-input",
+        supported_commands: SUPPORTED_REMOTE_COMMANDS,
+        self_update: getSelfUpdateStatus()
+      }
+    })
+  }).catch((fetchError) => {
+    const msg = fetchError instanceof Error ? fetchError.message : String(fetchError);
+    throw new RegistrationError(`Network error: ${msg}`, 0);
+  });
+  if (!response.ok) {
+    let detail = `HTTP ${response.status}`;
+    const retryAfterMs = parseRetryAfterMs(response.headers.get("Retry-After"));
+    const text2 = await response.text().catch(() => "");
+    if (text2) {
+      try {
+        const parsed = JSON.parse(text2);
+        if (parsed.message) {
+          detail = parsed.message;
+        } else if (parsed.error) {
+          detail = `HTTP ${response.status}: ${parsed.error}`;
+          if (parsed.errorCode) {
+            detail += ` (${parsed.errorCode})`;
+          }
+        } else {
+          detail += `: ${text2.slice(0, 200)}`;
+        }
+      } catch {
+        detail += `: ${text2.slice(0, 200)}`;
+      }
+    }
+    throw new RegistrationError(detail, response.status, retryAfterMs);
+  }
+  let body3;
+  try {
+    body3 = await response.json();
+  } catch {
+    throw new RegistrationError("Server returned non-JSON response — is the server running?", response.status);
+  }
+  const result = body3;
+  if (typeof result.connectionId !== "string" || typeof result.wsUrl !== "string") {
+    throw new RegistrationError("Server returned unexpected response shape (missing connectionId or wsUrl)", response.status);
+  }
+  return {
+    connectionId: result.connectionId,
+    wsUrl: result.wsUrl,
+    supportsSplitStatusChannels: result.supportsSplitStatusChannels === true
+  };
+}
+async function registerWithCloudRetry(opts, callbacks) {
+  const startTime = Date.now();
+  const maxDurationMs = callbacks?.maxDurationMs ?? REGISTER_MAX_DURATION_MS;
+  const sleep9 = callbacks?.sleep ?? ((delayMs) => new Promise((resolve31) => setTimeout(resolve31, delayMs)));
+  let attempt = 0;
+  for (;; ) {
+    try {
+      return await registerWithCloud(opts, callbacks?.fetchImpl);
+    } catch (error54) {
+      const elapsed = Date.now() - startTime;
+      if (!isTransientRegistrationError(error54) || elapsed >= maxDurationMs) {
+        throw error54;
+      }
+      attempt++;
+      const backoffDelay = Math.min(REGISTER_INITIAL_DELAY_MS * 2 ** (attempt - 1), REGISTER_MAX_DELAY_MS);
+      const delay2 = error54 instanceof RegistrationError && error54.retryAfterMs !== undefined ? Math.max(error54.retryAfterMs, backoffDelay) : backoffDelay;
+      const jitterWindow = Math.min(REGISTER_MAX_JITTER_MS, Math.floor(delay2 * REGISTER_JITTER_RATIO));
+      const jitter = jitterWindow > 0 ? Math.floor((callbacks?.random ?? Math.random)() * jitterWindow) : 0;
+      const retryDelay = delay2 + jitter;
+      if (error54 instanceof Error) {
+        callbacks?.onRetry?.(attempt, retryDelay, error54);
+      }
+      await sleep9(retryDelay);
+    }
+  }
+}
+var RegistrationError, REGISTER_INITIAL_DELAY_MS = 1000, REGISTER_MAX_DELAY_MS = 30000, REGISTER_MAX_DURATION_MS, REGISTER_MAX_JITTER_MS = 1000, REGISTER_JITTER_RATIO = 0.25;
+var init_listen_register = __esm(() => {
+  init_auto_update();
+  init_version();
+  init_listener_constants();
+  RegistrationError = class RegistrationError extends Error {
+    statusCode;
+    retryAfterMs;
+    constructor(message, statusCode2, retryAfterMs) {
+      super(message);
+      this.name = "RegistrationError";
+      this.statusCode = statusCode2;
+      this.retryAfterMs = retryAfterMs;
+    }
+  };
+  REGISTER_MAX_DURATION_MS = 2 * 60 * 1000;
+});
+
+// src/websocket/listener/auth.ts
+function getListenerOAuthDeps() {
+  return listenerOAuthDepsOverride ?? defaultListenerOAuthDeps;
+}
+function errorMessage(error54) {
+  return error54 instanceof Error ? error54.message : String(error54);
+}
+function getListenerServerUrl(settings3) {
+  return process.env.LETTA_BASE_URL || settings3.env?.LETTA_BASE_URL || getListenerOAuthDeps().LETTA_CLOUD_API_URL;
+}
+function normalizeListenerBaseUrl(url2) {
+  return url2.trim().replace(/\/+$/, "");
+}
+function isCloudListenerServerUrl(serverUrl) {
+  return normalizeListenerBaseUrl(serverUrl) === normalizeListenerBaseUrl(getListenerOAuthDeps().LETTA_CLOUD_API_URL);
+}
+function shouldRefreshListenerAccessToken(settings3, apiKey) {
+  if (!settings3.refreshToken) {
+    return false;
+  }
+  if (!apiKey) {
+    return true;
+  }
+  return settings3.tokenExpiresAt !== undefined && Date.now() >= settings3.tokenExpiresAt - LISTENER_TOKEN_REFRESH_WINDOW_MS;
+}
+function isAccessTokenStillValid(settings3, apiKey) {
+  return Boolean(apiKey && (settings3.tokenExpiresAt === undefined || Date.now() < settings3.tokenExpiresAt));
+}
+async function refreshListenerAccessToken(settings3, deviceId, connectionName) {
+  if (!settings3.refreshToken) {
+    throw new MissingListenerApiKeyError;
+  }
+  const now = Date.now();
+  console.log("Access token expired, refreshing...");
+  const tokens = await refreshAccessTokenSingleFlight(settings3.refreshToken, deviceId, connectionName, getListenerOAuthDeps().refreshAccessToken);
+  settingsManager.updateSettings({
+    env: { LETTA_API_KEY: tokens.access_token },
+    refreshToken: tokens.refresh_token ?? settings3.refreshToken,
+    tokenExpiresAt: now + tokens.expires_in * 1000
+  });
+  await settingsManager.flush();
+  console.log("Token refreshed successfully.");
+  return tokens.access_token;
+}
+async function runListenerOAuthLogin(deviceId, connectionName) {
+  const oauthDeps = getListenerOAuthDeps();
+  console.log(`No API key found. Starting OAuth login...
+`);
+  const deviceData = await oauthDeps.requestDeviceCode();
+  console.log(`To authenticate, visit: ${deviceData.verification_uri_complete}`);
+  console.log(`Your code: ${deviceData.user_code}
+`);
+  console.log(`Waiting for authorization...
+`);
+  const tokens = await oauthDeps.pollForToken(deviceData.device_code, deviceData.interval, deviceData.expires_in, deviceId, connectionName);
+  const now = Date.now();
+  settingsManager.updateSettings({
+    env: { LETTA_API_KEY: tokens.access_token },
+    ...tokens.refresh_token ? { refreshToken: tokens.refresh_token } : {},
+    tokenExpiresAt: now + tokens.expires_in * 1000
+  });
+  await settingsManager.flush();
+  console.log(`Authenticated successfully.
+`);
+  return tokens.access_token;
+}
+async function resolveListenerAuth(deviceId, connectionName, options3) {
+  const allowInteractiveOAuth = options3.allowInteractiveOAuth ?? true;
+  const settings3 = await settingsManager.getSettingsWithSecureTokens();
+  const serverUrl = getListenerServerUrl(settings3);
+  const envApiKey = process.env.LETTA_API_KEY;
+  if (envApiKey) {
+    return { serverUrl, apiKey: envApiKey };
+  }
+  let apiKey = settings3.env?.LETTA_API_KEY;
+  if (!isCloudListenerServerUrl(serverUrl)) {
+    if (!apiKey) {
+      throw new MissingListenerApiKeyError;
+    }
+    return { serverUrl, apiKey };
+  }
+  if (shouldRefreshListenerAccessToken(settings3, apiKey)) {
+    try {
+      apiKey = await refreshListenerAccessToken(settings3, deviceId, connectionName);
+    } catch (refreshError) {
+      const retryable = !(refreshError instanceof OAuthRefreshError) || refreshError.retryable;
+      if (retryable && isAccessTokenStillValid(settings3, apiKey)) {
+        console.warn(`Token refresh failed; using the current access token: ${errorMessage(refreshError)}`);
+        return { serverUrl, apiKey };
+      }
+      if (retryable) {
+        throw new ListenerAuthRetryableError(refreshError);
+      }
+      if (!allowInteractiveOAuth) {
+        throw new ListenerReauthenticationRequiredError(refreshError);
+      }
+      console.warn(`Token refresh failed: ${errorMessage(refreshError)}`);
+      apiKey = undefined;
+    }
+  }
+  if (!apiKey) {
+    if (!allowInteractiveOAuth) {
+      throw new ListenerReauthenticationRequiredError;
+    }
+    apiKey = await runListenerOAuthLogin(deviceId, connectionName);
+  }
+  return { serverUrl, apiKey };
+}
+async function resolveListenerRegistrationOptions(deviceId, connectionName, options3 = {}) {
+  const auth = await resolveListenerAuth(deviceId, connectionName, options3);
+  return {
+    ...auth,
+    deviceId,
+    connectionName,
+    listenerInstanceId: deriveListenerInstanceId(options3.surface ?? "server", connectionName)
+  };
+}
+async function resolveListenerReconnectAuth(options3) {
+  try {
+    const auth = await resolveListenerAuth(options3.deviceId, options3.connectionName, { allowInteractiveOAuth: false });
+    return { kind: "ready", apiKey: auth.apiKey };
+  } catch (error54) {
+    if (error54 instanceof ListenerAuthRetryableError) {
+      return { kind: "retry" };
+    }
+    throw error54;
+  }
+}
+var LISTENER_TOKEN_REFRESH_WINDOW_MS, defaultListenerOAuthDeps, listenerOAuthDepsOverride = null, MissingListenerApiKeyError, ListenerAuthRetryableError, ListenerReauthenticationRequiredError;
+var init_auth = __esm(() => {
+  init_oauth();
+  init_oauth_refresh();
+  init_settings_manager();
+  init_listen_register();
+  LISTENER_TOKEN_REFRESH_WINDOW_MS = 5 * 60 * 1000;
+  defaultListenerOAuthDeps = {
+    LETTA_CLOUD_API_URL,
+    pollForToken,
+    refreshAccessToken,
+    requestDeviceCode
+  };
+  MissingListenerApiKeyError = class MissingListenerApiKeyError extends Error {
+    constructor() {
+      super("LETTA_API_KEY not found");
+      this.name = "MissingListenerApiKeyError";
+    }
+  };
+  ListenerAuthRetryableError = class ListenerAuthRetryableError extends Error {
+    constructor(refreshError) {
+      super(`Could not refresh listener credentials: ${errorMessage(refreshError)}`);
+      this.name = "ListenerAuthRetryableError";
+    }
+  };
+  ListenerReauthenticationRequiredError = class ListenerReauthenticationRequiredError extends Error {
+    constructor(refreshError) {
+      const detail = refreshError ? `: ${errorMessage(refreshError)}` : "";
+      super(`Saved Letta API credentials require reauthentication${detail}. Run letta to sign in again, or set LETTA_API_KEY.`);
+      this.name = "ListenerReauthenticationRequiredError";
+    }
+  };
+});
+
 // src/agent/acting-user.ts
 function actingUserRequestOptions(actingUserId) {
   if (!actingUserId) {
@@ -449685,9 +450093,9 @@ async function drainStream(stream12, buffers, refresh, abortSignal, onFirstMessa
       }
     }
   } catch (e2) {
-    const errorMessage = e2 instanceof Error ? e2.message : String(e2);
+    const errorMessage2 = e2 instanceof Error ? e2.message : String(e2);
     const sdkDiagnostic = consumeLastSDKDiagnostic();
-    const errorMessageWithDiagnostic = sdkDiagnostic ? `${errorMessage} [${sdkDiagnostic}]` : errorMessage;
+    const errorMessageWithDiagnostic = sdkDiagnostic ? `${errorMessage2} [${sdkDiagnostic}]` : errorMessage2;
     debugWarn("drainStream", "Stream error caught: %s last_chunk=%s stream=%s", errorMessageWithDiagnostic, lastChunkDebugSummary, summarizeStreamForDebug(stream12));
     if (e2 instanceof Error && e2.stack) {
       debugWarn("drainStream", "Stream error stack: %s", e2.stack);
@@ -456706,7 +457114,7 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
           });
           break;
         }
-        const errorMessage = errorDetail || `Unexpected stop reason: ${stopReason}`;
+        const errorMessage2 = errorDetail || `Unexpected stop reason: ${stopReason}`;
         const terminalRunId = runId || runtime.activeRunId || runErrorInfo2?.run_id;
         const transition = finishTurn({
           stopReason: effectiveStopReason,
@@ -456717,7 +457125,7 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
           break;
         }
         const formattedError = emitLoopErrorNotice(socket, runtime, {
-          message: errorMessage,
+          message: errorMessage2,
           stopReason: effectiveStopReason,
           isTerminal: true,
           runId: terminalRunId,
@@ -456727,7 +457135,7 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
           cancelRequested: turnAbortSignal.aborted,
           abortSignal: turnAbortSignal
         });
-        runtime.lastTerminalLoopErrorMessage = formattedError ?? errorMessage;
+        runtime.lastTerminalLoopErrorMessage = formattedError ?? errorMessage2;
         runtime.lastTerminalLoopErrorRunId = terminalRunId ?? null;
         break;
       }
@@ -456849,7 +457257,7 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
       });
       return;
     }
-    const errorMessage = error54 instanceof Error ? error54.message : String(error54);
+    const errorMessage2 = error54 instanceof Error ? error54.message : String(error54);
     const terminalRunId = runtime.activeRunId;
     const transition = finishTurn({
       stopReason: "error",
@@ -456860,7 +457268,7 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
       return;
     }
     const formattedError = emitLoopErrorNotice(socket, runtime, {
-      message: errorMessage,
+      message: errorMessage2,
       stopReason: "error",
       isTerminal: true,
       runId: terminalRunId,
@@ -456870,7 +457278,7 @@ async function handleIncomingMessage(msg, socket, runtime, onStatusChange, conne
       cancelRequested: turnAbortSignal.aborted,
       abortSignal: turnAbortSignal
     });
-    runtime.lastTerminalLoopErrorMessage = formattedError ?? errorMessage;
+    runtime.lastTerminalLoopErrorMessage = formattedError ?? errorMessage2;
     runtime.lastTerminalLoopErrorRunId = terminalRunId ?? null;
     if (isDebugEnabled()) {
       console.error("[Listen] Error handling message:", error54);
@@ -458343,11 +458751,11 @@ async function handleExecuteCommand(command, socket, conversationRuntime, opts)
       error: error54,
       context: "listener_command_execution"
     });
-    const errorMessage = error54 instanceof Error ? error54.message : String(error54);
+    const errorMessage2 = error54 instanceof Error ? error54.message : String(error54);
     emitSlashCommandEnd(socket, conversationRuntime, scope, {
       command_id: command.command_id,
       input,
-      output: `Failed: ${errorMessage}`,
+      output: `Failed: ${errorMessage2}`,
       success: false
     });
   }
@@ -465803,11 +466211,13 @@ async function connectWithRetry(runtime, opts, attempt = 0, startTime = Date.now
   if (attempt === 0) {
     await loadTools();
   }
-  const settings3 = await settingsManager.getSettingsWithSecureTokens();
-  const apiKey = process.env.LETTA_API_KEY || settings3.env?.LETTA_API_KEY;
-  if (!apiKey) {
-    throw new Error("Missing LETTA_API_KEY");
+  const auth = await resolveListenerReconnectAuth(opts);
+  if (auth.kind === "retry")
+    return connectWithRetry(runtime, opts, attempt + 1, startTime);
+  if (runtime !== getActiveRuntime() || runtime.intentionallyClosed) {
+    return;
   }
+  const apiKey = auth.apiKey;
   const url2 = new URL(opts.wsUrl);
   url2.searchParams.set("deviceId", opts.deviceId);
   url2.searchParams.set("connectionName", opts.connectionName);
@@ -465994,6 +466404,7 @@ var init_lifecycle = __esm(async () => {
   init_debug();
   init_message_queue_bridge();
   init_terminal_handler();
+  init_auth();
   init_channel_turn_session();
   init_constants3();
   init_cwd();
@@ -468857,141 +469268,6 @@ var init_startup = __esm(() => {
   init_mode();
 });
 
-// src/websocket/listen-register.ts
-import { createHash as createHash7 } from "node:crypto";
-function deriveListenerInstanceId(surface, connectionName) {
-  const nameHash = createHash7("sha256").update(connectionName).digest("hex").slice(0, 16);
-  return `${surface}-${nameHash}`;
-}
-function isTransientRegistrationError(error54) {
-  if (error54 instanceof RegistrationError) {
-    return error54.statusCode === 0 || error54.statusCode === 429 || error54.statusCode >= 500;
-  }
-  return true;
-}
-function parseRetryAfterMs(value) {
-  if (!value) {
-    return;
-  }
-  const seconds = Number(value);
-  if (Number.isFinite(seconds) && seconds >= 0) {
-    return seconds * 1000;
-  }
-  const dateMs = Date.parse(value);
-  if (Number.isFinite(dateMs)) {
-    return Math.max(0, dateMs - Date.now());
-  }
-  return;
-}
-async function registerWithCloud(opts, fetchImpl = fetch) {
-  const registerUrl = `${opts.serverUrl}/v1/environments/register`;
-  const response = await fetchImpl(registerUrl, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${opts.apiKey}`,
-      "X-Letta-Source": "letta-code"
-    },
-    body: JSON.stringify({
-      deviceId: opts.deviceId,
-      ...opts.listenerInstanceId ? { listenerInstanceId: opts.listenerInstanceId } : {},
-      connectionName: opts.connectionName,
-      metadata: {
-        lettaCodeVersion: getVersion(),
-        os: process.platform,
-        nodeVersion: process.version,
-        environmentMessageProtocol: "v2-input",
-        supported_commands: SUPPORTED_REMOTE_COMMANDS,
-        self_update: getSelfUpdateStatus()
-      }
-    })
-  }).catch((fetchError) => {
-    const msg = fetchError instanceof Error ? fetchError.message : String(fetchError);
-    throw new RegistrationError(`Network error: ${msg}`, 0);
-  });
-  if (!response.ok) {
-    let detail = `HTTP ${response.status}`;
-    const retryAfterMs2 = parseRetryAfterMs(response.headers.get("Retry-After"));
-    const text2 = await response.text().catch(() => "");
-    if (text2) {
-      try {
-        const parsed = JSON.parse(text2);
-        if (parsed.message) {
-          detail = parsed.message;
-        } else if (parsed.error) {
-          detail = `HTTP ${response.status}: ${parsed.error}`;
-          if (parsed.errorCode) {
-            detail += ` (${parsed.errorCode})`;
-          }
-        } else {
-          detail += `: ${text2.slice(0, 200)}`;
-        }
-      } catch {
-        detail += `: ${text2.slice(0, 200)}`;
-      }
-    }
-    throw new RegistrationError(detail, response.status, retryAfterMs2);
-  }
-  let body3;
-  try {
-    body3 = await response.json();
-  } catch {
-    throw new RegistrationError("Server returned non-JSON response — is the server running?", response.status);
-  }
-  const result = body3;
-  if (typeof result.connectionId !== "string" || typeof result.wsUrl !== "string") {
-    throw new RegistrationError("Server returned unexpected response shape (missing connectionId or wsUrl)", response.status);
-  }
-  return {
-    connectionId: result.connectionId,
-    wsUrl: result.wsUrl,
-    supportsSplitStatusChannels: result.supportsSplitStatusChannels === true
-  };
-}
-async function registerWithCloudRetry(opts, callbacks) {
-  const startTime = Date.now();
-  const maxDurationMs = callbacks?.maxDurationMs ?? REGISTER_MAX_DURATION_MS;
-  const sleep9 = callbacks?.sleep ?? ((delayMs) => new Promise((resolve31) => setTimeout(resolve31, delayMs)));
-  let attempt = 0;
-  for (;; ) {
-    try {
-      return await registerWithCloud(opts, callbacks?.fetchImpl);
-    } catch (error54) {
-      const elapsed = Date.now() - startTime;
-      if (!isTransientRegistrationError(error54) || elapsed >= maxDurationMs) {
-        throw error54;
-      }
-      attempt++;
-      const backoffDelay = Math.min(REGISTER_INITIAL_DELAY_MS * 2 ** (attempt - 1), REGISTER_MAX_DELAY_MS);
-      const delay2 = error54 instanceof RegistrationError && error54.retryAfterMs !== undefined ? Math.max(error54.retryAfterMs, backoffDelay) : backoffDelay;
-      const jitterWindow = Math.min(REGISTER_MAX_JITTER_MS, Math.floor(delay2 * REGISTER_JITTER_RATIO));
-      const jitter = jitterWindow > 0 ? Math.floor((callbacks?.random ?? Math.random)() * jitterWindow) : 0;
-      const retryDelay = delay2 + jitter;
-      if (error54 instanceof Error) {
-        callbacks?.onRetry?.(attempt, retryDelay, error54);
-      }
-      await sleep9(retryDelay);
-    }
-  }
-}
-var RegistrationError, REGISTER_INITIAL_DELAY_MS = 1000, REGISTER_MAX_DELAY_MS = 30000, REGISTER_MAX_DURATION_MS, REGISTER_MAX_JITTER_MS = 1000, REGISTER_JITTER_RATIO = 0.25;
-var init_listen_register = __esm(() => {
-  init_auto_update();
-  init_version();
-  init_listener_constants();
-  RegistrationError = class RegistrationError extends Error {
-    statusCode;
-    retryAfterMs;
-    constructor(message, statusCode2, retryAfterMs2) {
-      super(message);
-      this.name = "RegistrationError";
-      this.statusCode = statusCode2;
-      this.retryAfterMs = retryAfterMs2;
-    }
-  };
-  REGISTER_MAX_DURATION_MS = 2 * 60 * 1000;
-});
-
 // src/websocket/listener/client.ts
 function asListenerRuntimeForTests(runtime) {
   return "listener" in runtime ? runtime.listener : runtime;
@@ -476245,7 +476521,7 @@ ${loadedContents.join(`
       markIncompleteToolsAsCancelled(buffers, true, "stream_error");
       const errorLines = toLines(buffers).filter((line) => line.kind === "error");
       const errorMessages2 = errorLines.map((line) => ("text" in line) ? line.text : "").filter(Boolean);
-      let errorMessage = errorMessages2.length > 0 ? errorMessages2.join("; ") : `Unexpected stop reason: ${stopReason}`;
+      let errorMessage2 = errorMessages2.length > 0 ? errorMessages2.join("; ") : `Unexpected stop reason: ${stopReason}`;
       if (lastRunId && errorMessages2.length === 0) {
         try {
           const run = await getBackend().retrieveRun(lastRunId);
@@ -476257,18 +476533,18 @@ ${loadedContents.join(`
                 run_id: lastRunId
               }
             };
-            errorMessage = formatErrorDetails2(errorObject, agent2.id);
+            errorMessage2 = formatErrorDetails2(errorObject, agent2.id);
           }
         } catch (_e) {
-          errorMessage = `${errorMessage}
+          errorMessage2 = `${errorMessage2}
 (Unable to fetch additional error details from server)`;
         }
       }
-      trackHeadlessBoundaryError("headless_turn_failed", errorMessage, "headless_turn_execution");
+      trackHeadlessBoundaryError("headless_turn_failed", errorMessage2, "headless_turn_execution");
       if (outputFormat === "stream-json") {
         const errorMsg = {
           type: "error",
-          message: errorMessage,
+          message: errorMessage2,
           stop_reason: stopReason,
           run_id: lastRunId ?? undefined,
           session_id: sessionId,
@@ -476276,7 +476552,7 @@ ${loadedContents.join(`
         };
         await writeWireMessageAsync(errorMsg);
       } else {
-        console.error(`Error: ${errorMessage}`);
+        console.error(`Error: ${errorMessage2}`);
       }
       await exitHeadless(1, "headless_stop_reason_error");
     }
@@ -489773,7 +490049,7 @@ var init_AgentInfoBar = __esm(async () => {
     const isLocalAgent = agentId ? isLocalAgentId2(agentId) : false;
     const showCloudLinks = Boolean(isCloudUser && agentId && !isLocalAgent);
     const adeConversationUrl = showCloudLinks && agentId && agentId !== "loading" ? buildChatUrl(agentId, { conversationId }) : "";
-    const usageUrl = buildAppUrl("/settings/organization/usage");
+    const usageUrl = buildChatWebUrl("/preferences/usage");
     const showBottomBar = agentId && agentId !== "loading";
     const reasoningLabel = shouldHideReasoningForModelDisplay(currentModel) ? null : formatReasoningLabel(currentReasoningEffort);
     const modelLine = currentModel ? `${currentModel}${reasoningLabel ? ` (${reasoningLabel})` : ""}` : null;
@@ -493294,7 +493570,7 @@ function buildInstallPrBody(workflowPath) {
     "",
     "You can also specify a particular agent: `@letta-code [--agent agent-xxx]`",
     "",
-    "View agent runs and conversations at [app.letta.com](https://app.letta.com).",
+    "Chat with your agent at [chat.letta.com](https://chat.letta.com).",
     "",
     "### Important Notes",
     "",
@@ -493615,7 +493891,7 @@ var init_InstallGithubAppFlow = __esm(async () => {
     const solidLine = SOLID_LINE12.repeat(Math.max(terminalWidth, 10));
     const [step, setStep] = import_react87.useState("checking");
     const [status, setStatus] = import_react87.useState("Checking GitHub CLI prerequisites...");
-    const [errorMessage, setErrorMessage] = import_react87.useState("");
+    const [errorMessage2, setErrorMessage] = import_react87.useState("");
     const [currentRepo, setCurrentRepo] = import_react87.useState(null);
     const [repoChoiceIndex, setRepoChoiceIndex] = import_react87.useState(0);
     const [repoInput, setRepoInput] = import_react87.useState("");
@@ -494183,14 +494459,14 @@ var init_InstallGithubAppFlow = __esm(async () => {
           color: "red",
           children: [
             "Error: ",
-            errorMessage.split(`
+            errorMessage2.split(`
 `)[0] || "Unknown error"
           ]
         }, undefined, true, undefined, this),
         /* @__PURE__ */ jsx_dev_runtime61.jsxDEV(Box_default, {
           height: 1
         }, undefined, false, undefined, this),
-        errorMessage.split(`
+        errorMessage2.split(`
 `).slice(1).filter((line) => line.trim().length > 0).map((line, idx) => /* @__PURE__ */ jsx_dev_runtime61.jsxDEV(Text2, {
           dimColor: true,
           children: line
@@ -496859,13 +497135,16 @@ html.dark .warning-badge { background: hsl(42, 30%, 18%); color: hsl(42, 80%, 70
   var agentIdEl = document.getElementById('agent-id');
   agentIdEl.textContent = agentId;
   if (agentId) {
-    var adeBase;
-    if (serverUrl) {
-      adeBase = serverUrl.replace(/\\/v1\\/?$/, '').replace('api.letta.com', 'app.letta.com');
+    var chatBase;
+    var normalizedServerUrl = serverUrl.replace(/\\/+$/, '');
+    if (normalizedServerUrl === 'https://api.letta.com' || normalizedServerUrl === 'https://api.letta.com/v1') {
+      chatBase = 'https://chat.letta.com';
+    } else if (normalizedServerUrl) {
+      chatBase = normalizedServerUrl.replace(/\\/v1$/, '');
     } else {
-      adeBase = 'https://app.letta.com';
+      chatBase = 'https://chat.letta.com';
     }
-    agentIdEl.href = adeBase + '/chat/' + encodeURIComponent(agentId);
+    agentIdEl.href = chatBase + '/chat/' + encodeURIComponent(agentId);
     agentIdEl.target = '_blank';
   }
   document.getElementById('generated-at').textContent = 'Generated ' + new Date(DATA.generatedAt).toLocaleString();
@@ -505910,7 +506189,7 @@ function formatUsageStats({
     const monthlyCredits = Math.round(balance.monthly_credit_balance);
     const purchasedCredits = Math.round(balance.purchased_credit_balance);
     const toDollars = (credits) => (credits / 1000).toFixed(2);
-    outputLines.push(`Plan: [${balance.billing_tier}]`, buildAppUrl("/settings/organization/usage"), "", `Available credits:     ◎${formatNumber2(totalCredits)} ($${toDollars(totalCredits)})`, `Monthly credits:       ◎${formatNumber2(monthlyCredits)} ($${toDollars(monthlyCredits)})`, `Purchased credits:     ◎${formatNumber2(purchasedCredits)} ($${toDollars(purchasedCredits)})`);
+    outputLines.push(`Plan: [${balance.billing_tier}]`, buildChatWebUrl("/preferences/usage"), "", `Available credits:     ◎${formatNumber2(totalCredits)} ($${toDollars(totalCredits)})`, `Monthly credits:       ◎${formatNumber2(monthlyCredits)} ($${toDollars(monthlyCredits)})`, `Purchased credits:     ◎${formatNumber2(purchasedCredits)} ($${toDollars(purchasedCredits)})`);
   }
   return outputLines.join(`
 `);
@@ -516961,13 +517240,13 @@ var init_cleanLastNewline = () => {};
 function processLine(node, line, state) {
   const lineInfo = typeof state.lineInfo === "function" ? state.lineInfo(line) : state.lineInfo[line - 1];
   if (lineInfo == null) {
-    const errorMessage = `processLine: line ${line}, contains no state.lineInfo`;
-    console.error(errorMessage, {
+    const errorMessage2 = `processLine: line ${line}, contains no state.lineInfo`;
+    console.error(errorMessage2, {
       node,
       line,
       state
     });
-    throw new Error(errorMessage);
+    throw new Error(errorMessage2);
   }
   node.tagName = "div";
   node.properties["data-line"] = lineInfo.lineNumber;
@@ -520439,9 +520718,9 @@ var instanceId = -1, DiffHunksRenderer = class {
           let deletionLineContent = deletionLine != null ? deletionLines[deletionLine.lineIndex] : undefined;
           let additionLineContent = additionLine != null ? additionLines[additionLine.lineIndex] : undefined;
           if (deletionLineContent == null && additionLineContent == null) {
-            const errorMessage = "DiffHunksRenderer.processDiffResult: deletionLine and additionLine are null, something is wrong";
-            console.error(errorMessage, { file: fileDiff.name });
-            throw new Error(errorMessage);
+            const errorMessage2 = "DiffHunksRenderer.processDiffResult: deletionLine and additionLine are null, something is wrong";
+            console.error(errorMessage2, { file: fileDiff.name });
+            throw new Error(errorMessage2);
           }
           const lineType = type3 === "change" ? additionLine != null ? "change-addition" : "change-deletion" : type3;
           const lineDecoration = this.getUnifiedLineDecoration({
@@ -520483,9 +520762,9 @@ var instanceId = -1, DiffHunksRenderer = class {
             lineIndex: additionLine?.lineIndex
           });
           if (deletionLineContent == null && additionLineContent == null) {
-            const errorMessage = "DiffHunksRenderer.processDiffResult: deletionLine and additionLine are null, something is wrong";
-            console.error(errorMessage, { file: fileDiff.name });
-            throw new Error(errorMessage);
+            const errorMessage2 = "DiffHunksRenderer.processDiffResult: deletionLine and additionLine are null, something is wrong";
+            console.error(errorMessage2, { file: fileDiff.name });
+            throw new Error(errorMessage2);
           }
           const missingSide = (() => {
             if (type3 === "change") {
@@ -530589,19 +530868,12 @@ Messages will be executed locally using your letta-code environment.`, true);
     const deviceName = hostname8();
     updateCommandResult3(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `Registering listener "${connectionName}"...
 Device: ${deviceName} (${deviceId.slice(0, 8)}...)`, true, "running");
-    const serverUrl = getServerUrl();
-    const settings3 = await settingsManager.getSettingsWithSecureTokens();
-    const apiKey = process.env.LETTA_API_KEY || settings3.env?.LETTA_API_KEY;
-    if (!apiKey) {
-      throw new Error("Missing LETTA_API_KEY");
-    }
-    const { connectionId, wsUrl, supportsSplitStatusChannels } = await registerWithCloudRetry({
-      serverUrl,
-      apiKey,
-      deviceId,
-      connectionName,
-      listenerInstanceId: deriveListenerInstanceId("listen", connectionName)
-    }, {
+    const resolveRegisterOptions = () => resolveListenerRegistrationOptions(deviceId, connectionName, {
+      allowInteractiveOAuth: false,
+      surface: "listen"
+    });
+    const registerOptions = await resolveRegisterOptions();
+    const { connectionId, wsUrl, supportsSplitStatusChannels } = await registerWithCloudRetry(registerOptions, {
       onRetry: (attempt, delayMs, error54) => {
         updateCommandResult3(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `Registering listener "${connectionName}"...
 Retry ${attempt} in ${Math.round(delayMs / 1000)}s: ${error54.message}`, true, "running");
@@ -530655,13 +530927,8 @@ Awaiting instructions${urlText}`, true, "finished");
         onNeedsReregister: async () => {
           updateCommandResult3(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `Environment expired, re-registering "${connectionName}"...`, true, "running");
           try {
-            const reregisterResult = await registerWithCloudRetry({
-              serverUrl,
-              apiKey,
-              deviceId,
-              connectionName,
-              listenerInstanceId: deriveListenerInstanceId("listen", connectionName)
-            }, {
+            const nextRegisterOptions = await resolveRegisterOptions();
+            const reregisterResult = await registerWithCloudRetry(nextRegisterOptions, {
               maxDurationMs: Infinity,
               onRetry: (attempt, delayMs, error54) => {
                 updateCommandResult3(ctx.buffersRef, ctx.refreshDerived, cmdId, msg, `Re-registering "${connectionName}"...
@@ -530694,10 +530961,10 @@ Retry ${attempt} in ${Math.round(delayMs / 1000)}s: ${error54.message}`, true, "
 }
 var activeCommandId3 = null;
 var init_listen = __esm(() => {
-  init_client2();
   init_app_urls();
   init_settings_manager();
   init_listen_register();
+  init_auth();
 });
 
 // src/cli/app/submit-connection-commands.ts
@@ -542506,14 +542773,18 @@ function resolveImportFlagAlias(options3) {
   return options3.importFlagValue ?? options3.fromAfFlagValue;
 }
 
+// src/cli/helpers/app-urls.ts
+var CHAT_BASE2 = "https://chat.letta.com";
+var LETTA_CHAT_API_KEYS_URL2 = `${CHAT_BASE2}/preferences/api-keys`;
+
 // src/cli/helpers/error-formatter.ts
 init_error();
 init_conversation_busy_error();
 init_app_urls();
 init_error_context();
 init_zai_errors();
-var LETTA_USAGE_URL2 = buildAppUrl("/settings/organization/usage");
-var LETTA_AGENTS_URL2 = buildAppUrl("/projects/default-project/agents");
+var LETTA_USAGE_URL2 = buildChatWebUrl("/preferences/usage");
+var LETTA_AGENTS_URL2 = buildPlatformUrl("/projects/default-project/agents");
 function formatConversationBusyErrorForDisplay2(errorText, runId, options3) {
   if (!isConversationBusyErrorText(errorText))
     return null;
@@ -546350,7 +546621,7 @@ import { parseArgs as parseArgs7 } from "node:util";
 
 // src/cli/subcommands/dream-sources/index.ts
 init_reflection_transcript();
-import { createHash as createHash6 } from "node:crypto";
+import { createHash as createHash7 } from "node:crypto";
 
 // src/cli/subcommands/dream-sources/openhands.ts
 import { readdir as readdir12, readFile as readFile19, stat as stat14 } from "node:fs/promises";
@@ -546543,7 +546814,7 @@ function parseFromSource(spec) {
   return { adapter, locator };
 }
 function conversationIdForSource(parsed) {
-  const hash4 = createHash6("sha1").update(`${parsed.adapter.type}:${parsed.locator}`).digest("hex").slice(0, 12);
+  const hash4 = createHash7("sha1").update(`${parsed.adapter.type}:${parsed.locator}`).digest("hex").slice(0, 12);
   return `from-${parsed.adapter.type}-${hash4}`;
 }
 async function stageFromSource(agentId, parsed) {
@@ -546721,6 +546992,11 @@ Options:
   --timeout <seconds>         Fail if the reflection pass has not completed
                               in this many seconds (default: 1500)
   -i, --instruction <text>    Additional instruction for the reflection pass
+  --prompt <text>             Advanced: replace the reflection task prompt
+                              entirely (you supply the transcript/memory
+                              mechanics via $TRANSCRIPT_PATH and $MEMORY_DIR)
+  --system <text>             Advanced: replace the reflection subagent's
+                              system prompt
   --json                      Emit machine-readable JSON output
   -h, --help                  Show this help
 
@@ -546739,6 +547015,8 @@ var DREAM_OPTIONS = {
   effort: { type: "string" },
   timeout: { type: "string" },
   instruction: { type: "string", short: "i" },
+  prompt: { type: "string" },
+  system: { type: "string" },
   json: { type: "boolean" }
 };
 var DEFAULT_TIMEOUT_SECONDS = 1500;
@@ -546871,6 +547149,8 @@ ${targetInstruction}` : targetInstruction;
     description: "Reflect on recent conversations",
     model: parsed.values.model,
     instruction,
+    reflectionPromptOverride: parsed.values.prompt,
+    reflectionSystemPromptOverride: parsed.values.system,
     recompileByConversation: new Map,
     recompileQueuedByConversation: new Set,
     onCompletionMessage: (message, completionResult) => {
@@ -547125,7 +547405,6 @@ async function runEnvironmentsSubcommand(argv, deps = {}) {
 }
 
 // src/cli/subcommands/listen.tsx
-init_oauth();
 init_paths();
 init_restore_scope();
 await __promiseAll([
@@ -547298,26 +547577,9 @@ class RemoteSessionLog {
 
 // src/cli/subcommands/listen.tsx
 init_listen_register();
+init_auth();
 var jsx_dev_runtime12 = __toESM(require_jsx_dev_runtime(), 1);
-var LISTENER_TOKEN_REFRESH_WINDOW_MS = 5 * 60 * 1000;
 var activeListenerProcessAnchors = new Set;
-var defaultListenerOAuthDeps = {
-  LETTA_CLOUD_API_URL,
-  pollForToken,
-  refreshAccessToken,
-  requestDeviceCode
-};
-var listenerOAuthDepsOverride = null;
-function getListenerOAuthDeps() {
-  return listenerOAuthDepsOverride ?? defaultListenerOAuthDeps;
-}
-
-class MissingListenerApiKeyError extends Error {
-  constructor() {
-    super("LETTA_API_KEY not found");
-    this.name = "MissingListenerApiKeyError";
-  }
-}
 function PromptEnvName(props) {
   const [value, setValue] = import_react33.useState("");
   return /* @__PURE__ */ jsx_dev_runtime12.jsxDEV(Box_default, {
@@ -547367,16 +547629,6 @@ async function flushListenerTelemetryEnd(exitReason) {
     await telemetry.flush();
   } catch {}
 }
-function getListenerServerUrl(settings3) {
-  const oauthDeps = getListenerOAuthDeps();
-  return process.env.LETTA_BASE_URL || settings3.env?.LETTA_BASE_URL || oauthDeps.LETTA_CLOUD_API_URL;
-}
-function normalizeListenerBaseUrl(url2) {
-  return url2.trim().replace(/\/+$/, "");
-}
-function isCloudListenerServerUrl(serverUrl) {
-  return normalizeListenerBaseUrl(serverUrl) === normalizeListenerBaseUrl(getListenerOAuthDeps().LETTA_CLOUD_API_URL);
-}
 async function resolveListenerStartupMode(channelNames) {
   const settings3 = await settingsManager.getSettingsWithSecureTokens();
   const serverUrl = getListenerServerUrl(settings3);
@@ -547404,84 +547656,6 @@ function getScopedChannelRestoreAgentScope() {
 function resolveChannelRestoreAgentScope(scopedRestoreAgentScope) {
   return scopedRestoreAgentScope ?? parseChannelRestoreAgentScope(process.env[RESTORE_CHANNEL_AGENT_SCOPE_ENV]) ?? (isLocalBackendEnvEnabled() ? "local" : "cloud");
 }
-async function refreshListenerAccessToken(settings3, deviceId, connectionName) {
-  const oauthDeps = getListenerOAuthDeps();
-  const now = Date.now();
-  console.log("Access token expired, refreshing...");
-  const tokens = await oauthDeps.refreshAccessToken(settings3.refreshToken, deviceId, connectionName);
-  settingsManager.updateSettings({
-    env: { LETTA_API_KEY: tokens.access_token },
-    tokenExpiresAt: now + tokens.expires_in * 1000,
-    ...tokens.refresh_token ? { refreshToken: tokens.refresh_token } : {}
-  });
-  await settingsManager.flush();
-  console.log("Token refreshed successfully.");
-  return tokens.access_token;
-}
-async function runListenerOAuthLogin(deviceId, connectionName) {
-  const oauthDeps = getListenerOAuthDeps();
-  console.log(`No API key found. Starting OAuth login...
-`);
-  const deviceData = await oauthDeps.requestDeviceCode();
-  console.log(`To authenticate, visit: ${deviceData.verification_uri_complete}`);
-  console.log(`Your code: ${deviceData.user_code}
-`);
-  console.log(`Waiting for authorization...
-`);
-  const tokens = await oauthDeps.pollForToken(deviceData.device_code, deviceData.interval, deviceData.expires_in, deviceId, connectionName);
-  const now = Date.now();
-  settingsManager.updateSettings({
-    env: { LETTA_API_KEY: tokens.access_token },
-    tokenExpiresAt: now + tokens.expires_in * 1000,
-    ...tokens.refresh_token ? { refreshToken: tokens.refresh_token } : {}
-  });
-  await settingsManager.flush();
-  console.log(`Authenticated successfully.
-`);
-  return tokens.access_token;
-}
-async function resolveListenerRegistrationOptions(deviceId, connectionName) {
-  const settings3 = await settingsManager.getSettingsWithSecureTokens();
-  const serverUrl = getListenerServerUrl(settings3);
-  const envApiKey = process.env.LETTA_API_KEY;
-  if (envApiKey) {
-    return {
-      serverUrl,
-      apiKey: envApiKey,
-      deviceId,
-      connectionName,
-      listenerInstanceId: deriveListenerInstanceId("server", connectionName)
-    };
-  }
-  let apiKey = settings3.env?.LETTA_API_KEY;
-  if (isCloudListenerServerUrl(serverUrl)) {
-    const expiresAt = settings3.tokenExpiresAt;
-    if (settings3.refreshToken && expiresAt) {
-      const now = Date.now();
-      if (!apiKey || now >= expiresAt - LISTENER_TOKEN_REFRESH_WINDOW_MS) {
-        try {
-          apiKey = await refreshListenerAccessToken(settings3, deviceId, connectionName);
-        } catch (refreshErr) {
-          console.warn("Token refresh failed:", refreshErr instanceof Error ? refreshErr.message : String(refreshErr));
-          apiKey = undefined;
-        }
-      }
-    }
-    if (!apiKey) {
-      apiKey = await runListenerOAuthLogin(deviceId, connectionName);
-    }
-  }
-  if (!apiKey) {
-    throw new MissingListenerApiKeyError;
-  }
-  return {
-    serverUrl,
-    apiKey,
-    deviceId,
-    connectionName,
-    listenerInstanceId: deriveListenerInstanceId("server", connectionName)
-  };
-}
 var LISTEN_OPTIONS = {
   "env-name": { type: "string" },
   channels: { type: "string" },
@@ -551719,14 +551893,13 @@ class SettingsManager2 {
   }
   async getSettingsWithSecureTokens() {
     const baseSettings = this.getSettings();
-    let secureTokens = { ...this.secureTokensCache };
+    const secureTokens = { ...this.secureTokensCache };
     if (!getRuntimeContext()) {
       const secretsAvailable2 = await this.isKeychainAvailable();
       if (secretsAvailable2) {
-        secureTokens = {
-          ...secureTokens,
-          ...await this.getSecureTokens()
-        };
+        const storedTokens = await this.getSecureTokens();
+        secureTokens.apiKey = storedTokens.apiKey ?? secureTokens.apiKey;
+        secureTokens.refreshToken = storedTokens.refreshToken ?? secureTokens.refreshToken;
       }
     }
     const fallbackRefreshToken = !secureTokens.refreshToken && baseSettings.refreshToken ? baseSettings.refreshToken : secureTokens.refreshToken;
@@ -553786,7 +553959,7 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
     if (isHeadless && baseURL === LETTA_CLOUD_API_URL2 && !process.env.LETTA_API_KEY) {
       console.error("Missing LETTA_API_KEY");
       console.error("Headless mode requires an API key set via the LETTA_API_KEY environment variable.");
-      console.error("Get an API key at https://app.letta.com/api-keys");
+      console.error(`Get an API key at ${LETTA_CHAT_API_KEYS_URL2}`);
       process.exit(1);
     }
     if (!isHeadless && baseURL === LETTA_CLOUD_API_URL2 && !settings3.refreshToken && !apiKey) {
@@ -554793,4 +554966,4 @@ Error during initialization: ${message}`);
 }
 main2();
 
-//# debugId=EA7311931B35FB9664756E2164756E21
+//# debugId=8218A0B8DF5E5AFE64756E2164756E21