@syntero/orca-cli 1.2.0 → 1.2.2

package/dist/assistant.js

@@ -138,9 +138,10 @@ When a user asks to "update" Orca:
 2. If the deployment directory is not found, ask the user for the path
 3. Once you have the path, cd to that directory and run these steps:
    a. docker rm -f orca-sandbox-keeper 2>/dev/null (remove sandbox keeper if running)
-   b. docker compose up -d --pull always --remove-orphans (pull stable images and restart)
+   b. docker compose up -d --pull always --force-recreate --remove-orphans (pull stable images and force-recreate containers)
    c. Wait for all services to be healthy by checking: docker ps --filter "name=orca-"
    d. docker system prune -af (clean up old images)
+   e. Use rebuild_all_sandboxes to rebuild sandbox containers with the new image
 4. If the deployment directory was provided by the user (not from settings), save it using save_deployment_dir tool for future updates
 
 ## Post-Update Container Management
@@ -233,6 +234,145 @@ function addToolsCacheControl(tools) {
     };
     return toolsCopy;
 }
+/**
+ * Resolve the OpenAI/Azure model name and registry ID.
+ */
+function resolveOpenAIModel(settings, isAzure) {
+    if (isAzure) {
+        const modelIdForRegistry = settings.azure.deployment;
+        const creds = loadCredentials();
+        const model = creds?.llm
+            ? resolveAzureDeployment(settings.azure.deployment, creds.llm)
+            : settings.azure.deployment;
+        return { model, modelIdForRegistry };
+    }
+    return { model: settings.openai.model, modelIdForRegistry: settings.openai.model };
+}
+/**
+ * Convert Anthropic message history to OpenAI message format.
+ */
+function convertMessagesToOpenAI(messages) {
+    const openaiMessages = [{ role: 'system', content: SYSTEM_PROMPT }];
+    for (const msg of messages) {
+        if (msg.role === 'user') {
+            if (Array.isArray(msg.content)) {
+                for (const item of msg.content) {
+                    if (item.type === 'tool_result') {
+                        openaiMessages.push({
+                            role: 'tool',
+                            tool_call_id: item.tool_use_id || '',
+                            content: item.content || '',
+                        });
+                    }
+                }
+            }
+            else {
+                openaiMessages.push({ role: 'user', content: msg.content });
+            }
+        }
+        else if (msg.role === 'assistant') {
+            if (Array.isArray(msg.content)) {
+                const toolCallsArr = [];
+                let textContent = '';
+                for (const item of msg.content) {
+                    if (item.type === 'text') {
+                        textContent = item.text || '';
+                    }
+                    else if (item.type === 'tool_use') {
+                        toolCallsArr.push({
+                            id: item.id || '',
+                            type: 'function',
+                            function: {
+                                name: item.name || '',
+                                arguments: JSON.stringify(item.input || {}),
+                            },
+                        });
+                    }
+                }
+                const assistantMsg = {
+                    role: 'assistant',
+                    content: textContent || null,
+                };
+                if (toolCallsArr.length > 0) {
+                    assistantMsg.tool_calls = toolCallsArr;
+                }
+                openaiMessages.push(assistantMsg);
+            }
+        }
+    }
+    return openaiMessages;
+}
+/**
+ * Execute tool calls: display headers, check dangerous commands, run tools, collect results.
+ */
+async function* executeToolCalls(toolCalls, confirmCommand, approvedCategories) {
+    const anthropicResults = [];
+    const openaiResults = [];
+    for (const tc of toolCalls) {
+        const input = tc.input;
+        // Show tool header
+        if (tc.name === 'run_command') {
+            yield color(`\n\n[${tc.name}] `, Colors.dim);
+            yield color(`${input.command}\n`, Colors.cyan);
+            if (input.gist) {
+                yield color(`${input.gist}\n`, Colors.dim);
+            }
+        }
+        else {
+            yield color(`\n\n[${tc.name}]\n`, Colors.dim);
+        }
+        let result;
+        if (tc.name === 'run_command' && confirmCommand) {
+            const command = input.command;
+            const gist = input.gist;
+            const dangerCheck = checkCommand(command);
+            if (dangerCheck.isDangerous && !allCategoriesApproved(dangerCheck, approvedCategories || new Set())) {
+                yield color(`Dangerous command detected. Waiting for confirmation...\n`, Colors.yellow);
+                const confirmResult = await confirmCommand(command, dangerCheck, gist);
+                if (!confirmResult.confirmed) {
+                    result = 'Command cancelled by user.';
+                    yield color(`${result}\n`, Colors.dim);
+                }
+                else {
+                    result = await handleToolCall(tc.name, tc.input);
+                    const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
+                    yield color(`${preview}\n`, Colors.dim);
+                }
+            }
+            else {
+                result = await handleToolCall(tc.name, tc.input);
+                const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
+                yield color(`${preview}\n`, Colors.dim);
+            }
+        }
+        else {
+            result = await handleToolCall(tc.name, tc.input);
+            const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
+            yield color(`${preview}\n`, Colors.dim);
+        }
+        anthropicResults.push({
+            type: 'tool_result',
+            tool_use_id: tc.id,
+            content: result,
+        });
+        openaiResults.push({
+            tool_call_id: tc.id,
+            content: result,
+        });
+    }
+    return { anthropicResults, openaiResults };
+}
+/**
+ * Inject a queued user message into conversation history.
+ */
+function* injectQueuedMessage(msg, messages, openaiMessages) {
+    const injectedContent = `[User update while AI was working]: ${msg}`;
+    messages.push({ role: 'user', content: injectedContent });
+    if (openaiMessages) {
+        openaiMessages.push({ role: 'user', content: injectedContent });
+    }
+    yield color(`\n[Queued message injected: "${msg.length > 50 ? msg.slice(0, 50) + '...' : msg}"]\n`, Colors.dim);
+}
 /**
  * Run assistant with Anthropic API with streaming.
  * @param getQueuedMessage - Optional callback to check for queued messages at each iteration
@@ -245,20 +385,11 @@ export async function* runAssistantAnthropic(client, settings, userMessage, mess
         // Check for queued messages at the start of each iteration
         const queuedMessage = getQueuedMessage?.();
         if (queuedMessage) {
-            // Inject the queued message into the conversation
-            messages.push({
-                role: 'user',
-                content: `[User update while AI was working]: ${queuedMessage}`,
-            });
-            yield color(`\n[Queued message injected: "${queuedMessage.length > 50 ? queuedMessage.slice(0, 50) + '...' : queuedMessage}"]\n`, Colors.dim);
+            yield* injectQueuedMessage(queuedMessage, messages);
         }
         let responseText = '';
         const toolCalls = [];
         // Anthropic prompt caching: Add cache_control markers to reduce token costs
-        // - System prompt: cached as content block array
-        // - Tools: cache_control on last tool
-        // - Messages: cache_control on last content block of last message
-        // This enables incremental caching - each turn builds on the cached prefix
         const cachedSystem = [
             { type: 'text', text: SYSTEM_PROMPT, cache_control: { type: 'ephemeral' } },
         ];
@@ -315,51 +446,8 @@ export async function* runAssistantAnthropic(client, settings, userMessage, mess
         }
         messages.push({ role: 'assistant', content: assistantContent });
         if (finalMessage.stop_reason === 'tool_use') {
-            const toolResults = [];
-            for (const tc of toolCalls) {
-                yield color(`\n\n[${tc.name}]\n`, Colors.dim);
-                let result;
-                // Check for dangerous commands that need confirmation
-                if (tc.name === 'run_command' && confirmCommand) {
-                    const input = tc.input;
-                    const command = input.command;
-                    const gist = input.gist;
-                    const dangerCheck = checkCommand(command);
-                    if (dangerCheck.isDangerous && !allCategoriesApproved(dangerCheck, approvedCategories || new Set())) {
-                        // Request confirmation from user
-                        yield color(`Dangerous command detected. Waiting for confirmation...\n`, Colors.yellow);
-                        const confirmResult = await confirmCommand(command, dangerCheck, gist);
-                        if (!confirmResult.confirmed) {
-                            result = 'Command cancelled by user.';
-                            yield color(`${result}\n`, Colors.dim);
-                        }
-                        else {
-                            // User confirmed - execute the command
-                            result = await handleToolCall(tc.name, tc.input);
-                            const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                            yield color(`${preview}\n`, Colors.dim);
-                        }
-                    }
-                    else {
-                        // Not dangerous or already approved - execute normally
-                        result = await handleToolCall(tc.name, tc.input);
-                        const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                        yield color(`${preview}\n`, Colors.dim);
-                    }
-                }
-                else {
-                    // Not run_command or no confirmation callback - execute normally
-                    result = await handleToolCall(tc.name, tc.input);
-                    const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                    yield color(`${preview}\n`, Colors.dim);
-                }
-                toolResults.push({
-                    type: 'tool_result',
-                    tool_use_id: tc.id,
-                    content: result,
-                });
-            }
-            messages.push({ role: 'user', content: toolResults });
+            const { anthropicResults } = yield* executeToolCalls(toolCalls, confirmCommand, approvedCategories);
+            messages.push({ role: 'user', content: anthropicResults });
         }
         else {
             break;
@@ -380,12 +468,7 @@ export async function* runAssistantAnthropicNonStreaming(client, settings, userM
         // Check for queued messages at the start of each iteration
         const queuedMessage = getQueuedMessage?.();
         if (queuedMessage) {
-            // Inject the queued message into the conversation
-            messages.push({
-                role: 'user',
-                content: `[User update while AI was working]: ${queuedMessage}`,
-            });
-            yield color(`\n[Queued message injected: "${queuedMessage.length > 50 ? queuedMessage.slice(0, 50) + '...' : queuedMessage}"]\n`, Colors.dim);
+            yield* injectQueuedMessage(queuedMessage, messages);
         }
         // Anthropic prompt caching: Add cache_control markers to reduce token costs
         const cachedSystem = [
@@ -435,51 +518,8 @@ export async function* runAssistantAnthropicNonStreaming(client, settings, userM
         }
         messages.push({ role: 'assistant', content: assistantContent });
         if (response.stop_reason === 'tool_use') {
-            const toolResults = [];
-            for (const tc of toolCalls) {
-                yield color(`\n\n[${tc.name}]\n`, Colors.dim);
-                let result;
-                // Check for dangerous commands that need confirmation
-                if (tc.name === 'run_command' && confirmCommand) {
-                    const input = tc.input;
-                    const command = input.command;
-                    const gist = input.gist;
-                    const dangerCheck = checkCommand(command);
-                    if (dangerCheck.isDangerous && !allCategoriesApproved(dangerCheck, approvedCategories || new Set())) {
-                        // Request confirmation from user
-                        yield color(`Dangerous command detected. Waiting for confirmation...\n`, Colors.yellow);
-                        const confirmResult = await confirmCommand(command, dangerCheck, gist);
-                        if (!confirmResult.confirmed) {
-                            result = 'Command cancelled by user.';
-                            yield color(`${result}\n`, Colors.dim);
-                        }
-                        else {
-                            // User confirmed - execute the command
-                            result = await handleToolCall(tc.name, tc.input);
-                            const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                            yield color(`${preview}\n`, Colors.dim);
-                        }
-                    }
-                    else {
-                        // Not dangerous or already approved - execute normally
-                        result = await handleToolCall(tc.name, tc.input);
-                        const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                        yield color(`${preview}\n`, Colors.dim);
-                    }
-                }
-                else {
-                    // Not run_command or no confirmation callback - execute normally
-                    result = await handleToolCall(tc.name, tc.input);
-                    const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                    yield color(`${preview}\n`, Colors.dim);
-                }
-                toolResults.push({
-                    type: 'tool_result',
-                    tool_use_id: tc.id,
-                    content: result,
-                });
-            }
-            messages.push({ role: 'user', content: toolResults });
+            const { anthropicResults } = yield* executeToolCalls(toolCalls, confirmCommand, approvedCategories);
+            messages.push({ role: 'user', content: anthropicResults });
         }
         else {
             break;
@@ -494,85 +534,15 @@ export async function* runAssistantAnthropicNonStreaming(client, settings, userM
  * @param approvedCategories - Set of command categories approved for the session
  */
 export async function* runAssistantOpenAI(client, settings, userMessage, messages, isAzure = false, signal, getQueuedMessage, confirmCommand, approvedCategories) {
-    // For Azure, resolve the model ID (azure-large/azure-small) to the actual deployment name
-    let model;
-    let modelIdForRegistry; // The model ID to use for ModelRegistry lookups
-    if (isAzure) {
-        modelIdForRegistry = settings.azure.deployment; // e.g., 'azure-large'
-        const creds = loadCredentials();
-        if (creds?.llm) {
-            model = resolveAzureDeployment(settings.azure.deployment, creds.llm);
-        }
-        else {
-            // Fallback to settings if no cloud credentials (local Azure config)
-            model = settings.azure.deployment;
-        }
-    }
-    else {
-        model = settings.openai.model;
-        modelIdForRegistry = model;
-    }
-    // Convert messages format for OpenAI
-    const openaiMessages = [{ role: 'system', content: SYSTEM_PROMPT }];
-    for (const msg of messages) {
-        if (msg.role === 'user') {
-            if (Array.isArray(msg.content)) {
-                // Tool results
-                for (const item of msg.content) {
-                    if (item.type === 'tool_result') {
-                        openaiMessages.push({
-                            role: 'tool',
-                            tool_call_id: item.tool_use_id || '',
-                            content: item.content || '',
-                        });
-                    }
-                }
-            }
-            else {
-                openaiMessages.push({ role: 'user', content: msg.content });
-            }
-        }
-        else if (msg.role === 'assistant') {
-            if (Array.isArray(msg.content)) {
-                const toolCallsArr = [];
-                let textContent = '';
-                for (const item of msg.content) {
-                    if (item.type === 'text') {
-                        textContent = item.text || '';
-                    }
-                    else if (item.type === 'tool_use') {
-                        toolCallsArr.push({
-                            id: item.id || '',
-                            type: 'function',
-                            function: {
-                                name: item.name || '',
-                                arguments: JSON.stringify(item.input || {}),
-                            },
-                        });
-                    }
-                }
-                const assistantMsg = {
-                    role: 'assistant',
-                    content: textContent || null,
-                };
-                if (toolCallsArr.length > 0) {
-                    assistantMsg.tool_calls = toolCallsArr;
-                }
-                openaiMessages.push(assistantMsg);
-            }
-        }
-    }
+    const { model, modelIdForRegistry } = resolveOpenAIModel(settings, isAzure);
+    const openaiMessages = convertMessagesToOpenAI(messages);
     openaiMessages.push({ role: 'user', content: userMessage });
     messages.push({ role: 'user', content: userMessage });
     while (true) {
         // Check for queued messages at the start of each iteration
         const queuedMessage = getQueuedMessage?.();
         if (queuedMessage) {
-            // Inject the queued message into both message formats
-            const injectedContent = `[User update while AI was working]: ${queuedMessage}`;
-            messages.push({ role: 'user', content: injectedContent });
-            openaiMessages.push({ role: 'user', content: injectedContent });
-            yield color(`\n[Queued message injected: "${queuedMessage.length > 50 ? queuedMessage.slice(0, 50) + '...' : queuedMessage}"]\n`, Colors.dim);
+            yield* injectQueuedMessage(queuedMessage, messages, openaiMessages);
         }
         let responseText = '';
         const toolCalls = {};
@@ -653,56 +623,11 @@ export async function* runAssistantOpenAI(client, settings, userMessage, message
         openaiMessages.push(openaiAssistantMsg);
         messages.push({ role: 'assistant', content: assistantContent });
         if (finishReason === 'tool_calls' && Object.keys(toolCalls).length > 0) {
-            const toolResults = [];
-            for (const tc of Object.values(toolCalls)) {
-                yield color(`\n\n[${tc.name}]\n`, Colors.dim);
-                let result;
-                // Check for dangerous commands that need confirmation
-                if (tc.name === 'run_command' && confirmCommand) {
-                    const input = tc.input;
-                    const command = input.command;
-                    const gist = input.gist;
-                    const dangerCheck = checkCommand(command);
-                    if (dangerCheck.isDangerous && !allCategoriesApproved(dangerCheck, approvedCategories || new Set())) {
-                        // Request confirmation from user
-                        yield color(`Dangerous command detected. Waiting for confirmation...\n`, Colors.yellow);
-                        const confirmResult = await confirmCommand(command, dangerCheck, gist);
-                        if (!confirmResult.confirmed) {
-                            result = 'Command cancelled by user.';
-                            yield color(`${result}\n`, Colors.dim);
-                        }
-                        else {
-                            // User confirmed - execute the command
-                            result = await handleToolCall(tc.name, tc.input);
-                            const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                            yield color(`${preview}\n`, Colors.dim);
-                        }
-                    }
-                    else {
-                        // Not dangerous or already approved - execute normally
-                        result = await handleToolCall(tc.name, tc.input);
-                        const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                        yield color(`${preview}\n`, Colors.dim);
-                    }
-                }
-                else {
-                    // Not run_command or no confirmation callback - execute normally
-                    result = await handleToolCall(tc.name, tc.input);
-                    const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                    yield color(`${preview}\n`, Colors.dim);
-                }
-                openaiMessages.push({
-                    role: 'tool',
-                    tool_call_id: tc.id,
-                    content: result,
-                });
-                toolResults.push({
-                    type: 'tool_result',
-                    tool_use_id: tc.id,
-                    content: result,
-                });
+            const { anthropicResults, openaiResults } = yield* executeToolCalls(Object.values(toolCalls), confirmCommand, approvedCategories);
+            for (const r of openaiResults) {
+                openaiMessages.push({ role: 'tool', tool_call_id: r.tool_call_id, content: r.content });
             }
-            messages.push({ role: 'user', content: toolResults });
+            messages.push({ role: 'user', content: anthropicResults });
         }
         else {
             break;
@@ -718,85 +643,15 @@ export async function* runAssistantOpenAI(client, settings, userMessage, message
  * @param approvedCategories - Set of command categories approved for the session
  */
 export async function* runAssistantOpenAINonStreaming(client, settings, userMessage, messages, isAzure = false, signal, getQueuedMessage, confirmCommand, approvedCategories) {
-    // For Azure, resolve the model ID (azure-large/azure-small) to the actual deployment name
-    let model;
-    let modelIdForRegistry; // The model ID to use for ModelRegistry lookups
-    if (isAzure) {
-        modelIdForRegistry = settings.azure.deployment; // e.g., 'azure-large'
-        const creds = loadCredentials();
-        if (creds?.llm) {
-            model = resolveAzureDeployment(settings.azure.deployment, creds.llm);
-        }
-        else {
-            // Fallback to settings if no cloud credentials (local Azure config)
-            model = settings.azure.deployment;
-        }
-    }
-    else {
-        model = settings.openai.model;
-        modelIdForRegistry = model;
-    }
-    // Convert messages format for OpenAI
-    const openaiMessages = [{ role: 'system', content: SYSTEM_PROMPT }];
-    for (const msg of messages) {
-        if (msg.role === 'user') {
-            if (Array.isArray(msg.content)) {
-                // Tool results
-                for (const item of msg.content) {
-                    if (item.type === 'tool_result') {
-                        openaiMessages.push({
-                            role: 'tool',
-                            tool_call_id: item.tool_use_id || '',
-                            content: item.content || '',
-                        });
-                    }
-                }
-            }
-            else {
-                openaiMessages.push({ role: 'user', content: msg.content });
-            }
-        }
-        else if (msg.role === 'assistant') {
-            if (Array.isArray(msg.content)) {
-                const toolCallsArr = [];
-                let textContent = '';
-                for (const item of msg.content) {
-                    if (item.type === 'text') {
-                        textContent = item.text || '';
-                    }
-                    else if (item.type === 'tool_use') {
-                        toolCallsArr.push({
-                            id: item.id || '',
-                            type: 'function',
-                            function: {
-                                name: item.name || '',
-                                arguments: JSON.stringify(item.input || {}),
-                            },
-                        });
-                    }
-                }
-                const assistantMsg = {
-                    role: 'assistant',
-                    content: textContent || null,
-                };
-                if (toolCallsArr.length > 0) {
-                    assistantMsg.tool_calls = toolCallsArr;
-                }
-                openaiMessages.push(assistantMsg);
-            }
-        }
-    }
+    const { model, modelIdForRegistry } = resolveOpenAIModel(settings, isAzure);
+    const openaiMessages = convertMessagesToOpenAI(messages);
     openaiMessages.push({ role: 'user', content: userMessage });
     messages.push({ role: 'user', content: userMessage });
     while (true) {
         // Check for queued messages at the start of each iteration
         const queuedMessage = getQueuedMessage?.();
         if (queuedMessage) {
-            // Inject the queued message into both message formats
-            const injectedContent = `[User update while AI was working]: ${queuedMessage}`;
-            messages.push({ role: 'user', content: injectedContent });
-            openaiMessages.push({ role: 'user', content: injectedContent });
-            yield color(`\n[Queued message injected: "${queuedMessage.length > 50 ? queuedMessage.slice(0, 50) + '...' : queuedMessage}"]\n`, Colors.dim);
+            yield* injectQueuedMessage(queuedMessage, messages, openaiMessages);
         }
         // Build request options with dynamic max_tokens parameter based on model ID (not deployment name)
         const maxTokensParam = ModelRegistry.getMaxTokensParam(modelIdForRegistry);
@@ -865,56 +720,11 @@ export async function* runAssistantOpenAINonStreaming(client, settings, userMess
         openaiMessages.push(openaiAssistantMsg);
         messages.push({ role: 'assistant', content: assistantContent });
         if (finishReason === 'tool_calls' && Object.keys(toolCalls).length > 0) {
-            const toolResults = [];
-            for (const tc of Object.values(toolCalls)) {
-                yield color(`\n\n[${tc.name}]\n`, Colors.dim);
-                let result;
-                // Check for dangerous commands that need confirmation
-                if (tc.name === 'run_command' && confirmCommand) {
-                    const input = tc.input;
-                    const command = input.command;
-                    const gist = input.gist;
-                    const dangerCheck = checkCommand(command);
-                    if (dangerCheck.isDangerous && !allCategoriesApproved(dangerCheck, approvedCategories || new Set())) {
-                        // Request confirmation from user
-                        yield color(`Dangerous command detected. Waiting for confirmation...\n`, Colors.yellow);
-                        const confirmResult = await confirmCommand(command, dangerCheck, gist);
-                        if (!confirmResult.confirmed) {
-                            result = 'Command cancelled by user.';
-                            yield color(`${result}\n`, Colors.dim);
-                        }
-                        else {
-                            // User confirmed - execute the command
-                            result = await handleToolCall(tc.name, tc.input);
-                            const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                            yield color(`${preview}\n`, Colors.dim);
-                        }
-                    }
-                    else {
-                        // Not dangerous or already approved - execute normally
-                        result = await handleToolCall(tc.name, tc.input);
-                        const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                        yield color(`${preview}\n`, Colors.dim);
-                    }
-                }
-                else {
-                    // Not run_command or no confirmation callback - execute normally
-                    result = await handleToolCall(tc.name, tc.input);
-                    const preview = result.length > 500 ? result.slice(0, 500) + '...' : result;
-                    yield color(`${preview}\n`, Colors.dim);
-                }
-                openaiMessages.push({
-                    role: 'tool',
-                    tool_call_id: tc.id,
-                    content: result,
-                });
-                toolResults.push({
-                    type: 'tool_result',
-                    tool_use_id: tc.id,
-                    content: result,
-                });
+            const { anthropicResults, openaiResults } = yield* executeToolCalls(Object.values(toolCalls), confirmCommand, approvedCategories);
+            for (const r of openaiResults) {
+                openaiMessages.push({ role: 'tool', tool_call_id: r.tool_call_id, content: r.content });
             }
-            messages.push({ role: 'user', content: toolResults });
+            messages.push({ role: 'user', content: anthropicResults });
         }
         else {
             break;
@@ -1046,23 +856,7 @@ async function summarizeWithAnthropic(client, settings, conversationText) {
  * Summarize a conversation using the OpenAI/Azure API.
  */
 async function summarizeWithOpenAI(client, settings, conversationText, isAzure) {
-    // For Azure, resolve the model ID to the actual deployment name
-    let model;
-    let modelIdForRegistry; // The model ID to use for ModelRegistry lookups
-    if (isAzure) {
-        modelIdForRegistry = settings.azure.deployment; // e.g., 'azure-large'
-        const creds = loadCredentials();
-        if (creds?.llm) {
-            model = resolveAzureDeployment(settings.azure.deployment, creds.llm);
-        }
-        else {
-            model = settings.azure.deployment;
-        }
-    }
-    else {
-        model = settings.openai.model;
-        modelIdForRegistry = model;
-    }
+    const { model, modelIdForRegistry } = resolveOpenAIModel(settings, isAzure);
     // Build request options with dynamic max_tokens parameter based on model ID (not deployment name)
     const maxTokensParam = ModelRegistry.getMaxTokensParam(modelIdForRegistry);
     const baseOptions = {
@@ -1154,22 +948,7 @@ export async function generateAITitle(client, settings, messages) {
         }
         else if (settings.provider === Provider.OPENAI || settings.provider === Provider.AZURE) {
             const openaiClient = client;
-            let model;
-            let modelIdForRegistry; // The model ID to use for ModelRegistry lookups
-            if (settings.provider === Provider.AZURE) {
-                modelIdForRegistry = settings.azure.deployment; // e.g., 'azure-large'
-                const creds = loadCredentials();
-                if (creds?.llm) {
-                    model = resolveAzureDeployment(settings.azure.deployment, creds.llm);
-                }
-                else {
-                    model = settings.azure.deployment;
-                }
-            }
-            else {
-                model = settings.openai.model;
-                modelIdForRegistry = model;
-            }
+            const { model, modelIdForRegistry } = resolveOpenAIModel(settings, settings.provider === Provider.AZURE);
             // Build request options with dynamic max_tokens parameter based on model ID (not deployment name)
             const maxTokensParam = ModelRegistry.getMaxTokensParam(modelIdForRegistry);
             const baseOptions = {