@letta-ai/letta-code 0.26.4 → 0.26.5

package/letta.js

@@ -4997,7 +4997,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@letta-ai/letta-code",
-    version: "0.26.4",
+    version: "0.26.5",
     description: "Letta Code is a CLI tool for interacting with stateful Letta agents from the terminal.",
     type: "module",
     packageManager: "bun@1.3.0",
@@ -139855,6 +139855,15 @@ function unregisterPiProvidersForOwner(ownerId) {
   if (changed)
     notifyRegistryListeners();
 }
+function clearRegisteredPiProviders() {
+  if (registeredProviders.size === 0)
+    return;
+  for (const providerName of registeredProviders.keys()) {
+    unregisterPiOAuthProvider(providerName);
+  }
+  registeredProviders.clear();
+  notifyRegistryListeners();
+}
 function getRegisteredPiProvider(providerName) {
   const provider = registeredProviders.get(providerName);
   if (!provider)
@@ -162292,6 +162301,24 @@ async function emitExtensionEvent(emitter, name, event2) {
   return emitter.emitEvent(name, event2);
 }
 
+// src/extensions/disable.ts
+function isTruthyEnvFlag(value) {
+  if (!value)
+    return false;
+  const normalized = value.trim().toLowerCase();
+  return ["1", "true", "yes", "on"].includes(normalized);
+}
+function areExtensionsDisabled(env3 = process.env) {
+  return isTruthyEnvFlag(env3[LETTA_DISABLE_EXTENSIONS_ENV]);
+}
+function shouldDisableExtensions(options3) {
+  return Boolean(options3?.cliFlag || areExtensionsDisabled(options3?.env ?? process.env));
+}
+function disableExtensionsForProcess() {
+  process.env[LETTA_DISABLE_EXTENSIONS_ENV] = "1";
+}
+var LETTA_DISABLE_EXTENSIONS_ENV = "LETTA_DISABLE_EXTENSIONS";
+
 // src/extensions/tool-registry.ts
 function getMutableExtensionToolsRegistry() {
   const global2 = globalThis;
@@ -162301,6 +162328,8 @@ function getMutableExtensionToolsRegistry() {
   return global2[EXTENSION_TOOLS_KEY];
 }
 function getAvailableExtensionToolsRegistry() {
+  if (areExtensionsDisabled())
+    return new Map;
   return new Map(Array.from(getMutableExtensionToolsRegistry().entries()).filter(([, tool2]) => {
     if (tool2.activationSignal.aborted)
       return false;
@@ -162312,6 +162341,8 @@ function getAvailableExtensionToolsRegistry() {
   }));
 }
 function registerExtensionTool(tool2) {
+  if (areExtensionsDisabled())
+    return;
   getMutableExtensionToolsRegistry().set(tool2.name, tool2);
 }
 function unregisterExtensionTool(name, owner) {
@@ -162329,13 +162360,22 @@ function unregisterExtensionToolsForOwner(owner) {
     }
   }
 }
+function clearExtensionTools() {
+  getMutableExtensionToolsRegistry().clear();
+}
 function getExtensionToolDefinition(name, registry2 = getMutableExtensionToolsRegistry()) {
+  if (areExtensionsDisabled())
+    return;
   return registry2.get(name);
 }
 function extensionToolRequiresApproval(name, registry2 = getMutableExtensionToolsRegistry()) {
+  if (areExtensionsDisabled())
+    return;
   return registry2.get(name)?.requiresApproval;
 }
 function isExtensionToolParallelSafe(name, registry2 = getMutableExtensionToolsRegistry()) {
+  if (areExtensionsDisabled())
+    return false;
   return registry2.get(name)?.parallelSafe === true;
 }
 async function runExtensionTool(tool2, context2) {
@@ -165285,7 +165325,7 @@ At most one step can be in_progress at a time.
 var init_UpdatePlan = () => {};
 
 // src/tools/descriptions/ViewImage.md
-var ViewImage_default = `View a local image from the filesystem (only use if given a full filepath by the user, and the image isn't already attached to the thread context within <image ...> tags).
+var ViewImage_default = `View a local image file from the filesystem when visual inspection is needed. Use this for images already available on disk.
 `;
 var init_ViewImage = () => {};
 
@@ -169800,7 +169840,7 @@ function emitQueueUpdateIfOpen(runtime, scope) {
     emitQueueUpdate(transport, runtime, scope);
   }
 }
-function emitStateSync(socket, runtime, scope) {
+function emitStateSync(socket, runtime, scope, options3) {
   const deviceStatus = buildDeviceStatus(runtime, scope);
   const deviceStatusJson = JSON.stringify(deviceStatus);
   const cacheKey = `${scope.agent_id ?? ""}:${scope.conversation_id ?? ""}`;
@@ -169810,7 +169850,7 @@ function emitStateSync(socket, runtime, scope) {
     lastSyncDeviceStatusByTransport.set(socket, scopeCache);
   }
   const prev = scopeCache.get(cacheKey);
-  if (deviceStatusJson !== prev) {
+  if (options3?.forceDeviceStatus || deviceStatusJson !== prev) {
     scopeCache.set(cacheKey, deviceStatusJson);
     const message = {
       type: "update_device_status",
@@ -170299,7 +170339,7 @@ function isSyncCommand(value) {
     return false;
   }
   const candidate = value;
-  return candidate.type === "sync" && isRuntimeScope(candidate.runtime) && (candidate.recover_approvals === undefined || typeof candidate.recover_approvals === "boolean");
+  return candidate.type === "sync" && isRuntimeScope(candidate.runtime) && (candidate.recover_approvals === undefined || typeof candidate.recover_approvals === "boolean") && (candidate.force_device_status === undefined || typeof candidate.force_device_status === "boolean");
 }
 function isTerminalSpawnCommand(value) {
   if (!value || typeof value !== "object")
@@ -188928,6 +188968,110 @@ Results include:
 `;
 var init_recall_subagent = () => {};
 
+// src/agent/prompts/recall_subagent_local.md
+var recall_subagent_local_default = `Your task is to recall past experience based on a query. Use the local CLI commands and search strategies below to search conversation history. Try to finish quickly with just 1-2 tool calls if possible (but use more if needed).
+
+## Output Format
+
+1. **Direct answer** - What the user asked about
+2. **Key findings** - Relevant quotes or summaries from past conversations
+3. **When discussed** - Timestamps of relevant discussions
+4. **Outcome/Decision** - What was decided or concluded (if applicable)
+
+## Searching Messages
+
+Use the CLI to search through past conversations.
+
+### CLI Usage
+
+\`\`\`bash
+letta messages search --query <text> [options]
+\`\`\`
+
+### Options
+
+| Option | Description |
+|--------|-------------|
+| \`--query <text>\` | Search query (required) |
+| \`--start-date <date>\` | Filter messages after this date (ISO format) |
+| \`--end-date <date>\` | Filter messages before this date (ISO format) |
+| \`--limit <n>\` | Max results (default: 10) |
+| \`--all-agents\` | Search all agents, not just current agent |
+| \`--agent <id>\` | Explicit agent ID (overrides LETTA_AGENT_ID) |
+
+Local search is transcript-backed full-text search. Prefer distinctive keywords, exact strings, quoted phrases, and date bounds when possible.
+
+### Expanding Context: messages list
+
+Use this to expand around a found message by ID cursor:
+
+\`\`\`bash
+letta messages list [options]
+\`\`\`
+
+| Option | Description |
+|--------|-------------|
+| \`--after <message-id>\` | Get messages after this ID (cursor) |
+| \`--before <message-id>\` | Get messages before this ID (cursor) |
+| \`--order <asc\\|desc>\` | Sort order (default: desc = newest first) |
+| \`--limit <n>\` | Max results (default: 20) |
+
+### Search Strategies
+
+**Strategy 1: Needle + Expand (Recommended)**
+
+1. Search with keywords to find relevant messages:
+   \`\`\`bash
+   letta messages search --query "topic keywords" --limit 5
+   \`\`\`
+
+2. Note the \`message_id\` of the most relevant result
+
+3. Expand before to get leading context:
+   \`\`\`bash
+   letta messages list --before "message-xyz" --limit 10
+   \`\`\`
+
+4. Expand after for following context:
+   \`\`\`bash
+   letta messages list --after "message-xyz" --order asc --limit 10
+   \`\`\`
+
+**Strategy 2: Date-Bounded Search**
+
+When you know approximately when something was discussed:
+
+\`\`\`bash
+letta messages search --query "topic" --start-date "2025-12-31T00:00:00Z" --end-date "2025-12-31T23:59:59Z"
+\`\`\`
+
+**Strategy 3: Broaden Terms**
+
+When exact keywords miss, try alternate terms, abbreviations, filenames, issue IDs, branch names, or user quotes.
+
+### Accessing the Underlying Files
+
+Prefer \`letta messages search\` first. If local full-text search misses or you need custom inspection, local backend transcripts are JSONL files on disk. The storage root is \`$LETTA_LOCAL_BACKEND_DIR\`, or \`~/.letta/lc-local-backend\` by default. Conversation directories live under \`conversations/\` and contain \`conversation.json\`, \`manifest.json\`, and \`messages.jsonl\`.
+
+Use read-only Bash tools such as \`find\`, \`grep\`, \`rg\` if installed, or small scripts for custom searches, for example:
+
+\`\`\`bash
+ROOT="\${LETTA_LOCAL_BACKEND_DIR:-$HOME/.letta/lc-local-backend}"
+find "$ROOT/conversations" -name messages.jsonl -print
+grep -R -n --include='messages.jsonl' "needle" "$ROOT/conversations"
+\`\`\`
+
+### Search Output
+
+Results include:
+- \`message_id\` - Use for cursor-based expansion
+- \`message_type\` - \`user_message\`, \`assistant_message\`, \`reasoning_message\`
+- \`content\` or \`reasoning\` - The message text
+- \`created_at\` - Timestamp (ISO format)
+- \`agent_id\` - Which agent the message belongs to
+`;
+var init_recall_subagent_local = () => {};
+
 // src/agent/subagents/context-budget.ts
 function estimateStartupContextTokens(text) {
   return Math.ceil(text.length / STARTUP_CONTEXT_ESTIMATED_CHARS_PER_TOKEN);
@@ -189616,8 +189760,12 @@ ${SYSTEM_REMINDER_CLOSE}
 
 `;
 }
-function buildForkSystemReminder(subagentType) {
+function recallPromptForBackend(backendMode) {
+  return backendMode === "local" ? recall_subagent_local_default : recall_subagent_default;
+}
+function buildForkSystemReminder(subagentType, backendMode) {
   if (subagentType === "recall") {
+    const recallPrompt = recallPromptForBackend(backendMode);
     return `${SYSTEM_REMINDER_OPEN}
 You have been forked from the primary conversational thread to run as an independent subagent. The fork only exists so you can see the parent agent's conversation trajectory in-context as reference — you are NOT the primary agent and do not share its tools.
 
@@ -189628,7 +189776,7 @@ Your toolset is limited to Bash, Read, and TaskOutput. You cannot edit files, ru
 You CANNOT ask questions mid-execution — all instructions are provided upfront.
 Your final message will be returned to the caller.
 
-${recall_subagent_default}
+${recallPrompt}
 ${SYSTEM_REMINDER_CLOSE}
 
 `;
@@ -189682,7 +189830,7 @@ async function spawnSubagent(type3, prompt, userModel, subagentId, signal, exist
     try {
       const cachedParent = parentAgent ?? await getBackend().retrieveAgent(resolvedParentAgentId);
       if (forkedContext) {
-        const systemReminder = buildForkSystemReminder(type3);
+        const systemReminder = buildForkSystemReminder(type3, backendMode);
         finalPrompt = systemReminder + prompt;
       } else {
         const systemReminder = buildDeploySystemReminder(cachedParent.name ?? "", resolvedParentAgentId);
@@ -189699,6 +189847,7 @@ var init_manager3 = __esm(() => {
   init_context();
   init_model();
   init_recall_subagent();
+  init_recall_subagent_local();
   init_subagent_state();
   init_backend2();
   init_metadata();
@@ -195644,9 +195793,9 @@ async function loadTools(modelIdentifier, options3) {
 function isOpenAIModel(modelIdentifier) {
   const info = getModelInfo(modelIdentifier);
   if (info?.handle && typeof info.handle === "string") {
-    return info.handle.startsWith("openai/") || info.handle.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`) || info.handle.startsWith("chatgpt_oauth/");
+    return info.handle.startsWith("openai/") || info.handle.startsWith("openai-codex/") || info.handle.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`) || info.handle.startsWith("chatgpt_oauth/");
   }
-  return modelIdentifier.startsWith("openai/") || modelIdentifier.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`) || modelIdentifier.startsWith("chatgpt_oauth/");
+  return modelIdentifier.startsWith("openai/") || modelIdentifier.startsWith("openai-codex/") || modelIdentifier.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`) || modelIdentifier.startsWith("chatgpt_oauth/");
 }
 function isGeminiModel(modelIdentifier) {
   const info = getModelInfo(modelIdentifier);
@@ -198909,7 +199058,8 @@ function createLocalConversationRecord(conversationId, agentId, _sequence, body
     in_context_message_ids: [],
     ...typeof bodyRecord.model === "string" || bodyRecord.model === null ? { model: bodyRecord.model } : {},
     ...modelSettings !== undefined ? { model_settings: modelSettings } : {},
-    ...typeof bodyRecord.context_window_limit === "number" ? { context_window_limit: bodyRecord.context_window_limit } : {}
+    ...typeof bodyRecord.context_window_limit === "number" ? { context_window_limit: bodyRecord.context_window_limit } : {},
+    ...typeof bodyRecord.hidden === "boolean" ? { hidden: bodyRecord.hidden } : {}
   };
 }
 function updateLocalConversationRecord(current, body, updatedAt) {
@@ -198939,6 +199089,9 @@ function updateLocalConversationRecord(current, body, updatedAt) {
   if (typeof bodyRecord.context_window_limit === "number") {
     next.context_window_limit = bodyRecord.context_window_limit;
   }
+  if (typeof bodyRecord.hidden === "boolean") {
+    next.hidden = bodyRecord.hidden;
+  }
   if (typeof bodyRecord.summary === "string" || bodyRecord.summary === null) {
     next.summary = bodyRecord.summary;
   }
@@ -199585,7 +199738,7 @@ class LocalStore {
     const agentId = optionalString(bodyRecord.agent_id);
     const after = optionalString(bodyRecord.after);
     const limit3 = typeof bodyRecord.limit === "number" ? bodyRecord.limit : 20;
-    let conversations = [...this.conversations.values()].filter((conversation) => conversation.id !== "default" && (!agentId || conversation.agent_id === agentId));
+    let conversations = [...this.conversations.values()].filter((conversation) => conversation.id !== "default" && (bodyRecord.include_hidden === true || !conversation.hidden) && (!agentId || conversation.agent_id === agentId));
     conversations.sort((a, b) => {
       const aDate = a.last_message_at ?? a.updated_at ?? a.created_at ?? "";
       const bDate = b.last_message_at ?? b.updated_at ?? b.created_at ?? "";
@@ -199647,7 +199800,8 @@ class LocalStore {
     const forked = createLocalConversationRecord(`${this.conversationIdPrefix}${this.conversationSeq}`, targetAgentId, this.conversationSeq, {
       summary: source2.summary ?? null,
       ...source2.model !== undefined ? { model: source2.model } : {},
-      ...source2.model_settings !== undefined ? { model_settings: source2.model_settings } : {}
+      ...source2.model_settings !== undefined ? { model_settings: source2.model_settings } : {},
+      ...typeof options3.hidden === "boolean" ? { hidden: options3.hidden } : {}
     });
     const sourceMessages = this.localMessagesForConversation(source2.id, source2.agent_id);
     const forkedMessages = sourceMessages.map((message) => this.cloneLocalMessageForConversation(message, forked.id, targetAgentId));
@@ -204779,6 +204933,9 @@ var init_local_backend = __esm(() => {
       this.complete = options3.complete;
       this.memfsEnabledOverride = options3.memfsEnabled;
     }
+    getLocalStorageDir() {
+      return this.storageDir;
+    }
     async listModels() {
       return listLocalModels(this.storageDir);
     }
@@ -252413,7 +252570,7 @@ async function getResumeDataFromBackend2(agent2, conversationId, options3 = {})
         messageHistory: prepareMessageHistory2(messages)
       };
     } else {
-      inContextMessageIds = agentWithInContext.in_context_message_ids;
+      inContextMessageIds = agentWithInContext.in_context_message_ids ?? agent2.message_ids;
       const lastInContextId = inContextMessageIds?.at(-1);
       let defaultConversationMessages = [];
       if (includeMessageHistory && isBackfillEnabled2() || !lastInContextId) {
@@ -258804,7 +258961,7 @@ function parsePatchToAdvancedDiff(patchLines, filePath) {
     hunks
   };
 }
-var ADV_DIFF_CONTEXT_LINES = 1, ADV_DIFF_IGNORE_WHITESPACE = true;
+var ADV_DIFF_CONTEXT_LINES = 1, ADV_DIFF_IGNORE_WHITESPACE = false;
 var init_diff4 = __esm(() => {
   init_libesm();
 });
@@ -263106,7 +263263,8 @@ function createListenerMessageHandler(params) {
           return;
         }
         await replaySyncStateForRuntime(runtime, socket, parsed.runtime, {
-          recoverApprovals: parsed.recover_approvals !== false
+          recoverApprovals: parsed.recover_approvals !== false,
+          forceDeviceStatus: parsed.force_device_status === true
         });
         return;
       }
@@ -263468,7 +263626,9 @@ async function replaySyncStateForRuntime(listenerRuntime, socket, scope, opts) {
       }
     }
   }
-  emitStateSync(socket, listenerRuntime, scope);
+  emitStateSync(socket, listenerRuntime, scope, {
+    forceDeviceStatus: opts?.forceDeviceStatus
+  });
   (opts?.scheduleWarmupsAfterSync ?? scheduleListenerWarmupsAfterSync)(listenerRuntime, scope);
 }
 async function recoverPendingChannelControlRequests(listener, opts) {
@@ -264608,20 +264768,80 @@ var init_listen_client = __esm(async () => {
   await init_client6();
 });
 
-// src/backend/message-search.ts
-function pageItems3(page) {
-  if (Array.isArray(page))
-    return page;
-  if (page && typeof page === "object") {
-    const maybePage = page;
-    if (typeof maybePage.getPaginatedItems === "function") {
-      return maybePage.getPaginatedItems();
-    }
-    if (Array.isArray(maybePage.items)) {
-      return maybePage.items;
-    }
+// src/backend/local/transcript-search.ts
+import { existsSync as existsSync40, readdirSync as readdirSync16, readFileSync as readFileSync30, statSync as statSync15 } from "node:fs";
+import { join as join41 } from "node:path";
+function readJsonFile2(path33) {
+  if (!existsSync40(path33))
+    return;
+  try {
+    return JSON.parse(readFileSync30(path33, "utf8"));
+  } catch {
+    return;
   }
-  return [];
+}
+function readJsonlFile2(path33) {
+  if (!existsSync40(path33))
+    return [];
+  try {
+    return readFileSync30(path33, "utf8").split(`
+`).filter((line) => line.trim().length > 0).map((line) => JSON.parse(line));
+  } catch {
+    return [];
+  }
+}
+function conversationSearchRecord(value) {
+  if (!isRecord(value))
+    return;
+  if (typeof value.id !== "string" || typeof value.agent_id !== "string") {
+    return;
+  }
+  return {
+    id: value.id,
+    agent_id: value.agent_id,
+    ...typeof value.hidden === "boolean" ? { hidden: value.hidden } : {}
+  };
+}
+function isLocalMessage(value) {
+  return isRecord(value) && typeof value.id === "string" && (value.role === "user" || value.role === "assistant" || value.role === "toolResult");
+}
+function transcriptFormat(manifest2, rows) {
+  if (manifest2?.message_format === LOCAL_TRANSCRIPT_MESSAGE_FORMAT || manifest2?.message_format === LOCAL_TRANSCRIPT_LEGACY_MESSAGE_FORMAT) {
+    return manifest2.message_format;
+  }
+  const firstDataRow = rows.find((row) => Boolean(isRecord(row) && row.type !== "session"));
+  if (isRecord(firstDataRow) && "message" in firstDataRow) {
+    return LOCAL_TRANSCRIPT_MESSAGE_FORMAT;
+  }
+  if (rows.some(isLocalMessage)) {
+    return LOCAL_TRANSCRIPT_LEGACY_MESSAGE_FORMAT;
+  }
+  return;
+}
+function transcriptMessageRows(rows, format5) {
+  if (format5 === LOCAL_TRANSCRIPT_LEGACY_MESSAGE_FORMAT) {
+    return rows.map((row, sourceIndex) => ({ row, sourceIndex })).filter((item) => isLocalMessage(item.row)).map(({ row, sourceIndex }) => ({
+      timestamp: row.metadata?.created_at,
+      message: row,
+      sourceIndex
+    }));
+  }
+  const messageRows = [];
+  rows.forEach((row, sourceIndex) => {
+    if (!isRecord(row))
+      return;
+    if (row.type !== "message" && row.type !== "compaction")
+      return;
+    const message = row.message;
+    if (!isLocalMessage(message))
+      return;
+    messageRows.push({
+      timestamp: typeof row.timestamp === "string" ? row.timestamp : undefined,
+      message,
+      sourceIndex
+    });
+  });
+  return messageRows;
 }
 function textFromContent2(content) {
   if (typeof content === "string")
@@ -264648,105 +264868,216 @@ function stringifySearchValue(value) {
   }
 }
 function searchableText(message) {
-  const toolCalls = Array.isArray(message.tool_calls) ? message.tool_calls : message.tool_call ? [message.tool_call] : [];
+  const localMessage = message;
+  const toolCalls = Array.isArray(localMessage.tool_calls) ? localMessage.tool_calls : localMessage.tool_call ? [localMessage.tool_call] : [];
   return [
-    message.message_type,
-    textFromContent2(message.content),
-    message.reasoning,
-    message.summary,
+    localMessage.message_type,
+    textFromContent2(localMessage.content),
+    localMessage.reasoning,
+    localMessage.summary,
     ...toolCalls.flatMap((call2) => [call2.name, call2.arguments]),
-    stringifySearchValue(message.tool_return),
-    stringifySearchValue(message.func_response)
+    stringifySearchValue(localMessage.tool_return),
+    stringifySearchValue(localMessage.func_response)
   ].filter((part) => typeof part === "string" && part.length > 0).join(`
 `);
 }
-function matchesQuery(message, query2) {
-  const terms = query2.toLowerCase().split(/\s+/).map((term) => term.trim()).filter(Boolean);
-  if (terms.length === 0)
-    return false;
-  const haystack = searchableText(message).toLowerCase();
-  return terms.every((term) => haystack.includes(term));
+function normalizeText(value) {
+  return value.toLowerCase().replace(/\s+/g, " ").trim();
 }
-function withinDateRange(message, startDate, endDate) {
+function parseQuery(query2) {
+  const terms = [];
+  const phrases = [];
+  let buffer = "";
+  let inQuote = false;
+  let sawUnclosedQuote = false;
+  const flush = () => {
+    const value = buffer.trim();
+    buffer = "";
+    if (!value)
+      return;
+    if (inQuote)
+      phrases.push(value);
+    else
+      terms.push(value);
+  };
+  for (const char of query2.trim()) {
+    if (char === '"') {
+      if (inQuote) {
+        flush();
+        inQuote = false;
+      } else {
+        flush();
+        inQuote = true;
+      }
+      continue;
+    }
+    if (!inQuote && /\s/.test(char)) {
+      flush();
+      continue;
+    }
+    buffer += char;
+  }
+  if (inQuote)
+    sawUnclosedQuote = true;
+  flush();
+  if (sawUnclosedQuote) {
+    return {
+      terms: query2.trim().split(/\s+/).map((term) => term.trim()).filter(Boolean),
+      phrases: []
+    };
+  }
+  return { terms, phrases };
+}
+function matchScore(text2, query2) {
+  const haystack = normalizeText(text2);
+  if (!haystack)
+    return null;
+  let score = 0;
+  for (const rawPhrase of query2.phrases) {
+    const phrase = normalizeText(rawPhrase);
+    if (!phrase)
+      continue;
+    const index = haystack.indexOf(phrase);
+    if (index < 0)
+      return null;
+    score += index * 0.1;
+  }
+  for (const rawTerm of query2.terms) {
+    const term = normalizeText(rawTerm);
+    if (!term)
+      continue;
+    const index = haystack.indexOf(term);
+    if (index < 0)
+      return null;
+    score += index + Math.max(0, 50 - term.length);
+  }
+  return score;
+}
+function dateInRange(createdAt, startDate, endDate) {
   if (!startDate && !endDate)
     return true;
-  if (!message.date)
+  if (!createdAt)
+    return true;
+  const messageTime = Date.parse(createdAt);
+  if (!Number.isFinite(messageTime))
     return true;
-  const time3 = new Date(message.date).getTime();
-  if (Number.isNaN(time3))
+  const startTime = startDate ? Date.parse(startDate) : Number.NEGATIVE_INFINITY;
+  const endTime = endDate ? Date.parse(endDate) : Number.POSITIVE_INFINITY;
+  if (startDate && !Number.isFinite(startTime))
     return true;
-  const startTime = startDate ? new Date(startDate).getTime() : 0;
-  const endTime = endDate ? new Date(endDate).getTime() : Number.POSITIVE_INFINITY;
-  return time3 >= startTime && time3 <= endTime;
+  if (endDate && !Number.isFinite(endTime))
+    return true;
+  return messageTime >= startTime && messageTime <= endTime;
 }
 function toSearchResult(message) {
-  const createdAt = message.date ?? new Date(0).toISOString();
+  const localMessage = message;
+  const createdAt = localMessage.date ?? new Date(0).toISOString();
   return {
-    ...message,
-    message_id: message.id ?? `${message.agent_id ?? "local"}:${createdAt}`,
+    ...localMessage,
+    message_id: localMessage.id ?? `${localMessage.agent_id ?? "local"}:${createdAt}`,
     created_at: createdAt,
-    agent_id: message.agent_id ?? null,
-    conversation_id: message.conversation_id ?? null
+    agent_id: localMessage.agent_id ?? null,
+    conversation_id: localMessage.conversation_id ?? null
   };
 }
-async function localConversationMessages(backend4, conversationId, agentId) {
+function projectedTranscriptMessages(input) {
+  const fallbackDate = input.row.timestamp ?? input.row.message.metadata?.created_at ?? new Date(0).toISOString();
+  const projected = projectLocalMessageToStoredMessages(input.row.message, input.agentId, input.conversationId, fallbackDate);
+  return withProjectedMessageDates(projected, input.row.sourceIndex);
+}
+function collectConversationMessages(input) {
+  const { conversation, conversationDir } = input;
+  if (input.agentId && conversation.agent_id !== input.agentId)
+    return [];
+  if (input.conversationId && conversation.id !== input.conversationId)
+    return [];
+  const messagesPath = join41(conversationDir, "messages.jsonl");
+  const rows = readJsonlFile2(messagesPath);
+  if (rows.length === 0)
+    return [];
+  const manifest2 = readJsonFile2(join41(conversationDir, "manifest.json"));
+  const format5 = transcriptFormat(manifest2, rows);
+  if (!format5)
+    return [];
+  return transcriptMessageRows(rows, format5).flatMap((row) => projectedTranscriptMessages({
+    row,
+    agentId: conversation.agent_id,
+    conversationId: conversation.id
+  })).map((message) => ({
+    message,
+    text: searchableText(message),
+    score: Number.POSITIVE_INFINITY
+  })).map((record5) => {
+    const score = matchScore(record5.text, input.query);
+    return score === null ? null : { ...record5, score };
+  }).filter((record5) => record5 !== null).filter((record5) => {
+    const message = record5.message;
+    return dateInRange(message.date, input.startDate, input.endDate);
+  });
+}
+function conversationDirectories(storageDir) {
+  const conversationsDir = join41(storageDir, "conversations");
+  if (!existsSync40(conversationsDir))
+    return [];
   try {
-    const page = await backend4.listConversationMessages(conversationId, {
-      limit: LOCAL_SEARCH_SCAN_LIMIT,
-      order: "desc",
-      ...agentId ? { agent_id: agentId } : {}
-    });
-    return pageItems3(page);
+    return readdirSync16(conversationsDir).map((entry) => join41(conversationsDir, entry)).filter((entryPath) => statSync15(entryPath).isDirectory());
   } catch {
     return [];
   }
 }
-async function localAgentMessages(backend4, agentId) {
-  const messages = [
-    ...await localConversationMessages(backend4, "default", agentId)
-  ];
-  try {
-    const conversationsPage = await backend4.listConversations({
-      agent_id: agentId,
-      limit: LOCAL_SEARCH_SCAN_LIMIT
-    });
-    const conversations = pageItems3(conversationsPage);
-    for (const conversation of conversations) {
-      if (!conversation.id || conversation.id === "default")
-        continue;
-      messages.push(...await localConversationMessages(backend4, conversation.id, agentId));
-    }
-  } catch {}
-  return messages;
-}
-async function localSearchMessages(backend4, body3) {
-  const query2 = typeof body3.query === "string" ? body3.query.trim() : "";
-  if (!query2)
+function searchLocalTranscriptMessages(storageDir, body3) {
+  const queryText = typeof body3.query === "string" ? body3.query.trim() : "";
+  if (!queryText)
+    return [];
+  const parsedQuery = parseQuery(queryText);
+  if (parsedQuery.terms.length === 0 && parsedQuery.phrases.length === 0) {
+    return [];
+  }
+  const limit3 = typeof body3.limit === "number" ? Math.max(0, body3.limit) : 100;
+  if (limit3 === 0)
     return [];
-  const limit3 = typeof body3.limit === "number" ? body3.limit : 100;
   const agentId = typeof body3.agent_id === "string" ? body3.agent_id : undefined;
   const conversationId = typeof body3.conversation_id === "string" ? body3.conversation_id : undefined;
+  if (conversationId === "default" && !agentId)
+    return [];
   const startDate = typeof body3.start_date === "string" ? body3.start_date : undefined;
   const endDate = typeof body3.end_date === "string" ? body3.end_date : undefined;
-  let messages = [];
-  if (conversationId) {
-    messages = await localConversationMessages(backend4, conversationId, agentId);
-  } else if (agentId) {
-    messages = await localAgentMessages(backend4, agentId);
-  } else {
-    const agentsPage = await backend4.listAgents({
-      limit: LOCAL_SEARCH_SCAN_LIMIT
+  const includeHidden = body3.include_hidden === true;
+  const records = conversationDirectories(storageDir).flatMap((conversationDir) => {
+    const conversation = conversationSearchRecord(readJsonFile2(join41(conversationDir, "conversation.json")));
+    if (!conversation)
+      return [];
+    if (conversation.hidden && !includeHidden)
+      return [];
+    return collectConversationMessages({
+      conversationDir,
+      conversation,
+      query: parsedQuery,
+      agentId,
+      conversationId,
+      startDate,
+      endDate
     });
-    const agents = pageItems3(agentsPage);
-    for (const agent2 of agents) {
-      messages.push(...await localAgentMessages(backend4, agent2.id));
-    }
-  }
-  return messages.filter((message) => matchesQuery(message, query2)).filter((message) => withinDateRange(message, startDate, endDate)).sort((a2, b3) => (b3.date ?? "").localeCompare(a2.date ?? "")).slice(0, limit3).map(toSearchResult);
+  });
+  return records.sort((a2, b3) => {
+    if (a2.score !== b3.score)
+      return a2.score - b3.score;
+    const aDate = a2.message.date ?? "";
+    const bDate = b3.message.date ?? "";
+    return bDate.localeCompare(aDate);
+  }).slice(0, limit3).map((record5) => toSearchResult(record5.message));
+}
+var init_transcript_search = __esm(() => {
+  init_local_store();
+});
+
+// src/backend/message-search.ts
+function localStorageDirForBackend(backend4) {
+  return backend4.getLocalStorageDir?.() ?? getLocalBackendStorageDir();
 }
 async function searchMessagesForBackend(body3, backend4 = getBackend()) {
   if (backend4.capabilities.localModelCatalog) {
-    return await localSearchMessages(backend4, body3);
+    return searchLocalTranscriptMessages(localStorageDirForBackend(backend4), body3);
   }
   return searchMessages({
     ...body3,
@@ -264763,10 +265094,11 @@ async function warmMessageSearchCacheForBackend(body3, backend4 = getBackend())
   }
   return warmSearchCache(body3);
 }
-var LOCAL_SEARCH_SCAN_LIMIT = 1000;
 var init_message_search = __esm(() => {
   init_search();
   init_backend();
+  init_paths();
+  init_transcript_search();
 });
 
 // src/auth/ConstellationLoginView.tsx
@@ -265297,9 +265629,9 @@ var init_paste_registry = __esm(() => {
 
 // src/cli/helpers/clipboard.ts
 import { execFileSync as execFileSync4 } from "node:child_process";
-import { existsSync as existsSync40, readFileSync as readFileSync30, statSync as statSync15, unlinkSync as unlinkSync8 } from "node:fs";
+import { existsSync as existsSync41, readFileSync as readFileSync31, statSync as statSync16, unlinkSync as unlinkSync8 } from "node:fs";
 import { tmpdir as tmpdir5 } from "node:os";
-import { basename as basename18, extname as extname8, isAbsolute as isAbsolute17, join as join41, resolve as resolve30 } from "node:path";
+import { basename as basename18, extname as extname8, isAbsolute as isAbsolute17, join as join42, resolve as resolve30 } from "node:path";
 function countLines(text2) {
   return (text2.match(/\r\n|\r|\n/g) || []).length + 1;
 }
@@ -265354,16 +265686,16 @@ function translatePasteForImages(paste) {
       if (IMAGE_EXTS.has(ext3)) {
         let buf = null;
         try {
-          const stat11 = statSync15(filePath);
+          const stat11 = statSync16(filePath);
           if (stat11.isFile())
-            buf = readFileSync30(filePath);
+            buf = readFileSync31(filePath);
         } catch {}
         let clipboardMediaType = null;
         if (!buf && process.platform === "darwin" && /TemporaryItems\/.*screencaptureui/i.test(filePath)) {
           const clipResult = getClipboardImageToTempFile();
           if (clipResult) {
             try {
-              buf = readFileSync30(clipResult.tempPath);
+              buf = readFileSync31(clipResult.tempPath);
               clipboardMediaType = UTI_TO_MEDIA_TYPE[clipResult.uti] || null;
               try {
                 unlinkSync8(clipResult.tempPath);
@@ -265389,7 +265721,7 @@ function translatePasteForImages(paste) {
 function getClipboardImageToTempFile() {
   if (process.platform !== "darwin")
     return null;
-  const tempPath = join41(tmpdir5(), `letta-clipboard-${Date.now()}.bin`);
+  const tempPath = join42(tmpdir5(), `letta-clipboard-${Date.now()}.bin`);
   try {
     const jxa = `
       ObjC.import('AppKit');
@@ -265412,11 +265744,11 @@ function getClipboardImageToTempFile() {
       encoding: "utf8",
       stdio: ["ignore", "pipe", "ignore"]
     }).trim();
-    if (!uti || !existsSync40(tempPath))
+    if (!uti || !existsSync41(tempPath))
       return null;
     return { tempPath, uti };
   } catch {
-    if (existsSync40(tempPath)) {
+    if (existsSync41(tempPath)) {
       try {
         unlinkSync8(tempPath);
       } catch {}
@@ -265432,7 +265764,7 @@ async function tryImportClipboardImageMac() {
     return null;
   const { tempPath, uti } = clipboardResult;
   try {
-    const buffer = readFileSync30(tempPath);
+    const buffer = readFileSync31(tempPath);
     try {
       unlinkSync8(tempPath);
     } catch {}
@@ -265449,7 +265781,7 @@ async function tryImportClipboardImageMac() {
       height: resized.height
     };
   } catch (err) {
-    if (existsSync40(tempPath)) {
+    if (existsSync41(tempPath)) {
       try {
         unlinkSync8(tempPath);
       } catch {}
@@ -267181,14 +267513,14 @@ __export(exports_debug2, {
 });
 import {
   appendFileSync as appendFileSync7,
-  existsSync as existsSync42,
+  existsSync as existsSync43,
   mkdirSync as mkdirSync30,
-  readdirSync as readdirSync16,
-  readFileSync as readFileSync32,
+  readdirSync as readdirSync17,
+  readFileSync as readFileSync33,
   unlinkSync as unlinkSync9
 } from "node:fs";
 import { homedir as homedir25 } from "node:os";
-import { join as join44 } from "node:path";
+import { join as join45 } from "node:path";
 import { format as format5 } from "node:util";
 function isDebugEnabled2() {
   const lettaDebug = process.env.LETTA_DEBUG;
@@ -267219,8 +267551,8 @@ class DebugLogFile2 {
     const telem = process.env.LETTA_CODE_TELEM;
     if (telem === "0" || telem === "false")
       return;
-    this.agentDir = join44(DEBUG_LOG_DIR2, agentId);
-    this.logPath = join44(this.agentDir, `${sessionId}.log`);
+    this.agentDir = join45(DEBUG_LOG_DIR2, agentId);
+    this.logPath = join45(this.agentDir, `${sessionId}.log`);
     this.dirCreated = false;
     this.pruneOldSessions();
   }
@@ -267236,9 +267568,9 @@ class DebugLogFile2 {
     if (!this.logPath)
       return;
     try {
-      if (!existsSync42(this.logPath))
+      if (!existsSync43(this.logPath))
         return;
-      const content = readFileSync32(this.logPath, "utf8");
+      const content = readFileSync33(this.logPath, "utf8");
       const lines = content.trimEnd().split(`
 `);
       return lines.slice(-maxLines).join(`
@@ -267251,7 +267583,7 @@ class DebugLogFile2 {
     if (this.dirCreated || !this.agentDir)
       return;
     try {
-      if (!existsSync42(this.agentDir)) {
+      if (!existsSync43(this.agentDir)) {
         mkdirSync30(this.agentDir, { recursive: true });
       }
       this.dirCreated = true;
@@ -267261,14 +267593,14 @@ class DebugLogFile2 {
     if (!this.agentDir)
       return;
     try {
-      if (!existsSync42(this.agentDir))
+      if (!existsSync43(this.agentDir))
         return;
-      const files = readdirSync16(this.agentDir).filter((f4) => f4.endsWith(".log")).sort();
+      const files = readdirSync17(this.agentDir).filter((f4) => f4.endsWith(".log")).sort();
       if (files.length >= MAX_SESSION_FILES3) {
         const toDelete = files.slice(0, files.length - MAX_SESSION_FILES3 + 1);
         for (const file3 of toDelete) {
           try {
-            unlinkSync9(join44(this.agentDir, file3));
+            unlinkSync9(join45(this.agentDir, file3));
           } catch {}
         }
       }
@@ -267293,7 +267625,7 @@ function debugWarn2(prefix, message, ...args) {
 }
 var DEBUG_LOG_DIR2, MAX_SESSION_FILES3 = 5, DEFAULT_TAIL_LINES2 = 50, debugLogFile2;
 var init_debug2 = __esm(() => {
-  DEBUG_LOG_DIR2 = join44(homedir25(), ".letta", "logs", "debug");
+  DEBUG_LOG_DIR2 = join45(homedir25(), ".letta", "logs", "debug");
   debugLogFile2 = new DebugLogFile2;
 });
 
@@ -267325,16 +267657,16 @@ __export(exports_skills3, {
   SKILLS_DIR: () => SKILLS_DIR2,
   GLOBAL_SKILLS_DIR: () => GLOBAL_SKILLS_DIR2
 });
-import { existsSync as existsSync43 } from "node:fs";
+import { existsSync as existsSync44 } from "node:fs";
 import { readdir as readdir10, readFile as readFile13, realpath as realpath5, stat as stat11 } from "node:fs/promises";
-import { dirname as dirname22, join as join45 } from "node:path";
+import { dirname as dirname22, join as join46 } from "node:path";
 import { fileURLToPath as fileURLToPath9 } from "node:url";
 function getBundledSkillsPath2() {
   const thisDir = dirname22(fileURLToPath9(import.meta.url));
   if (thisDir.includes("src/agent") || thisDir.includes("src\\agent")) {
-    return join45(thisDir, "../skills/builtin");
+    return join46(thisDir, "../skills/builtin");
   }
-  return join45(thisDir, "skills");
+  return join46(thisDir, "skills");
 }
 function compareSkills2(a2, b3) {
   return a2.id.localeCompare(b3.id) || a2.source.localeCompare(b3.source) || a2.path.localeCompare(b3.path);
@@ -267375,7 +267707,7 @@ function isUserInvocableSkill2(skill2) {
   return skill2.userInvocable !== false;
 }
 function getAgentSkillsDir2(agentId) {
-  return join45(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents", agentId, "memory/skills");
+  return join46(process.env.HOME || process.env.USERPROFILE || "~", ".letta/agents", agentId, "memory/skills");
 }
 async function getBundledSkills2() {
   const bundledPath = getBundledSkillsPath2();
@@ -267384,7 +267716,7 @@ async function getBundledSkills2() {
 }
 async function discoverSkillsFromDir2(skillsPath, source2) {
   const errors7 = [];
-  if (!existsSync43(skillsPath)) {
+  if (!existsSync44(skillsPath)) {
     return { skills: [], errors: [] };
   }
   const skills = [];
@@ -267398,7 +267730,7 @@ async function discoverSkillsFromDir2(skillsPath, source2) {
   }
   return { skills, errors: errors7 };
 }
-async function discoverSkills2(projectSkillsPath = join45(process.cwd(), SKILLS_DIR2), agentId, options3) {
+async function discoverSkills2(projectSkillsPath = join46(process.cwd(), SKILLS_DIR2), agentId, options3) {
   const allErrors = [];
   const skillsById = new Map;
   const sourceSet = new Set(options3?.sources ?? ALL_SKILL_SOURCES);
@@ -267453,7 +267785,7 @@ async function findSkillFiles2(currentPath, rootPath, skills, errors7, source2,
   try {
     const entries = await readdir10(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join45(currentPath, entry.name);
+      const fullPath = join46(currentPath, entry.name);
       try {
         let isDirectory = entry.isDirectory();
         let isFile = entry.isFile();
@@ -267543,7 +267875,7 @@ ${lines.join(`
 var SKILLS_DIR2 = ".skills", GLOBAL_SKILLS_DIR2;
 var init_skills4 = __esm(() => {
   init_skill_sources();
-  GLOBAL_SKILLS_DIR2 = join45(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
+  GLOBAL_SKILLS_DIR2 = join46(process.env.HOME || process.env.USERPROFILE || "~", ".letta/skills");
 });
 
 // src/utils/fs.ts
@@ -267551,13 +267883,13 @@ var exports_fs = {};
 __export(exports_fs, {
   writeJsonFile: () => writeJsonFile,
   writeFile: () => writeFile14,
-  readJsonFile: () => readJsonFile2,
+  readJsonFile: () => readJsonFile3,
   readFile: () => readFile14,
   mkdir: () => mkdir12,
   exists: () => exists2
 });
 import {
-  existsSync as existsSync44,
+  existsSync as existsSync45,
   readFileSync as fsReadFileSync2,
   writeFileSync as fsWriteFileSync2,
   mkdirSync as mkdirSync31
@@ -267568,18 +267900,18 @@ async function readFile14(path33) {
 }
 async function writeFile14(path33, content) {
   const dir = dirname23(path33);
-  if (!existsSync44(dir)) {
+  if (!existsSync45(dir)) {
     mkdirSync31(dir, { recursive: true });
   }
   fsWriteFileSync2(path33, content, { encoding: "utf-8", flush: true });
 }
 function exists2(path33) {
-  return existsSync44(path33);
+  return existsSync45(path33);
 }
 async function mkdir12(path33, options3) {
   mkdirSync31(path33, options3);
 }
-async function readJsonFile2(path33) {
+async function readJsonFile3(path33) {
   const text2 = await readFile14(path33);
   return JSON.parse(text2);
 }
@@ -267783,7 +268115,7 @@ __export(exports_auto_update2, {
 import { execFile as execFile16 } from "node:child_process";
 import { realpathSync as realpathSync4 } from "node:fs";
 import { readdir as readdir11, rm as rm5 } from "node:fs/promises";
-import { join as join46 } from "node:path";
+import { join as join47 } from "node:path";
 import { promisify as promisify14 } from "node:util";
 function debugLog4(...args) {
   if (DEBUG2) {
@@ -267948,12 +268280,12 @@ async function getNpmGlobalPath2() {
   }
 }
 async function cleanupOrphanedDirs2(globalPath) {
-  const lettaAiDir = join46(globalPath, "lib/node_modules/@letta-ai");
+  const lettaAiDir = join47(globalPath, "lib/node_modules/@letta-ai");
   try {
     const entries = await readdir11(lettaAiDir);
     for (const entry of entries) {
       if (entry.startsWith(".letta-code-")) {
-        const orphanPath = join46(lettaAiDir, entry);
+        const orphanPath = join47(lettaAiDir, entry);
         debugLog4("Cleaning orphaned temp directory:", orphanPath);
         await rm5(orphanPath, { recursive: true, force: true });
       }
@@ -268491,17 +268823,17 @@ var exports_bootstrap_tools = {};
 __export(exports_bootstrap_tools, {
   bootstrapBaseToolsIfNeeded: () => bootstrapBaseToolsIfNeeded
 });
-import { existsSync as existsSync46, mkdirSync as mkdirSync33, writeFileSync as writeFileSync25 } from "node:fs";
+import { existsSync as existsSync47, mkdirSync as mkdirSync33, writeFileSync as writeFileSync25 } from "node:fs";
 import { homedir as homedir27 } from "node:os";
-import { join as join48 } from "node:path";
+import { join as join49 } from "node:path";
 async function bootstrapBaseToolsIfNeeded() {
-  if (existsSync46(MARKER_PATH))
+  if (existsSync47(MARKER_PATH))
     return;
   debugLog("bootstrap", "No marker found, bootstrapping base tools...");
   try {
     const success2 = await addBaseToolsToServer();
     if (success2) {
-      mkdirSync33(join48(homedir27(), ".letta"), { recursive: true });
+      mkdirSync33(join49(homedir27(), ".letta"), { recursive: true });
       writeFileSync25(MARKER_PATH, new Date().toISOString(), "utf-8");
     }
   } catch (err) {
@@ -268512,7 +268844,7 @@ var MARKER_PATH;
 var init_bootstrap_tools = __esm(() => {
   init_debug();
   init_create6();
-  MARKER_PATH = join48(homedir27(), ".letta", ".bootstrapped");
+  MARKER_PATH = join49(homedir27(), ".letta", ".bootstrapped");
 });
 
 // src/tools/filter.ts
@@ -268915,6 +269247,61 @@ function validateRegistryHandleOrThrow2(handle2) {
   }
 }
 
+// src/extensions/capabilities.ts
+function cloneExtensionCapabilities(capabilities) {
+  return {
+    tools: capabilities.tools,
+    commands: capabilities.commands,
+    events: {
+      lifecycle: capabilities.events.lifecycle,
+      tools: capabilities.events.tools,
+      turns: capabilities.events.turns
+    },
+    providers: capabilities.providers,
+    ui: {
+      panels: capabilities.ui.panels,
+      statusValues: capabilities.ui.statusValues,
+      customStatuslineRenderer: capabilities.ui.customStatuslineRenderer
+    }
+  };
+}
+function resolveExtensionCapabilities(capabilities) {
+  return cloneExtensionCapabilities(capabilities ?? DEFAULT_EXTENSION_CAPABILITIES);
+}
+var DEFAULT_EXTENSION_CAPABILITIES, DISABLED_EXTENSION_CAPABILITIES;
+var init_capabilities = __esm(() => {
+  DEFAULT_EXTENSION_CAPABILITIES = {
+    tools: true,
+    commands: true,
+    events: {
+      lifecycle: true,
+      tools: true,
+      turns: true
+    },
+    providers: true,
+    ui: {
+      panels: true,
+      statusValues: true,
+      customStatuslineRenderer: true
+    }
+  };
+  DISABLED_EXTENSION_CAPABILITIES = {
+    tools: false,
+    commands: false,
+    events: {
+      lifecycle: false,
+      tools: false,
+      turns: false
+    },
+    providers: false,
+    ui: {
+      panels: false,
+      statusValues: false,
+      customStatuslineRenderer: false
+    }
+  };
+});
+
 // node_modules/typescript/lib/typescript.js
 var require_typescript = __commonJS((exports, module3) => {
   var __dirname = "/home/runner/work/letta-code/letta-code/node_modules/typescript/lib", __filename = "/home/runner/work/letta-code/letta-code/node_modules/typescript/lib/typescript.js";
@@ -277027,7 +277414,7 @@ ${lanes.join(`
             return process.memoryUsage().heapUsed;
           },
           getFileSize(path35) {
-            const stat12 = statSync18(path35);
+            const stat12 = statSync19(path35);
             if (stat12 == null ? undefined : stat12.isFile()) {
               return stat12.size;
             }
@@ -277070,7 +277457,7 @@ ${lanes.join(`
           }
         };
         return nodeSystem;
-        function statSync18(path35) {
+        function statSync19(path35) {
           try {
             return _fs.statSync(path35, statSyncOptions);
           } catch {
@@ -277122,7 +277509,7 @@ ${lanes.join(`
             activeSession.post("Profiler.stop", (err, { profile }) => {
               var _a8;
               if (!err) {
-                if ((_a8 = statSync18(profilePath)) == null ? undefined : _a8.isDirectory()) {
+                if ((_a8 = statSync19(profilePath)) == null ? undefined : _a8.isDirectory()) {
                   profilePath = _path.join(profilePath, `${(/* @__PURE__ */ new Date()).toISOString().replace(/:/g, "-")}+P${process.pid}.cpuprofile`);
                 }
                 try {
@@ -277231,7 +277618,7 @@ ${lanes.join(`
               let stat12;
               if (typeof dirent === "string" || dirent.isSymbolicLink()) {
                 const name = combinePaths(path35, entry);
-                stat12 = statSync18(name);
+                stat12 = statSync19(name);
                 if (!stat12) {
                   continue;
                 }
@@ -277255,7 +277642,7 @@ ${lanes.join(`
           return matchFiles(path35, extensions, excludes, includes, useCaseSensitiveFileNames2, process.cwd(), depth, getAccessibleFileSystemEntries, realpath6);
         }
         function fileSystemEntryExists(path35, entryKind) {
-          const stat12 = statSync18(path35);
+          const stat12 = statSync19(path35);
           if (!stat12) {
             return false;
           }
@@ -277289,7 +277676,7 @@ ${lanes.join(`
         }
         function getModifiedTime3(path35) {
           var _a8;
-          return (_a8 = statSync18(path35)) == null ? undefined : _a8.mtime;
+          return (_a8 = statSync19(path35)) == null ? undefined : _a8.mtime;
         }
         function setModifiedTime(path35, time3) {
           try {
@@ -437636,46 +438023,6 @@ Additional information: BADCLIENT: Bad error code, ${badCode} not found in range
   } });
 });
 
-// src/extensions/capabilities.ts
-function cloneExtensionCapabilities(capabilities) {
-  return {
-    tools: capabilities.tools,
-    commands: capabilities.commands,
-    events: {
-      lifecycle: capabilities.events.lifecycle,
-      tools: capabilities.events.tools,
-      turns: capabilities.events.turns
-    },
-    providers: capabilities.providers,
-    ui: {
-      panels: capabilities.ui.panels,
-      statusValues: capabilities.ui.statusValues,
-      customStatuslineRenderer: capabilities.ui.customStatuslineRenderer
-    }
-  };
-}
-function resolveExtensionCapabilities(capabilities) {
-  return cloneExtensionCapabilities(capabilities ?? DEFAULT_EXTENSION_CAPABILITIES);
-}
-var DEFAULT_EXTENSION_CAPABILITIES;
-var init_capabilities = __esm(() => {
-  DEFAULT_EXTENSION_CAPABILITIES = {
-    tools: true,
-    commands: true,
-    events: {
-      lifecycle: true,
-      tools: true,
-      turns: true
-    },
-    providers: true,
-    ui: {
-      panels: true,
-      statusValues: true,
-      customStatuslineRenderer: true
-    }
-  };
-});
-
 // src/extensions/conversation-handle.ts
 function createExtensionConversationHandle(options3) {
   const conversationId = options3.conversationId ?? "default";
@@ -437716,11 +438063,11 @@ function createExtensionConversationHandle(options3) {
 // src/extensions/extension-host.ts
 import { createHash as createHash5 } from "node:crypto";
 import {
-  existsSync as existsSync47,
+  existsSync as existsSync48,
   mkdirSync as mkdirSync34,
-  readdirSync as readdirSync18,
-  readFileSync as readFileSync33,
-  statSync as statSync18,
+  readdirSync as readdirSync19,
+  readFileSync as readFileSync34,
+  statSync as statSync19,
   symlinkSync,
   unlinkSync as unlinkSync11,
   writeFileSync as writeFileSync26
@@ -437730,9 +438077,9 @@ import { homedir as homedir28 } from "node:os";
 import path35 from "node:path";
 import { pathToFileURL as pathToFileURL3 } from "node:url";
 function listExtensionFiles(directory) {
-  if (!existsSync47(directory))
+  if (!existsSync48(directory))
     return [];
-  return readdirSync18(directory, { withFileTypes: true }).filter((entry) => {
+  return readdirSync19(directory, { withFileTypes: true }).filter((entry) => {
     if (!entry.isFile())
       return false;
     if (entry.name.startsWith("."))
@@ -437882,7 +438229,7 @@ function getRuntimePackageDirectory(packageName) {
 function ensureRuntimeDependencySymlink(cacheDirectory, packageName) {
   const nodeModulesDirectory = path35.join(cacheDirectory, "node_modules");
   const linkPath = path35.join(nodeModulesDirectory, packageName);
-  if (existsSync47(linkPath))
+  if (existsSync48(linkPath))
     return;
   mkdirSync34(nodeModulesDirectory, { recursive: true });
   symlinkSync(getRuntimePackageDirectory(packageName), linkPath, process.platform === "win32" ? "junction" : "dir");
@@ -437926,17 +438273,17 @@ function prepareExtensionForImport(extensionPath, source2) {
 }
 function createImportableExtensionPath(extensionPath, cacheDirectory) {
   ensureExtensionCache(cacheDirectory);
-  const source2 = readFileSync33(extensionPath, "utf8");
+  const source2 = readFileSync34(extensionPath, "utf8");
   const hash4 = createHash5("sha256").update(source2).digest("hex").slice(0, 16);
   const extension = path35.extname(extensionPath);
   const importableSource = prepareExtensionForImport(extensionPath, source2);
   const baseName = path35.basename(extensionPath, extension).replace(/[^a-zA-Z0-9_-]/g, "-");
   const importPath = path35.join(cacheDirectory, `.letta-extension-${baseName}-${hash4}.mjs`);
-  if (!existsSync47(importPath)) {
+  if (!existsSync48(importPath)) {
     writeFileSync26(importPath, importableSource, "utf8");
   }
   try {
-    for (const entry of readdirSync18(cacheDirectory)) {
+    for (const entry of readdirSync19(cacheDirectory)) {
       if (entry.startsWith(`.letta-extension-${baseName}-`) && entry !== path35.basename(importPath)) {
         unlinkSync11(path35.join(cacheDirectory, entry));
       }
@@ -438405,7 +438752,7 @@ async function loadLocalExtensions(options3) {
       registry2.ownerAbortControllers[owner.id] = abortController;
       registry2.owners[owner.id] = owner;
       try {
-        const mtimeMs = statSync18(extensionPath).mtimeMs;
+        const mtimeMs = statSync19(extensionPath).mtimeMs;
         failurePhase = TYPESCRIPT_EXTENSION_FILE_EXTENSIONS.has(path35.extname(extensionPath)) ? "transpile" : "import";
         const importPath = createImportableExtensionPath(extensionPath, cacheDirectory);
         failurePhase = "import";
@@ -438670,6 +439017,96 @@ var init_extension_host = __esm(() => {
 });
 
 // src/extensions/extension-runtime.ts
+function createDisabledExtensionRegistry() {
+  return {
+    capabilities: cloneExtensionCapabilities(DISABLED_EXTENSION_CAPABILITIES),
+    commands: {},
+    diagnostics: [],
+    disposers: [],
+    errors: [],
+    events: {},
+    generation: 0,
+    loadedPaths: [],
+    ownerAbortControllers: {},
+    owners: {},
+    sources: [],
+    tools: {},
+    ui: {
+      panels: {},
+      statuslineRenderer: null,
+      statusOwners: {},
+      statusValues: {}
+    }
+  };
+}
+function createDisabledExtensionHost(registry2) {
+  return {
+    dispose() {},
+    emitEvent(name) {
+      return Promise.resolve(emptyEventEmissionResult(name));
+    },
+    getSnapshot() {
+      return registry2;
+    },
+    reload() {
+      return Promise.resolve();
+    },
+    subscribe() {
+      return () => {
+        return;
+      };
+    }
+  };
+}
+function createDisabledExtensionRuntime(options3) {
+  clearExtensionTools();
+  clearRegisteredPiProviders();
+  let context3 = options3.initialContext;
+  const registry2 = createDisabledExtensionRegistry();
+  const host = createDisabledExtensionHost(registry2);
+  const snapshot = {
+    hadStatuslineRenderer: false,
+    hasExtensionSources: false,
+    isLoading: false,
+    registry: registry2
+  };
+  const eventEmitter = {
+    emitEvent(name) {
+      return Promise.resolve(emptyEventEmissionResult(name));
+    },
+    getSnapshot() {
+      return snapshot;
+    }
+  };
+  return {
+    dispose() {},
+    emitEvent(name) {
+      return Promise.resolve(emptyEventEmissionResult(name));
+    },
+    eventEmitter,
+    getBackendApi() {
+      return;
+    },
+    getContext() {
+      return context3;
+    },
+    getSnapshot() {
+      return snapshot;
+    },
+    host,
+    reload() {
+      return Promise.resolve();
+    },
+    subscribe() {
+      return () => {
+        return;
+      };
+    },
+    updateContext(nextContext) {
+      context3 = nextContext;
+    }
+  };
+}
 function hasExtensionSources(options3) {
   return resolveLocalExtensionSources(options3).some((source2) => source2.files.length > 0);
 }
@@ -438694,6 +439131,12 @@ function createLazyRuntimeBackendApi(getBackendApi) {
   };
 }
 function createExtensionRuntime(options3) {
+  if (options3.disabled) {
+    disableExtensionsForProcess();
+  }
+  if (options3.disabled || areExtensionsDisabled()) {
+    return createDisabledExtensionRuntime(options3);
+  }
   const {
     getBackendApi: resolveBackendApi,
     initialContext,
@@ -438793,7 +439236,10 @@ function createExtensionRuntime(options3) {
   };
 }
 var init_extension_runtime = __esm(() => {
+  init_pi_provider_extension_registry();
+  init_capabilities();
   init_extension_host();
+  init_tool_registry();
   init_debug();
 });
 
@@ -438885,6 +439331,7 @@ function createHeadlessExtensionRuntime(options3) {
   return createExtensionRuntime({
     ...options3.cacheDirectory ? { cacheDirectory: options3.cacheDirectory } : {},
     capabilities: HEADLESS_EXTENSION_CAPABILITIES,
+    disabled: options3.disabled,
     getBackendApi: () => createHeadlessExtensionBackendApi(options3.backend),
     getClient,
     ...options3.globalExtensionsDirectory ? { globalExtensionsDirectory: options3.globalExtensionsDirectory } : {},
@@ -439122,7 +439569,7 @@ function parseRegistryHandle(handle2) {
 }
 async function importAgentFromRegistry(options3) {
   const { tmpdir: tmpdir7 } = await import("node:os");
-  const { join: join49 } = await import("node:path");
+  const { join: join50 } = await import("node:path");
   const { writeFile: writeFile16, unlink: unlink4 } = await import("node:fs/promises");
   const { author, name } = parseRegistryHandle(options3.handle);
   const rawUrl = `https://raw.githubusercontent.com/${AGENT_REGISTRY_OWNER}/${AGENT_REGISTRY_REPO}/refs/heads/${AGENT_REGISTRY_BRANCH}/agents/@${author}/${name}/${name}.af`;
@@ -439134,7 +439581,7 @@ async function importAgentFromRegistry(options3) {
     throw new Error(`Failed to download agent @${author}/${name}: ${response.statusText}`);
   }
   const afContent = await response.text();
-  const tempPath = join49(tmpdir7(), `letta-import-${author}-${name}-${Date.now()}.af`);
+  const tempPath = join50(tmpdir7(), `letta-import-${author}-${name}-${Date.now()}.af`);
   await writeFile16(tempPath, afContent, "utf-8");
   try {
     const result = await importAgentFromFile({
@@ -439477,6 +439924,12 @@ async function writeFinalHeadlessStdout(text2) {
 async function handleHeadlessCommand(parsedArgs, model, skillsDirectoryOverride, skillSourcesOverride, systemInfoReminderEnabledOverride, startupOptions = {}) {
   const { values: values2, positionals } = parsedArgs;
   telemetry.setSurface(getTerminalTelemetrySurface(true));
+  const extensionsDisabled = shouldDisableExtensions({
+    cliFlag: values2["no-extensions"]
+  });
+  if (extensionsDisabled) {
+    disableExtensionsForProcess();
+  }
   if (values2.tools !== undefined) {
     const { toolFilter: toolFilter3 } = await Promise.resolve().then(() => (init_filter(), exports_filter));
     toolFilter3.setEnabledTools(values2.tools);
@@ -440156,7 +440609,8 @@ Current session AGENT_ID=${process.env.AGENT_ID}; --backend local switches to a
     conversationId,
     permissionMode: headlessPermissionMode,
     reflectionSettings: effectiveReflectionSettings,
-    sessionStats
+    sessionStats,
+    disabled: extensionsDisabled
   });
   await headlessExtensionRuntime.reload();
   try {
@@ -442980,13 +443434,13 @@ __export(exports_terminal_keybinding_installer, {
 });
 import {
   copyFileSync as copyFileSync2,
-  existsSync as existsSync49,
+  existsSync as existsSync50,
   mkdirSync as mkdirSync36,
-  readFileSync as readFileSync35,
+  readFileSync as readFileSync36,
   writeFileSync as writeFileSync28
 } from "node:fs";
 import { homedir as homedir30, platform as platform6 } from "node:os";
-import { dirname as dirname25, join as join50 } from "node:path";
+import { dirname as dirname25, join as join51 } from "node:path";
 function detectTerminalType() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
     return "cursor";
@@ -443018,16 +443472,16 @@ function getKeybindingsPath(terminal) {
   }[terminal];
   const os7 = platform6();
   if (os7 === "darwin") {
-    return join50(homedir30(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join51(homedir30(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os7 === "win32") {
     const appData = process.env.APPDATA;
     if (!appData)
       return null;
-    return join50(appData, appName, "User", "keybindings.json");
+    return join51(appData, appName, "User", "keybindings.json");
   }
   if (os7 === "linux") {
-    return join50(homedir30(), ".config", appName, "User", "keybindings.json");
+    return join51(homedir30(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -443049,10 +443503,10 @@ function parseKeybindings(content) {
   }
 }
 function keybindingExists(keybindingsPath) {
-  if (!existsSync49(keybindingsPath))
+  if (!existsSync50(keybindingsPath))
     return false;
   try {
-    const content = readFileSync35(keybindingsPath, { encoding: "utf-8" });
+    const content = readFileSync36(keybindingsPath, { encoding: "utf-8" });
     const keybindings = parseKeybindings(content);
     if (!keybindings)
       return false;
@@ -443062,7 +443516,7 @@ function keybindingExists(keybindingsPath) {
   }
 }
 function createBackup(keybindingsPath) {
-  if (!existsSync49(keybindingsPath))
+  if (!existsSync50(keybindingsPath))
     return null;
   const backupPath = `${keybindingsPath}.letta-backup`;
   try {
@@ -443078,14 +443532,14 @@ function installKeybinding(keybindingsPath) {
       return { success: true, alreadyExists: true };
     }
     const parentDir = dirname25(keybindingsPath);
-    if (!existsSync49(parentDir)) {
+    if (!existsSync50(parentDir)) {
       mkdirSync36(parentDir, { recursive: true });
     }
     let keybindings = [];
     let backupPath = null;
-    if (existsSync49(keybindingsPath)) {
+    if (existsSync50(keybindingsPath)) {
       backupPath = createBackup(keybindingsPath);
-      const content = readFileSync35(keybindingsPath, { encoding: "utf-8" });
+      const content = readFileSync36(keybindingsPath, { encoding: "utf-8" });
       const parsed = parseKeybindings(content);
       if (parsed === null) {
         return {
@@ -443113,10 +443567,10 @@ function installKeybinding(keybindingsPath) {
 }
 function removeKeybinding(keybindingsPath) {
   try {
-    if (!existsSync49(keybindingsPath)) {
+    if (!existsSync50(keybindingsPath)) {
       return { success: true };
     }
-    const content = readFileSync35(keybindingsPath, { encoding: "utf-8" });
+    const content = readFileSync36(keybindingsPath, { encoding: "utf-8" });
     const keybindings = parseKeybindings(content);
     if (!keybindings) {
       return {
@@ -443180,14 +443634,14 @@ function getWezTermConfigPath() {
   }
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig) {
-    const xdgPath = join50(xdgConfig, "wezterm", "wezterm.lua");
-    if (existsSync49(xdgPath))
+    const xdgPath = join51(xdgConfig, "wezterm", "wezterm.lua");
+    if (existsSync50(xdgPath))
       return xdgPath;
   }
-  const configPath = join50(homedir30(), ".config", "wezterm", "wezterm.lua");
-  if (existsSync49(configPath))
+  const configPath = join51(homedir30(), ".config", "wezterm", "wezterm.lua");
+  if (existsSync50(configPath))
     return configPath;
-  return join50(homedir30(), ".wezterm.lua");
+  return join51(homedir30(), ".wezterm.lua");
 }
 function stripLuaCommentsFromLine(line, blockCommentEnd) {
   let code2 = "";
@@ -443290,10 +443744,10 @@ ${WEZTERM_DELETE_FIX}
 `;
 }
 function wezTermDeleteFixExists(configPath) {
-  if (!existsSync49(configPath))
+  if (!existsSync50(configPath))
     return false;
   try {
-    const content = readFileSync35(configPath, { encoding: "utf-8" });
+    const content = readFileSync36(configPath, { encoding: "utf-8" });
     return content.includes("Letta Code: Fix Delete key") || content.includes("key = 'Delete'") && content.includes("SendString") && content.includes("\\x1b[3~");
   } catch {
     return false;
@@ -443307,14 +443761,14 @@ function installWezTermDeleteFix() {
     }
     let content = "";
     let backupPath = null;
-    if (existsSync49(configPath)) {
+    if (existsSync50(configPath)) {
       backupPath = `${configPath}.letta-backup`;
       copyFileSync2(configPath, backupPath);
-      content = readFileSync35(configPath, { encoding: "utf-8" });
+      content = readFileSync36(configPath, { encoding: "utf-8" });
     }
     content = injectWezTermDeleteFix(content);
     const parentDir = dirname25(configPath);
-    if (!existsSync49(parentDir)) {
+    if (!existsSync50(parentDir)) {
       mkdirSync36(parentDir, { recursive: true });
     }
     writeFileSync28(configPath, content, { encoding: "utf-8" });
@@ -443366,9 +443820,9 @@ __export(exports_settings2, {
   getSetting: () => getSetting
 });
 import { homedir as homedir31 } from "node:os";
-import { join as join51 } from "node:path";
+import { join as join52 } from "node:path";
 function getSettingsPath() {
-  return join51(homedir31(), ".letta", "settings.json");
+  return join52(homedir31(), ".letta", "settings.json");
 }
 async function loadSettings() {
   const settingsPath = getSettingsPath();
@@ -443405,7 +443859,7 @@ async function getSetting(key2) {
   return settings3[key2];
 }
 function getProjectSettingsPath() {
-  return join51(process.cwd(), ".letta", "settings.local.json");
+  return join52(process.cwd(), ".letta", "settings.local.json");
 }
 async function loadProjectSettings() {
   const settingsPath = getProjectSettingsPath();
@@ -443423,7 +443877,7 @@ async function loadProjectSettings() {
 }
 async function saveProjectSettings(settings3) {
   const settingsPath = getProjectSettingsPath();
-  const dirPath = join51(process.cwd(), ".letta");
+  const dirPath = join52(process.cwd(), ".letta");
   try {
     if (!exists(dirPath)) {
       await mkdir(dirPath, { recursive: true });
@@ -444126,8 +444580,9 @@ function createExtensionBackendApi(backend4) {
     }
   };
 }
-function useLocalExtensionRuntime(initialContext) {
+function useLocalExtensionRuntime(initialContext, options3 = {}) {
   const runtime = import_react40.useMemo(() => createExtensionRuntime2({
+    disabled: options3.disabled,
     getBackendApi: () => createExtensionBackendApi(getBackend()),
     getClient,
     initialContext
@@ -445736,35 +446191,89 @@ function padLeft(n, width) {
   const s3 = String(n);
   return s3.length >= width ? s3 : " ".repeat(width - s3.length) + s3;
 }
+function expandTabsForDiffDisplay(text2) {
+  return text2.replaceAll("\t", " ".repeat(TAB_WIDTH2));
+}
+function exceedsAdvancedDiffHighlightLimits(hunks) {
+  let totalBytes = 0;
+  let totalLines = 0;
+  for (const hunk of hunks) {
+    for (const line of hunk.lines) {
+      const raw2 = line.raw || "";
+      if (raw2.charAt(0) === "\\")
+        continue;
+      totalBytes += Buffer.byteLength(raw2.slice(1), "utf8");
+      totalLines += 1;
+      if (totalBytes > HIGHLIGHT_MAX_BYTES || totalLines > HIGHLIGHT_MAX_LINES) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+function takePrefixByDisplayWidth(text2, maxWidth) {
+  if (maxWidth <= 0) {
+    return { prefix: "", rest: text2, width: 0 };
+  }
+  let prefix = "";
+  let width = 0;
+  for (const char of text2) {
+    const charWidth = stringWidth(char);
+    if (width + charWidth > maxWidth) {
+      break;
+    }
+    prefix += char;
+    width += charWidth;
+  }
+  return { prefix, rest: text2.slice(prefix.length), width };
+}
+function takeFirstCharacter(text2) {
+  const prefix = Array.from(text2)[0] ?? "";
+  return {
+    prefix,
+    rest: text2.slice(prefix.length),
+    width: stringWidth(prefix)
+  };
+}
 function buildPaddedRows2(chunks, cols, contIndent) {
   if (cols <= 0)
     return [chunks];
   const rows = [];
   let row = [];
-  let len = 0;
+  let width = 0;
   for (const chunk of chunks) {
     let rem = chunk.text;
     while (rem.length > 0) {
-      const space = cols - len;
-      if (rem.length <= space) {
+      if (width >= cols) {
+        rows.push(row);
+        row = [{ text: " ".repeat(contIndent) }];
+        width = contIndent;
+      }
+      const space = Math.max(1, cols - width);
+      if (stringWidth(rem) <= space) {
         row.push({ text: rem, color: chunk.color, dimColor: chunk.dimColor });
-        len += rem.length;
+        width += stringWidth(rem);
         rem = "";
       } else {
+        let next = takePrefixByDisplayWidth(rem, space);
+        if (!next.prefix) {
+          next = takeFirstCharacter(rem);
+        }
         row.push({
-          text: rem.slice(0, space),
+          text: next.prefix,
           color: chunk.color,
           dimColor: chunk.dimColor
         });
+        width += next.width;
+        rem = next.rest;
         rows.push(row);
         row = [{ text: " ".repeat(contIndent) }];
-        len = contIndent;
-        rem = rem.slice(space);
+        width = contIndent;
       }
     }
   }
-  if (len < cols)
-    row.push({ text: " ".repeat(cols - len) });
+  if (width < cols)
+    row.push({ text: " ".repeat(cols - width) });
   if (row.length > 0)
     rows.push(row);
   return rows;
@@ -445790,10 +446299,13 @@ function Line({
   chunks.push({ text: " " });
   if (syntaxSpans && syntaxSpans.length > 0) {
     for (const span2 of syntaxSpans) {
-      chunks.push({ text: span2.text, color: span2.color });
+      chunks.push({
+        text: expandTabsForDiffDisplay(span2.text),
+        color: span2.color
+      });
     }
   } else {
-    chunks.push({ text: text2 });
+    chunks.push({ text: expandTabsForDiffDisplay(text2) });
   }
   const contIndent = indent.length + gutterStr.length + 1 + 1;
   const rows = buildPaddedRows2(chunks, columns, contIndent);
@@ -445809,6 +446321,67 @@ function Line({
     }, ri, false, undefined, this))
   }, undefined, false, undefined, this);
 }
+function buildAdvancedDiffRows(hunks, hunkSyntaxLines = []) {
+  const rows = [];
+  for (let hIdx = 0;hIdx < hunks.length; hIdx++) {
+    const h3 = hunks[hIdx];
+    if (!h3) {
+      continue;
+    }
+    const syntaxForHunk = hunkSyntaxLines[hIdx] ?? [];
+    let oldNo = h3.oldStart;
+    let newNo = h3.newStart;
+    let displayLineIdx = 0;
+    for (let i4 = 0;i4 < h3.lines.length; i4++) {
+      const line = h3.lines[i4];
+      if (!line)
+        continue;
+      const raw2 = line.raw || "";
+      const ch = raw2.charAt(0);
+      const body3 = raw2.slice(1);
+      if (ch === "\\")
+        continue;
+      const spans = syntaxForHunk[displayLineIdx];
+      displayLineIdx++;
+      if (ch === " ") {
+        rows.push({
+          kind: "context",
+          displayNo: newNo,
+          text: body3,
+          syntaxSpans: spans
+        });
+        oldNo++;
+        newNo++;
+      } else if (ch === "-") {
+        rows.push({
+          kind: "remove",
+          displayNo: oldNo,
+          text: body3,
+          syntaxSpans: spans
+        });
+        oldNo++;
+      } else if (ch === "+") {
+        rows.push({
+          kind: "add",
+          displayNo: newNo,
+          text: body3,
+          syntaxSpans: spans
+        });
+        newNo++;
+      } else {
+        rows.push({
+          kind: "context",
+          displayNo: newNo,
+          text: raw2,
+          syntaxSpans: spans
+        });
+        oldNo++;
+        newNo++;
+      }
+    }
+  }
+  return rows;
+}
 function AdvancedDiffRenderer(props) {
   const columns = useTerminalWidth();
   const result = import_react46.useMemo(() => {
@@ -445895,6 +446468,7 @@ function AdvancedDiffRenderer(props) {
   const filePath = props.filePath;
   const relative13 = formatRelativePath(filePath);
   const lang41 = languageFromPath(filePath);
+  const shouldHighlight = lang41 && !exceedsAdvancedDiffHighlightLimits(hunks);
   const hunkSyntaxLines = [];
   for (const h3 of hunks) {
     const textLines = [];
@@ -445908,68 +446482,11 @@ function AdvancedDiffRenderer(props) {
     }
     const block = textLines.join(`
 `);
-    const highlighted = lang41 ? highlightCode(block, lang41) : undefined;
-    hunkSyntaxLines.push(textLines.map((_3, i4) => highlighted?.[i4]));
-  }
-  const rows = [];
-  for (let hIdx = 0;hIdx < hunks.length; hIdx++) {
-    const h3 = hunks[hIdx];
-    if (!h3) {
-      continue;
-    }
-    const syntaxForHunk = hunkSyntaxLines[hIdx] ?? [];
-    let oldNo = h3.oldStart;
-    let newNo = h3.newStart;
-    let lastRemovalNo = null;
-    let displayLineIdx = 0;
-    for (let i4 = 0;i4 < h3.lines.length; i4++) {
-      const line = h3.lines[i4];
-      if (!line)
-        continue;
-      const raw2 = line.raw || "";
-      const ch = raw2.charAt(0);
-      const body3 = raw2.slice(1);
-      if (ch === "\\")
-        continue;
-      const spans = syntaxForHunk[displayLineIdx];
-      displayLineIdx++;
-      if (ch === " ") {
-        rows.push({
-          kind: "context",
-          displayNo: oldNo,
-          text: body3,
-          syntaxSpans: spans
-        });
-        oldNo++;
-        newNo++;
-        lastRemovalNo = null;
-      } else if (ch === "-") {
-        rows.push({
-          kind: "remove",
-          displayNo: oldNo,
-          text: body3,
-          syntaxSpans: spans
-        });
-        lastRemovalNo = oldNo;
-        oldNo++;
-      } else if (ch === "+") {
-        const displayNo = lastRemovalNo !== null ? lastRemovalNo : newNo;
-        rows.push({ kind: "add", displayNo, text: body3, syntaxSpans: spans });
-        newNo++;
-        lastRemovalNo = null;
-      } else {
-        rows.push({
-          kind: "context",
-          displayNo: oldNo,
-          text: raw2,
-          syntaxSpans: spans
-        });
-        oldNo++;
-        newNo++;
-        lastRemovalNo = null;
-      }
-    }
+    const highlighted = shouldHighlight ? highlightCode(block, lang41) : undefined;
+    const syntaxLines = highlighted?.length === textLines.length ? highlighted : undefined;
+    hunkSyntaxLines.push(textLines.map((_3, i4) => syntaxLines?.[i4]));
   }
+  const rows = buildAdvancedDiffRows(hunks, hunkSyntaxLines);
   const maxDisplayNo = rows.reduce((m4, r5) => Math.max(m4, r5.displayNo), 1);
   const gutterWidth = String(maxDisplayNo).length;
   const header = props.kind === "write" ? `Wrote changes to ${relative13}` : `Updated ${relative13}`;
@@ -446100,8 +446617,9 @@ function AdvancedDiffRenderer(props) {
     ]
   }, undefined, true, undefined, this);
 }
-var import_react46, jsx_dev_runtime22;
+var import_react46, jsx_dev_runtime22, TAB_WIDTH2 = 4, HIGHLIGHT_MAX_BYTES, HIGHLIGHT_MAX_LINES = 1e4;
 var init_AdvancedDiffRenderer = __esm(async () => {
+  init_string_width();
   init_diff4();
   init_glyphs();
   init_use_terminal_width();
@@ -446114,6 +446632,7 @@ var init_AdvancedDiffRenderer = __esm(async () => {
   ]);
   import_react46 = __toESM(require_react(), 1);
   jsx_dev_runtime22 = __toESM(require_jsx_dev_runtime(), 1);
+  HIGHLIGHT_MAX_BYTES = 512 * 1024;
 });
 
 // src/cli/components/InlineFileEditApproval.tsx
@@ -446148,9 +446667,9 @@ function getHeaderText(fileEdit) {
   const relPath = relative13(cwd2, fileEdit.filePath);
   const displayPath = relPath.startsWith("..") ? fileEdit.filePath : relPath;
   if (t2 === "write" || t2 === "write_file" || t2 === "writefile" || t2 === "write_file_gemini" || t2 === "writefilegemini") {
-    const { existsSync: existsSync50 } = __require("node:fs");
+    const { existsSync: existsSync51 } = __require("node:fs");
     try {
-      if (existsSync50(fileEdit.filePath)) {
+      if (existsSync51(fileEdit.filePath)) {
         return `Overwrite ${displayPath}?`;
       }
     } catch {}
@@ -450270,9 +450789,9 @@ __export(exports_custom, {
   GLOBAL_COMMANDS_DIR: () => GLOBAL_COMMANDS_DIR,
   COMMANDS_DIR: () => COMMANDS_DIR
 });
-import { existsSync as existsSync50 } from "node:fs";
+import { existsSync as existsSync51 } from "node:fs";
 import { readdir as readdir12, readFile as readFile16 } from "node:fs/promises";
-import { basename as basename20, dirname as dirname26, join as join52 } from "node:path";
+import { basename as basename20, dirname as dirname26, join as join53 } from "node:path";
 async function getCustomCommands() {
   if (cachedCommands !== null) {
     return cachedCommands;
@@ -450283,7 +450802,7 @@ async function getCustomCommands() {
 function refreshCustomCommands() {
   cachedCommands = null;
 }
-async function discoverCustomCommands(projectPath = join52(process.cwd(), COMMANDS_DIR)) {
+async function discoverCustomCommands(projectPath = join53(process.cwd(), COMMANDS_DIR)) {
   const commandsById = new Map;
   const userCommands = await discoverFromDirectory(GLOBAL_COMMANDS_DIR, "user");
   for (const cmd of userCommands) {
@@ -450304,7 +450823,7 @@ async function discoverCustomCommands(projectPath = join52(process.cwd(), COMMAN
   return result;
 }
 async function discoverFromDirectory(dirPath, source2) {
-  if (!existsSync50(dirPath)) {
+  if (!existsSync51(dirPath)) {
     return [];
   }
   const commands2 = [];
@@ -450315,7 +450834,7 @@ async function findCommandFiles(currentPath, rootPath, commands2, source2) {
   try {
     const entries = await readdir12(currentPath, { withFileTypes: true });
     for (const entry of entries) {
-      const fullPath = join52(currentPath, entry.name);
+      const fullPath = join53(currentPath, entry.name);
       if (entry.isDirectory()) {
         await findCommandFiles(fullPath, rootPath, commands2, source2);
       } else if (entry.isFile() && entry.name.endsWith(".md")) {
@@ -450400,7 +450919,7 @@ async function findCustomCommand(commandName) {
 }
 var COMMANDS_DIR = ".commands", GLOBAL_COMMANDS_DIR, cachedCommands = null;
 var init_custom = __esm(() => {
-  GLOBAL_COMMANDS_DIR = join52(process.env.HOME || process.env.USERPROFILE || "~", ".letta/commands");
+  GLOBAL_COMMANDS_DIR = join53(process.env.HOME || process.env.USERPROFILE || "~", ".letta/commands");
 });
 
 // src/cli/components/HelpDialog.tsx
@@ -453453,22 +453972,22 @@ var init_AgentInfoBar = __esm(async () => {
 });
 
 // src/cli/helpers/file-search.ts
-import { readdirSync as readdirSync19, statSync as statSync19 } from "node:fs";
-import { join as join53, relative as relative13, resolve as resolve36 } from "node:path";
+import { readdirSync as readdirSync20, statSync as statSync20 } from "node:fs";
+import { join as join54, relative as relative13, resolve as resolve36 } from "node:path";
 function searchDirectoryRecursive(dir, pattern4, maxResults = 200, results = [], depth = 0, maxDepth = 10, lowerPattern = pattern4.toLowerCase()) {
   if (results.length >= maxResults || depth >= maxDepth) {
     return results;
   }
   try {
-    const entries = readdirSync19(dir);
+    const entries = readdirSync20(dir);
     for (const entry of entries) {
       try {
-        const fullPath = join53(dir, entry);
+        const fullPath = join54(dir, entry);
         const relativePath = relative13(getIndexRoot(), fullPath);
         if (shouldHardExcludeEntry(entry, getIndexRoot())) {
           continue;
         }
-        const stats = statSync19(fullPath);
+        const stats = statSync20(fullPath);
         const matches2 = pattern4.length === 0 || relativePath.toLowerCase().includes(lowerPattern);
         if (matches2) {
           results.push({
@@ -453499,7 +454018,7 @@ async function searchFiles(query2, deep = false) {
       try {
         const resolvedDir = resolve36(getIndexRoot(), dirPart);
         try {
-          statSync19(resolvedDir);
+          statSync20(resolvedDir);
           searchDir = resolvedDir;
           searchPattern = pattern4;
         } catch {}
@@ -453533,7 +454052,7 @@ async function searchFiles(query2, deep = false) {
       } else {
         let entries = [];
         try {
-          entries = readdirSync19(searchDir);
+          entries = readdirSync20(searchDir);
         } catch {
           return [];
         }
@@ -453541,8 +454060,8 @@ async function searchFiles(query2, deep = false) {
         const matchingEntries = entries.filter((entry) => !shouldHardExcludeEntry(entry, getIndexRoot()) && (searchPattern.length === 0 || entry.toLowerCase().includes(lowerPattern)));
         for (const entry of matchingEntries.slice(0, 50)) {
           try {
-            const fullPath = join53(searchDir, entry);
-            const stats = statSync19(fullPath);
+            const fullPath = join54(searchDir, entry);
+            const stats = statSync20(fullPath);
             const relativePath = relative13(getIndexRoot(), fullPath);
             results.push({
               path: relativePath,
@@ -454300,6 +454819,7 @@ function renderDreamingStatus(agent2) {
   const elapsedS = Math.round((Date.now() - agent2.startTime) / 1000);
   const typeLabel = typeLabelForBackgroundAgent(agent2);
   const chatUrl = chatUrlForBackgroundAgent(agent2);
+  const isTmux = Boolean(process.env.TMUX);
   return /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
     children: [
       /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(BlinkingSpinner, {
@@ -454308,7 +454828,21 @@ function renderDreamingStatus(agent2) {
         marginRight: 0,
         pulseIntervalMs: 400
       }, undefined, false, undefined, this),
-      chatUrl ? /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(dist_default5, {
+      chatUrl && isTmux ? /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(jsx_dev_runtime57.Fragment, {
+        children: [
+          /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
+            color: colors.bgSubagent.label,
+            children: typeLabel
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
+            dimColor: true,
+            children: [
+              ": ",
+              chatUrl
+            ]
+          }, undefined, true, undefined, this)
+        ]
+      }, undefined, true, undefined, this) : chatUrl ? /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(dist_default5, {
         url: chatUrl,
         fallback: false,
         children: /* @__PURE__ */ jsx_dev_runtime57.jsxDEV(Text2, {
@@ -456541,15 +457075,15 @@ var init_agents7 = __esm(() => {
 // src/cli/commands/install-github-app.ts
 import { execFileSync as execFileSync5 } from "node:child_process";
 import {
-  existsSync as existsSync51,
+  existsSync as existsSync52,
   mkdirSync as mkdirSync37,
   mkdtempSync as mkdtempSync2,
-  readFileSync as readFileSync36,
+  readFileSync as readFileSync37,
   rmSync as rmSync8,
   writeFileSync as writeFileSync29
 } from "node:fs";
 import { tmpdir as tmpdir7 } from "node:os";
-import { dirname as dirname27, join as join54 } from "node:path";
+import { dirname as dirname27, join as join55 } from "node:path";
 function runCommand(command, args, cwd2, input) {
   try {
     return execFileSync5(command, args, {
@@ -456770,8 +457304,8 @@ async function createLettaAgent(apiKey, name) {
   return createMinimalAgent(apiKey, name);
 }
 function cloneRepoToTemp(repo) {
-  const tempDir = mkdtempSync2(join54(tmpdir7(), "letta-install-github-app-"));
-  const repoDir = join54(tempDir, "repo");
+  const tempDir = mkdtempSync2(join55(tmpdir7(), "letta-install-github-app-"));
+  const repoDir = join55(tempDir, "repo");
   runCommand("gh", ["repo", "clone", repo, repoDir, "--", "--depth=1"]);
   return { tempDir, repoDir };
 }
@@ -456782,14 +457316,14 @@ function runGit4(args, cwd2) {
   return runCommand("git", args, cwd2);
 }
 function writeWorkflow(repoDir, workflowPath, content) {
-  const absolutePath = join54(repoDir, workflowPath);
-  if (!existsSync51(dirname27(absolutePath))) {
+  const absolutePath = join55(repoDir, workflowPath);
+  if (!existsSync52(dirname27(absolutePath))) {
     mkdirSync37(dirname27(absolutePath), { recursive: true });
   }
   const next = `${content.trimEnd()}
 `;
-  if (existsSync51(absolutePath)) {
-    const previous = readFileSync36(absolutePath, "utf8");
+  if (existsSync52(absolutePath)) {
+    const previous = readFileSync37(absolutePath, "utf8");
     if (previous === next) {
       return false;
     }
@@ -461193,9 +461727,9 @@ __export(exports_generate_memory_viewer, {
   generateAndOpenMemoryViewer: () => generateAndOpenMemoryViewer
 });
 import { execFile as execFileCb4 } from "node:child_process";
-import { chmodSync as chmodSync4, existsSync as existsSync52, mkdirSync as mkdirSync38, writeFileSync as writeFileSync30 } from "node:fs";
+import { chmodSync as chmodSync4, existsSync as existsSync53, mkdirSync as mkdirSync38, writeFileSync as writeFileSync30 } from "node:fs";
 import { homedir as homedir33 } from "node:os";
-import { join as join55 } from "node:path";
+import { join as join56 } from "node:path";
 import { promisify as promisify15 } from "node:util";
 function messagesFromOverview(overview) {
   return overview.messages?.map((message) => ({
@@ -461504,7 +462038,7 @@ ${m4.body}` : m4.subject;
 async function generateAndOpenMemoryViewer(agentId, options3) {
   const memoryRoot = getScopedMemoryFilesystemRoot(agentId);
   const repoDir = memoryRoot;
-  if (!existsSync52(join55(repoDir, ".git"))) {
+  if (!existsSync53(join56(repoDir, ".git"))) {
     throw new Error("Memory viewer requires memfs. Run /memfs enable first.");
   }
   const data = await collectMemoryData(agentId, repoDir, memoryRoot, options3?.conversationId);
@@ -461514,13 +462048,13 @@ async function generateAndOpenMemoryViewer(agentId, options3) {
   data.context = applyContextUsageSnapshot(data.context, options3?.contextUsage);
   const jsonPayload = JSON.stringify(data).replace(/</g, "\\u003c");
   const html5 = memory_viewer_template_default.replace("<!--LETTA_DATA_PLACEHOLDER-->", () => jsonPayload);
-  if (!existsSync52(VIEWERS_DIR)) {
+  if (!existsSync53(VIEWERS_DIR)) {
     mkdirSync38(VIEWERS_DIR, { recursive: true, mode: 448 });
   }
   try {
     chmodSync4(VIEWERS_DIR, 448);
   } catch {}
-  const filePath = join55(VIEWERS_DIR, `memory-${encodeURIComponent(agentId)}.html`);
+  const filePath = join56(VIEWERS_DIR, `memory-${encodeURIComponent(agentId)}.html`);
   writeFileSync30(filePath, html5);
   chmodSync4(filePath, 384);
   const skipOpen = Boolean(process.env.TMUX) || Boolean(process.env.SSH_CONNECTION) || Boolean(process.env.SSH_TTY);
@@ -461545,13 +462079,13 @@ var init_generate_memory_viewer = __esm(() => {
   init_local_memory_context();
   init_memory_viewer_template();
   execFile17 = promisify15(execFileCb4);
-  VIEWERS_DIR = join55(homedir33(), ".letta", "viewers");
+  VIEWERS_DIR = join56(homedir33(), ".letta", "viewers");
   REFLECTION_PATTERN = /\(reflection\)|🔮|reflection:/i;
 });
 
 // src/cli/components/MemfsTreeViewer.tsx
-import { existsSync as existsSync53 } from "node:fs";
-import { join as join56 } from "node:path";
+import { existsSync as existsSync54 } from "node:fs";
+import { join as join57 } from "node:path";
 function renderTreePrefix(node) {
   let prefix = "";
   for (let i4 = 0;i4 < node.depth; i4++) {
@@ -461579,8 +462113,8 @@ function MemfsTreeViewer({
   const [status, setStatus] = import_react90.useState(null);
   const statusTimerRef = import_react90.useRef(null);
   const memoryRoot = getScopedMemoryFilesystemRoot(agentId);
-  const memoryExists = existsSync53(memoryRoot);
-  const hasGitRepo = import_react90.useMemo(() => existsSync53(join56(memoryRoot, ".git")), [memoryRoot]);
+  const memoryExists = existsSync54(memoryRoot);
+  const hasGitRepo = import_react90.useMemo(() => existsSync54(join57(memoryRoot, ".git")), [memoryRoot]);
   function showStatus(msg, durationMs) {
     if (statusTimerRef.current)
       clearTimeout(statusTimerRef.current);
@@ -462388,7 +462922,7 @@ function isSearchRangeAvailable(range3, options3) {
 function buildSearchTargetPlan(mode, range3, options3) {
   const availableRanges = SEARCH_RANGES.filter((candidateRange) => isSearchRangeAvailable(candidateRange, options3));
   const prefetch = [
-    ...SEARCH_MODES.filter((candidateMode) => candidateMode !== mode).map((candidateMode) => ({ mode: candidateMode, range: range3 })),
+    ...options3.textOnlyModes ? [] : SEARCH_MODES.filter((candidateMode) => candidateMode !== mode).map((candidateMode) => ({ mode: candidateMode, range: range3 })),
     ...availableRanges.filter((candidateRange) => candidateRange !== range3).map((candidateRange) => ({ mode, range: candidateRange }))
   ];
   return {
@@ -462396,6 +462930,22 @@ function buildSearchTargetPlan(mode, range3, options3) {
     prefetch
   };
 }
+function buildMessageSearchRequestBody(query2, mode, range3, options3) {
+  const body3 = {
+    query: query2.trim(),
+    search_mode: mode,
+    limit: options3.limit ?? SEARCH_LIMIT
+  };
+  if (range3 === "agent" && options3.agentId) {
+    body3.agent_id = options3.agentId;
+  } else if (range3 === "conv" && options3.conversationId) {
+    body3.conversation_id = options3.conversationId;
+    if (options3.agentId) {
+      body3.agent_id = options3.agentId;
+    }
+  }
+  return body3;
+}
 function formatLocalTime(dateStr) {
   if (!dateStr)
     return "";
@@ -462414,6 +462964,17 @@ function formatLocalTime(dateStr) {
 function escapeRegExp4(text2) {
   return text2.replace(/[.*+?^${}()|[\]\\]/g, (match4) => `\\${match4}`);
 }
+function stringifyMessageValue(value) {
+  if (typeof value === "string")
+    return value;
+  if (value === null || value === undefined)
+    return "";
+  try {
+    return JSON.stringify(value);
+  } catch {
+    return String(value);
+  }
+}
 function getMessageText(msg) {
   if ("content" in msg) {
     const content = msg.content;
@@ -462438,8 +462999,8 @@ function getMessageText(msg) {
   }
   if ("tool_return" in msg) {
     const toolName = "name" in msg ? msg.name : "tool";
-    const returnValue = msg.tool_return;
-    const preview2 = returnValue?.slice(0, 100) || "";
+    const returnValue = stringifyMessageValue(msg.tool_return);
+    const preview2 = returnValue.slice(0, 100);
     return `${toolName}: ${preview2}`;
   }
   return `[${msg.message_type || "unknown"}]`;
@@ -462489,6 +463050,7 @@ function MessageSearch({
   const [error54, setError] = import_react92.useState(null);
   const [selectedIndex, setSelectedIndex] = import_react92.useState(0);
   const [expandedMessage, setExpandedMessage] = import_react92.useState(null);
+  const textOnlyModes = getBackend().capabilities.localModelCatalog;
   const searchRequestIdRef = import_react92.useRef(0);
   const resultsCache = import_react92.useRef(new Map);
   const pendingResultsCache = import_react92.useRef(new Map);
@@ -462496,20 +463058,16 @@ function MessageSearch({
     warmMessageSearchCache().catch(() => {});
   }, []);
   const getCacheKey = import_react92.useCallback((query2, mode, range3) => {
+    const modeKey = textOnlyModes ? "text" : mode;
     const rangeKey = range3 === "agent" ? agentId || "no-agent" : range3 === "conv" ? conversationId || "no-conv" : "all";
-    return `${query2.trim()}-${mode}-${rangeKey}`;
-  }, [agentId, conversationId]);
+    return `${query2.trim()}-${modeKey}-${rangeKey}`;
+  }, [agentId, conversationId, textOnlyModes]);
   const fetchSearchResults = import_react92.useCallback(async (query2, mode, range3) => {
-    const body3 = {
-      query: query2.trim(),
-      search_mode: mode,
+    const body3 = buildMessageSearchRequestBody(query2, mode, range3, {
+      agentId,
+      conversationId,
       limit: SEARCH_LIMIT
-    };
-    if (range3 === "agent" && agentId) {
-      body3.agent_id = agentId;
-    } else if (range3 === "conv" && conversationId) {
-      body3.conversation_id = conversationId;
-    }
+    });
     return searchMessagesForBackend(body3);
   }, [agentId, conversationId]);
   const fetchAndCacheSearchResults = import_react92.useCallback(async (query2, mode, range3) => {
@@ -462539,7 +463097,8 @@ function MessageSearch({
   const prefetchSearchResults = import_react92.useCallback((query2, mode, range3) => {
     const { prefetch } = buildSearchTargetPlan(mode, range3, {
       agentId,
-      conversationId
+      conversationId,
+      textOnlyModes
     });
     if (prefetch.length === 0) {
       return;
@@ -462549,7 +463108,7 @@ function MessageSearch({
         await Promise.all(prefetch.map(({ mode: prefetchMode, range: prefetchRange }) => fetchAndCacheSearchResults(query2, prefetchMode, prefetchRange).catch(() => [])));
       } catch {}
     })();
-  }, [agentId, conversationId, fetchAndCacheSearchResults]);
+  }, [agentId, conversationId, fetchAndCacheSearchResults, textOnlyModes]);
   const executeSearch = import_react92.useCallback(async (query2, mode, range3) => {
     if (!query2.trim())
       return;
@@ -462983,6 +463542,7 @@ function MessageSearch({
 }
 var import_react92, jsx_dev_runtime67, SOLID_LINE17 = "─", VISIBLE_ITEMS = 5, SEARCH_LIMIT = 100, SEARCH_MODES, SEARCH_RANGES;
 var init_MessageSearch = __esm(async () => {
+  init_backend2();
   init_message_search();
   init_truncate_text();
   init_use_terminal_width();
@@ -463842,10 +464402,10 @@ var init_PersonalitySelector = __esm(async () => {
 // src/utils/aws-credentials.ts
 import { readFile as readFile17 } from "node:fs/promises";
 import { homedir as homedir34 } from "node:os";
-import { join as join57 } from "node:path";
+import { join as join58 } from "node:path";
 async function parseAwsCredentials() {
-  const credentialsPath = join57(homedir34(), ".aws", "credentials");
-  const configPath = join57(homedir34(), ".aws", "config");
+  const credentialsPath = join58(homedir34(), ".aws", "credentials");
+  const configPath = join58(homedir34(), ".aws", "config");
   const profiles = new Map;
   try {
     const content = await readFile17(credentialsPath, "utf-8");
@@ -465105,8 +465665,8 @@ function SkillsDialog({ onClose, agentId }) {
       try {
         const { discoverSkills: discoverSkills3, SKILLS_DIR: SKILLS_DIR3 } = await Promise.resolve().then(() => (init_skills3(), exports_skills2));
         const { getSkillsDirectory: getSkillsDirectory2, getSkillSources: getSkillSources2 } = await Promise.resolve().then(() => (init_context(), exports_context));
-        const { join: join58 } = await import("node:path");
-        const skillsDir = getSkillsDirectory2() || join58(process.cwd(), SKILLS_DIR3);
+        const { join: join59 } = await import("node:path");
+        const skillsDir = getSkillsDirectory2() || join59(process.cwd(), SKILLS_DIR3);
         const result = await discoverSkills3(skillsDir, agentId, {
           sources: getSkillSources2()
         });
@@ -469036,9 +469596,9 @@ function getFileEditHeader(toolName, toolArgs) {
     const relPath = relative14(cwd2, filePath);
     const displayPath2 = relPath.startsWith("..") ? filePath : relPath;
     if (t2 === "write" || t2 === "write_file" || t2 === "writefile" || t2 === "write_file_gemini" || t2 === "writefilegemini") {
-      const { existsSync: existsSync54 } = __require("node:fs");
+      const { existsSync: existsSync55 } = __require("node:fs");
       try {
-        if (existsSync54(filePath)) {
+        if (existsSync55(filePath)) {
           return `Overwrite ${displayPath2}?`;
         }
       } catch {}
@@ -484461,9 +485021,9 @@ __export(exports_generate_diff_viewer, {
   generateAndOpenDiffViewer: () => generateAndOpenDiffViewer
 });
 import { execFile as execFileCb5 } from "node:child_process";
-import { chmodSync as chmodSync5, existsSync as existsSync54, mkdirSync as mkdirSync39, writeFileSync as writeFileSync31 } from "node:fs";
+import { chmodSync as chmodSync5, existsSync as existsSync55, mkdirSync as mkdirSync39, writeFileSync as writeFileSync31 } from "node:fs";
 import { homedir as homedir35 } from "node:os";
-import { isAbsolute as isAbsolute19, join as join58, resolve as resolve37 } from "node:path";
+import { isAbsolute as isAbsolute19, join as join59, resolve as resolve37 } from "node:path";
 import { promisify as promisify16 } from "node:util";
 async function runGit5(cwd2, args) {
   try {
@@ -484682,13 +485242,13 @@ async function generateAndOpenDiffViewer(targetPath) {
   };
   const jsonPayload = JSON.stringify(payload).replace(/</g, "\\u003c");
   const html5 = diff_viewer_template_default.replace("<!--LETTA_DIFF_DATA_PLACEHOLDER-->", () => jsonPayload);
-  if (!existsSync54(VIEWERS_DIR2)) {
+  if (!existsSync55(VIEWERS_DIR2)) {
     mkdirSync39(VIEWERS_DIR2, { recursive: true, mode: 448 });
   }
   try {
     chmodSync5(VIEWERS_DIR2, 448);
   } catch {}
-  const filePath = join58(VIEWERS_DIR2, `diff-${encodeURIComponent(worktreePath)}.html`);
+  const filePath = join59(VIEWERS_DIR2, `diff-${encodeURIComponent(worktreePath)}.html`);
   writeFileSync31(filePath, html5);
   chmodSync5(filePath, 384);
   const skipOpen = shouldSkipOpen();
@@ -484759,7 +485319,7 @@ var init_generate_diff_viewer = __esm(() => {
   init_ssr();
   init_diff_viewer_template();
   execFile18 = promisify16(execFileCb5);
-  VIEWERS_DIR2 = join58(homedir35(), ".letta", "viewers");
+  VIEWERS_DIR2 = join59(homedir35(), ".letta", "viewers");
   GIT_MAX_BUFFER = 50 * 1024 * 1024;
 });
 
@@ -486710,16 +487270,16 @@ __export(exports_shell_aliases, {
   expandAliases: () => expandAliases,
   clearAliasCache: () => clearAliasCache
 });
-import { existsSync as existsSync55, readFileSync as readFileSync37 } from "node:fs";
+import { existsSync as existsSync56, readFileSync as readFileSync38 } from "node:fs";
 import { homedir as homedir36 } from "node:os";
-import { join as join59 } from "node:path";
+import { join as join60 } from "node:path";
 function parseAliasesFromFile(filePath) {
   const aliases = new Map;
-  if (!existsSync55(filePath)) {
+  if (!existsSync56(filePath)) {
     return aliases;
   }
   try {
-    const content = readFileSync37(filePath, "utf-8");
+    const content = readFileSync38(filePath, "utf-8");
     const lines = content.split(`
 `);
     let inFunction = false;
@@ -486784,7 +487344,7 @@ function loadAliases(forceReload = false) {
   const home = homedir36();
   const allAliases = new Map;
   for (const file3 of ALIAS_FILES) {
-    const filePath = join59(home, file3);
+    const filePath = join60(home, file3);
     const fileAliases = parseAliasesFromFile(filePath);
     for (const [name, value] of fileAliases) {
       allAliases.set(name, value);
@@ -492918,9 +493478,9 @@ var init_conversation_switch_alert = __esm(() => {
 
 // src/cli/app/use-submit-handler.ts
 import { randomUUID as randomUUID28 } from "node:crypto";
-import { existsSync as existsSync56, readFileSync as readFileSync38, renameSync as renameSync3, writeFileSync as writeFileSync32 } from "node:fs";
+import { existsSync as existsSync57, readFileSync as readFileSync39, renameSync as renameSync3, writeFileSync as writeFileSync32 } from "node:fs";
 import { tmpdir as tmpdir8 } from "node:os";
-import { join as join60 } from "node:path";
+import { join as join61 } from "node:path";
 async function hasCustomCommand(commandName) {
   const { findCustomCommand: findCustomCommand2 } = await Promise.resolve().then(() => (init_custom(), exports_custom));
   return Boolean(await findCustomCommand2(commandName));
@@ -493273,12 +493833,12 @@ ${SYSTEM_REMINDER_CLOSE}` : "";
           try {
             const memoryRoot = getScopedMemoryFilesystemRoot(agentId);
             const personaCandidates = [
-              join60(memoryRoot, "system", "persona.md"),
-              join60(memoryRoot, "memory", "system", "persona.md")
+              join61(memoryRoot, "system", "persona.md"),
+              join61(memoryRoot, "memory", "system", "persona.md")
             ];
-            const personaPath = personaCandidates.find((candidate) => existsSync56(candidate));
+            const personaPath = personaCandidates.find((candidate) => existsSync57(candidate));
             if (personaPath) {
-              const personaContent = readFileSync38(personaPath, "utf-8");
+              const personaContent = readFileSync39(personaPath, "utf-8");
               setCurrentPersonalityId(detectPersonalityFromPersonaFile(personaContent));
             } else {
               setCurrentPersonalityId(null);
@@ -494230,11 +494790,11 @@ Path: ${memoryDir}`, true);
           setCommandRunning(true);
           try {
             const memoryDir = getScopedMemoryFilesystemRoot(agentId);
-            if (!existsSync56(memoryDir)) {
+            if (!existsSync57(memoryDir)) {
               updateMemorySyncCommand(cmdId, "No local memory filesystem found to reset.", true, msg);
               return { submitted: true };
             }
-            const backupDir = join60(tmpdir8(), `letta-memfs-reset-${agentId}-${Date.now()}`);
+            const backupDir = join61(tmpdir8(), `letta-memfs-reset-${agentId}-${Date.now()}`);
             renameSync3(memoryDir, backupDir);
             if (getBackend().capabilities.localMemfs) {
               const { initializeLocalMemoryRepo: initializeLocalMemoryRepo2 } = await Promise.resolve().then(() => (init_memory_git(), exports_memory_git));
@@ -494278,8 +494838,8 @@ Run \`/memfs sync\` to repopulate from API.`, true, msg);
             await removeGitMemoryTag2(agentId);
             let backupInfo = "";
             const memoryDir = getScopedMemoryFilesystemRoot(agentId);
-            if (existsSync56(memoryDir)) {
-              const backupDir = join60(tmpdir8(), `letta-memfs-disable-${agentId}-${Date.now()}`);
+            if (existsSync57(memoryDir)) {
+              const backupDir = join61(tmpdir8(), `letta-memfs-disable-${agentId}-${Date.now()}`);
               renameSync3(memoryDir, backupDir);
               backupInfo = `
 Local files backed up to ${backupDir}`;
@@ -495197,6 +495757,7 @@ function App2({
   releaseNotes = null,
   updateNotification = null,
   systemInfoReminderEnabled = true,
+  extensionsDisabled = false,
   onReload
 }) {
   import_react122.useEffect(() => {
@@ -496408,7 +496969,9 @@ function App2({
     isLocalBackend,
     statusLinePayload
   ]);
-  const extensionRuntime = useLocalExtensionRuntime(extensionContext);
+  const extensionRuntime = useLocalExtensionRuntime(extensionContext, {
+    disabled: extensionsDisabled
+  });
   import_react122.useEffect(() => {
     extensionRuntimeRef.current = extensionRuntime;
   }, [extensionRuntime]);
@@ -497148,9 +497711,9 @@ Memory may be stale. Try running: git -C ${getScopedMemoryFilesystemRoot(agentId
     (async () => {
       try {
         const { watch: watch3 } = await import("node:fs");
-        const { existsSync: existsSync57 } = await import("node:fs");
+        const { existsSync: existsSync58 } = await import("node:fs");
         const memRoot = getScopedMemoryFilesystemRoot(agentId);
-        if (!existsSync57(memRoot))
+        if (!existsSync58(memRoot))
           return;
         watcher = watch3(memRoot, { recursive: true }, () => {});
         memfsWatcherRef.current = watcher;
@@ -498308,13 +498871,13 @@ __export(exports_terminal_keybinding_installer2, {
 });
 import {
   copyFileSync as copyFileSync3,
-  existsSync as existsSync57,
+  existsSync as existsSync58,
   mkdirSync as mkdirSync40,
-  readFileSync as readFileSync39,
+  readFileSync as readFileSync40,
   writeFileSync as writeFileSync33
 } from "node:fs";
 import { homedir as homedir38, platform as platform7 } from "node:os";
-import { dirname as dirname28, join as join61 } from "node:path";
+import { dirname as dirname28, join as join62 } from "node:path";
 function detectTerminalType2() {
   if (process.env.CURSOR_TRACE_ID || process.env.CURSOR_CHANNEL) {
     return "cursor";
@@ -498346,16 +498909,16 @@ function getKeybindingsPath2(terminal) {
   }[terminal];
   const os8 = platform7();
   if (os8 === "darwin") {
-    return join61(homedir38(), "Library", "Application Support", appName, "User", "keybindings.json");
+    return join62(homedir38(), "Library", "Application Support", appName, "User", "keybindings.json");
   }
   if (os8 === "win32") {
     const appData = process.env.APPDATA;
     if (!appData)
       return null;
-    return join61(appData, appName, "User", "keybindings.json");
+    return join62(appData, appName, "User", "keybindings.json");
   }
   if (os8 === "linux") {
-    return join61(homedir38(), ".config", appName, "User", "keybindings.json");
+    return join62(homedir38(), ".config", appName, "User", "keybindings.json");
   }
   return null;
 }
@@ -498377,10 +498940,10 @@ function parseKeybindings2(content) {
   }
 }
 function keybindingExists2(keybindingsPath) {
-  if (!existsSync57(keybindingsPath))
+  if (!existsSync58(keybindingsPath))
     return false;
   try {
-    const content = readFileSync39(keybindingsPath, { encoding: "utf-8" });
+    const content = readFileSync40(keybindingsPath, { encoding: "utf-8" });
     const keybindings = parseKeybindings2(content);
     if (!keybindings)
       return false;
@@ -498390,7 +498953,7 @@ function keybindingExists2(keybindingsPath) {
   }
 }
 function createBackup2(keybindingsPath) {
-  if (!existsSync57(keybindingsPath))
+  if (!existsSync58(keybindingsPath))
     return null;
   const backupPath = `${keybindingsPath}.letta-backup`;
   try {
@@ -498406,14 +498969,14 @@ function installKeybinding2(keybindingsPath) {
       return { success: true, alreadyExists: true };
     }
     const parentDir = dirname28(keybindingsPath);
-    if (!existsSync57(parentDir)) {
+    if (!existsSync58(parentDir)) {
       mkdirSync40(parentDir, { recursive: true });
     }
     let keybindings = [];
     let backupPath = null;
-    if (existsSync57(keybindingsPath)) {
+    if (existsSync58(keybindingsPath)) {
       backupPath = createBackup2(keybindingsPath);
-      const content = readFileSync39(keybindingsPath, { encoding: "utf-8" });
+      const content = readFileSync40(keybindingsPath, { encoding: "utf-8" });
       const parsed = parseKeybindings2(content);
       if (parsed === null) {
         return {
@@ -498441,10 +499004,10 @@ function installKeybinding2(keybindingsPath) {
 }
 function removeKeybinding2(keybindingsPath) {
   try {
-    if (!existsSync57(keybindingsPath)) {
+    if (!existsSync58(keybindingsPath)) {
       return { success: true };
     }
-    const content = readFileSync39(keybindingsPath, { encoding: "utf-8" });
+    const content = readFileSync40(keybindingsPath, { encoding: "utf-8" });
     const keybindings = parseKeybindings2(content);
     if (!keybindings) {
       return {
@@ -498508,14 +499071,14 @@ function getWezTermConfigPath2() {
   }
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig) {
-    const xdgPath = join61(xdgConfig, "wezterm", "wezterm.lua");
-    if (existsSync57(xdgPath))
+    const xdgPath = join62(xdgConfig, "wezterm", "wezterm.lua");
+    if (existsSync58(xdgPath))
       return xdgPath;
   }
-  const configPath = join61(homedir38(), ".config", "wezterm", "wezterm.lua");
-  if (existsSync57(configPath))
+  const configPath = join62(homedir38(), ".config", "wezterm", "wezterm.lua");
+  if (existsSync58(configPath))
     return configPath;
-  return join61(homedir38(), ".wezterm.lua");
+  return join62(homedir38(), ".wezterm.lua");
 }
 function stripLuaCommentsFromLine2(line, blockCommentEnd) {
   let code2 = "";
@@ -498618,10 +499181,10 @@ ${WEZTERM_DELETE_FIX2}
 `;
 }
 function wezTermDeleteFixExists2(configPath) {
-  if (!existsSync57(configPath))
+  if (!existsSync58(configPath))
     return false;
   try {
-    const content = readFileSync39(configPath, { encoding: "utf-8" });
+    const content = readFileSync40(configPath, { encoding: "utf-8" });
     return content.includes("Letta Code: Fix Delete key") || content.includes("key = 'Delete'") && content.includes("SendString") && content.includes("\\x1b[3~");
   } catch {
     return false;
@@ -498635,14 +499198,14 @@ function installWezTermDeleteFix2() {
     }
     let content = "";
     let backupPath = null;
-    if (existsSync57(configPath)) {
+    if (existsSync58(configPath)) {
       backupPath = `${configPath}.letta-backup`;
       copyFileSync3(configPath, backupPath);
-      content = readFileSync39(configPath, { encoding: "utf-8" });
+      content = readFileSync40(configPath, { encoding: "utf-8" });
     }
     content = injectWezTermDeleteFix2(content);
     const parentDir = dirname28(configPath);
-    if (!existsSync57(parentDir)) {
+    if (!existsSync58(parentDir)) {
       mkdirSync40(parentDir, { recursive: true });
     }
     writeFileSync33(configPath, content, { encoding: "utf-8" });
@@ -498694,9 +499257,9 @@ __export(exports_settings3, {
   getSetting: () => getSetting2
 });
 import { homedir as homedir39 } from "node:os";
-import { join as join62 } from "node:path";
+import { join as join63 } from "node:path";
 function getSettingsPath2() {
-  return join62(homedir39(), ".letta", "settings.json");
+  return join63(homedir39(), ".letta", "settings.json");
 }
 async function loadSettings2() {
   const settingsPath = getSettingsPath2();
@@ -498733,7 +499296,7 @@ async function getSetting2(key2) {
   return settings3[key2];
 }
 function getProjectSettingsPath2() {
-  return join62(process.cwd(), ".letta", "settings.local.json");
+  return join63(process.cwd(), ".letta", "settings.local.json");
 }
 async function loadProjectSettings2() {
   const settingsPath = getProjectSettingsPath2();
@@ -498751,7 +499314,7 @@ async function loadProjectSettings2() {
 }
 async function saveProjectSettings2(settings3) {
   const settingsPath = getProjectSettingsPath2();
-  const dirPath = join62(process.cwd(), ".letta");
+  const dirPath = join63(process.cwd(), ".letta");
   try {
     if (!exists(dirPath)) {
       await mkdir(dirPath, { recursive: true });
@@ -499365,7 +499928,7 @@ function parseRegistryHandle2(handle2) {
 }
 async function importAgentFromRegistry2(options3) {
   const { tmpdir: tmpdir9 } = await import("node:os");
-  const { join: join63 } = await import("node:path");
+  const { join: join64 } = await import("node:path");
   const { writeFile: writeFile17, unlink: unlink4 } = await import("node:fs/promises");
   const { author, name } = parseRegistryHandle2(options3.handle);
   const rawUrl = `https://raw.githubusercontent.com/${AGENT_REGISTRY_OWNER2}/${AGENT_REGISTRY_REPO2}/refs/heads/${AGENT_REGISTRY_BRANCH2}/agents/@${author}/${name}/${name}.af`;
@@ -499377,7 +499940,7 @@ async function importAgentFromRegistry2(options3) {
     throw new Error(`Failed to download agent @${author}/${name}: ${response.statusText}`);
   }
   const afContent = await response.text();
-  const tempPath = join63(tmpdir9(), `letta-import-${author}-${name}-${Date.now()}.af`);
+  const tempPath = join64(tmpdir9(), `letta-import-${author}-${name}-${Date.now()}.af`);
   await writeFile17(tempPath, afContent, "utf-8");
   try {
     const result = await importAgentFromFile2({
@@ -499426,14 +499989,14 @@ __export(exports_memory_filesystem2, {
   MEMORY_FS_MEMORY_DIR: () => MEMORY_FS_MEMORY_DIR2,
   MEMORY_FS_AGENTS_DIR: () => MEMORY_FS_AGENTS_DIR2
 });
-import { existsSync as existsSync58, mkdirSync as mkdirSync41 } from "node:fs";
+import { existsSync as existsSync59, mkdirSync as mkdirSync41 } from "node:fs";
 import { homedir as homedir40 } from "node:os";
-import { join as join63, resolve as resolve40 } from "node:path";
+import { join as join64, resolve as resolve40 } from "node:path";
 function getMemoryFilesystemRoot2(agentId, homeDir = homedir40()) {
-  return join63(homeDir, MEMORY_FS_ROOT2, MEMORY_FS_AGENTS_DIR2, agentId, MEMORY_FS_MEMORY_DIR2);
+  return join64(homeDir, MEMORY_FS_ROOT2, MEMORY_FS_AGENTS_DIR2, agentId, MEMORY_FS_MEMORY_DIR2);
 }
 function getMemorySystemDir2(agentId, homeDir = homedir40()) {
-  return join63(getMemoryFilesystemRoot2(agentId, homeDir), MEMORY_SYSTEM_DIR2);
+  return join64(getMemoryFilesystemRoot2(agentId, homeDir), MEMORY_SYSTEM_DIR2);
 }
 function getScopedMemoryFilesystemRoot2(agentId, options3 = {}) {
   const env6 = options3.env ?? process.env;
@@ -499469,10 +500032,10 @@ function resolveScopedMemoryDir2(options3 = {}) {
 function ensureMemoryFilesystemDirs2(agentId, homeDir = homedir40()) {
   const root2 = getMemoryFilesystemRoot2(agentId, homeDir);
   const systemDir = getMemorySystemDir2(agentId, homeDir);
-  if (!existsSync58(root2)) {
+  if (!existsSync59(root2)) {
     mkdirSync41(root2, { recursive: true });
   }
-  if (!existsSync58(systemDir)) {
+  if (!existsSync59(systemDir)) {
     mkdirSync41(systemDir, { recursive: true });
   }
 }
@@ -501131,7 +501694,7 @@ async function getResumeDataFromBackend(agent2, conversationId, options3 = {}) {
         messageHistory: prepareMessageHistory(messages)
       };
     } else {
-      inContextMessageIds = agentWithInContext.in_context_message_ids;
+      inContextMessageIds = agentWithInContext.in_context_message_ids ?? agent2.message_ids;
       const lastInContextId = inContextMessageIds?.at(-1);
       let defaultConversationMessages = [];
       if (includeMessageHistory && isBackfillEnabled() || !lastInContextId) {
@@ -502020,6 +502583,14 @@ var CLI_FLAG_CATALOG = {
       description: "Disable first-turn environment reminder (device/git/cwd context)"
     }
   },
+  "no-extensions": {
+    parser: { type: "boolean" },
+    mode: "both",
+    help: {
+      description: "Disable local extensions for this session",
+      continuationLines: ["Recovery alias: LETTA_DISABLE_EXTENSIONS=1 letta"]
+    }
+  },
   "reflection-trigger": {
     parser: { type: "string" },
     mode: "both",
@@ -504449,6 +505020,14 @@ var CLI_FLAG_CATALOG2 = {
       description: "Disable first-turn environment reminder (device/git/cwd context)"
     }
   },
+  "no-extensions": {
+    parser: { type: "boolean" },
+    mode: "both",
+    help: {
+      description: "Disable local extensions for this session",
+      continuationLines: ["Recovery alias: LETTA_DISABLE_EXTENSIONS=1 letta"]
+    }
+  },
   "reflection-trigger": {
     parser: { type: "string" },
     mode: "both",
@@ -507034,10 +507613,14 @@ Search options:
   --all-agents          Search all agents, not just current agent
   --agent <id>          Explicit agent ID (overrides LETTA_AGENT_ID)
   --agent-id <id>       Alias for --agent
+  --conversation <id>   Conversation ID to search; "default" requires an agent
+  --conversation-id <id> Alias for --conversation
 
 List options:
   --agent <id>          Agent ID (overrides LETTA_AGENT_ID)
   --agent-id <id>       Alias for --agent
+  --conversation <id>   Conversation ID to list (default: default)
+  --conversation-id <id> Alias for --conversation
   --after <message-id>  Cursor: get messages after this ID
   --before <message-id> Cursor: get messages before this ID
   --order <asc|desc>    Sort order (default: desc = newest first)
@@ -507084,7 +507667,7 @@ function parseOrder(value) {
 function getAgentId5(agentFromArgs, agentIdFromArgs) {
   return agentFromArgs || agentIdFromArgs || process.env.LETTA_AGENT_ID || "";
 }
-function pageItems4(page) {
+function pageItems3(page) {
   if (Array.isArray(page))
     return page;
   if (page && typeof page === "object") {
@@ -507125,7 +507708,7 @@ function parseMessagesArgs(argv) {
     allowPositionals: true
   });
 }
-async function runMessagesSubcommand(argv) {
+async function runMessagesSubcommand(argv, deps = {}) {
   let parsed;
   try {
     parsed = parseMessagesArgs(argv);
@@ -507141,8 +507724,9 @@ async function runMessagesSubcommand(argv) {
     return 0;
   }
   try {
-    await settingsManager.initialize();
-    const backend4 = getBackend();
+    await (deps.initializeSettings ?? (() => settingsManager.initialize()))();
+    const backend4 = (deps.getBackend ?? getBackend)();
+    const searchMessages2 = deps.searchMessagesForBackend ?? searchMessagesForBackend;
     const renderText = (value) => {
       if (typeof value === "string")
         return value;
@@ -507232,7 +507816,7 @@ async function runMessagesSubcommand(argv) {
           ...conversationId === "default" && agentIdForDefault ? { agent_id: agentIdForDefault } : {},
           ...cursorBefore ? { before: cursorBefore } : {}
         });
-        const items3 = pageItems4(page);
+        const items3 = pageItems3(page);
         if (items3.length === 0) {
           break;
         }
@@ -507259,42 +507843,61 @@ async function runMessagesSubcommand(argv) {
         return 1;
       }
       const allAgents = parsed.values["all-agents"] ?? false;
+      const explicitAgentId = parsed.values.agent || parsed.values["agent-id"] || "";
       const agentId = getAgentId5(parsed.values.agent, parsed.values["agent-id"]);
-      if (!allAgents && !agentId) {
-        console.error("Missing agent id. Set LETTA_AGENT_ID or pass --agent/--agent-id.");
+      const conversationId = parsed.values.conversation || parsed.values["conversation-id"];
+      if (conversationId === "default") {
+        if (!agentId) {
+          console.error('Conversation "default" requires an agent id. Set LETTA_AGENT_ID or pass --agent/--agent-id.');
+          return 1;
+        }
+        if (allAgents) {
+          console.error('Conversation "default" requires a single agent id; do not combine --all-agents with --conversation default.');
+          return 1;
+        }
+      }
+      if (!allAgents && !agentId && !conversationId) {
+        console.error("Missing search scope. Set LETTA_AGENT_ID, pass --agent/--agent-id, pass --conversation, or use --all-agents.");
         return 1;
       }
-      const result = await searchMessagesForBackend({
+      const scopedAgentId = conversationId === "default" ? agentId : conversationId ? explicitAgentId || undefined : allAgents ? undefined : agentId || undefined;
+      const searchBody = {
         query: query2,
-        agent_id: allAgents ? undefined : agentId,
         search_mode: parseMode(parsed.values.mode) ?? "hybrid",
         start_date: parsed.values["start-date"],
         end_date: parsed.values["end-date"],
-        limit: parseLimit2(parsed.values.limit, 10)
-      });
+        limit: parseLimit2(parsed.values.limit, 10),
+        ...scopedAgentId ? { agent_id: scopedAgentId } : {},
+        ...typeof conversationId === "string" ? { conversation_id: conversationId } : {}
+      };
+      const result = await searchMessages2(searchBody);
       console.log(JSON.stringify(result, null, 2));
       return 0;
     }
     if (action3 === "list") {
       const agentId = getAgentId5(parsed.values.agent, parsed.values["agent-id"]);
-      if (!agentId) {
-        console.error("Missing agent id. Set LETTA_AGENT_ID or pass --agent/--agent-id.");
-        return 1;
-      }
       const orderRaw = parsed.values.order;
       const order = parseOrder(orderRaw);
       if (orderRaw !== undefined && !order) {
         console.error(`Invalid --order "${orderRaw}". Use "asc" or "desc".`);
         return 1;
       }
-      const response = await backend4.listAgentMessages(agentId, {
-        conversation_id: "default",
+      const conversationId = parsed.values.conversation || parsed.values["conversation-id"] || "default";
+      if (conversationId === "default" && !agentId) {
+        console.error('Conversation "default" requires an agent id. Set LETTA_AGENT_ID or pass --agent/--agent-id.');
+        return 1;
+      }
+      const listBody = {
         limit: parseLimit2(parsed.values.limit, 20),
         after: parsed.values.after,
         before: parsed.values.before,
         order
-      });
-      const messages = pageItems4(response);
+      };
+      const response = conversationId === "default" ? await backend4.listAgentMessages(agentId, {
+        conversation_id: "default",
+        ...listBody
+      }) : await backend4.listConversationMessages(conversationId, listBody);
+      const messages = pageItems3(response);
       const startDate = parsed.values["start-date"];
       const endDate = parsed.values["end-date"];
       let filtered = messages;
@@ -507422,16 +508025,16 @@ async function runSetupSubcommand(argv) {
 // src/cli/subcommands/skills.ts
 import {
   cpSync as cpSync2,
-  existsSync as existsSync41,
+  existsSync as existsSync42,
   mkdtempSync,
-  readFileSync as readFileSync31,
+  readFileSync as readFileSync32,
   rmSync as rmSync7,
-  statSync as statSync16,
+  statSync as statSync17,
   writeFileSync as writeFileSync23
 } from "node:fs";
 import { mkdir as mkdir11, readdir as readdir9 } from "node:fs/promises";
 import { tmpdir as tmpdir6 } from "node:os";
-import { basename as basename19, dirname as dirname21, join as join42, normalize as normalize7, resolve as resolve31, sep as sep7 } from "node:path";
+import { basename as basename19, dirname as dirname21, join as join43, normalize as normalize7, resolve as resolve31, sep as sep7 } from "node:path";
 import { parseArgs as parseArgs10 } from "node:util";
 var HERMES_REPO_URL = "https://github.com/NousResearch/hermes-agent.git";
 var HERMES_OPTIONAL_SKILLS_DIR = "optional-skills";
@@ -507688,14 +508291,14 @@ async function resolveBranchAndSubdir(location) {
 }
 async function cloneSkillSource(location) {
   const resolvedLocation = await resolveBranchAndSubdir(location);
-  const tmpDir = mkdtempSync(join42(tmpdir6(), "letta-skill-install-"));
+  const tmpDir = mkdtempSync(join43(tmpdir6(), "letta-skill-install-"));
   const args = ["clone", "--depth", "1"];
   if (resolvedLocation.branch) {
     args.push("--branch", resolvedLocation.branch);
   }
   args.push(resolvedLocation.repoUrl, tmpDir);
   await execFile15("git", args, { timeout: 120000 });
-  const sourceDir = resolvedLocation.subdir ? join42(tmpDir, resolvedLocation.subdir) : tmpDir;
+  const sourceDir = resolvedLocation.subdir ? join43(tmpDir, resolvedLocation.subdir) : tmpDir;
   return { tmpDir, sourceDir };
 }
 async function fetchJson2(url2) {
@@ -507732,9 +508335,9 @@ function assertSafeZipMember(name) {
 }
 async function downloadClawHubSkillSource(location) {
   const version2 = await resolveClawHubVersion(location);
-  const tmpDir = mkdtempSync(join42(tmpdir6(), "letta-clawhub-skill-"));
-  const zipPath = join42(tmpDir, "skill.zip");
-  const sourceDir = join42(tmpDir, "skill");
+  const tmpDir = mkdtempSync(join43(tmpdir6(), "letta-clawhub-skill-"));
+  const zipPath = join43(tmpDir, "skill.zip");
+  const sourceDir = join43(tmpDir, "skill");
   await mkdir11(sourceDir, { recursive: true });
   const url2 = new URL(`${CLAWHUB_API_BASE_URL}/download`);
   url2.searchParams.set("slug", location.slug);
@@ -507773,7 +508376,7 @@ function sanitizeSkillName(name) {
   return trimmed;
 }
 function getSkillName(sourceDir) {
-  const skillMd = readFileSync31(join42(sourceDir, "SKILL.md"), "utf8");
+  const skillMd = readFileSync32(join43(sourceDir, "SKILL.md"), "utf8");
   const { frontmatter } = parseFrontmatter(skillMd);
   const frontmatterName = frontmatter.name;
   const name = typeof frontmatterName === "string" && frontmatterName.trim() ? frontmatterName : basename19(sourceDir);
@@ -507782,18 +508385,18 @@ function getSkillName(sourceDir) {
 async function installSkillDirectory(params) {
   const sourceDir = resolve31(params.sourceDir);
   const memoryDir = resolve31(params.memoryDir);
-  const skillMdPath = join42(sourceDir, "SKILL.md");
-  if (!existsSync41(skillMdPath)) {
+  const skillMdPath = join43(sourceDir, "SKILL.md");
+  if (!existsSync42(skillMdPath)) {
     throw new Error("No SKILL.md found in the skill directory.");
   }
-  if (!statSync16(sourceDir).isDirectory()) {
+  if (!statSync17(sourceDir).isDirectory()) {
     throw new Error(`Skill source is not a directory: ${sourceDir}`);
   }
   const name = getSkillName(sourceDir);
-  const skillsDir = join42(memoryDir, "skills");
-  const targetPath = join42(skillsDir, name);
+  const skillsDir = join43(memoryDir, "skills");
+  const targetPath = join43(skillsDir, name);
   assertInside(skillsDir, targetPath);
-  if (existsSync41(targetPath)) {
+  if (existsSync42(targetPath)) {
     if (!params.force) {
       throw new Error(`Skill "${name}" already exists at ${targetPath}. Re-run with --force to replace it.`);
     }
@@ -507808,22 +508411,22 @@ async function installSkillDirectory(params) {
 }
 async function listSkillDirectories(params) {
   const memoryDir = resolve31(params.memoryDir);
-  const skillsDir = join42(memoryDir, "skills");
-  if (!existsSync41(skillsDir))
+  const skillsDir = join43(memoryDir, "skills");
+  if (!existsSync42(skillsDir))
     return [];
   const entries = await readdir9(skillsDir, { withFileTypes: true });
   const skills = [];
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;
-    const skillDir = join42(skillsDir, entry.name);
-    const skillMdPath = join42(skillDir, "SKILL.md");
-    if (!existsSync41(skillMdPath))
+    const skillDir = join43(skillsDir, entry.name);
+    const skillMdPath = join43(skillDir, "SKILL.md");
+    if (!existsSync42(skillMdPath))
       continue;
     let name = entry.name;
     let description;
     try {
-      const skillMd = readFileSync31(skillMdPath, "utf8");
+      const skillMd = readFileSync32(skillMdPath, "utf8");
       const { frontmatter } = parseFrontmatter(skillMd);
       if (typeof frontmatter.name === "string" && frontmatter.name.trim()) {
         name = frontmatter.name.trim();
@@ -507838,14 +508441,14 @@ async function listSkillDirectories(params) {
 }
 async function deleteSkillDirectory(params) {
   const memoryDir = resolve31(params.memoryDir);
-  const skillsDir = join42(memoryDir, "skills");
+  const skillsDir = join43(memoryDir, "skills");
   const name = sanitizeSkillName(params.name);
-  const targetPath = join42(skillsDir, name);
+  const targetPath = join43(skillsDir, name);
   assertInside(skillsDir, targetPath);
-  if (!existsSync41(targetPath)) {
+  if (!existsSync42(targetPath)) {
     throw new Error(`Skill "${name}" is not installed at ${targetPath}.`);
   }
-  if (!statSync16(targetPath).isDirectory()) {
+  if (!statSync17(targetPath).isDirectory()) {
     throw new Error(`Skill path is not a directory: ${targetPath}`);
   }
   rmSync7(targetPath, { recursive: true, force: true });
@@ -507864,7 +508467,7 @@ async function installSkill(specifier, agentId, force) {
     tmpDir = downloaded.tmpDir;
     const sourceDir = resolve31(downloaded.sourceDir);
     assertInside(tmpDir, sourceDir);
-    if (!existsSync41(sourceDir)) {
+    if (!existsSync42(sourceDir)) {
       const missingPath = gitSource?.subdir || clawHubSource?.slug || ".";
       throw new Error(`Skill path not found: ${missingPath}`);
     }
@@ -508129,6 +508732,24 @@ async function runSubcommand(argv) {
   }
 }
 
+// src/extensions/disable.ts
+var LETTA_DISABLE_EXTENSIONS_ENV2 = "LETTA_DISABLE_EXTENSIONS";
+function isTruthyEnvFlag2(value) {
+  if (!value)
+    return false;
+  const normalized = value.trim().toLowerCase();
+  return ["1", "true", "yes", "on"].includes(normalized);
+}
+function areExtensionsDisabled2(env5 = process.env) {
+  return isTruthyEnvFlag2(env5[LETTA_DISABLE_EXTENSIONS_ENV2]);
+}
+function shouldDisableExtensions2(options3) {
+  return Boolean(options3?.cliFlag || areExtensionsDisabled2(options3?.env ?? process.env));
+}
+function disableExtensionsForProcess2() {
+  process.env[LETTA_DISABLE_EXTENSIONS_ENV2] = "1";
+}
+
 // src/permissions/mode.ts
 init_cross_agent_guard();
 init_memory_denial_reason();
@@ -508355,7 +508976,7 @@ init_fs();
 init_secrets();
 import { randomUUID as randomUUID19 } from "node:crypto";
 import { homedir as homedir24 } from "node:os";
-import { join as join43, resolve as resolve32 } from "node:path";
+import { join as join44, resolve as resolve32 } from "node:path";
 var DEFAULT_SETTINGS3 = {
   lastAgent: null,
   tokenStreaming: false,
@@ -508800,7 +509421,7 @@ class SettingsManager2 {
       return;
     const settingsPath = this.getSettingsPath();
     const home = process.env.HOME || homedir24();
-    const dirPath = join43(home, ".letta");
+    const dirPath = join44(home, ".letta");
     try {
       if (!exists(dirPath)) {
         await mkdir(dirPath, { recursive: true });
@@ -508839,7 +509460,7 @@ class SettingsManager2 {
     if (!settings3)
       return;
     const settingsPath = this.getProjectSettingsPath(workingDirectory);
-    const dirPath = join43(workingDirectory, ".letta");
+    const dirPath = join44(workingDirectory, ".letta");
     try {
       let existingSettings = {};
       if (exists(settingsPath)) {
@@ -508861,16 +509482,16 @@ class SettingsManager2 {
   }
   getSettingsPath() {
     const home = process.env.HOME || homedir24();
-    return join43(home, ".letta", "settings.json");
+    return join44(home, ".letta", "settings.json");
   }
   getProjectSettingsPath(workingDirectory) {
-    return join43(workingDirectory, ".letta", "settings.json");
+    return join44(workingDirectory, ".letta", "settings.json");
   }
   isProjectSettingsPathCollidingWithGlobal(workingDirectory) {
     return resolve32(this.getProjectSettingsPath(workingDirectory)) === resolve32(this.getSettingsPath());
   }
   getLocalProjectSettingsPath(workingDirectory) {
-    return join43(workingDirectory, ".letta", "settings.local.json");
+    return join44(workingDirectory, ".letta", "settings.local.json");
   }
   async loadLocalProjectSettings(workingDirectory = process.cwd()) {
     const cached2 = this.localProjectSettings.get(workingDirectory);
@@ -508931,7 +509552,7 @@ class SettingsManager2 {
     if (!settings3)
       return;
     const settingsPath = this.getLocalProjectSettingsPath(workingDirectory);
-    const dirPath = join43(workingDirectory, ".letta");
+    const dirPath = join44(workingDirectory, ".letta");
     try {
       if (!exists(dirPath)) {
         await mkdir(dirPath, { recursive: true });
@@ -509460,7 +510081,7 @@ class SettingsManager2 {
     this.upsertAgentSettings(agentId, { systemPromptPreset: "" });
   }
   hasLocalLettaDir(workingDirectory = process.cwd()) {
-    const dirPath = join43(workingDirectory, ".letta");
+    const dirPath = join44(workingDirectory, ".letta");
     return exists(dirPath);
   }
   storeOAuthState(state, codeVerifier, redirectUri, provider) {
@@ -509937,9 +510558,9 @@ async function loadTools2(modelIdentifier, options3) {
 function isOpenAIModel2(modelIdentifier) {
   const info = getModelInfo(modelIdentifier);
   if (info?.handle && typeof info.handle === "string") {
-    return info.handle.startsWith("openai/") || info.handle.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`) || info.handle.startsWith("chatgpt_oauth/");
+    return info.handle.startsWith("openai/") || info.handle.startsWith("openai-codex/") || info.handle.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`) || info.handle.startsWith("chatgpt_oauth/");
   }
-  return modelIdentifier.startsWith("openai/") || modelIdentifier.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`) || modelIdentifier.startsWith("chatgpt_oauth/");
+  return modelIdentifier.startsWith("openai/") || modelIdentifier.startsWith("openai-codex/") || modelIdentifier.startsWith(`${OPENAI_CODEX_PROVIDER_NAME}/`) || modelIdentifier.startsWith("chatgpt_oauth/");
 }
 function injectSubagentsIntoTaskDescription2(baseDescription, subagents) {
   if (subagents.length === 0) {
@@ -510170,12 +510791,12 @@ EXAMPLES
   console.log(usage);
 }
 async function printInfo() {
-  const { join: join64 } = await import("path");
+  const { join: join65 } = await import("path");
   const { getVersion: getVersion3 } = await Promise.resolve().then(() => (init_version2(), exports_version));
   const { SKILLS_DIR: SKILLS_DIR3 } = await Promise.resolve().then(() => (init_skills4(), exports_skills3));
   const { exists: exists3 } = await Promise.resolve().then(() => (init_fs2(), exports_fs));
   const cwd2 = process.cwd();
-  const skillsDir = join64(cwd2, SKILLS_DIR3);
+  const skillsDir = join65(cwd2, SKILLS_DIR3);
   const skillsExist = exists3(skillsDir);
   await settingsManager2.loadLocalProjectSettings(cwd2);
   const localPinned = settingsManager2.getLocalPinnedAgents(cwd2);
@@ -510556,6 +511177,12 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
   const noBundledSkillsFlag = values2["no-bundled-skills"];
   const skillSourcesRaw = values2["skill-sources"];
   const noSystemInfoReminderFlag = values2["no-system-info-reminder"];
+  const extensionsDisabled = shouldDisableExtensions2({
+    cliFlag: values2["no-extensions"]
+  });
+  if (extensionsDisabled) {
+    disableExtensionsForProcess2();
+  }
   const resolvedSkillSources = (() => {
     try {
       return resolveSkillSourcesSelection2({
@@ -510750,9 +511377,9 @@ Note: Flags should use double dashes for full names (e.g., --yolo, not -yolo)`);
       }
     } else {
       const { resolve: resolve41 } = await import("path");
-      const { existsSync: existsSync59 } = await import("fs");
+      const { existsSync: existsSync60 } = await import("fs");
       const resolvedPath = resolve41(fromAfFile);
-      if (!existsSync59(resolvedPath)) {
+      if (!existsSync60(resolvedPath)) {
         console.error(`Error: AgentFile not found: ${resolvedPath}`);
         process.exit(1);
       }
@@ -511731,7 +512358,8 @@ Error during initialization: ${message}`);
         startupHasCloudCredentials,
         startupHasAvailableLocalModels,
         releaseNotes: releaseNotes2,
-        systemInfoReminderEnabled: !noSystemInfoReminderFlag
+        systemInfoReminderEnabled: !noSystemInfoReminderFlag,
+        extensionsDisabled
       });
     }
     return React15.createElement(App3, {
@@ -511754,6 +512382,7 @@ Error during initialization: ${message}`);
       releaseNotes: releaseNotes2,
       updateNotification,
       systemInfoReminderEnabled: !noSystemInfoReminderFlag,
+      extensionsDisabled,
       onReload: handleReload
     });
   }
@@ -511776,4 +512405,4 @@ Error during initialization: ${message}`);
 }
 main2();
 
-//# debugId=2668B262D16800F764756E2164756E21
+//# debugId=FB2D67983121CCDA64756E2164756E21