salmon-loop 0.4.1 → 0.5.0

package/dist/core/grizzco/engine/transaction/transaction-runner.js

@@ -3,7 +3,7 @@ import { mapErrorForAudit } from '../../../observability/error-mapping.js';
 import { ReflectionEngine } from '../../../reflection/engine.js';
 import { resolveExecutionProfile } from '../../../runtime/execution-profile.js';
 import { executeFlowAttempt } from '../../flows/flow-dispatch.js';
-import { resolveAttemptFailure } from './attempt-failure.js';
+import { extractErrorCode, resolveAttemptFailure } from './attempt-failure.js';
 import { buildAuthorizationSummary } from './authorization-summary.js';
 import { mapRetryExhaustedReport, mapSuccessReport, mapTerminalFailureReport, } from './report-mapper.js';
 import { evaluateRetryPolicy } from './retry-policy.js';
@@ -128,7 +128,6 @@ export class FlowTransactionRunner {
     lastRecentReadArtifacts;
     lastToolResultPreviewArtifacts;
     lastReplacementState;
-    pendingAutopilotVerification;
     constructor(params) {
         this.params = params;
         this.lastVerifyArtifact = params.options.artifactHints?.verifyArtifact;
@@ -183,7 +182,6 @@ export class FlowTransactionRunner {
                         : undefined,
                 },
                 replacementState: this.lastReplacementState,
-                pendingVerification: this.pendingAutopilotVerification,
                 lastError: this.currentLastError,
                 applyBackRuntime: {
                     activeRepoPath: this.params.env.activeRepoPath,
@@ -212,20 +210,9 @@ export class FlowTransactionRunner {
                 flowReport: result,
                 context: shrinkCtx,
                 flowMode: this.params.flowMode,
+                verifyPolicy: this.params.options.verifyPolicy,
             });
             lastAttemptFailure = attemptFailure;
-            if (this.params.flowMode === 'autopilot') {
-                if (attemptFailure?.reasonCode === 'VERIFY_FAILED') {
-                    this.pendingAutopilotVerification = {
-                        changedFiles: terminalCtx && 'changedFiles' in terminalCtx
-                            ? (terminalCtx.changedFiles ?? undefined)
-                            : undefined,
-                    };
-                }
-                else if (!attemptFailure) {
-                    this.pendingAutopilotVerification = undefined;
-                }
-            }
             const entry = {
                 attempt,
                 plan: shrinkCtx?.plan ?? null,
@@ -245,27 +232,24 @@ export class FlowTransactionRunner {
                         ? 'SHRINK'
                         : 'APPLY_BACK';
                 recordAuditEvent('loop.attempt.success', { attempt, flowMode: this.params.flowMode }, { phase: successPhase, severity: 'low', scope: 'session' });
-                // Reflection Mechanism: trigger when multiple attempts were needed
-                if (attempt > 1 && this.params.options.llm) {
-                    const reflectionEngine = new ReflectionEngine(this.params.options.llm);
-                    const reflectionInput = {
+                this.emitReflection({
+                    success: true,
+                    attempt,
+                    input: {
                         instruction: this.params.options.instruction,
                         history: this.historyEntries,
                         success: true,
                         metadata: shrinkCtx?.context?.projectMetadata,
                         finalPlan: shrinkCtx?.plan,
                         finalPatch: shrinkCtx?.diff,
-                    };
-                    reflectionEngine
-                        .reflect(reflectionInput, this.params.options.repoPath)
-                        .catch((e) => recordAuditEvent('reflection.error', { error: String(e) }, { severity: 'medium' }));
-                }
+                    },
+                });
                 return mapSuccessReport({
                     attempt,
                     flowReport: result,
                     history: this.historyEntries,
                     authorizationSummary: this.authorizationSummary,
-                    lastErrorCode: this.extractErrorCode(result.error),
+                    lastErrorCode: extractErrorCode(result.error),
                     lastContext: terminalCtx,
                     lastVerifyArtifact: this.lastVerifyArtifact,
                     lastSubAgentPatchArtifacts: this.lastSubAgentPatchArtifacts,
@@ -317,12 +301,20 @@ export class FlowTransactionRunner {
                 if (retryDecision.retryExhausted) {
                     break;
                 }
+                this.emitReflection({
+                    success: false,
+                    input: {
+                        instruction: this.params.options.instruction,
+                        history: this.historyEntries,
+                        success: false,
+                    },
+                });
                 return mapTerminalFailureReport({
                     attempt,
                     flowReport: result,
                     history: this.historyEntries,
                     authorizationSummary: this.authorizationSummary,
-                    lastErrorCode: attemptFailure.errorCode ?? this.extractErrorCode(result.error),
+                    lastErrorCode: attemptFailure.errorCode ?? extractErrorCode(result.error),
                     lastContext: terminalCtx,
                     lastVerifyArtifact: this.lastVerifyArtifact,
                     lastSubAgentPatchArtifacts: this.lastSubAgentPatchArtifacts,
@@ -333,7 +325,7 @@ export class FlowTransactionRunner {
                 });
             }
             this.currentContext = shrinkCtx?.context;
-            this.currentLastError = attemptFailure.reason;
+            this.currentLastError = shrinkCtx?.lastError ?? attemptFailure.reason;
             this.params.emit({
                 type: 'retry',
                 fromAttempt: attempt,
@@ -346,13 +338,21 @@ export class FlowTransactionRunner {
         if (!lastReport) {
             throw new Error('SalmonLoop execution terminated without a FlowReport');
         }
+        this.emitReflection({
+            success: false,
+            input: {
+                instruction: this.params.options.instruction,
+                history: this.historyEntries,
+                success: false,
+            },
+        });
         return mapRetryExhaustedReport({
             attempts: retries,
             flowReport: lastReport,
             history: this.historyEntries,
             authorizationSummary: this.authorizationSummary,
             failure: lastAttemptFailure,
-            lastErrorCode: this.extractErrorCode(lastReport.error),
+            lastErrorCode: extractErrorCode(lastReport.error),
             lastContext: this.lastContext,
             lastVerifyArtifact: this.lastVerifyArtifact,
             lastSubAgentPatchArtifacts: this.lastSubAgentPatchArtifacts,
@@ -361,13 +361,19 @@ export class FlowTransactionRunner {
             lastToolResultPreviewArtifacts: this.lastToolResultPreviewArtifacts,
         });
     }
-    extractErrorCode(error) {
-        if (typeof error === 'object' && error !== null) {
-            return (error.llmCode ??
-                error.code ??
-                error.name);
+    emitReflection(params) {
+        if (!this.params.options.llm)
+            return;
+        const engine = new ReflectionEngine(this.params.options.llm);
+        const { repoPath } = this.params.options;
+        const fallback = (e) => recordAuditEvent('reflection.error', { error: String(e) }, { severity: 'medium' });
+        if (params.success) {
+            const method = (params.attempt ?? 1) > 1 ? 'reflect' : 'reflectOnSuccess';
+            engine[method](params.input, repoPath).catch(fallback);
+        }
+        else {
+            engine.reflectOnFailure(params.input, repoPath).catch(fallback);
         }
-        return undefined;
     }
 }
 //# sourceMappingURL=transaction-runner.js.map

package/dist/core/grizzco/execution/RejectionManager.js

@@ -1,5 +1,6 @@
 import * as path from 'path';
 import * as fs from '../../adapters/fs/node-fs.js';
+import { getLogger } from '../../observability/logger.js';
 /**
  * RejectionManager
  * Handles creation and management of .rej files for failed merges.
@@ -46,13 +47,14 @@ export class RejectionManager {
                         ...header,
                     });
                 }
-                catch {
-                    // Ignore malformed files
+                catch (error) {
+                    getLogger().debug(`[RejectionManager] Malformed rejection file ${file}: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }
             return rejections;
         }
-        catch {
+        catch (error) {
+            getLogger().debug(`[RejectionManager] Failed to read rejection directory: ${error instanceof Error ? error.message : String(error)}`);
             return [];
         }
     }
@@ -63,8 +65,8 @@ export class RejectionManager {
         try {
             await fs.rm(this.rejectDir, { recursive: true, force: true });
         }
-        catch {
-            // Ignore
+        catch (error) {
+            getLogger().warn(`[RejectionManager] Failed to clear rejection directory: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
 }

package/dist/core/grizzco/runtime/apply-back-runtime.js

@@ -2,6 +2,7 @@ import { text } from '../../../locales/index.js';
 import { recordAuditEvent } from '../../observability/audit-trail.js';
 import { writeDebugArtifact } from '../../observability/debug-artifacts.js';
 import { buildErrorEnvelope, toSafeErrorSummary } from '../../observability/error-envelope.js';
+import { getLogger } from '../../observability/logger.js';
 import { isRecord } from '../../utils/serialize.js';
 import { collectSidecarPaths } from './apply-back-utils.js';
 export async function runApplyBackPhase(params) {
@@ -95,8 +96,9 @@ export async function runApplyBackPhase(params) {
                 ].join('\n'),
             });
         }
-        catch {
+        catch (artifactError) {
             // Best-effort: do not mask the primary failure if artifact writing fails.
+            getLogger().debug(`[ApplyBackRuntime] Failed to write debug artifact: ${artifactError instanceof Error ? artifactError.message : String(artifactError)}`);
         }
         const envelope = buildErrorEnvelope({
             domain: 'applyBack',

package/dist/core/grizzco/services/implementations/default/GitConfigService.js

@@ -10,7 +10,8 @@ export class GitConfigService {
                 try {
                     return await git.exec(['config', '--get', key], { allowError: true });
                 }
-                catch {
+                catch (error) {
+                    getLogger().debug(`[GitConfigService] git config --get failed for key "${key}": ${error instanceof Error ? error.message : String(error)}`);
                     return null;
                 }
             };

package/dist/core/grizzco/steps/autopilot.js

@@ -6,6 +6,7 @@ import { GitAdapter } from '../../adapters/git/git-adapter.js';
 import { LIMITS } from '../../config/limits.js';
 import { supportsLlmStreaming } from '../../llm/capabilities.js';
 import { emitLlmOutput } from '../../llm/output-policy.js';
+import { getLogger } from '../../observability/logger.js';
 import { getAutopilotSystemPrompt } from '../../prompts/runtime.js';
 import { SessionReplacementPreviewProvider } from '../../session/replacement-preview-provider.js';
 import { chatWithTools, chatWithToolsStreaming } from '../../tools/session.js';
@@ -286,13 +287,11 @@ function isRuntimeGeneratedPath(path) {
     return false;
 }
 function lastFailedToolAuditEntry(entries) {
-    if (!Array.isArray(entries))
+    if (!Array.isArray(entries) || entries.length === 0)
         return undefined;
-    for (let index = entries.length - 1; index >= 0; index -= 1) {
-        const entry = entries[index];
-        if (entry?.toolResultStatus && entry.toolResultStatus !== 'ok') {
-            return entry;
-        }
+    const last = entries[entries.length - 1];
+    if (last?.toolResultStatus && last.toolResultStatus !== 'ok') {
+        return last;
     }
     return undefined;
 }
@@ -370,12 +369,16 @@ export async function runAutopilot(ctx) {
         try {
             workspaceFingerprintBefore = await captureWorkspaceFingerprintForContext(ctx);
         }
-        catch {
+        catch (error) {
+            getLogger().debug(`[Autopilot] Workspace fingerprint capture failed (before): ${error instanceof Error ? error.message : String(error)}`);
             samplingFailedClosed = true;
         }
     }
-    const assistant = supportsTools
-        ? await (supportsStreaming ? chatWithToolsStreaming : chatWithTools)(shared.baseMessages, {
+    let assistant = null;
+    let content = '';
+    const messages = shared.baseMessages;
+    assistant = supportsTools
+        ? await (supportsStreaming ? chatWithToolsStreaming : chatWithTools)(messages, {
             phase: AUTOPILOT_TOOL_PHASE,
             providerHints: shared.envelope.providerHints,
             temperature: 0.2,
@@ -400,7 +403,7 @@ export async function runAutopilot(ctx) {
             },
             emit: (event) => ctx.emit({ ...event, timestamp: event.timestamp ?? new Date() }),
         })
-        : await llmClient.chat(shared.baseMessages, {
+        : await llmClient.chat(messages, {
             phase: 'AUTOPILOT',
             providerHints: shared.envelope.providerHints,
             temperature: 0.2,
@@ -408,7 +411,7 @@ export async function runAutopilot(ctx) {
             tools: [],
             toolChoice: 'none',
         });
-    const content = String(assistant?.content ?? '').trim();
+    content = String(assistant?.content ?? '').trim();
     if (!supportsTools) {
         emitLlmOutput({
             emit: ctx.emit,
@@ -435,28 +438,18 @@ export async function runAutopilot(ctx) {
                         workspaceFingerprintBefore.head !== workspaceFingerprintAfter.head ||
                         workspaceFingerprintBefore.index !== workspaceFingerprintAfter.index;
             }
-            catch {
+            catch (error) {
+                getLogger().debug(`[Autopilot] Workspace fingerprint capture failed (after): ${error instanceof Error ? error.message : String(error)}`);
                 mutated = true;
             }
         }
     }
-    const pendingChangedFiles = ctx.pendingVerification?.changedFiles && ctx.pendingVerification.changedFiles.length > 0
-        ? ctx.pendingVerification.changedFiles
-        : undefined;
-    const effectiveChangedFiles = changedFiles && changedFiles.length > 0
-        ? changedFiles
-        : pendingChangedFiles && pendingChangedFiles.length > 0
-            ? pendingChangedFiles
-            : undefined;
-    const effectiveMutated = mutated || Boolean(ctx.pendingVerification);
+    const effectiveChangedFiles = changedFiles && changedFiles.length > 0 ? changedFiles : undefined;
     return {
         ...ctx,
-        mutated: effectiveMutated,
+        mutated,
         changedFiles: effectiveChangedFiles,
-        pendingVerification: effectiveMutated
-            ? { changedFiles: effectiveChangedFiles }
-            : ctx.pendingVerification,
-        completion: resolveAutopilotCompletion({ content, mutated: effectiveMutated, localAudit }),
+        completion: resolveAutopilotCompletion({ content, mutated, localAudit }),
         toolCallingAudit: mergedAudit,
         report: {
             kind: 'answer',
@@ -473,13 +466,10 @@ export async function runAutopilotVerifyGate(ctx) {
         };
     }
     if (!ctx.options.verify) {
+        // Autopilot is LLM-driven: the agent verifies on its own via shell.exec.
+        // Skip the gate instead of failing — the agent's tool calls are the verification.
         return {
             ...ctx,
-            completion: {
-                status: 'verification_missing',
-                reason: 'Autopilot changed the workspace but no verification command was configured.',
-                errorCode: 'VERIFY_COMMAND_MISSING',
-            },
             verifyResult: undefined,
         };
     }
@@ -491,7 +481,6 @@ export async function runAutopilotVerifyGate(ctx) {
     const nextCtx = {
         ...ctx,
         verifyResult,
-        pendingVerification: verifyResult.ok ? undefined : ctx.pendingVerification,
     };
     return verifyArtifact ? { ...nextCtx, verifyArtifact } : nextCtx;
 }

package/dist/core/grizzco/steps/explore.js

@@ -2,6 +2,7 @@ import path from 'path';
 import { text } from '../../../locales/index.js';
 import { supportsLlmStreaming } from '../../llm/capabilities.js';
 import { recordAuditEvent } from '../../observability/audit-trail.js';
+import { getLogger } from '../../observability/logger.js';
 import { getExplorePrompt, getExploreSystemPrompt } from '../../prompts/runtime.js';
 import { SessionReplacementPreviewProvider } from '../../session/replacement-preview-provider.js';
 import { chatWithTools, chatWithToolsStreaming } from '../../tools/session.js';
@@ -119,8 +120,9 @@ export const exploreCodebase = async (ctx) => {
                                     capturedFiles.set(filePath, content);
                                 }
                             }
-                            catch {
+                            catch (error) {
                                 // Ignore parsing errors, just don't capture
+                                getLogger().debug(`[Explore] Failed to parse tool arguments for file capture: ${error instanceof Error ? error.message : String(error)}`);
                             }
                         }
                     }
@@ -196,8 +198,9 @@ export const exploreCodebase = async (ctx) => {
                     capturedFiles.set(rel, content);
                 }
             }
-            catch {
+            catch (error) {
                 // Best-effort; failure here should not abort exploration.
+                getLogger().debug(`[Explore] Failed to read inferred file "${rel}": ${error instanceof Error ? error.message : String(error)}`);
             }
         }
     }

package/dist/core/grizzco/steps/generateReview.js

@@ -1,5 +1,6 @@
 import { text } from '../../../locales/index.js';
 import { emitLlmOutput } from '../../llm/output-policy.js';
+import { getLogger } from '../../observability/logger.js';
 import { getReviewPrompt } from '../../prompts/runtime.js';
 function normalizeReviewSuggestions(value) {
     if (value == null)
@@ -23,7 +24,8 @@ function parseReviewResponse(content) {
     try {
         return normalizeReviewSuggestions(JSON.parse(content));
     }
-    catch {
+    catch (error) {
+        getLogger().debug(`[GenerateReview] Failed to parse review response as JSON: ${error instanceof Error ? error.message : String(error)}`);
         return normalizeReviewSuggestions(content);
     }
 }

package/dist/core/grizzco/steps/research.js

@@ -2,6 +2,7 @@ import { text } from '../../../locales/index.js';
 import { supportsLlmStreaming } from '../../llm/capabilities.js';
 import { emitLlmOutput } from '../../llm/output-policy.js';
 import { recordAuditEvent } from '../../observability/audit-trail.js';
+import { getLogger } from '../../observability/logger.js';
 import { getResearchPrompt, getResearchSystemPrompt } from '../../prompts/runtime.js';
 import { SessionReplacementPreviewProvider } from '../../session/replacement-preview-provider.js';
 import { chatWithTools, chatWithToolsStreaming } from '../../tools/session.js';
@@ -50,7 +51,8 @@ function parseResearchResponse(content, fallbackSources) {
     try {
         parsed = JSON.parse(content);
     }
-    catch {
+    catch (error) {
+        getLogger().debug(`[Research] Failed to parse research response as JSON: ${error instanceof Error ? error.message : String(error)}`);
         parsed = undefined;
     }
     const researchText = String(parsed?.researchText ?? content ?? text.grizzco.research.empty ?? '');

package/dist/core/grizzco/steps/verify.js

@@ -1,5 +1,6 @@
 import { text } from '../../../locales/index.js';
 import { collectBudgetMetrics, evaluateBudgetAlert, getGlobalAdjuster, recordBudgetAlert, } from '../../context/budget/integration.js';
+import { getEffectivenessTracker } from '../../context/effectiveness/tracker.js';
 import { recordAuditEvent } from '../../observability/audit-trail.js';
 import { executeVerifyForWorkspace } from './verify-shared.js';
 function extractCommandProgram(command) {
@@ -32,7 +33,12 @@ export const runVerify = async (ctx) => {
         scope: 'session',
         phase: 'VERIFY',
     });
-    // Collect budget metrics after verification
+    // Collect budget metrics and effectiveness data after verification
+    const effectivenessTracker = getEffectivenessTracker();
+    effectivenessTracker.recordExecution(verifyResult.ok, 0);
+    if (!verifyResult.ok) {
+        effectivenessTracker.recordFailure('missing_context', `Verification failed: ${verifyResult.output?.slice(0, 200) ?? 'unknown'}`);
+    }
     if (ctx.contextResult) {
         const metrics = collectBudgetMetrics({
             contextResult: ctx.contextResult,

package/dist/core/grizzco/validation/AstValidationService.js

@@ -4,6 +4,7 @@ import path from 'path';
 import { readFile, rm } from '../../adapters/fs/node-fs.js';
 import { GitAdapter } from '../../adapters/git/git-adapter.js';
 import { AstParser } from '../../ast/index.js';
+import { getLogger } from '../../observability/logger.js';
 import { convertDiffToShadowOperations } from '../../patch/diff.js';
 import { tryGetPluginRegistry } from '../../plugin/registry.js';
 import { OpType } from '../domain/grizzco-types.js';
@@ -70,7 +71,8 @@ async function defaultBuildProposedSource(workPath, operation) {
             return null;
         return showResult.stdout.toString('utf8');
     }
-    catch {
+    catch (error) {
+        getLogger().debug(`[AstValidationService] Failed to build proposed source for "${operation.path}": ${error instanceof Error ? error.message : String(error)}`);
         return null;
     }
     finally {

package/dist/core/history/input-history.js

@@ -1,5 +1,6 @@
 import { join } from 'path';
 import { FileAdapter } from '../adapters/fs/index.js';
+import { getLogger } from '../observability/logger.js';
 /**
  * Manages persistence of user input history isolated by Session.
  * Storage path: .salmonloop/ui-history/{sessionId}.json
@@ -26,7 +27,8 @@ export class InputHistoryManager {
             const data = await this.fileAdapter.readFile(filePath);
             return JSON.parse(data);
         }
-        catch {
+        catch (error) {
+            getLogger().debug(`[InputHistory] Failed to load history for session "${sessionId}": ${error instanceof Error ? error.message : String(error)}`);
             return [];
         }
     }

package/dist/core/intent/chat-intent.js

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { getLogger } from '../observability/logger.js';
 const LlmDecisionSchema = z
     .object({
     intent: z.enum(['answer', 'review', 'patch', 'debug', 'research']),
@@ -165,8 +166,9 @@ async function routeByLlm(input, options) {
         try {
             return JSON.parse(candidate);
         }
-        catch {
+        catch (error) {
             // Best-effort: extract the first JSON object from mixed output.
+            getLogger().debug(`[ChatIntent] Primary JSON parse failed, attempting extraction: ${error instanceof Error ? error.message : String(error)}`);
             const start = candidate.indexOf('{');
             const end = candidate.lastIndexOf('}');
             if (start >= 0 && end > start) {

package/dist/core/llm/ai-sdk/message-mapper.js

@@ -1,6 +1,7 @@
 import { jsonSchema, tool } from 'ai';
 import { z } from 'zod';
 import { zodToJsonSchema } from 'zod-to-json-schema';
+import { getLogger } from '../../observability/logger.js';
 import { toolToOpenAI } from '../../tools/mapper.js';
 import { isRecord } from '../../utils/serialize.js';
 function formatOutputSchema(schema) {
@@ -20,8 +21,9 @@ function formatOutputSchema(schema) {
             return JSON.stringify(cleanSchema);
         }
     }
-    catch {
+    catch (error) {
         // Fallback to generic description for invalid/unsupported schema.
+        getLogger().debug(`[MessageMapper] Failed to format output schema to JSON: ${error instanceof Error ? error.message : String(error)}`);
     }
     return 'complex object';
 }
@@ -31,8 +33,8 @@ function safeParseJsonObject(textValue) {
         if (parsed && typeof parsed === 'object' && !Array.isArray(parsed))
             return parsed;
     }
-    catch {
-        // ignored
+    catch (error) {
+        getLogger().debug(`[MessageMapper] Failed to parse JSON object: ${error instanceof Error ? error.message : String(error)}`);
     }
     return {};
 }
@@ -43,7 +45,8 @@ function deepCloneJson(value, fallback) {
             return fallback;
         return JSON.parse(serialized);
     }
-    catch {
+    catch (error) {
+        getLogger().debug(`[MessageMapper] deepCloneJson failed: ${error instanceof Error ? error.message : String(error)}`);
         return fallback;
     }
 }
@@ -102,7 +105,8 @@ export function toAiSdkMessages(messages) {
             try {
                 parsedContent = JSON.parse(m.content);
             }
-            catch {
+            catch (error) {
+                getLogger().debug(`[MessageMapper] Failed to parse tool message content as JSON: ${error instanceof Error ? error.message : String(error)}`);
                 parsedContent = m.content;
             }
             if (isToolApprovalResponse(parsedContent)) {
@@ -247,14 +251,15 @@ export function toOpenAiToolCalls(toolCalls) {
                     try {
                         parsed = JSON.parse(nested);
                     }
-                    catch {
-                        // ignored
+                    catch (error) {
+                        getLogger().debug(`[MessageMapper] Failed to parse nested JSON string: ${error instanceof Error ? error.message : String(error)}`);
                     }
                 }
             }
             return parsed;
         }
-        catch {
+        catch (error) {
+            getLogger().debug(`[MessageMapper] Failed to normalize tool input JSON: ${error instanceof Error ? error.message : String(error)}`);
             return raw;
         }
     };

package/dist/core/llm/ai-sdk/request-params.js

@@ -113,9 +113,7 @@ export function buildAiSdkRequestParams(params) {
         responseFormat: resolveResponseFormat(params.options),
         toolChoice: (params.options.toolChoice === 'none'
             ? 'none'
-            : params.tools
-                ? 'auto'
-                : undefined),
+            : (params.options.toolChoice ?? (params.tools ? 'auto' : undefined))),
         providerOptions: mergeProviderOptions({
             providerOptions: params.options.providerOptions,
             providerHints: params.options.providerHints,

package/dist/core/llm/ai-sdk/retry-classifier.js

@@ -37,14 +37,15 @@ function findNetworkCode(err) {
     }
     return undefined;
 }
-function isAbortLikeError(err) {
+function isUserAbortError(err) {
     const unwrapped = unwrapRetryError(err);
     const name = unwrapped instanceof Error ? unwrapped.name : '';
-    const msg = String((isRecord(unwrapped) ? unwrapped.message : undefined) ?? unwrapped).toLowerCase();
-    return name === 'AbortError' || msg.includes('aborted');
+    // Only treat as user abort if the error name is AbortError (from AbortController).
+    // Provider-side "aborted" messages are transient and should be retried.
+    return name === 'AbortError';
 }
 export function classifyRetryableApiError(err) {
-    if (isAbortLikeError(err))
+    if (isUserAbortError(err))
         return { retryable: false, reason: 'aborted' };
     const statusCode = findStatusCode(err);
     const networkCode = findNetworkCode(err);
@@ -69,6 +70,13 @@ export function classifyRetryableApiError(err) {
     if (msg.includes('overloaded')) {
         return { retryable: true, reason: 'overloaded', statusCode, networkCode };
     }
+    // Provider-side aborts and unexpected errors are transient — retry them.
+    if (msg.includes('aborted')) {
+        return { retryable: true, reason: 'provider_abort', statusCode, networkCode };
+    }
+    if (msg.includes('unexpected error')) {
+        return { retryable: true, reason: 'unexpected', statusCode, networkCode };
+    }
     if (typeof networkCode === 'string') {
         const normalized = networkCode.toUpperCase();
         if (normalized === 'ECONNRESET' ||

package/dist/core/llm/ai-sdk/retry-executor.js

@@ -2,7 +2,7 @@ import { toLlmError } from '../errors.js';
 import { withRetry, withStreamRetry } from '../retry-utils.js';
 import { createAiSdkRetryLogger, isRetryableAiSdkError } from './request-runtime.js';
 const DEFAULT_AI_SDK_RETRY_OPTIONS = {
-    maxRetries: 2,
+    maxRetries: 3,
     jitterRatio: 0.2,
 };
 export async function executeWithAiSdkRetry(params) {

package/dist/core/llm/errors.js

@@ -1,3 +1,4 @@
+import { getLogger } from '../observability/logger.js';
 import { SalmonError } from '../types/errors.js';
 import { sanitizeErrorMessage } from '../utils/sanitizer.js';
 import { isRecord } from '../utils/serialize.js';
@@ -45,8 +46,8 @@ function extractProviderDetails(err) {
                     details.providerMessage = sanitizeError(parsed.message);
                 }
             }
-            catch {
-                // ignore
+            catch (error) {
+                getLogger().debug(`[LlmErrors] Failed to parse responseBody as JSON: ${error instanceof Error ? error.message : String(error)}`);
             }
         }
         else if (candidate.responseBody) {
@@ -73,8 +74,8 @@ function extractProviderDetails(err) {
                         details.providerMessage = sanitizeError(parsed.error.message);
                     }
                 }
-                catch {
-                    // ignore
+                catch (error) {
+                    getLogger().debug(`[LlmErrors] Failed to parse embedded JSON in message: ${error instanceof Error ? error.message : String(error)}`);
                 }
             }
         }