salmon-loop 0.3.2 → 0.4.1

package/dist/cli/authorization/non-interactive.js

@@ -1,6 +1,7 @@
 import { execa } from 'execa';
 import { z } from 'zod';
 import { getLogger, McpConnectionManager, } from '../../core/facades/cli-authorization-non-interactive.js';
+import { isRecord } from '../../core/facades/cli-utils-serialize.js';
 import { text } from '../locales/index.js';
 const DecisionSchema = z
     .object({
@@ -22,24 +23,19 @@ function findMcpServer(extensions, name) {
     return extensions.mcpServers.find((s) => s.enabled && s.name === name);
 }
 function extractDecisionPayloadFromMcpResult(result) {
-    if (!result || typeof result !== 'object')
+    if (!isRecord(result))
         return result;
-    const obj = result;
-    if (obj.decision && typeof obj.decision === 'object')
-        return obj.decision;
-    if (typeof obj.outcome === 'string')
-        return obj;
-    const content = obj.content;
+    if (isRecord(result.decision))
+        return result.decision;
+    if (typeof result.outcome === 'string')
+        return result;
+    const content = result.content;
     if (!Array.isArray(content))
         return result;
     for (const item of content) {
-        if (!item || typeof item !== 'object')
+        if (!isRecord(item))
             continue;
-        const candidate = item.json ??
-            item.text ??
-            item.value ??
-            item.data ??
-            undefined;
+        const candidate = item.json ?? item.text ?? item.value ?? item.data ?? undefined;
         if (typeof candidate === 'string' && candidate.trim()) {
             try {
                 return JSON.parse(candidate);

package/dist/cli/chat.js

@@ -1,5 +1,6 @@
 import { buildSessionArtifactStateFromLoopResult, buildEffectiveConversationContext, ChatSessionManager, DEFAULT_LLM_OUTPUT_POLICY, emitLlmOutput, getDefaultSessionContextBudgetTokens, InputHistoryManager, logIgnoredError, getLogger, refreshSessionSummary, runSalmonLoop, TokenTracker, createInitialTracking, onNormalTurnComplete, runCompactionPipeline, reactiveCompact, } from '../core/facades/cli-chat.js';
 import { createSubAgentController } from '../core/facades/cli-subagent.js';
+import { isRecord } from '../core/facades/cli-utils-serialize.js';
 import { createUiAuthorizationProvider } from './authorization/provider.js';
 import { resolveActiveChatFlowMode, resolveChatCheckpointStrategy } from './chat-flow.js';
 import { commands } from './commands/registry.js';
@@ -66,8 +67,9 @@ export async function startChatMode(options) {
             const answers = {};
             for (const question of input.questions) {
                 if (requestOptions?.signal?.aborted) {
-                    const err = new Error(text.cli.askUserCancelled);
-                    err.code = 'ASK_USER_CANCELLED';
+                    const err = Object.assign(new Error(text.cli.askUserCancelled), {
+                        code: 'ASK_USER_CANCELLED',
+                    });
                     throw err;
                 }
                 const items = question.options.map((opt) => ({
@@ -84,8 +86,9 @@ export async function startChatMode(options) {
                     multiSelect: question.multiSelect,
                 });
                 if (!selected || selected.length === 0) {
-                    const err = new Error(text.cli.askUserCancelled);
-                    err.code = 'ASK_USER_CANCELLED';
+                    const err = Object.assign(new Error(text.cli.askUserCancelled), {
+                        code: 'ASK_USER_CANCELLED',
+                    });
                     throw err;
                 }
                 const answer = question.multiSelect ? selected.join(', ') : (selected[0] ?? '');
@@ -299,6 +302,7 @@ export async function startChatMode(options) {
                     authorizationMode: 'deferred',
                     userInputProvider,
                     subAgentController,
+                    llmFactory: options.llmFactory,
                     permissionMode: options.permissionMode,
                 }).catch(async (error) => {
                     // Level 2: Reactive Compact
@@ -307,13 +311,14 @@ export async function startChatMode(options) {
                     const isContextOverflow = (() => {
                         if (!error || typeof error !== 'object')
                             return false;
-                        if ('llmCode' in error &&
+                        if (isRecord(error) &&
+                            'llmCode' in error &&
                             error.llmCode === 'LLM_CONTEXT_LENGTH_EXCEEDED') {
                             return true;
                         }
                         const message = error instanceof Error
                             ? error.message
-                            : typeof error.message === 'string'
+                            : isRecord(error) && typeof error.message === 'string'
                                 ? String(error.message)
                                 : '';
                         const lower = message.toLowerCase();
@@ -382,6 +387,7 @@ export async function startChatMode(options) {
                         authorizationMode: 'deferred',
                         userInputProvider,
                         subAgentController,
+                        llmFactory: options.llmFactory,
                         permissionMode: options.permissionMode,
                     });
                 });

package/dist/cli/commands/allowlist.js

@@ -1,4 +1,4 @@
-import { EXECUTION_PHASES, getLogger } from '../../core/facades/cli-command-allowlist.js';
+import { EXECUTION_PHASES, getLogger, } from '../../core/facades/cli-command-allowlist.js';
 import { clearAllowlist, clearAllowlistCache, listAllowlist, persistAllowlistDecision, removeAllowlistRule, } from '../authorization/allowlist.js';
 import { text } from '../locales/index.js';
 import { clearKnownToolNames, getKnownToolNames, getKnownToolNamesSync, validateSideEffects, } from './tool-names.js';

package/dist/cli/commands/chat.js

@@ -1,4 +1,4 @@
-import { createPluginRegistry, createPromptRegistry, createRuntimeLlm, setPluginRegistry, setPromptRegistry, ExtensionConfigError, getLogger, normalizePermissionMode, PluginLoader, resolveExecutionProfile, resolveExtensions, } from '../../core/facades/cli-command-chat.js';
+import { createPluginRegistry, createPromptRegistry, createRuntimeLlm, createSubAgentLlmFactory, getString, setPluginRegistry, setPromptRegistry, ExtensionConfigError, getLogger, normalizePermissionMode, PluginLoader, resolveExecutionProfile, resolveExtensions, } from '../../core/facades/cli-command-chat.js';
 import { text } from '../locales/index.js';
 import { getOptionValueSourceWithGlobalFallback } from '../utils/command-option-source.js';
 import { resolveLlmOutputPolicyFromCli } from '../utils/llm-output.js';
@@ -8,26 +8,22 @@ import { resolveVerifyOption } from '../utils/verify-resolver.js';
 export async function handleChatCommand(options, command) {
     const allOptions = command.optsWithGlobals();
     const configResult = await resolveCliConfig({
-        repo: allOptions.repo,
+        repo: getString(allOptions, 'repo') ?? undefined,
         cwd: process.cwd(),
-        configPath: allOptions.config,
+        configPath: getString(allOptions, 'config') ?? undefined,
         enableConfigFile: allOptions.configFile !== false,
-        auditScope: allOptions.auditScope,
+        auditScope: getString(allOptions, 'auditScope') ?? undefined,
         verbose: allOptions.verbose,
-        logMode: allOptions.logMode,
+        logMode: getString(allOptions, 'logMode') ?? undefined,
     });
     if (!configResult.ok) {
         getLogger().error(configResult.message, true);
         process.exit(1);
     }
     const { resolvedConfig, auditScope, repoPath: runPath, verboseLevel } = configResult;
-    const printInstruction = typeof allOptions.print === 'string'
-        ? allOptions.print
-        : undefined;
+    const printInstruction = getString(allOptions, 'print') ?? undefined;
     const continueSession = Boolean(allOptions.continue);
-    const resumeSessionId = typeof allOptions.resume === 'string'
-        ? allOptions.resume
-        : undefined;
+    const resumeSessionId = getString(allOptions, 'resume') ?? undefined;
     if (printInstruction) {
         getLogger().error(text.cli.printCommandConflict('chat'), true);
         process.exit(1);
@@ -54,7 +50,7 @@ export async function handleChatCommand(options, command) {
         getLogger().error(`Invalid --mode "${String(rawPermissionMode)}". Expected "interactive" or "yolo".`);
         process.exit(1);
     }
-    const llmOutputResolution = resolveLlmOutputPolicyFromCli(resolvedConfig.llmOutput, allOptions.llmOutput);
+    const llmOutputResolution = resolveLlmOutputPolicyFromCli(resolvedConfig.llmOutput, getString(allOptions, 'llmOutput') ?? undefined);
     if (!llmOutputResolution.ok) {
         getLogger().error(text.cli.invalidLlmOutputKind(llmOutputResolution.invalid), true);
         process.exitCode = 1;
@@ -64,6 +60,7 @@ export async function handleChatCommand(options, command) {
     const { llm } = createRuntimeLlm(resolvedConfig.llm, {
         langfuseEnabled: resolvedConfig.observability.langfuse.enabled,
     });
+    const llmFactory = createSubAgentLlmFactory(resolvedConfig.llm);
     const outcomeReporter = createOutcomeReporter({
         enabled: resolvedConfig.observability.langfuse.outcome,
         endpoint: resolvedConfig.observability.langfuse.endpoint,
@@ -71,7 +68,9 @@ export async function handleChatCommand(options, command) {
         langfuseApiKey: resolvedConfig.observability.langfuse.apiKey,
     });
     // Smart verification resolution with auto-detection
-    const verifyCommand = await resolveVerifyOption(runPath, allOptions.verify, resolvedConfig.verify.command);
+    const verifyRaw = allOptions.verify;
+    const verifyCliOption = typeof verifyRaw === 'string' || typeof verifyRaw === 'boolean' ? verifyRaw : undefined;
+    const verifyCommand = await resolveVerifyOption(runPath, verifyCliOption, resolvedConfig.verify.command);
     // Verification is now optional - the loop will skip if undefined
     if (!verifyCommand) {
         getLogger().warn(text.verify.noCommandFound);
@@ -115,6 +114,7 @@ export async function handleChatCommand(options, command) {
             langfuseSessionId: resolvedConfig.observability.langfuse.sessionId,
             langfuseUserId: resolvedConfig.observability.langfuse.userId,
             languagePlugins,
+            llmFactory,
         });
     }
     catch (err) {

package/dist/cli/commands/parallel.js

@@ -198,7 +198,7 @@ export const parallelCommand = {
                 });
                 try {
                     const scheduler = new ParallelScheduler(toolstack.router, new InMemoryLockManager());
-                    const phase = state.runtime?.phase || 'PATCH';
+                    const phase = state.runtime?.phase ?? 'PATCH';
                     const runtime = {
                         repoRoot: workspace.workPath,
                         worktreeRoot: workspace.workPath,

package/dist/cli/commands/run/handler.js

@@ -1,5 +1,5 @@
 import { randomUUID } from 'crypto';
-import { buildEffectiveConversationContext, createPluginRegistry, createPromptRegistry, getExitCode, getDefaultSessionContextBudgetTokens, getLogger, normalizePermissionMode, resolveExecutionProfile, SilentReporter, setPluginRegistry, setPromptRegistry, } from '../../../core/facades/cli-run-handler.js';
+import { buildEffectiveConversationContext, createPluginRegistry, createPromptRegistry, createSubAgentLlmFactory, getExitCode, getDefaultSessionContextBudgetTokens, getLogger, normalizePermissionMode, resolveExecutionProfile, SilentReporter, setPluginRegistry, setPromptRegistry, } from '../../../core/facades/cli-run-handler.js';
 import { createStdoutWriter } from '../../headless/stdout-writer.js';
 import { text } from '../../locales/index.js';
 import { getOptionValueSourceWithGlobalFallback } from '../../utils/command-option-source.js';
@@ -338,6 +338,7 @@ export async function handleRunCommand(options, command) {
             langfuseEnabled: resolvedConfig.observability.langfuse.enabled,
             headlessOutput,
         });
+        const llmFactory = createSubAgentLlmFactory(resolvedConfig.llm);
         let structuredOutputState = { ok: true, candidate: null };
         const reporter = createRunReporter({
             useGui,
@@ -435,6 +436,7 @@ export async function handleRunCommand(options, command) {
                 ? { allow: allowedToolRules, deny: disallowedToolRules }
                 : undefined,
             permissionMode,
+            llmFactory,
         });
         const buildAssistantMessage = (result) => buildRunAssistantMessage({ mode, result });
         const result = await executeRunLoop({
@@ -504,8 +506,9 @@ export async function handleRunCommand(options, command) {
             rawOutputProfile !== 'openai' &&
             activeReporterStarted &&
             activeReporter) {
-            const error = new Error(text.cli.unexpectedError(msg));
-            error.auditPath = lastKnownAuditPath;
+            const error = Object.assign(new Error(text.cli.unexpectedError(msg)), {
+                auditPath: lastKnownAuditPath,
+            });
             activeReporter.onError(error);
         }
         else if (outputFormat === 'stream-json') {

package/dist/cli/commands/run/loop-params.js

@@ -35,6 +35,7 @@ export function buildRunLoopParams(params) {
         permissionMode: params.permissionMode,
         extensions: params.extensions,
         permissionRules: params.permissionRules,
+        llmFactory: params.llmFactory,
         eventPayload: params.headlessIncludeToolInput ||
             params.headlessIncludeToolOutput ||
             params.headlessIncludeAuthorizationDecisions

package/dist/cli/commands/run/parse-options.js

@@ -1,3 +1,4 @@
+import { getString } from '../../../core/utils/serialize.js';
 import { resolveRepoPath } from '../../utils/resolve-cli-config.js';
 function splitToolRules(raw) {
     const parts = [];
@@ -20,39 +21,26 @@ function splitToolRules(raw) {
 }
 export function parseRunCommandOptions(command) {
     const allOptions = command.optsWithGlobals();
-    const repoPath = resolveRepoPath({ repo: allOptions.repo, cwd: process.cwd() });
+    const repoPath = resolveRepoPath({
+        repo: getString(allOptions, 'repo') ?? undefined,
+        cwd: process.cwd(),
+    });
     const continueSession = Boolean(allOptions.continue);
-    const resumeSessionId = typeof allOptions.resume === 'string'
-        ? allOptions.resume
-        : undefined;
-    const printInstruction = typeof allOptions.print === 'string'
-        ? allOptions.print
-        : undefined;
-    const explicitInstruction = typeof allOptions.instruction === 'string' ? allOptions.instruction : undefined;
-    const jsonSchemaSpec = typeof allOptions.jsonSchema === 'string'
-        ? allOptions.jsonSchema
-        : undefined;
+    const resumeSessionId = getString(allOptions, 'resume') ?? undefined;
+    const printInstruction = getString(allOptions, 'print') ?? undefined;
+    const explicitInstruction = getString(allOptions, 'instruction') ?? undefined;
+    const jsonSchemaSpec = getString(allOptions, 'jsonSchema') ?? undefined;
     const rawOutputFormat = String(allOptions.outputFormat || 'text');
-    const rawOutputProfile = typeof allOptions.outputProfile === 'string'
-        ? String(allOptions.outputProfile)
-        : undefined;
+    const rawOutputProfile = getString(allOptions, 'outputProfile') ?? undefined;
     const outputProfileForStreamJson = rawOutputProfile ?? 'native';
     const headlessIncludeToolInput = Boolean(allOptions.headlessIncludeToolInput);
     const headlessIncludeToolOutput = Boolean(allOptions.headlessIncludeToolOutput);
     const headlessIncludeAuthorizationDecisions = Boolean(allOptions.headlessIncludeAuthorizationDecisions);
     const allowOutsideCacheRoot = Boolean(allOptions.allowOutsideCacheRoot);
-    const exportPatchPath = typeof allOptions.exportPatch === 'string'
-        ? allOptions.exportPatch
-        : undefined;
-    const sweBenchInstanceId = typeof allOptions.sweBenchInstanceId === 'string'
-        ? allOptions.sweBenchInstanceId
-        : undefined;
-    const sweBenchModelName = typeof allOptions.sweBenchModelName === 'string'
-        ? allOptions.sweBenchModelName
-        : undefined;
-    const sweBenchPredictionsPath = typeof allOptions.sweBenchPredictions === 'string'
-        ? allOptions.sweBenchPredictions
-        : undefined;
+    const exportPatchPath = getString(allOptions, 'exportPatch') ?? undefined;
+    const sweBenchInstanceId = getString(allOptions, 'sweBenchInstanceId') ?? undefined;
+    const sweBenchModelName = getString(allOptions, 'sweBenchModelName') ?? undefined;
+    const sweBenchPredictionsPath = getString(allOptions, 'sweBenchPredictions') ?? undefined;
     const instruction = explicitInstruction ?? printInstruction;
     const allowedToolRules = splitToolRules(allOptions.allowedTools);
     const disallowedToolRules = splitToolRules(allOptions.disallowedTools);

package/dist/cli/commands/run/runtime-llm.js

@@ -41,24 +41,27 @@ export function createRuntimeLlmAndWarn(params) {
                 continue;
             if (!target || typeof target !== 'object')
                 continue;
+            const phaseTarget = target;
             const perPhaseConfig = {
-                id: target.id,
-                type: target.type,
-                clientPackage: target.clientPackage,
+                id: phaseTarget.id,
+                type: phaseTarget.type,
+                clientPackage: phaseTarget.clientPackage,
                 api: {
-                    baseUrl: target.api?.baseUrl,
-                    timeoutMs: target.api?.timeoutMs,
-                    headers: target.api?.headers,
-                    apiKey: target.api?.apiKey,
-                    apiKeySource: target.api?.apiKeySource,
+                    baseUrl: phaseTarget.api?.baseUrl,
+                    timeoutMs: phaseTarget.api?.timeoutMs,
+                    headers: phaseTarget.api?.headers,
+                    apiKey: phaseTarget.api?.apiKey,
+                    apiKeySource: phaseTarget.api?.apiKeySource,
                 },
                 models: {
-                    selectedModelId: target.model?.id,
-                    selectedModelSlot: target.model?.slot || 'default',
+                    selectedModelId: phaseTarget.model?.id,
+                    selectedModelSlot: phaseTarget.model?.slot || 'default',
                 },
-                capabilities: target.capabilities,
+                capabilities: phaseTarget.capabilities,
             };
-            const created = createRuntimeLlm(perPhaseConfig, { langfuseEnabled: params.langfuseEnabled });
+            const created = createRuntimeLlm(perPhaseConfig, {
+                langfuseEnabled: params.langfuseEnabled,
+            });
             warnings.push(...created.warnings);
             phaseLlms[phase] = created.llm;
         }

package/dist/cli/headless/openai-responses-canonical-applier.js

@@ -1,11 +1,5 @@
 import { parseCanonicalFunctionCallItemId, } from '../../core/facades/cli-headless.js';
-function isRecord(value) {
-    return Boolean(value) && typeof value === 'object';
-}
-function getString(record, key) {
-    const value = record[key];
-    return typeof value === 'string' ? value : null;
-}
+import { isRecord, getString } from '../../core/utils/serialize.js';
 export class OpenAiResponsesCanonicalApplier {
     state;
     constructor(state) {

package/dist/cli/reporters/standard.js

@@ -124,9 +124,8 @@ export class StandardReporter {
         getLogger().error(text.cli.unexpectedError(error.message), true);
     }
     initProgressBar() {
-        // 🛡️ DCAP Defense: Check if stderr supports TTY operations to prevent clearLine crashes and unexpected termination
-        const stream = process.stderr;
-        if (typeof stream.clearLine !== 'function' || typeof stream.cursorTo !== 'function') {
+        // DCAP Defense: Check if stderr supports TTY operations to prevent clearLine crashes and unexpected termination
+        if (!('clearLine' in process.stderr) || !('cursorTo' in process.stderr)) {
             this.bar = {
                 render: () => { },
                 tick: () => { },

package/dist/cli/reporters/stream-json.js

@@ -98,7 +98,8 @@ export class StreamJsonReporter {
         }));
     }
     onError(error) {
-        const auditPath = typeof error.auditPath === 'string' ? error.auditPath : undefined;
+        const errorRecord = error;
+        const auditPath = typeof errorRecord.auditPath === 'string' ? errorRecord.auditPath : undefined;
         this.emit(encodeStreamFailure({
             uuid: this.uuid(),
             sessionId: this.sessionId,

package/dist/cli/slash/runtime.js

@@ -135,10 +135,10 @@ export async function createCliSlashRuntime(options) {
                         // @see https://agentskills.io/specification — Progressive disclosure
                         const skill = await skillLoader.activateSkill(catalogEntry.id);
                         const meta = (req.meta ?? {});
-                        const signal = meta?.signal;
+                        const signal = meta.signal;
                         // Prepare an isolated worktree environment for governed shell execution.
                         const silentEmit = (event) => {
-                            if (event?.type === 'log' && event?.level === 'error') {
+                            if (event.type === 'log' && event.level === 'error') {
                                 options.emit(event);
                                 return;
                             }

package/dist/cli/ui/hooks/useLoopEvents.js

@@ -9,7 +9,7 @@ import { prepareMessagePayload, sanitizeMessage } from '../utils/sanitizer.js';
  */
 export function useLoopEvents(mode, onStart, signal, options) {
     const store = useUIStore();
-    const dispatch = store.dispatch;
+    const { dispatch } = store;
     const runStartedRef = useRef(false);
     const activeStreamIdRef = useRef(null);
     const logModeRef = useRef('normal');

package/dist/cli/ui/hooks/useLoopState.js

@@ -31,7 +31,7 @@ export function useLoopState() {
                             {
                                 id: Math.random().toString(36).substring(7),
                                 message: event.message,
-                                level: event.level,
+                                level: event.level === 'trace' ? 'debug' : event.level,
                                 timestamp: event.timestamp,
                             },
                         ].slice(-100),

package/dist/core/ast/parser.js

@@ -24,39 +24,48 @@ export class AstParser {
     static state = InitState.Idle;
     static initPromise = null;
     /**
-     * Get the Parser class from web-tree-sitter, handling different API versions
+     * Get the Parser class from web-tree-sitter, handling different API versions.
+     * Uses `as unknown as` for CJS/ESM interop — the runtime module shape varies
+     * across bundler configurations.
      */
     static getParserClass() {
+        const mod = TreeSitter;
         try {
-            return TreeSitter.Parser || TreeSitter.default?.Parser || TreeSitter;
+            return (mod.Parser ??
+                mod.default?.Parser ??
+                TreeSitter);
         }
         catch (_error) {
             getLogger().degrade(text.ast.degradedApi);
-            return TreeSitter.default || TreeSitter;
+            return (mod.default ?? TreeSitter);
         }
     }
     /**
-     * Get the Language class from web-tree-sitter, handling different API versions
+     * Get the Language class from web-tree-sitter, handling different API versions.
+     * Uses `as unknown as` for CJS/ESM interop.
      */
     static getLanguageClass() {
+        const mod = TreeSitter;
         try {
-            return TreeSitter.Language || TreeSitter.default?.Language;
+            return (mod.Language ?? mod.default?.Language);
         }
         catch (_error) {
             getLogger().degrade(text.ast.degradedApi);
-            return TreeSitter.default?.Language;
+            return mod.default?.Language;
         }
     }
     /**
-     * Get the Query class from web-tree-sitter, handling different API versions
+     * Get the Query class from web-tree-sitter, handling different API versions.
+     * Uses `as unknown as` for CJS/ESM interop.
      */
     static getQueryClass() {
+        const mod = TreeSitter;
         try {
-            return TreeSitter.Query || TreeSitter.default?.Query;
+            return (mod.Query ?? mod.default?.Query);
         }
         catch (_error) {
             getLogger().degrade(text.ast.degradedApi);
-            return TreeSitter.default?.Query;
+            return mod.default?.Query;
         }
     }
     static languages = new Map();