@myagentroam/node 0.11.45 → 0.11.47

package/dist/connector.js

@@ -443,7 +443,7 @@ export class NodeConnector {
         emitSession: (session) => this.emitSessionWorkbenchEvent({ session }),
         emitPage: (session, page) => this.emitWorkbenchEvent('conversation', {
             sessionId: session.id,
-            snapshot: this.conversationSegmentService.projectInitial(session, page, 10)
+            snapshot: this.conversationSegmentService.projectInitial(session, page, 3)
         }),
         nodeId: () => this.config?.nodeId ?? 'runtime-node',
         nodeGeneration: () => this.nodeGeneration,
@@ -854,7 +854,7 @@ export class NodeConnector {
                     prompt: item.content,
                     modelText: prepared.input,
                     clientMessageId: item.clientMessageId,
-                    model: prepared.model,
+                    modelId: prepared.modelId,
                     effort: prepared.effort,
                     access: prepared.access,
                     collaborationMode: prepared.collaborationMode,
@@ -968,7 +968,7 @@ export class NodeConnector {
                     runner: session.runner,
                     externalSessionId: nativeSessionId,
                     workspaceId: session.workspaceId,
-                    ...(session.model === null ? {} : { model: session.model }),
+                    ...(session.modelId === null ? {} : { modelId: session.modelId }),
                     ...(session.effort === null ? {} : { effort: session.effort }),
                     ...(session.access === null ? {} : { access: session.access }),
                     ...(session.customTitle === null ? {} : { customTitle: session.customTitle }),
@@ -1508,7 +1508,7 @@ export class NodeConnector {
                     workspaceId: task.workspaceId,
                     ownerUserId: task.ownerUserId,
                     runner: task.runner,
-                    model: configuredSession.model
+                    modelId: configuredSession.modelId
                 });
                 return {
                     secretEnvironment: context.secretEnvironment,

package/dist/database.js

@@ -4,6 +4,7 @@ import { NODE_SCHEMA_MIGRATION_V19 } from './migrations/v019.js';
 import { NODE_SCHEMA_MIGRATION_V20 } from './migrations/v020.js';
 import { NODE_SCHEMA_MIGRATION_V21 } from './migrations/v021.js';
 import { NODE_SCHEMA_MIGRATION_V22 } from './migrations/v022.js';
+import { NODE_SCHEMA_MIGRATION_V23 } from './migrations/v023.js';
 import { normalizeSessionPrompt } from './runner/personal-instructions.js';
 import { randomUUID } from 'node:crypto';
 import { closeSync, existsSync, mkdirSync, openSync, rmSync } from 'node:fs';
@@ -27,7 +28,8 @@ export const NODE_SCHEMA_MIGRATIONS = [
     NODE_SCHEMA_MIGRATION_V19,
     NODE_SCHEMA_MIGRATION_V20,
     NODE_SCHEMA_MIGRATION_V21,
-    NODE_SCHEMA_MIGRATION_V22
+    NODE_SCHEMA_MIGRATION_V22,
+    NODE_SCHEMA_MIGRATION_V23
 ];
 const LEGACY_NODE_SCHEMA_V12 = NODE_SCHEMA_VERSION_V13 - 1;
 const OBSOLETE_NODE_SCHEMA_V16 = 16;
@@ -314,7 +316,7 @@ export class NodeDatabase {
             pinOrder = 0;
         else if (input.pinned === false)
             pinOrder = null;
-        const model = input.model === undefined ? (current?.model ?? null) : input.model;
+        const model = input.modelId === undefined ? (current?.modelId ?? null) : input.modelId;
         const effort = input.effort === undefined ? (current?.effort ?? null) : input.effort;
         const access = input.access === undefined ? (current?.access ?? null) : input.access;
         const parentSessionId = current === undefined || input.initializeParent === true
@@ -326,7 +328,7 @@ export class NodeDatabase {
             sessionPrompt,
             runnerTitle,
             runnerTitlePending,
-            model,
+            modelId: model,
             effort,
             access
         });
@@ -367,7 +369,7 @@ export class NodeDatabase {
             runnerTitlePending,
             pinnedAt: pinOrder === null ? null : 1,
             pinOrder,
-            model,
+            modelId: model,
             effort,
             access
         };
@@ -666,7 +668,7 @@ function sessionMetadata(row) {
         sessionPrompt: value('sessionPrompt'),
         runnerTitle: value('runnerTitle'),
         runnerTitlePending: raw['runnerTitlePending'] === true,
-        model: value('model'),
+        modelId: value('modelId'),
         effort: value('effort'),
         access: value('access')
     };

package/dist/marctl-guidance.js

@@ -10,7 +10,7 @@ const marctlSafety = 'Acceptance is not completion. If a request result is unkno
 export const marctlManagementInstructions = [
     '## MAR Workspace management',
     'Use native agent_* tools for Agent discovery, creation, communication, observation, waiting and stopping. Do not switch to marctl when a native operation fails.',
-    'Use marctl agents config <id> --model <id> --effort <effort> to change future model settings; agents rename <id> --title <title> changes a title.',
+    'Use marctl agents config <id> --model-id <id> --effort <effort> to change future model settings; agents rename <id> --title <title> changes a title.',
     'Use agents prompt get/set/clear for persistent instructions; set accepts -m or --message-file. Use agents schedule list/get/create/update for scheduled tasks; update requires --expected-revision.',
     'marctl nodes lists authorized Nodes; marctl ssh executes remote commands and marctl scp transfers files. Use marctl help agents, nodes, ssh or scp for options.',
     marctlSafety
@@ -19,7 +19,7 @@ export const marctlDescription = 'Use marctl agents to create, send to, wait for
 export const marctlInstructions = [
     '## MAR Workspace CLI',
     'Run marctl from the shell. Commands use the authenticated Node and Workspace; marctl help agents, nodes, ssh or scp shows options.',
-    'Use agents start --title <title> -m <text> [--runner <runner>] [--model <id>] [--effort <effort>] [--goal <objective>]. An Agent must supply a nonblank title; a manual terminal may omit it. The default Runner is the current Session Runner; a terminal without a current Session must specify --runner or an explicit --parent. Start returns without waiting.',
+    'Use agents start --title <title> -m <text> [--runner <runner>] [--model-id <id>] [--effort <effort>] [--goal <objective>]. An Agent must supply a nonblank title; a manual terminal may omit it. The default Runner is the current Session Runner; a terminal without a current Session must specify --runner or an explicit --parent. Start returns without waiting.',
     'Use agents send <id> -m <text> [--steer|--queue], agents wait [<id>] [--wait-for message|completion] [--timeout <duration>], agents stop <id> --execution <execution-id>, agents list [--scope children|descendants|workspace|profile], and agents view <id> [--history]. Wait defaults to direct-child completion for 30 seconds; --timeout 0ms takes a snapshot. Stop clears the target Session Goal.',
     'Prefer agents send <id> --steer -m <text> for timely communication or course correction. Use --queue only for deliberately deferred input: it is consumed after current work and earlier queued inputs finish, and with an active Goal it is not consumed until that Goal exits. Acceptance is not a guarantee of immediate processing.',
     'Start and send accept repeated --image <local-path> for PNG, JPEG, GIF or WebP; limits are five images, 5 MiB each and 10 MiB total. Send can update a Goal alone with --goal <objective> or --clear-goal; omitted Goal leaves it unchanged. Decide a direct child approval with send <id> --approval <approval-id> --decision approve|reject.',

package/dist/migrations/v023.js

@@ -0,0 +1,25 @@
+import { NODE_SCHEMA_MIGRATION_V22 } from './v022.js';
+const defaultPaths = ['codex', 'claude-code', 'opencode', 'mar-agent'].map((runner) => `$.runnerDefaults."${runner}"`);
+const rename = (column, path) => `json_remove(CASE WHEN json_type(${column}, '${path}.modelId') IS NULL
+    THEN json_set(${column}, '${path}.modelId', json_extract(${column}, '${path}.model'))
+    ELSE ${column} END, '${path}.model')`;
+export const NODE_SCHEMA_MIGRATION_V23 = {
+    version: 23,
+    sql: [
+        `UPDATE agent_sessions SET metadata = ${rename('metadata', '$')}
+      WHERE json_type(metadata, '$.model') IS NOT NULL;`,
+        ...defaultPaths.map((path) => `UPDATE node_settings SET settings = ${rename('settings', path)}
+        WHERE json_type(settings, '${path}.model') IS NOT NULL;`)
+    ].join('\n'),
+    preflight: (database) => NODE_SCHEMA_MIGRATION_V22.assert(database),
+    assert(database) {
+        NODE_SCHEMA_MIGRATION_V22.assert(database);
+        if (database
+            .prepare("SELECT 1 FROM agent_sessions WHERE json_type(metadata, '$.model') IS NOT NULL")
+            .get() !== undefined ||
+            defaultPaths.some((path) => database
+                .prepare(`SELECT 1 FROM node_settings WHERE json_type(settings, '${path}.model') IS NOT NULL`)
+                .get() !== undefined))
+            throw new Error('NODE_DATABASE_SCHEMA_INVALID:modelId');
+    }
+};

package/dist/runner/abstract-runner.js

@@ -30,7 +30,7 @@ export class AbstractRunner {
     supportsConfiguration(configuration, workspace, environment) {
         void [workspace, environment];
         const profile = this.profileForValidation();
-        const model = profile.models.find((candidate) => candidate.id === configuration.model);
+        const model = profile.models.find((candidate) => candidate.id === configuration.modelId);
         return (configuration.runner === this.name &&
             model !== undefined &&
             model.supportedEfforts.includes(configuration.effort) &&

package/dist/runner/claude/managed-run-controller.js

@@ -62,7 +62,7 @@ export class ClaudeManagedRunController {
             input,
             cwd: session.cwd,
             externalSessionId: session.externalSessionId,
-            model: session.model,
+            model: session.modelId,
             effort: session.effort,
             access: session.access,
             secretEnvironment

package/dist/runner/claude-code-runner.js

@@ -49,7 +49,7 @@ export class ClaudeCodeRunner extends AbstractRunner {
     defaultConfiguration() {
         return {
             runner: this.name,
-            model: claudeDefaultModel(this.environment),
+            modelId: claudeDefaultModel(this.environment),
             effort: 'medium',
             access: 'default'
         };

package/dist/runner/codex/managed-run-controller.js

@@ -400,7 +400,7 @@ export class CodexManagedRunController {
             usage = new CodexUsageNormalizer(runId, (value) => this.host.emit(runId, 'run.usage', {
                 ...value,
                 sessionId: this.runner.execution.runs.get(runId)?.threadId
-            }), active ? (this.host.session(active.sessionId)?.model ?? undefined) : undefined);
+            }), active ? (this.host.session(active.sessionId)?.modelId ?? undefined) : undefined);
             this.usage.set(runId, usage);
         }
         return usage;

package/dist/runner/codex-runner.js

@@ -202,7 +202,7 @@ export class CodexRunner extends AbstractRunner {
                     ? emptyCodexConfiguration()
                     : {
                         runner: this.name,
-                        model: selected.model,
+                        modelId: selected.model,
                         effort: selected.defaultEffort,
                         access: 'on-request'
                     }
@@ -361,7 +361,8 @@ export class CodexRunner extends AbstractRunner {
             return false;
         const profile = this.profileCacheForEnvironment(environment)?.profile;
         return (profile !== undefined &&
-            profile.models.some((model) => model.id === configuration.model && model.supportedEfforts.includes(configuration.effort)) &&
+            profile.models.some((model) => model.id === configuration.modelId &&
+                model.supportedEfforts.includes(configuration.effort)) &&
             profile.accessOptions.some((option) => option.id === configuration.access));
     }
     profileCacheForEnvironment(_environment) {
@@ -695,7 +696,11 @@ export class CodexRunner extends AbstractRunner {
         const threadId = session.externalSessionId;
         if (threadId === null)
             throw new Error('SESSION_REWIND_UNAVAILABLE');
-        const configuration = { model: session.model, effort: session.effort, access: session.access };
+        const configuration = {
+            model: session.modelId,
+            effort: session.effort,
+            access: session.access
+        };
         return this.withTemporaryClient(async (client) => {
             const result = boundary === null
                 ? await client.startThread(session.cwd, configuration)
@@ -719,7 +724,7 @@ export class CodexRunner extends AbstractRunner {
         const threadId = session.externalSessionId;
         return this.withTemporaryClient(async (client) => {
             const resumed = await client.resumeThread(threadId, session.cwd, {
-                model: session.model,
+                model: session.modelId,
                 effort: session.effort,
                 access: session.access
             });
@@ -753,7 +758,7 @@ export class CodexRunner extends AbstractRunner {
     }
 }
 function emptyCodexConfiguration() {
-    return { runner: 'codex', model: '', effort: '', access: 'on-request' };
+    return { runner: 'codex', modelId: '', effort: '', access: 'on-request' };
 }
 function codexModelPage(value) {
     if (!isPlainRecord(value) || !Array.isArray(value.data))

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

@@ -1,6 +1,10 @@
 import { agentNetworkWaitModelOutput } from './agent-network-wait-output.js';
 import { agentOperationEvent } from './agent-operation-presentation.js';
 const text = { type: 'string', minLength: 1 };
+const runner = {
+    ...text,
+    description: 'Runner type (for example mar-agent), not a model name; defaults to the current Runner.'
+};
 const attachmentIds = {
     type: 'array',
     items: text,
@@ -42,8 +46,11 @@ const tools = [
             content: { type: 'string' },
             attachments,
             attachmentIds,
-            runner: text,
-            model: text,
+            runner,
+            modelId: {
+                ...text,
+                description: 'Model ID from the target Runner Profile models[].id, not a display name. For MAR Agent this is an internal configuration ID, not an upstream model ID; omit to use the Runner default.'
+            },
             effort: text,
             title: text,
             goal,
@@ -53,7 +60,7 @@ const tools = [
     },
     {
         action: 'send',
-        description: 'Send input, decide an approval or update a Goal; goal:null leaves it unchanged, goal:{clear:true} clears it. Prefer REPLACE_CURRENT for timely communication or course correction. QUEUE is consumed only after current work and earlier queued inputs finish; an active Goal must exit first. Sending to a non-child does not subscribe to its updates.',
+        description: 'Send input, decide an approval or update a Goal; goal:null leaves it unchanged, goal:{clear:true} clears it. Messages default to REPLACE_CURRENT (steer); use QUEUE only when deferred delivery is explicitly requested. QUEUE is consumed only after current work and earlier queued inputs finish; an active Goal must exit first.',
         properties: {
             agentId: text,
             content: { type: 'string' },
@@ -66,14 +73,18 @@ const tools = [
                 required: ['approvalId', 'decision'],
                 properties: { approvalId: text, decision: { type: 'string', enum: ['approve', 'reject'] } }
             },
-            deliveryIntent: { type: 'string', enum: ['SEND', 'QUEUE', 'REPLACE_CURRENT'] },
+            deliveryIntent: {
+                type: 'string',
+                enum: ['SEND', 'QUEUE', 'REPLACE_CURRENT'],
+                description: 'Message delivery defaults to REPLACE_CURRENT (steer); explicit SEND remains supported.'
+            },
             clientMessageId: text
         },
         required: ['agentId']
     },
     {
         action: 'wait',
-        description: 'Wait for completion or messages; defaults to direct children, completion and 30 seconds. Use waitMs 0 for a snapshot. Non-child targets are observed only during this call.',
+        description: 'Wait for completion or messages; defaults to direct children, completion and 30 seconds. Use waitMs 0 for a snapshot.',
         properties: {
             agentId: text,
             agentIds: { type: 'array', items: text, minItems: 1, maxItems: 8 },
@@ -90,13 +101,18 @@ const tools = [
     },
     {
         action: 'list',
-        description: 'List Sessions, descendants or a Runner profile.',
+        description: 'List direct children by default, discover Workspace Sessions, inspect descendants or query a Runner profile.',
         properties: {
             scope: { type: 'string', enum: ['workspace', 'children', 'descendants', 'profile'] },
-            agentId: text,
-            parent: text,
-            runner: text,
-            query: { type: 'string' },
+            agentId: {
+                ...text,
+                description: 'Root for children or descendants; defaults to the current Session.'
+            },
+            runner: {
+                ...runner,
+                description: 'Runner for profile scope; defaults to the current Runner, not a model name.'
+            },
+            query: { type: 'string', description: 'Search Sessions; not a model selector.' },
             limit: { type: 'integer', minimum: 1, maximum: 100 },
             cursor: text
         }
@@ -117,12 +133,14 @@ const delegationPrompt = [
     '# Delegation and coordination',
     'Delegate bounded, self-contained tasks when independent progress or context savings materially helps. Keep simple or tightly coupled work local.',
     'Give each child an objective, necessary context, expected output, and a read-only boundary or non-overlapping write scope.',
+    'Follow up through the direct delegate by default; inspect deeper Sessions only when a concrete issue needs independent verification.',
     'While children run, continue meaningful non-overlapping work. Do not redo delegated work. Wait only when the next step needs the result.',
     'Verify consequential findings and changes. Join or stop task-required child work before final delivery, and retain responsibility for the final result.'
 ].join('\n\n');
 const collaborationPrompt = [
     '# Workspace collaboration',
-    "Use native agent_* tools to collaborate within the Agent Network when another Session's context or ongoing work materially helps. Keep requests focused and avoid unnecessary cross-Session coordination. Peer Sessions retain their own work and lifecycle; do not treat them as task-owned children or stop them merely for task cleanup. Sending to a non-child does not subscribe to its updates; explicitly wait when you need its progress or completion."
+    "Use native agent_* tools to collaborate within the Agent Network when another Session's context or ongoing work materially helps. Keep requests focused and avoid unnecessary cross-Session coordination. Peer Sessions retain their own work and lifecycle; do not treat them as task-owned children or stop them merely for task cleanup. Explicitly wait when you need progress or completion.",
+    "Reuse known Session IDs rather than rediscovering them. Send updates for meaningful progress, blockers, or changes that affect the recipient's work; combine related updates and avoid acknowledgment-only exchanges."
 ].join('\n\n');
 const managementPrompt = [
     '# Workspace management',
@@ -168,7 +186,7 @@ export function agentNetworkExtension(invoke, currentExecution) {
                         'title',
                         'executionId',
                         'runner',
-                        'model',
+                        'modelId',
                         'effort',
                         'waitFor',
                         'waitMs',
@@ -184,12 +202,34 @@ export function agentNetworkExtension(invoke, currentExecution) {
                         const executionId = currentExecution();
                         if (!executionId)
                             throw new Error('AGENT_ACTOR_NOT_ACTIVE');
-                        const result = await invoke(executionId, tool.action, input, call);
+                        const args = input;
+                        const operationInput = tool.action === 'send' &&
+                            args.deliveryIntent === undefined &&
+                            ((typeof args.content === 'string' && !!args.content.trim()) ||
+                                (Array.isArray(args.attachments) && args.attachments.length > 0) ||
+                                (Array.isArray(args.attachmentIds) && args.attachmentIds.length > 0))
+                            ? { ...args, deliveryIntent: 'REPLACE_CURRENT' }
+                            : args;
+                        const onResolved = call.publishEventData
+                            ? async (sessions) => {
+                                const rows = sessions.map((session) => ({
+                                    agentId: session.id,
+                                    title: session.customTitle ?? session.runnerTitle ?? undefined
+                                }));
+                                const result = tool.action === 'wait'
+                                    ? { agents: rows }
+                                    : tool.action === 'view'
+                                        ? { session: rows[0] }
+                                        : (rows[0] ?? {});
+                                await call.publishEventData(agentOperationEvent(tool.action, {}, result).eventData);
+                            }
+                            : undefined;
+                        const result = await invoke(executionId, tool.action, operationInput, call, onResolved);
                         const modelResult = tool.action === 'wait' ? agentNetworkWaitModelOutput(result) : result;
                         return {
                             data: result,
                             content: JSON.stringify(modelResult),
-                            ...agentOperationEvent(tool.action, input, result)
+                            ...agentOperationEvent(tool.action, operationInput, result)
                         };
                     }
                 });

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

@@ -6,7 +6,7 @@ export function normalizeMarAgentUsage(usage) {
 }
 import { boundedConversationItemId, compactRunnerText, compactRunnerValue } from '../normalization.js';
 import { runnerErrorProjection } from '../runner-error.js';
-import { toolPresentationSchema } from '@myagentroam/protocol';
+import { toolPresentationSchema, agentOperationPresentationSchema } from '@myagentroam/protocol';
 import { publicOutputSnapshot, publicToolOutput } from '../normalization.js';
 import { boundToolOutput } from '@myagentroam/protocol';
 import { agentOperationAction, agentOperationPresentation } from './agent-operation-presentation.js';
@@ -170,6 +170,20 @@ export class MarAgentConversationNormalizer {
                 ...this.#codeModeToolResults(event)
             ];
         }
+        if (event.type === 'tool.updated') {
+            const state = this.#tools.get(event.callId);
+            if (!state?.active ||
+                state.toolName !== event.toolName ||
+                !agentOperationAction(event.toolName))
+                return [];
+            const operation = agentOperationPresentationSchema.safeParse(record(event.data)?.agentOperation);
+            if (!operation.success || operation.data.action !== agentOperationAction(event.toolName))
+                return [];
+            this.#tools.set(event.callId, { ...state, presentationData: event.data });
+            return [
+                genericToolItem(state.itemId, state.toolName, 'IN_PROGRESS', state.input, null, null, false, event.data, state.subagentTitle, state.subagentDetails, undefined, undefined, state.inputTruncated)
+            ];
+        }
         if (event.type === 'sleep.started') {
             const state = this.#tools.get(event.callId);
             if (state?.toolName !== 'sleep')
@@ -673,7 +687,7 @@ export class MarAgentConversationNormalizer {
         }
         const item = genericToolItem(state?.itemId ?? itemId('tool', event.callId), event.toolName, 'COMPLETED', state?.input, generatedImages.length === 0
             ? event.summary
-            : generatedImages.map((image) => image.name).join(', '), null, event.outputTruncation !== undefined, event.data, agentId === undefined ? state?.subagentTitle : this.#subagentTitles.get(agentId), details, state?.sleepStartedAt, event.outputTruncation, state?.inputTruncated, event.summaryTruncated === true);
+            : generatedImages.map((image) => image.name).join(', '), null, event.outputTruncation !== undefined, mergeAgentOperationData(event.toolName, state?.presentationData, event.data), agentId === undefined ? state?.subagentTitle : this.#subagentTitles.get(agentId), details, state?.sleepStartedAt, event.outputTruncation, state?.inputTruncated, event.summaryTruncated === true);
         return [
             {
                 ...item,
@@ -704,7 +718,11 @@ export class MarAgentConversationNormalizer {
         return [
             genericToolItem(state?.itemId ?? itemId('tool', event.callId), event.toolName, event.code === 'MAR_AGENT_CANCELLED' || event.code === 'MAR_AGENT_EXECUTION_CANCELLED'
                 ? 'CANCELLED'
-                : 'FAILED', state?.input, event.message ?? event.code, event.code, event.truncated === true, state?.presentationData, state?.subagentTitle, state?.subagentDetails, state?.sleepStartedAt, event.outputTruncation, state?.inputTruncated)
+                : 'FAILED', state?.input, event.message ?? event.code, event.code, event.truncated === true, agentOperationAction(event.toolName)
+                ? mergeAgentOperationData(event.toolName, state?.presentationData, event.data)
+                : event.data === undefined
+                    ? state?.presentationData
+                    : event.data, state?.subagentTitle, state?.subagentDetails, state?.sleepStartedAt, event.outputTruncation, state?.inputTruncated)
         ];
     }
     #codeModeToolResults(event) {
@@ -1027,6 +1045,28 @@ function codeExecutionError(data) {
         message: compactRunnerText(error.message, 1000)
     };
 }
+function mergeAgentOperationData(toolName, previous, current) {
+    if (!agentOperationAction(toolName))
+        return current;
+    const before = agentOperationPresentationSchema.safeParse(record(previous)?.agentOperation);
+    if (!before.success || before.data.action !== agentOperationAction(toolName))
+        return current;
+    const after = agentOperationPresentationSchema.safeParse(record(current)?.agentOperation);
+    if (!after.success || after.data.action !== before.data.action) {
+        return { ...record(current), agentOperation: before.data };
+    }
+    return {
+        ...record(current),
+        agentOperation: {
+            ...after.data,
+            targets: before.data.targets.map((target) => ({
+                ...after.data.targets.find((candidate) => candidate.agentId === target.agentId),
+                ...target
+            })),
+            ...(before.data.targetsTruncated ? { targetsTruncated: true } : {})
+        }
+    };
+}
 function genericToolItem(id, toolName, status, input, outputSummary = null, errorCode = null, truncated = false, output, subagentTitle, knownSubagentDetails, sleepStartedAt, outputTruncation, inputTruncated = false, summaryTruncated = false) {
     if (toolName === 'code_exec') {
         const code = typeof input === 'string' ? input : record(input)?.code;

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

@@ -15,7 +15,7 @@ export function projectMarAgentHistory(session, entries, options = {}) {
             runId: null,
             userItemId: null,
             status: 'INTERRUPTED',
-            model: session.model,
+            model: session.modelId,
             effort: session.effort,
             access: session.access,
             rewind: { before: previous?.id ?? null, after: turnId },

package/dist/runner/mar-agent/hosted-conversation-runtime.js

@@ -470,7 +470,7 @@ export class MarAgentHostedConversationRuntime {
 function historySession(input) {
     return {
         id: input.sessionId,
-        model: input.modelId ?? null,
+        modelId: input.modelId ?? null,
         effort: null,
         access: 'full-access'
     };

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

@@ -118,7 +118,7 @@ export class MarAgentManagedRunController {
         const execution = context.executionContext;
         const resolved = resolveMarAgentExecutionInput(execution?.runner === 'mar-agent'
             ? execution.runnerInput
-            : undefined, session.model ?? '');
+            : undefined, session.modelId ?? '');
         if (resolved === undefined)
             throw new Error('RUNNER_COMMAND_UNAVAILABLE');
         const runId = randomUUID();
@@ -409,7 +409,7 @@ export class MarAgentManagedRunController {
             if (input.mode !== 'compact')
                 this.#steerTargets.set(input.runId, async (request) => {
                     if (controller.signal.aborted ||
-                        (request.model && request.model !== input.model.id) ||
+                        (request.modelId && request.modelId !== input.model.id) ||
                         (request.effort &&
                             request.effort !==
                                 (reasoningEffort ??

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

@@ -232,7 +232,7 @@ export class MarAgentRunner extends AbstractRunner {
         if (configuration.runner !== this.name)
             return false;
         const profile = this.profileForValidation();
-        const model = profile.models.find((candidate) => candidate.id === configuration.model);
+        const model = profile.models.find((candidate) => candidate.id === configuration.modelId);
         return (model !== undefined &&
             (model.supportedEfforts.length === 0
                 ? configuration.effort === model.defaultEffort
@@ -246,7 +246,7 @@ export class MarAgentRunner extends AbstractRunner {
         const model = profile.models[0];
         return {
             runner: 'mar-agent',
-            model: model?.id ?? '',
+            modelId: model?.id ?? '',
             effort: model?.defaultEffort ?? '',
             access: 'auto'
         };
@@ -357,7 +357,7 @@ export class MarAgentRunner extends AbstractRunner {
                         }),
                         ...(executionConfiguration?.modelId === undefined
                             ? {}
-                            : { model: executionConfiguration.modelId }),
+                            : { modelId: executionConfiguration.modelId }),
                         ...(executionConfiguration?.reasoningEffort === undefined
                             ? {}
                             : { effort: executionConfiguration.reasoningEffort })
@@ -577,9 +577,9 @@ export class MarAgentRunner extends AbstractRunner {
         return [resolve(session.cwd), ...(generatedImages === undefined ? [] : [generatedImages])];
     }
     async readContextUsage(session) {
-        if (session.externalSessionId === null || session.model === null)
+        if (session.externalSessionId === null || session.modelId === null)
             return undefined;
-        const model = this.#models.find((candidate) => candidate.id === session.model);
+        const model = this.#models.find((candidate) => candidate.id === session.modelId);
         if (model === undefined)
             return undefined;
         let catalog;

package/dist/runner/opencode/managed-run-controller.js

@@ -51,7 +51,7 @@ export class OpenCodeManagedRunController {
     }
     compact(session, environment, initiatedByUserId) {
         if (session.externalSessionId === null ||
-            session.model === null ||
+            session.modelId === null ||
             session.nativeControl !== 'MAR_MANAGED' ||
             this.host.hasActiveSessionLease(session.id))
             throw new Error('RUNNER_COMMAND_UNAVAILABLE');
@@ -78,7 +78,7 @@ export class OpenCodeManagedRunController {
         });
         this.host.emit(runId, 'run.started', { command: 'compact' }, 'STARTING');
         this.host.emitItem(runId, openCodeCompactionItem('opencode-compact', runId, false));
-        void this.runCompact(runId, session.model);
+        void this.runCompact(runId, session.modelId);
         return {
             command: 'compact',
             run: this.host.run(runId),

package/dist/runner/opencode-runner.js

@@ -147,7 +147,7 @@ export class OpenCodeRunner extends AbstractRunner {
         if (configuration.runner !== this.name)
             return false;
         const models = this.cachedModels(environment);
-        const model = models.find((candidate) => candidate.id === configuration.model);
+        const model = models.find((candidate) => candidate.id === configuration.modelId);
         return (model !== undefined &&
             (model.supportedEfforts.length === 0 ||
                 model.supportedEfforts.includes(configuration.effort)) &&
@@ -157,7 +157,7 @@ export class OpenCodeRunner extends AbstractRunner {
         const model = this.cachedModels(environment)[0];
         return {
             runner: this.name,
-            model: model?.id ?? '',
+            modelId: model?.id ?? '',
             effort: model?.supportedEfforts[0] ?? '',
             access: 'default'
         };
@@ -377,11 +377,11 @@ export class OpenCodeRunner extends AbstractRunner {
         return value.id;
     }
     async executeCompact(session, environment) {
-        if (session.externalSessionId === null || session.model === null)
+        if (session.externalSessionId === null || session.modelId === null)
             throw new Error('RUNNER_COMMAND_UNAVAILABLE');
         const client = this.managedClient(environment);
         try {
-            return await client.summarize(session.cwd, session.externalSessionId, session.model);
+            return await client.summarize(session.cwd, session.externalSessionId, session.modelId);
         }
         finally {
             this.releaseManagedClient(client);
@@ -402,7 +402,7 @@ export class OpenCodeRunner extends AbstractRunner {
         const tokens = object(latest?.tokens);
         const cache = object(tokens?.cache);
         const usedTokens = positiveNumber(tokens?.input) + positiveNumber(cache?.read);
-        const modelId = provider !== undefined && model !== undefined ? `${provider}/${model}` : session.model;
+        const modelId = provider !== undefined && model !== undefined ? `${provider}/${model}` : session.modelId;
         if (modelId === null || usedTokens <= 0)
             return undefined;
         const maxTokens = Date.now() >= this.contextLimitsExpiresAt ? undefined : this.contextLimits.get(modelId);

package/dist/runner-profiles.js

@@ -239,7 +239,7 @@ export function supportsRunnerConfiguration(input) {
     const profile = input.runner === 'claude-code'
         ? claudeProfile(input.environment ?? process.env)
         : definitions[input.runner];
-    const model = profile.models.find((candidate) => candidate.id === input.model);
+    const model = profile.models.find((candidate) => candidate.id === input.modelId);
     return (model !== undefined &&
         model.supportedEfforts.includes(input.effort) &&
         profile.accessOptions.some((candidate) => candidate.id === input.access));