@myagentroam/node 0.11.41 → 0.11.43

package/dist/runner/mar-agent/conversation-normalizer.js

@@ -7,7 +7,41 @@ export function normalizeMarAgentUsage(usage) {
 import { boundedConversationItemId, compactRunnerText, compactRunnerValue } from '../normalization.js';
 import { runnerErrorProjection } from '../runner-error.js';
 import { toolPresentationSchema } from '@myagentroam/protocol';
-import { boundExecutionPresentation, publicOutputSnapshot } from '../execution-presentation.js';
+import { boundExecutionPresentation } from '../execution-presentation.js';
+import { publicOutputSnapshot } from '../normalization.js';
+function boundCodeOutputSnapshots(sources) {
+    for (const channel of ['outputPreview', 'stdout', 'stderr']) {
+        const text = (entry) => channel === 'outputPreview' ? entry.outputPreview : entry.displayOutput[channel];
+        let excess = [...sources.values()].reduce((length, entry) => length + text(entry).length, 0) - 10_000;
+        for (const [id, entry] of sources) {
+            if (excess <= 0)
+                break;
+            const before = text(entry);
+            if (!before)
+                continue;
+            let removed = Math.min(excess, before.length);
+            if (/^[\uDC00-\uDFFF]/u.test(before.slice(removed)))
+                removed++;
+            const tail = before.slice(removed);
+            if (channel === 'outputPreview') {
+                sources.set(id, { ...entry, outputPreview: tail, truncated: true });
+            }
+            else {
+                const dropped = channel === 'stdout' ? 'stdoutDroppedBytes' : 'stderrDroppedBytes';
+                sources.set(id, {
+                    ...entry,
+                    truncated: true,
+                    displayOutput: {
+                        ...entry.displayOutput,
+                        [channel]: tail,
+                        [dropped]: entry.displayOutput[dropped] + Buffer.byteLength(before.slice(0, removed))
+                    }
+                });
+            }
+            excess -= removed;
+        }
+    }
+}
 export class MarAgentConversationNormalizer {
     input(entry) {
         return {
@@ -32,6 +66,7 @@ export class MarAgentConversationNormalizer {
     #codeModeSourceCallIds = new Set();
     #codeModeOutputCalls = new Map();
     #codeModeOutputSnapshots = new Map();
+    #codeModeOutputArchive = new Map();
     #runningCodeModeCells = new Map();
     #codeModeCellWaiters = new Map();
     messageItemId(nativeItemId) {
@@ -234,6 +269,8 @@ export class MarAgentConversationNormalizer {
     }
     #toolOutput(event) {
         const { callId, toolName, executionId, turnId, parentCallId, output } = event;
+        if (output.mode === 'delta')
+            return this.#toolOutputDelta(event);
         const inputOutput = [output.stdout, output.stderr].filter(Boolean).join('\n');
         const displayOutput = execDisplayOutput(output.displayOutput) ?? {
             stdout: output.stdout,
@@ -248,9 +285,10 @@ export class MarAgentConversationNormalizer {
         const snapshot = {
             outputPreview: bounded.text,
             truncated: bounded.truncated || inputOutput.length > 10_000,
-            displayOutput
+            displayOutput,
+            processId: output.processId
         };
-        if (parentCallId !== undefined)
+        if (parentCallId !== undefined && (toolName === 'exec' || toolName === 'exec_wait'))
             return this.#codeModeToolOutput(callId, parentCallId, toolName, executionId, turnId, output.processId, snapshot);
         const state = this.#tools.get(callId);
         if (state === undefined ||
@@ -263,10 +301,15 @@ export class MarAgentConversationNormalizer {
         if (typeof input?.processId === 'string' && input.processId !== output.processId)
             return [];
         if (state.commandOrigin === undefined) {
-            if (toolName !== 'exec_wait')
+            if (toolName !== 'exec_wait' && toolName !== 'code_exec_wait')
                 return [];
             return [
-                genericToolItem(state.itemId, toolName, 'IN_PROGRESS', state.input, snapshot.outputPreview, null, snapshot.truncated, { processId: output.processId, displayOutput: snapshot.displayOutput })
+                genericToolItem(state.itemId, toolName, 'IN_PROGRESS', state.input, snapshot.outputPreview, null, snapshot.truncated, {
+                    processId: output.processId,
+                    displayOutput: snapshot.displayOutput,
+                    outputHeadTruncated: snapshot.displayOutput.stdoutDroppedBytes > 0 ||
+                        snapshot.displayOutput.stderrDroppedBytes > 0
+                })
             ];
         }
         const command = this.#commands.get(state.commandOrigin);
@@ -279,6 +322,93 @@ export class MarAgentConversationNormalizer {
         command.truncated = snapshot.truncated;
         return [commandItem(command, 'IN_PROGRESS')];
     }
+    #toolOutputDelta(event) {
+        const { callId, toolName, executionId, turnId, parentCallId, output } = event;
+        let target = this.#tools.get(callId);
+        if (parentCallId !== undefined) {
+            const child = this.#codeModeOutputCalls.get(callId);
+            const parent = this.#tools.get(parentCallId);
+            if (!child ||
+                child.parentCallId !== parentCallId ||
+                child.toolName !== toolName ||
+                child.executionId !== executionId ||
+                (child.turnId && turnId && child.turnId !== turnId) ||
+                !parent ||
+                parent.executionId !== executionId ||
+                (parent.turnId && turnId && parent.turnId !== turnId))
+                return [];
+            const input = record(child.input);
+            if (typeof input?.processId === 'string' && input.processId !== output.processId)
+                return [];
+            const display = execDisplayOutput(output.displayOutput);
+            if (display) {
+                const snapshots = this.#codeModeOutputSnapshots.get(parentCallId) ?? new Map();
+                const text = [display.stdout, display.stderr].filter(Boolean).join('\n');
+                const bounded = publicOutputSnapshot(text, display.stdoutDroppedBytes > 0 || display.stderrDroppedBytes > 0);
+                snapshots.set(callId, {
+                    outputPreview: bounded.text,
+                    truncated: bounded.truncated,
+                    displayOutput: display,
+                    processId: output.processId
+                });
+                this.#codeModeOutputSnapshots.set(parentCallId, snapshots);
+            }
+            target = parent.active
+                ? parent
+                : this.#runningCodeModeCells.get(parentCallId)?.executionId === executionId
+                    ? this.#activeCodeModeWaiter(this.#runningCodeModeCells.get(parentCallId))
+                    : undefined;
+        }
+        else {
+            if (!target ||
+                !target.active ||
+                target.toolName !== toolName ||
+                target.executionId !== executionId ||
+                (target.turnId && turnId && target.turnId !== turnId))
+                return [];
+            const input = record(target.input);
+            if (typeof input?.processId === 'string' && input.processId !== output.processId)
+                return [];
+        }
+        if (!target)
+            return [];
+        const command = target.commandOrigin === undefined ? undefined : this.#commands.get(target.commandOrigin);
+        const item = command
+            ? commandItem(command, 'IN_PROGRESS')
+            : genericToolItem(target.itemId, target.toolName, 'IN_PROGRESS', target.input, null, null);
+        const original = record(record(item.payload.toolPresentation)?.execution);
+        const blocks = [
+            ...(output.stdout ? [{ channel: 'STDOUT', text: output.stdout }] : []),
+            ...(output.stderr ? [{ channel: 'STDERR', text: output.stderr }] : [])
+        ];
+        const text = [output.stdout, output.stderr].filter(Boolean).join('\n');
+        const boundedText = publicOutputSnapshot(text, output.truncated);
+        const bounded = boundExecutionPresentation({
+            kind: parentCallId !== undefined
+                ? target.toolName === 'code_exec'
+                    ? 'CODE'
+                    : 'CONTROL'
+                : toolName === 'exec'
+                    ? 'SHELL'
+                    : 'CONTROL',
+            ...(typeof original?.toolName === 'string' ? { toolName: original.toolName } : {}),
+            output: blocks,
+            ...(output.truncated ? { truncation: { output: 'HEAD' } } : {})
+        });
+        return [
+            {
+                ...item,
+                append: 'output',
+                merge: true,
+                payload: {
+                    ...item.payload,
+                    outputPreview: boundedText.text,
+                    output: boundedText,
+                    toolPresentation: bounded.presentation
+                }
+            }
+        ];
+    }
     #codeModeToolOutput(callId, parentCallId, toolName, executionId, turnId, processId, snapshot) {
         const parent = this.#tools.get(parentCallId);
         const child = this.#codeModeOutputCalls.get(callId);
@@ -305,13 +435,30 @@ export class MarAgentConversationNormalizer {
         const snapshots = this.#codeModeOutputSnapshots.get(parentCallId) ?? new Map();
         snapshots.set(callId, snapshot);
         this.#codeModeOutputSnapshots.set(parentCallId, snapshots);
-        const combined = [...snapshots.values()]
+        const sources = new Map(this.#codeModeOutputArchive.get(parentCallId));
+        for (const active of snapshots.values())
+            sources.set(active.processId, active);
+        const entries = [...sources.values()];
+        const combined = entries
             .map((entry) => entry.outputPreview)
             .filter(Boolean)
-            .join('\n');
-        const bounded = publicOutputSnapshot(combined, [...snapshots.values()].some((entry) => entry.truncated));
+            .join('');
+        const bounded = publicOutputSnapshot(combined, entries.some((entry) => entry.truncated));
         return [
-            genericToolItem(target.itemId, target.toolName, 'IN_PROGRESS', target.input, bounded.text, null, bounded.truncated)
+            genericToolItem(target.itemId, target.toolName, 'IN_PROGRESS', target.input, bounded.text, null, bounded.truncated, {
+                outputHeadTruncated: entries.some((entry) => entry.displayOutput.stdoutDroppedBytes > 0 ||
+                    entry.displayOutput.stderrDroppedBytes > 0),
+                displayOutput: {
+                    stdout: entries
+                        .map((entry) => entry.displayOutput.stdout)
+                        .filter(Boolean)
+                        .join(''),
+                    stderr: entries
+                        .map((entry) => entry.displayOutput.stderr)
+                        .filter(Boolean)
+                        .join('')
+                }
+            })
         ];
     }
     #trackCodeModeOutputCall(event) {
@@ -343,7 +490,16 @@ export class MarAgentConversationNormalizer {
         const call = this.#codeModeOutputCalls.get(callId);
         if (call?.parentCallId === parentCallId) {
             this.#codeModeOutputCalls.delete(callId);
-            this.#codeModeOutputSnapshots.get(parentCallId)?.delete(callId);
+            const snapshots = this.#codeModeOutputSnapshots.get(parentCallId);
+            const completed = snapshots?.get(callId);
+            snapshots?.delete(callId);
+            if (completed) {
+                const archive = this.#codeModeOutputArchive.get(parentCallId) ??
+                    new Map();
+                archive.set(completed.processId, completed);
+                boundCodeOutputSnapshots(archive);
+                this.#codeModeOutputArchive.set(parentCallId, archive);
+            }
         }
     }
     #trackCodeModeWait(event) {
@@ -415,6 +571,7 @@ export class MarAgentConversationNormalizer {
     }
     #clearCodeModeOutputSnapshots(parentCallId) {
         this.#codeModeOutputSnapshots.delete(parentCallId);
+        this.#codeModeOutputArchive.delete(parentCallId);
         for (const [callId, state] of this.#codeModeOutputCalls)
             if (state.parentCallId === parentCallId)
                 this.#codeModeOutputCalls.delete(callId);
@@ -822,28 +979,43 @@ function validCompactAnchor(value) {
     return value !== undefined && value.length > 0 && value.length <= 128 ? value : undefined;
 }
 function codeObservationOutput(data, summary) {
+    const blocks = [];
+    const add = (channel, text) => {
+        if (typeof text !== 'string' || text.length === 0)
+            return;
+        const existing = blocks.find((block) => block.channel === channel);
+        if (existing)
+            existing.text += `\n${text}`;
+        else
+            blocks.push({ channel, text });
+    };
+    const streams = (value) => {
+        const display = record(value?.displayOutput) ?? value;
+        if (typeof display?.stdout !== 'string' && typeof display?.stderr !== 'string')
+            return false;
+        add('STDOUT', display?.stdout);
+        add('STDERR', display?.stderr);
+        return true;
+    };
+    if (streams(data))
+        return blocks;
     if (Array.isArray(data?.observations)) {
-        return data.observations
-            .flatMap((entry) => {
+        for (const entry of data.observations) {
             const observation = record(entry);
-            if (observation?.type === 'value' && typeof observation.value === 'string')
-                return [observation.value];
+            if (observation?.type === 'value')
+                add('TEXT', observation.value);
             const result = record(observation?.result);
             const source = record(observation?.source);
-            if (observation?.type === 'tool_result' &&
-                (source?.toolName === 'exec' || source?.toolName === 'exec_wait')) {
-                const resultData = record(result?.data);
-                const display = record(resultData?.displayOutput) ?? resultData;
-                if (typeof display?.stdout === 'string' || typeof display?.stderr === 'string')
-                    return [display?.stdout, display?.stderr].filter((value) => typeof value === 'string' && value.length > 0);
-            }
-            return observation?.type === 'tool_result' && typeof result?.content === 'string'
-                ? [result.content]
-                : [];
-        })
-            .join('\n');
+            if (observation?.type !== 'tool_result')
+                continue;
+            if ((source?.toolName === 'exec' || source?.toolName === 'exec_wait') &&
+                streams(record(result?.data)))
+                continue;
+            add('TEXT', result?.content);
+        }
+        return blocks.length ? blocks : [{ channel: 'TEXT', text: '' }];
     }
-    return summary ?? undefined;
+    return summary === null ? undefined : [{ channel: 'TEXT', text: summary }];
 }
 function codeExecutionError(data) {
     const error = record(data?.error);
@@ -876,7 +1048,14 @@ function genericToolItem(id, toolName, status, input, outputSummary = null, erro
                 preview.length > 10_000
         }, status, 'Code execution', {
             kind: 'CODE',
-            ...(source.length > 10_000 ? { truncation: { input: true } } : {}),
+            ...(source.length > 10_000 || resultData?.outputHeadTruncated === true
+                ? {
+                    truncation: {
+                        ...(source.length > 10_000 ? { input: true } : {}),
+                        ...(resultData?.outputHeadTruncated === true ? { output: 'HEAD' } : {})
+                    }
+                }
+                : {}),
             ...(errorCode === null
                 ? resultError === undefined
                     ? {}
@@ -887,8 +1066,8 @@ function genericToolItem(id, toolName, status, input, outputSummary = null, erro
                         message: compactRunnerText(outputSummary ?? '', 1000)
                     }
                 }),
-            ...(codeOutput === undefined ? {} : { output: [{ channel: 'TEXT', text: codeOutput }] })
-        });
+            ...(codeOutput === undefined ? {} : { output: codeOutput })
+        }, toolName);
     }
     if (toolName === 'code_exec_wait' || toolName === 'exec_wait') {
         const inputRecord = record(input);
@@ -920,7 +1099,7 @@ function genericToolItem(id, toolName, status, input, outputSummary = null, erro
             .join('\n');
         return commandItem({
             itemId: id,
-            command: toolName,
+            command: '',
             cwd: null,
             outputPreview: status === 'IN_PROGRESS' && outputSummary !== null
                 ? outputSummary
@@ -938,6 +1117,14 @@ function genericToolItem(id, toolName, status, input, outputSummary = null, erro
                 resultSummary.length > 10_000
         }, status, toolName === 'code_exec_wait' ? 'Code execution wait' : 'Command wait', {
             kind: 'CONTROL',
+            toolName,
+            action: compactRunnerText(action, 128),
+            ...(typeof inputRecord?.processId === 'string' || typeof inputRecord?.cellId === 'string'
+                ? {
+                    targetId: compactRunnerText(String(inputRecord.processId ?? inputRecord.cellId), 256)
+                }
+                : {}),
+            ...executionSource(resultData?.executionSource),
             ...(display === undefined
                 ? {}
                 : {
@@ -947,10 +1134,9 @@ function genericToolItem(id, toolName, status, input, outputSummary = null, erro
                     ]
                 }),
             ...(display === undefined && legacyBlocks.length > 0 ? { output: legacyBlocks } : {}),
-            ...(codeOutput === undefined
-                ? {}
-                : { output: [{ channel: 'TEXT', text: codeOutput }] }),
+            ...(codeOutput === undefined ? {} : { output: codeOutput }),
             ...((typeof inputRecord?.data === 'string' && inputRecord.data.length > 10_000) ||
+                resultData?.outputHeadTruncated === true ||
                 (display !== undefined && (display.stdoutDroppedBytes || display.stderrDroppedBytes)) ||
                 (display === undefined && legacyBlocks.length > 0 && truncated)
                 ? {
@@ -958,8 +1144,9 @@ function genericToolItem(id, toolName, status, input, outputSummary = null, erro
                         ...(typeof inputRecord?.data === 'string' && inputRecord.data.length > 10_000
                             ? { input: true }
                             : {}),
-                        ...(display !== undefined &&
-                            (display.stdoutDroppedBytes || display.stderrDroppedBytes)
+                        ...(resultData?.outputHeadTruncated === true ||
+                            (display !== undefined &&
+                                (display.stdoutDroppedBytes || display.stderrDroppedBytes))
                             ? { output: 'HEAD' }
                             : display === undefined && legacyBlocks.length > 0 && truncated
                                 ? { output: 'SOURCE' }
@@ -993,6 +1180,7 @@ function genericToolItem(id, toolName, status, input, outputSummary = null, erro
             title: compactRunnerText(toolName, 500) || 'unknown',
             inputSummary: inputSummary.text || null,
             outputSummary: outputSummary === null ? null : compactRunnerText(outputSummary, 10_000),
+            ...(outputSummary === null ? {} : { output: publicOutputSnapshot(outputSummary, truncated) }),
             progressLabel: status === 'IN_PROGRESS' ? 'Running' : null,
             errorCode: errorCode === null ? null : compactRunnerText(errorCode, 80),
             truncated: truncated || inputSummary.truncated || (outputSummary?.length ?? 0) > 10_000,
@@ -1064,7 +1252,24 @@ function execDisplayOutput(value) {
         stderrDroppedBytes: data.stderrDroppedBytes
     };
 }
-function commandItem(command, status, title, execution) {
+function executionSource(value) {
+    const source = record(value);
+    if (!source ||
+        (source.kind !== 'SHELL' && source.kind !== 'CODE') ||
+        typeof source.text !== 'string')
+        return {};
+    return {
+        source: {
+            kind: source.kind,
+            text: compactRunnerText(source.text, 10_000),
+            ...(typeof source.cwd === 'string' ? { cwd: compactRunnerText(source.cwd, 10_000) } : {}),
+            truncated: source.truncated === true ||
+                source.text.length > 10_000 ||
+                (typeof source.cwd === 'string' && source.cwd.length > 10_000)
+        }
+    };
+}
+function commandItem(command, status, title, execution, toolName = 'exec') {
     const display = command.displayOutput;
     const detail = execution ?? {
         kind: 'SHELL',
@@ -1089,7 +1294,7 @@ function commandItem(command, status, title, execution) {
                 ]
             })
     };
-    const bounded = boundExecutionPresentation(detail);
+    const bounded = boundExecutionPresentation({ toolName, ...detail });
     return {
         itemId: command.itemId,
         kind: 'command_execution',
@@ -1099,7 +1304,13 @@ function commandItem(command, status, title, execution) {
             command: command.command,
             cwd: command.cwd,
             outputPreview: command.outputPreview,
-            outputRef: null,
+            output: {
+                text: publicOutputSnapshot(bounded.presentation.execution.output
+                    ?.map((block) => block.text)
+                    .filter(Boolean)
+                    .join('\n') ?? command.outputPreview).text,
+                truncated: command.truncated || bounded.truncated
+            },
             exitCode: command.exitCode,
             durationMs: null,
             truncated: command.truncated ||
@@ -1130,7 +1341,6 @@ function patchChanges(value, extensions) {
             additions: entry.additions,
             deletions: entry.deletions,
             changeId: entry.changeId,
-            diffAvailable: entry.diff.status === 'available',
             diff: entry.diff.status === 'available'
                 ? { ...entry.diff, source: 'TOOL_CHANGE' }
                 : {
@@ -1164,7 +1374,7 @@ function patchChanges(value, extensions) {
     });
 }
 function change(path, operation, additions, deletions) {
-    return { path, change: operation, additions, deletions, diffAvailable: false };
+    return { path, change: operation, additions, deletions };
 }
 function execResult(value, summary, eventTruncated = false) {
     const data = record(value);
@@ -1248,9 +1458,15 @@ function marAgentSubagentProjection(toolName, input, output, knownTitle, knownDe
         ...(title.length === 0 ? {} : { title }),
         ...subagentPayload(details),
         ...(typeof details.latestMessage?.text === 'string'
-            ? { outputSummary: boundedToolSummary(details.latestMessage.text) }
+            ? {
+                outputSummary: boundedToolSummary(details.latestMessage.text),
+                output: publicOutputSnapshot(details.latestMessage.text, details.latestMessage.truncated === true)
+            }
             : typeof outputData?.errorMessage === 'string'
-                ? { outputSummary: compactRunnerText(outputData.errorMessage, 10_000) }
+                ? {
+                    outputSummary: compactRunnerText(outputData.errorMessage, 10_000),
+                    output: publicOutputSnapshot(outputData.errorMessage)
+                }
                 : {}),
         ...(typeof outputData?.errorCode === 'string'
             ? { errorCode: compactRunnerText(outputData.errorCode, 80) }

package/dist/runner/mar-agent/managed-run-controller.js

@@ -737,7 +737,8 @@ export class MarAgentManagedRunController {
                     status: item.status,
                     payload: attachments.length === 0 ? item.payload : { ...item.payload, attachments },
                     ...(item.permissionStop === undefined ? {} : { permissionStop: item.permissionStop }),
-                    ...(item.merge === undefined ? {} : { merge: item.merge })
+                    ...(item.merge === undefined ? {} : { merge: item.merge }),
+                    ...(item.append === undefined ? {} : { append: item.append })
                 });
             }
         }

package/dist/runner/mar-agent/runtime-model-factory.js

@@ -87,10 +87,8 @@ export class MarAgentRuntimeModelFactory {
                         : { responsesConfigurationUpdates: configuration.responsesConfigurationUpdates }),
                     enabled: configuration.enabled
                 };
-                const { apiKey, credential } = configuration;
-                if (apiKey !== undefined)
-                    return { ...model, apiKey: new SecretValue(apiKey) };
-                if (credential?.type === 'INLINE_API_KEY')
+                const { credential } = configuration;
+                if (credential.type === 'INLINE_API_KEY')
                     return {
                         ...model,
                         apiKey: new SecretValue(credential.value)

package/dist/runner/mar-agent-runner.js

@@ -1,4 +1,4 @@
-import { marAgentNodeModelSummarySchema, parseComposerTags, resolveMarAgentDefaultReasoningEffort, serializeComposerTag } from '@myagentroam/protocol';
+import { marAgentNodeModelSummarySchema, marAgentRuntimeModelConfigurationSchema, parseComposerTags, resolveMarAgentDefaultReasoningEffort, serializeComposerTag } from '@myagentroam/protocol';
 import { nodeLog } from '../operational.js';
 import { runnerErrorProjection } from './runner-error.js';
 import { AgentError, openAgentSessionCatalog } from '@myagentroam/agent';
@@ -7,7 +7,7 @@ import { resolve } from 'node:path';
 import { AbstractRunner } from './abstract-runner.js';
 import { marAgentGeneratedImageSources, marAgentGeneratedImagesDirectory } from './mar-agent/generated-images.js';
 import { projectMarAgentHistory } from './mar-agent/history-projection.js';
-import { captureMarAgentExecutionInput } from './mar-agent/execution-input.js';
+import { captureMarAgentExecutionInput, marAgentEnvelopeInput } from './mar-agent/execution-input.js';
 export class MarAgentRunner extends AbstractRunner {
     homeDirectory;
     name = 'mar-agent';
@@ -31,6 +31,7 @@ export class MarAgentRunner extends AbstractRunner {
         return { runner: this.name, runnerInput: captureMarAgentExecutionInput(input) };
     }
     discoveryScope = 'ALL_WORKSPACES';
+    // Display and usage hints only; request admission/defaults use captured resources.
     #models = [];
     #releaseSessionResources;
     #generatedImageRegistrar;
@@ -45,6 +46,7 @@ export class MarAgentRunner extends AbstractRunner {
                 return parsed.success ? [parsed.data] : [];
             })
             : [];
+        return this.profileForValidation();
     }
     setSessionResourceReleaser(release) {
         this.#releaseSessionResources = release;
@@ -114,8 +116,9 @@ export class MarAgentRunner extends AbstractRunner {
     available(capabilities) {
         return capabilities.marAgent?.available === true;
     }
-    profileForValidation() {
-        const models = this.#models.filter((model) => model.enabled && model.conversationModel !== false);
+    profileForValidation(catalog = this
+        .#models) {
+        const models = catalog.filter((model) => model.enabled && model.conversationModel !== false);
         return {
             runner: 'mar-agent',
             models: models.map((model, index) => ({
@@ -202,10 +205,29 @@ export class MarAgentRunner extends AbstractRunner {
             .map((model) => model.id));
         return this.profileForValidation().models.filter((model) => eligible.has(model.id));
     }
-    assertChildModel(modelId) {
-        if (!this.childModels().some((model) => model.id === modelId))
+    assertChildModel(modelId, context) {
+        if (!this.executionModels(context).some((model) => model.id === modelId && model.enabled && model.conversationModel && model.subagentModel))
             throw new Error('MAR_AGENT_SUBAGENT_MODEL_UNAVAILABLE');
     }
+    executionModels(context, purpose = 'admission') {
+        if (context.runner !== this.name)
+            return [];
+        const input = marAgentEnvelopeInput({ runnerInput: context.runnerInput });
+        const candidates = purpose === 'defaults' && Array.isArray(input?.models) && input.models.length > 0
+            ? input.models
+            : input?.model !== undefined
+                ? [input.model]
+                : Array.isArray(input?.models)
+                    ? input.models
+                    : [];
+        return candidates.flatMap((value) => {
+            const runtime = marAgentRuntimeModelConfigurationSchema.safeParse(value);
+            if (runtime.success)
+                return [runtime.data];
+            const summary = marAgentNodeModelSummarySchema.safeParse(value);
+            return summary.success ? [summary.data] : [];
+        });
+    }
     supportsConfiguration(configuration) {
         if (configuration.runner !== this.name)
             return false;
@@ -217,8 +239,10 @@ export class MarAgentRunner extends AbstractRunner {
                 : model.supportedEfforts.includes(configuration.effort)) &&
             profile.accessOptions.some((candidate) => candidate.id === configuration.access));
     }
-    defaultConfiguration() {
-        const profile = this.profileForValidation();
+    defaultConfiguration(_workspace, _environment, executionContext) {
+        const profile = this.profileForValidation(executionContext === undefined
+            ? this.#models
+            : this.executionModels(executionContext, 'defaults'));
         const model = profile.models[0];
         return {
             runner: 'mar-agent',

package/dist/runner/normalization.js

@@ -1,6 +1,14 @@
 export function compactRunnerText(value, limit) {
     return value.length <= limit ? value : `${value.slice(0, Math.max(0, limit - 1))}…`;
 }
+export function publicOutputSnapshot(value, truncated = false) {
+    const text = typeof value === 'string' ? value : compactRunnerValue(value, Number.MAX_SAFE_INTEGER).text;
+    let bounded = text.slice(-10_000);
+    const first = bounded.charCodeAt(0);
+    if (text.length > 10_000 && first >= 0xdc00 && first <= 0xdfff)
+        bounded = bounded.slice(1);
+    return { text: bounded, truncated: truncated || text.length > 10_000 };
+}
 export function compactRunnerValue(value, limit) {
     if (value === undefined || value === null)
         return { text: '', truncated: false };

package/dist/runner/opencode/tool-normalizer.js

@@ -1,5 +1,5 @@
-import { compactRunnerText, compactRunnerValue } from '../normalization.js';
-import { publicOutputSnapshot, shellExecution } from '../execution-presentation.js';
+import { compactRunnerText, compactRunnerValue, publicOutputSnapshot } from '../normalization.js';
+import { shellExecution } from '../execution-presentation.js';
 export function normalizeOpenCodeTool(toolName, state) {
     const status = state?.status === 'completed'
         ? 'COMPLETED'
@@ -14,6 +14,7 @@ export function normalizeOpenCodeTool(toolName, state) {
         return {
             kind: 'command_execution',
             payload: {
+                toolName: publicToolName,
                 command: compactRunnerText(typeof input?.command === 'string'
                     ? input.command
                     : typeof input?.cmd === 'string'
@@ -21,7 +22,6 @@ export function normalizeOpenCodeTool(toolName, state) {
                         : publicToolName, 10_000),
                 cwd: typeof input?.cwd === 'string' ? compactRunnerText(input.cwd, 4_096) : null,
                 outputPreview: typeof state?.output === 'string' ? compactRunnerText(state.output, 10_000) : '',
-                outputRef: null,
                 exitCode: typeof state?.exitCode === 'number' ? state.exitCode : null,
                 durationMs: null,
                 truncated: typeof state?.output === 'string' && state.output.length > 10_000,
@@ -53,6 +53,7 @@ export function normalizeOpenCodeTool(toolName, state) {
                     }
                 }
                 : {}),
+            ...(typeof state?.output === 'string' ? { output: publicOutputSnapshot(state.output) } : {}),
             ...subagent
         }
     };
@@ -75,7 +76,10 @@ function openCodeSubagentProjection(toolName, input, output) {
         ...(title.length === 0 ? {} : { title }),
         ...(nativeResult === undefined
             ? {}
-            : { outputSummary: compactRunnerText(nativeResult.result, 10_000) || null })
+            : {
+                outputSummary: compactRunnerText(nativeResult.result, 10_000) || null,
+                output: publicOutputSnapshot(nativeResult.result)
+            })
     };
 }
 function openCodeTaskResult(value) {

package/dist/runner/personal-instructions.js

@@ -1,4 +1,9 @@
 const MAX_CONTENT_LENGTH = 20_000;
+const RESOLVED_INSTRUCTIONS = Symbol('resolvedPersonalInstructions');
+/** Carry Node-owned merged instructions across internal Session operations, never JSON input. */
+export function resolvedPersonalInstructions(value) {
+    return { [RESOLVED_INSTRUCTIONS]: value };
+}
 export function normalizeSessionPrompt(value) {
     if (value === null)
         return null;
@@ -15,6 +20,8 @@ export function personalInstructionsForRunner(value, runner) {
         return undefined;
     if (value === null || typeof value !== 'object' || Array.isArray(value))
         throw new Error('PERSONAL_INSTRUCTION_INVALID');
+    if (RESOLVED_INSTRUCTIONS in value && typeof value[RESOLVED_INSTRUCTIONS] === 'string')
+        return value[RESOLVED_INSTRUCTIONS] || undefined;
     const record = value;
     const instructions = {
         common: content(record['common']),