@marifold/core 0.64.1 → 0.66.0

package/dist/runtime/MarifoldRuntime.js

@@ -81,6 +81,7 @@ const SkillAppResolver_1 = require("../app/SkillAppResolver");
 const SkillAppInstanceRegistry_1 = require("../app/SkillAppInstanceRegistry");
 const TaskStore_1 = require("../tasks/TaskStore");
 const WorkspacePaths_1 = require("../workspace/WorkspacePaths");
+const NativeWebSearch_1 = require("./NativeWebSearch");
 // Older OpenAI-compatible gateways still take a raw `{think}` body option.
 // Priest 2.8 owns neutral reasoning for Ollama, Anthropic, and Responses.
 const LEGACY_THINK_PROVIDER_NAMES = new Set(['bailian', 'alibaba_cloud']);
@@ -97,6 +98,7 @@ class MarifoldRuntime {
     memoryStore;
     taskStore;
     searchBackend;
+    searchBackendOverridden;
     scheduleStore;
     constructor(options) {
         this.options = options;
@@ -107,6 +109,7 @@ class MarifoldRuntime {
         this.providerFactory = new ProviderFactory_1.ProviderFactory(config, configPath);
         this.memoryStore = new MemoryStore_1.MemoryStore(config.paths.profilesDir);
         this.taskStore = new TaskStore_1.TaskStore(config.paths.tasksDir);
+        this.searchBackendOverridden = options.searchBackend !== undefined;
         this.searchBackend = options.searchBackend
             ?? (0, createSearchBackend_1.createSearchBackend)((0, ConfigSchema_1.resolveWebSearchConfig)(config.webSearch));
         this.scheduleStore = new ScheduleStore_1.ScheduleStore(config.paths.schedulesDir ?? (0, WorkspacePaths_1.defaultSchedulesDir)());
@@ -138,10 +141,14 @@ class MarifoldRuntime {
         const engine = this.createEngine(settings.provider, Boolean(request.sessionId) && !replacing && !isolated, request.profileContext !== false);
         const memoryOn = this.memoryEnabled(settings.profile, request.memories);
         const memory = this.memoryForRequest(settings.profile, request.memories, request.prompt, settings.think);
-        const webSearchMode = this.resolveWebSearchMode(settings, request.chatTools !== false);
-        const chatTools = this.chatTools(request, webSearchMode);
-        const priestRequest = {
-            config: this.toPriestConfig(settings, webSearchMode === 'native'),
+        const searchResolution = this.resolveWebSearch(settings, request.chatTools !== false);
+        let webSearchMode = searchResolution.mode;
+        let chatTools = this.chatTools(request, webSearchMode);
+        const nativeFallbackAvailable = webSearchMode === 'native'
+            && this.fallbackWebSearchAvailable(settings, request.chatTools !== false);
+        let nativeFallbackAttempted = false;
+        const buildPriestRequest = () => ({
+            config: this.toPriestConfig(settings, webSearchMode === 'native' ? searchResolution.nativeStrategy : 'none'),
             profile: settings.profile,
             prompt: request.prompt,
             session: request.sessionId && !replacing && !isolated
@@ -155,10 +162,11 @@ class MarifoldRuntime {
             memory,
             images: preparedImages.images.length > 0 ? preparedImages.images : undefined,
             userContext: request.userContext,
-            providerTools: this.providerToolsFor(webSearchMode),
-        };
+            providerTools: this.providerToolsFor(webSearchMode, searchResolution.nativeStrategy),
+        });
+        let priestRequest = buildPriestRequest();
         const exchange = [];
-        const maxIterations = chatTools ? CHAT_TOOL_MAX_ITERATIONS : 1;
+        const maxIterations = chatTools || nativeFallbackAvailable ? CHAT_TOOL_MAX_ITERATIONS : 1;
         let response;
         let aggregateUsage;
         // Keep the non-streaming CLI/service path at parity with stream(): a model
@@ -172,6 +180,18 @@ class MarifoldRuntime {
                 ...(exchange.length > 0 ? { toolExchange: exchange } : {}),
             }, request.signal ? { signal: request.signal } : undefined);
             aggregateUsage = sumUsage(aggregateUsage, response.usage);
+            if (!response.ok
+                && webSearchMode === 'native'
+                && nativeFallbackAvailable
+                && !nativeFallbackAttempted
+                && (0, NativeWebSearch_1.isNativeWebSearchCapabilityError)(response.error)) {
+                nativeFallbackAttempted = true;
+                webSearchMode = 'fallback';
+                chatTools = this.chatTools(request, webSearchMode);
+                priestRequest = buildPriestRequest();
+                iteration -= 1;
+                continue;
+            }
             if (!response.ok || !chatTools || !response.toolCalls?.length)
                 break;
             exchange.push({
@@ -241,10 +261,14 @@ class MarifoldRuntime {
         const engine = this.createEngine(settings.provider, enginePersistsSession, request.profileContext !== false);
         const memoryOn = this.memoryEnabled(settings.profile, request.memories);
         const memory = this.memoryForRequest(settings.profile, request.memories, request.prompt, settings.think);
-        const webSearchMode = this.resolveWebSearchMode(settings, request.chatTools !== false);
-        const chatTools = this.chatTools(request, webSearchMode);
-        const baseRequest = {
-            config: this.toPriestConfig(settings, webSearchMode === 'native'),
+        const searchResolution = this.resolveWebSearch(settings, request.chatTools !== false);
+        let webSearchMode = searchResolution.mode;
+        let chatTools = this.chatTools(request, webSearchMode);
+        const nativeFallbackAvailable = webSearchMode === 'native'
+            && this.fallbackWebSearchAvailable(settings, request.chatTools !== false);
+        let nativeFallbackAttempted = false;
+        const buildBaseRequest = () => ({
+            config: this.toPriestConfig(settings, webSearchMode === 'native' ? searchResolution.nativeStrategy : 'none'),
             profile: settings.profile,
             prompt: request.prompt,
             session: request.sessionId && !replacing && !isolated
@@ -258,19 +282,21 @@ class MarifoldRuntime {
             memory,
             images: preparedImages.images.length > 0 ? preparedImages.images : undefined,
             userContext: request.userContext,
-            providerTools: this.providerToolsFor(webSearchMode),
-        };
+            providerTools: this.providerToolsFor(webSearchMode, searchResolution.nativeStrategy),
+        });
+        let baseRequest = buildBaseRequest();
         // Caller-executed fallback/read loop. Provider-hosted search is carried
         // separately and does not enter Marifold's tool exchange.
         // Intermediate tool-call turns are turn-local; the engine persists the
         // session only on the loop's final response, and memory payloads are
         // applied only from that final response.
         const exchange = [];
-        const maxIterations = chatTools ? CHAT_TOOL_MAX_ITERATIONS : 1;
+        const maxIterations = chatTools || nativeFallbackAvailable ? CHAT_TOOL_MAX_ITERATIONS : 1;
         for (let iteration = 0; iteration < maxIterations; iteration += 1) {
             const stripper = new MemoryControls_1.MemoryControlStripper();
             const visibleParts = [];
             let done;
+            let providerOutputStarted = false;
             const lastIteration = iteration === maxIterations - 1;
             for await (const event of engine.streamEvents({
                 ...baseRequest,
@@ -278,6 +304,7 @@ class MarifoldRuntime {
                 ...(exchange.length > 0 ? { toolExchange: exchange } : {}),
             }, request.signal ? { signal: request.signal } : undefined)) {
                 if (event.type === 'text_delta') {
+                    providerOutputStarted = true;
                     const visible = stripper.feed(event.text);
                     if (visible) {
                         visibleParts.push(visible);
@@ -285,8 +312,14 @@ class MarifoldRuntime {
                     }
                 }
                 else if (event.type === 'reasoning_summary_delta') {
+                    providerOutputStarted = true;
                     onReasoningSummary?.(event.text);
                 }
+                else if (event.type === 'tool_call_start'
+                    || event.type === 'tool_call_delta'
+                    || event.type === 'tool_call_end') {
+                    providerOutputStarted = true;
+                }
                 else if (event.type === 'done') {
                     done = event.response;
                 }
@@ -297,6 +330,18 @@ class MarifoldRuntime {
                 yield tail;
             }
             aggregateUsage = sumUsage(aggregateUsage, done?.usage);
+            if (!providerOutputStarted
+                && webSearchMode === 'native'
+                && nativeFallbackAvailable
+                && !nativeFallbackAttempted
+                && (0, NativeWebSearch_1.isNativeWebSearchCapabilityError)(done?.error)) {
+                nativeFallbackAttempted = true;
+                webSearchMode = 'fallback';
+                chatTools = this.chatTools(request, webSearchMode);
+                baseRequest = buildBaseRequest();
+                iteration -= 1;
+                continue;
+            }
             if (done?.error) {
                 this.discardFailedNewSession(request.sessionId, sessionWasMissing);
                 throw MarifoldError_1.MarifoldError.providerError(done.error.message, settings.provider, settings.model, done.error.code);
@@ -355,7 +400,7 @@ class MarifoldRuntime {
             }
         }
     }
-    /** Run the web search backend directly (the /search chat command). */
+    /** Run the selected web-search backend directly for non-chat integrations. */
     async searchWeb(query, maxResults) {
         const config = (0, ConfigSchema_1.resolveWebSearchConfig)(this.options.loadedConfig.config.webSearch);
         const results = await this.searchBackend.search(query, maxResults ?? config.maxResults);
@@ -495,6 +540,9 @@ class MarifoldRuntime {
      * validation as the CLI's `config set` (see ConfigManager.setValue). */
     setConfigValue(key, value) {
         new ConfigManager_1.ConfigManager(this.options.loadedConfig).setValue(key, value);
+        if (key.startsWith('web_search.') && !this.searchBackendOverridden) {
+            this.searchBackend = (0, createSearchBackend_1.createSearchBackend)((0, ConfigSchema_1.resolveWebSearchConfig)(this.options.loadedConfig.config.webSearch));
+        }
     }
     /** Read a config value by dotted key (CLI `config get`). */
     getConfigValue(key) {
@@ -623,23 +671,28 @@ class MarifoldRuntime {
             toolMode: override.toolMode ?? global.toolMode,
         };
     }
-    createAgentRunner(profile, registry) {
+    createAgentRunner(profile, registry, agentConfigOverride, runtimeOptions = {}) {
         return new AgentRunner_1.AgentRunner({
             taskStore: this.taskStore,
             registry: registry ?? this.createDefaultToolRegistry(profile),
-            agentConfig: this.resolveAgentConfigForProfile(profile),
+            agentConfig: agentConfigOverride ?? this.resolveAgentConfigForProfile(profile),
             resolveSettings: request => this.resolveSettings(request),
             prepareEngine: async (settings) => {
                 await this.refreshProviderCredentialsIfNeeded(settings.provider);
-                const webSearchMode = this.resolveWebSearchMode(settings);
+                const searchResolution = runtimeOptions.webSearch === false
+                    ? { mode: 'unavailable', nativeStrategy: 'none' }
+                    : this.resolveWebSearch(settings);
+                const webSearchMode = searchResolution.mode;
                 return {
                     // No engine-level session store: priest would otherwise persist the
                     // raw per-iteration `Objective:`/tool framing (and duplicates). The
                     // runner instead persists one clean turn pair via `persistTurn` below.
                     engine: this.createEngine(settings.provider, false),
-                    config: this.toPriestConfig(settings, webSearchMode === 'native'),
+                    config: this.toPriestConfig(settings, searchResolution.nativeStrategy),
                     webSearchMode,
-                    providerTools: this.providerToolsFor(webSearchMode),
+                    webSearchFallbackAvailable: webSearchMode === 'native'
+                        && this.fallbackWebSearchAvailable(settings),
+                    providerTools: this.providerToolsFor(webSearchMode, searchResolution.nativeStrategy),
                 };
             },
             prepareImages: async (images, optimize) => (await (0, ImageOptimizer_1.prepareImageInputs)(images, { optimize })).images,
@@ -671,12 +724,16 @@ class MarifoldRuntime {
                     })];
             },
             resolveReadOnlyFolders: resolvedProfile => {
+                if (runtimeOptions.readOnlyFolders)
+                    return runtimeOptions.readOnlyFolders;
                 const { config } = this.options.loadedConfig;
                 return [
                     path.join(config.paths.profilesDir, resolvedProfile, 'skills'),
                     config.paths.skillsDir ?? (0, WorkspacePaths_1.defaultSkillsDir)(),
                 ];
             },
+            resolveReadOnlyFiles: () => runtimeOptions.readOnlyFiles ?? [],
+            allowExternalReadOnlyFolders: runtimeOptions.allowExternalReadOnlyFolders,
         });
     }
     createDefaultToolRegistry(profile) {
@@ -759,7 +816,12 @@ class MarifoldRuntime {
     }
     createAppStore() {
         const { config } = this.options.loadedConfig;
-        return new AppStore_1.AppStore(config.paths.appsDir ?? (0, WorkspacePaths_1.defaultAppsDir)());
+        return new AppStore_1.AppStore(config.paths.appsDir ?? (0, WorkspacePaths_1.defaultAppsDir)(), {
+            resolveProfileSkill: (profile, skillName) => {
+                this.profileResolver.load(profile);
+                return this.createSkillStore(profile).get(skillName);
+            },
+        });
     }
     listApps() {
         return this.createAppStore().list();
@@ -767,36 +829,82 @@ class MarifoldRuntime {
     getApp(name) {
         return this.createAppStore().get(name);
     }
-    /** Execute one profile-free v1 operation and normalize provider output to
-     * the Skill's declared result contract. No session, memory, tools, profile
-     * context, or transcript is created. */
-    async runSkillAppOperation(appName, operationName, state, signal) {
+    /** Execute one statically compiled SkillApp operation. v1 operations remain
+     * profile-free; v2 profile operations load the referenced profile and may
+     * receive read-only memory plus instance-local history. */
+    async runSkillAppOperation(appName, operationName, state, signal, history, attachments) {
         const startedAt = Date.now();
         try {
             const store = this.createAppStore();
             const definition = store.require(appName);
             const operation = (0, SkillAppResolver_1.resolveSkillAppOperation)(store, definition, operationName, state);
-            await this.refreshProviderCredentialsIfNeeded(operation.model.provider);
-            const settings = {
-                profile: `skillapp-${appName}`,
-                provider: operation.model.provider,
-                model: operation.model.model,
-                think: operation.model.think,
-                mode: 'chat',
-            };
-            const response = await this.createEngine(settings.provider, false, false).run({
-                config: this.toPriestConfig(settings),
-                profile: settings.profile,
-                prompt: operation.prompt,
-                context: operation.instructions,
-            }, signal ? { signal } : undefined);
-            if (response.error) {
-                throw MarifoldError_1.MarifoldError.providerError(response.error.message, settings.provider, settings.model, response.error.code);
+            let settings;
+            let text;
+            let usage;
+            if (operation.profile) {
+                settings = this.resolveSettings({
+                    profile: operation.profile.profile,
+                    ...(operation.profile.provider ? { provider: operation.profile.provider } : {}),
+                    ...(operation.profile.model ? { model: operation.profile.model } : {}),
+                    ...(operation.profile.think !== undefined ? { think: operation.profile.think } : {}),
+                });
+                const memory = this.memoryForRequest(settings.profile, operation.profile.memory, operation.prompt, settings.think);
+                const historyContext = operation.profile.history && history?.length
+                    ? (0, AgentHistory_1.buildHistoryContext)(history, 16_000)
+                    : undefined;
+                const instructions = [
+                    ...operation.instructions,
+                    ...(historyContext ? [historyContext] : []),
+                ];
+                if ((operation.mode ?? settings.mode) === 'agent') {
+                    const run = await this.runProfileSkillAppAgent(appName, operation.operationName, settings, operation.prompt, instructions, memory, operation.skillDirectory, definition.permissions ?? [], attachments, signal);
+                    text = run.text;
+                    usage = run.usage;
+                }
+                else {
+                    if (attachments?.some(attachment => attachment.kind === 'file')) {
+                        throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operationName}' needs Agent mode to inspect non-image attachments.`);
+                    }
+                    await this.refreshProviderCredentialsIfNeeded(settings.provider);
+                    const response = await this.createEngine(settings.provider, false).run({
+                        config: this.toPriestConfig(settings),
+                        profile: settings.profile,
+                        prompt: operation.prompt,
+                        context: instructions,
+                        ...(memory.length > 0 ? { memory } : {}),
+                        ...(attachments?.some(attachment => attachment.kind === 'image') ? {
+                            images: attachments
+                                .filter(attachment => attachment.kind === 'image')
+                                .map(attachment => ({ data: attachment.data, mediaType: attachment.mediaType })),
+                        } : {}),
+                    }, signal ? { signal } : undefined);
+                    text = requireSkillAppResponseText(response, settings);
+                    usage = response.usage;
+                }
             }
-            if (response.text === undefined) {
-                throw MarifoldError_1.MarifoldError.providerError(`Provider '${settings.provider}' returned no text for model '${settings.model}'.`, settings.provider, settings.model, 'EMPTY_RESPONSE');
+            else {
+                if (!operation.model) {
+                    throw MarifoldError_1.MarifoldError.appInvalid(`SkillApp operation '${operationName}' has no model.`);
+                }
+                settings = {
+                    profile: `skillapp-${appName}`,
+                    provider: operation.model.provider,
+                    model: operation.model.model,
+                    think: operation.model.think,
+                    mode: 'chat',
+                };
+                await this.refreshProviderCredentialsIfNeeded(settings.provider);
+                const response = await this.createEngine(settings.provider, false, false).run({
+                    config: this.toPriestConfig(settings),
+                    profile: settings.profile,
+                    prompt: operation.prompt,
+                    context: operation.instructions,
+                }, signal ? { signal } : undefined);
+                text = requireSkillAppResponseText(response, settings);
+                usage = response.usage;
             }
-            const text = operation.result.trim ? response.text.trim() : response.text;
+            text = (0, MemoryControls_1.stripMemoryControls)(text).text;
+            text = operation.result.trim ? text.trim() : text;
             return {
                 status: 'ok',
                 data: { text },
@@ -804,7 +912,7 @@ class MarifoldRuntime {
                     engine: settings.provider,
                     model: settings.model,
                     durationMs: Date.now() - startedAt,
-                    ...(response.usage ? { usage: response.usage } : {}),
+                    ...(usage ? { usage } : {}),
                 },
             };
         }
@@ -823,6 +931,81 @@ class MarifoldRuntime {
     createSkillAppInstanceRegistry() {
         return new SkillAppInstanceRegistry_1.SkillAppInstanceRegistry(this);
     }
+    async runProfileSkillAppAgent(appName, operationName, settings, prompt, instructions, memory, skillDirectory, permissions = [], attachments = [], signal) {
+        const registry = new ToolRegistry_1.ToolRegistry();
+        registry.register(new InspectAttachmentTool_1.InspectAttachmentTool());
+        registry.register(new ReadAttachmentTool_1.ReadAttachmentTool());
+        registry.register(new SearchAttachmentTool_1.SearchAttachmentTool());
+        registry.register(new ReadFileTool_1.ReadFileTool({ strictWorkspace: true }));
+        const base = this.resolveAgentConfigForProfile(settings.profile);
+        const isolatedConfig = {
+            ...base,
+            approval: {
+                read: 'allow',
+                write: 'deny',
+                shell: 'deny',
+                network: 'deny',
+                delegate: 'deny',
+            },
+            trustedFolders: [],
+        };
+        const runner = this.createAgentRunner(settings.profile, registry, isolatedConfig, {
+            webSearch: false,
+            readOnlyFolders: [
+                ...(skillDirectory ? [skillDirectory] : []),
+                ...permissions.filter(permission => permission.kind === 'folder').map(permission => permission.path),
+            ],
+            readOnlyFiles: permissions
+                .filter(permission => permission.kind === 'file')
+                .map(permission => permission.path),
+            allowExternalReadOnlyFolders: true,
+        });
+        const images = attachments
+            .filter(attachment => attachment.kind === 'image')
+            .map(attachment => ({ data: attachment.data, mediaType: attachment.mediaType }));
+        const files = attachments
+            .filter(attachment => attachment.kind === 'file')
+            .map(attachment => ({
+            name: attachment.name,
+            mediaType: attachment.mediaType,
+            data: attachment.data,
+            ...(attachment.inspectionText !== undefined ? { inspectionText: attachment.inspectionText } : {}),
+        }));
+        let finalText;
+        let failure;
+        let status;
+        let usage;
+        for await (const event of runner.run({
+            objective: prompt,
+            profile: settings.profile,
+            provider: settings.provider,
+            model: settings.model,
+            think: settings.think,
+            lean: true,
+            instructions,
+            ...(images.length > 0 || files.length > 0 ? {
+                images,
+                files,
+            } : {}),
+            ...(memory.length > 0 ? { memory } : {}),
+            cwd: (0, WorkspacePaths_1.marifoldHome)(),
+            tags: ['skillapp', appName, operationName],
+            signal,
+        })) {
+            if (event.type === 'text' && event.phase === 'final')
+                finalText = event.text;
+            if (event.type === 'error')
+                failure = { code: event.code, message: event.message };
+            if (event.type === 'done') {
+                status = event.status;
+                usage = event.usage;
+            }
+        }
+        if (status !== 'completed' || finalText === undefined) {
+            throw MarifoldError_1.MarifoldError.providerError(failure?.message ?? `Profile Skill operation '${operationName}' did not produce a final response.`, settings.provider, settings.model, failure?.code ?? 'APP_SKILL_FAILED');
+        }
+        return { text: finalText, ...(usage ? { usage } : {}) };
+    }
     createSchedule(input) {
         return this.scheduleStore.create(input);
     }
@@ -1048,7 +1231,7 @@ class MarifoldRuntime {
             },
         };
     }
-    toPriestConfig(settings, nativeWebSearch = false) {
+    toPriestConfig(settings, nativeWebSearch = 'none') {
         const { config } = this.options.loadedConfig;
         const provider = config.providers[settings.provider];
         const neutralReasoning = this.supportsNeutralReasoning(settings.provider, settings.model);
@@ -1058,8 +1241,12 @@ class MarifoldRuntime {
         // Compatibility bridge for Priest 3.0.x. Priest 3.1 reads providerTools
         // directly; Marifold's Responses wrapper consumes and removes this marker
         // when an older engine does not forward that additive request field.
-        if (nativeWebSearch)
+        if (nativeWebSearch === 'responses-tool') {
             providerOptions[NATIVE_WEB_SEARCH_COMPAT_OPTION] = true;
+        }
+        else if (nativeWebSearch === 'chat-option') {
+            providerOptions['enable_search'] = true;
+        }
         return {
             provider: settings.provider,
             model: settings.model,
@@ -1108,20 +1295,35 @@ class MarifoldRuntime {
             thinking,
         });
     }
-    resolveWebSearchMode(settings, modelToolsEnabled = true) {
-        if (!modelToolsEnabled)
-            return 'unavailable';
+    resolveWebSearch(settings, modelToolsEnabled = true) {
+        if (!modelToolsEnabled) {
+            return { mode: 'unavailable', nativeStrategy: 'none' };
+        }
         const approval = this.resolveAgentConfigForProfile(settings.profile).approval;
-        if (approval.network === 'deny')
-            return 'unavailable';
-        if (this.providerFactory.supportsNativeWebSearch(settings.provider))
-            return 'native';
-        return (0, ConfigSchema_1.resolveWebSearchConfig)(this.options.loadedConfig.config.webSearch).enabled
-            ? 'fallback'
-            : 'unavailable';
+        if (approval.network === 'deny') {
+            return { mode: 'unavailable', nativeStrategy: 'none' };
+        }
+        const nativeStrategy = this.providerFactory.nativeWebSearchStrategy(settings.provider, settings.model);
+        if (nativeStrategy !== 'none') {
+            return { mode: 'native', nativeStrategy };
+        }
+        return {
+            mode: this.fallbackWebSearchAvailable(settings, modelToolsEnabled) ? 'fallback' : 'unavailable',
+            nativeStrategy: 'none',
+        };
     }
-    providerToolsFor(mode) {
-        return mode === 'native' ? [{ type: 'web_search' }] : undefined;
+    fallbackWebSearchAvailable(settings, modelToolsEnabled = true) {
+        if (!modelToolsEnabled) {
+            return false;
+        }
+        const approval = this.resolveAgentConfigForProfile(settings.profile).approval;
+        return approval.network !== 'deny'
+            && (0, ConfigSchema_1.resolveWebSearchConfig)(this.options.loadedConfig.config.webSearch).enabled;
+    }
+    providerToolsFor(mode, nativeStrategy) {
+        return mode === 'native' && nativeStrategy === 'responses-tool'
+            ? [{ type: 'web_search' }]
+            : undefined;
     }
     runtimeContext(memory, prompt, memoryOn, webSearchMode) {
         const context = ['Running inside Marifold.'];
@@ -1171,6 +1373,15 @@ class MarifoldRuntime {
     }
 }
 exports.MarifoldRuntime = MarifoldRuntime;
+function requireSkillAppResponseText(response, settings) {
+    if (response.error) {
+        throw MarifoldError_1.MarifoldError.providerError(response.error.message, settings.provider, settings.model, response.error.code);
+    }
+    if (response.text === undefined) {
+        throw MarifoldError_1.MarifoldError.providerError(`Provider '${settings.provider}' returned no text for model '${settings.model}'.`, settings.provider, settings.model, 'EMPTY_RESPONSE');
+    }
+    return response.text;
+}
 function completedResponseMetrics(mode, settings, startedAt, startedAtMs, usage) {
     const finishedAtMs = Date.now();
     return {