@myagentroam/node 0.10.7 → 0.10.9

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

@@ -5,7 +5,7 @@ import { safeErrorCode } from '../../util/safe-error.js';
 import { runnerErrorProjection } from '../../util/runner-error.js';
 import { ResponseLatencyTracker } from '../../service/response-latency-tracker.js';
 import { GenerationTimingTracker } from '../../service/generation-timing-tracker.js';
-import { boundedConversationItemId, codexImageAttachments, codexLiveConversationItem, codexUserInputQuestions, compactRunnerText, isPlainRecord } from './conversation-parser.js';
+import { boundedConversationItemId, codexImageAttachments, codexLiveConversationItem, CodexUsageNormalizer, codexUserInputQuestions, compactRunnerText, isPlainRecord } from './conversation-parser.js';
 export function resolveCodexNotificationRun(runs, input) {
     const entries = [...runs.entries()];
     if (input.turnId !== undefined) {
@@ -28,6 +28,7 @@ export function resolveCodexNotificationRun(runs, input) {
 export class CodexManagedRunController {
     runner;
     host;
+    usage = new Map();
     constructor(runner, host) {
         this.runner = runner;
         this.host = host;
@@ -113,6 +114,7 @@ export class CodexManagedRunController {
         catch (error) {
             this.emitError(runId, error, 'CODEX_COMPACT_FAILED');
             this.host.emit(runId, 'run.failed', runnerErrorProjection(error, 'CODEX_COMPACT_FAILED'), 'FAILED');
+            this.usage.delete(runId);
             this.runner.execution.runs.delete(runId);
             this.runner.releaseEnvironment(runId);
             this.host.removeActive(runId);
@@ -138,6 +140,12 @@ export class CodexManagedRunController {
         if (run === undefined)
             return;
         const [runId, activeRun] = run;
+        let usage = this.usage.get(runId);
+        if (!usage) {
+            usage = new CodexUsageNormalizer(runId, (value) => this.host.emit(runId, 'run.usage', value), this.host.session(activeRun.sessionId)?.model ?? undefined);
+            this.usage.set(runId, usage);
+        }
+        usage.observe(notification.method, params, activeRun.generationCompacting === true);
         const receiptAt = activeRun.generationTiming?.timestamp();
         if (notification.method === 'turn/started' && turnId !== undefined) {
             const active = this.runner.execution.runs.get(runId);
@@ -332,6 +340,7 @@ export class CodexManagedRunController {
                 this.host.session(active.sessionId)?.titleSource !== 'AUTO'
                 ? undefined
                 : this.host.syncTitle(active.sessionId, active.threadId, active.cwd);
+            this.usage.delete(runId);
             this.runner.execution.runs.delete(runId);
             if (titleRefresh === undefined)
                 this.runner.releaseEnvironment(runId);
@@ -624,6 +633,7 @@ export class CodexManagedRunController {
                     break;
                 }
                 catch (error) {
+                    this.usage.delete(runId);
                     this.runner.execution.runs.delete(runId);
                     if (attempt === 0 && (await this.runner.recoverMissingRollout(runId, error)))
                         continue;
@@ -663,6 +673,7 @@ export class CodexManagedRunController {
             }
             this.emitError(runId, error, 'CODEX_RUN_FAILED');
             this.host.emit(runId, 'run.failed', runnerErrorProjection(error, 'CODEX_RUN_FAILED'), 'FAILED');
+            this.usage.delete(runId);
             this.runner.execution.runs.delete(runId);
             this.runner.releaseEnvironment(runId);
             this.host.removeActive(runId);

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

@@ -96,7 +96,10 @@ function codexSubagentProjection(namespace, toolName, input, output) {
         : '';
     return {
         subagentOperation: operation,
-        subagentId: codexSubagentId(input) ?? codexSubagentId(output) ?? null,
+        ...(toolName === 'wait_agent' ? { subagentWait: true } : {}),
+        subagentId: Array.isArray(inputData?.targets) && inputData.targets.length > 1
+            ? null
+            : (codexSubagentId(input) ?? codexSubagentId(output) ?? null),
         ...(title.length === 0 ? {} : { title })
     };
 }
@@ -109,7 +112,7 @@ function codexSubagentId(value) {
         if (candidate !== undefined)
             return candidate;
     }
-    if (Array.isArray(data.targets)) {
+    if (Array.isArray(data.targets) && data.targets.length === 1) {
         for (const target of data.targets) {
             const candidate = boundedId(target);
             if (candidate !== undefined)

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

@@ -104,6 +104,7 @@ export async function generateMarAgentCompact(context, selected, signal) {
     try {
         const result = await generateModelText({
             model: selected.model,
+            ...(context.reportModelUsage === undefined ? {} : { onModelUsage: context.reportModelUsage }),
             system,
             reasoningEffort: selected.reasoningEffort,
             messages: [

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

@@ -1,3 +1,9 @@
+import { parseToolResultExtensions } from '@myagentroam/agent';
+/** SDK usage is already normalized; never parse provider payloads in Node. */
+export function normalizeMarAgentUsage(usage) {
+    const { executionId: _executionId, ...record } = usage;
+    return { ...record, schemaVersion: 1, coverage: 'request' };
+}
 import { boundedConversationItemId, compactRunnerText, compactRunnerValue } from '../../util/node-operation-parsers.js';
 import { runnerErrorProjection } from '../../util/runner-error.js';
 export class MarAgentConversationNormalizer {
@@ -6,8 +12,6 @@ export class MarAgentConversationNormalizer {
     #processOrigins = new Map();
     #subagentTitles = new Map();
     #subagentDetails = new Map();
-    #subagentStarts = new Map();
-    #subagentLifecycles = new Map();
     #codeModeObservationIds = new Set();
     #codeModeSourceCallIds = new Set();
     messageItemId(nativeItemId) {
@@ -183,9 +187,6 @@ export class MarAgentConversationNormalizer {
             : undefined;
         const subagentTitle = agentId === undefined ? undefined : this.#subagentTitles.get(agentId);
         const subagentDetails = agentId === undefined ? undefined : this.#subagentDetails.get(agentId);
-        const toolSubagentDetails = event.toolName === 'agent_message'
-            ? withoutSubagentLatestMessage(subagentDetails)
-            : subagentDetails;
         this.#tools.set(event.callId, {
             toolName: event.toolName,
             input: event.input,
@@ -197,7 +198,7 @@ export class MarAgentConversationNormalizer {
         if (event.toolName === 'apply_patch' && 'input' in event)
             return [fileChangeItem(ownItemId, 'IN_PROGRESS', [])];
         return [
-            genericToolItem(ownItemId, event.toolName, 'IN_PROGRESS', event.input, null, null, event.truncated === true, undefined, subagentTitle, toolSubagentDetails)
+            genericToolItem(ownItemId, event.toolName, 'IN_PROGRESS', event.input, null, null, event.truncated === true, undefined, subagentTitle, subagentDetails)
         ];
     }
     #toolCompleted(event) {
@@ -220,9 +221,11 @@ export class MarAgentConversationNormalizer {
             }
         }
         if (event.toolName === 'apply_patch' &&
-            (state?.structured === true || Array.isArray(record(event.data)?.files)))
+            (state?.structured === true ||
+                Array.isArray(record(event.data)?.files) ||
+                parseToolResultExtensions(event.resultExtensions) !== undefined))
             return [
-                fileChangeItem(state?.itemId ?? itemId('tool', event.callId), 'COMPLETED', patchChanges(event.data))
+                fileChangeItem(state?.itemId ?? itemId('tool', event.callId), 'COMPLETED', patchChanges(event.data, event.resultExtensions))
             ];
         const generatedImages = imageArtifacts(event);
         const controlTool = isMarAgentControlTool(event.toolName);
@@ -236,9 +239,7 @@ export class MarAgentConversationNormalizer {
             ? undefined
             : mergeSubagentDetails(this.#subagentDetails.get(agentId), state?.subagentDetails ?? {});
         const details = controlTool
-            ? mergeSubagentDetails(event.toolName === 'agent_message'
-                ? withoutSubagentLatestMessage(cachedDetails)
-                : cachedDetails, subagentDetails(controlOutput))
+            ? mergeSubagentDetails(cachedDetails, subagentDetails(controlOutput))
             : {};
         if (agentId !== undefined) {
             const output = structuredRecord(controlOutput);
@@ -248,18 +249,11 @@ export class MarAgentConversationNormalizer {
                     this.#subagentTitles.set(agentId, title);
             }
             if (Object.keys(details).length > 0)
-                this.#subagentDetails.set(agentId, details);
-            if (event.toolName === 'agent_start' && state !== undefined)
-                this.#subagentStarts.set(agentId, state);
+                this.#subagentDetails.set(agentId, withoutSubagentLatestMessage(details) ?? {});
         }
-        const lifecycle = event.toolName === 'agent_start' && agentId !== undefined
-            ? this.#subagentLifecycles.get(agentId)
-            : undefined;
-        const item = genericToolItem(state?.itemId ?? itemId('tool', event.callId), event.toolName, lifecycle?.status ??
-            (event.toolName === 'agent_start' ? subagentControlStatus(controlOutput) : 'COMPLETED'), state?.input, lifecycle?.outputSummary ??
-            (generatedImages.length === 0
-                ? event.summary
-                : generatedImages.map((image) => image.name).join(', ')), lifecycle?.errorCode ?? null, lifecycle?.truncated ?? event.truncated, event.data, agentId === undefined ? state?.subagentTitle : this.#subagentTitles.get(agentId), details);
+        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.truncated, event.data, agentId === undefined ? state?.subagentTitle : this.#subagentTitles.get(agentId), details);
         return [
             {
                 ...item,
@@ -283,7 +277,9 @@ export class MarAgentConversationNormalizer {
             }
         }
         if (event.toolName === 'apply_patch' && state?.structured === true)
-            return [fileChangeItem(state?.itemId ?? itemId('tool', event.callId), 'FAILED', [])];
+            return [
+                fileChangeItem(state?.itemId ?? itemId('tool', event.callId), 'FAILED', patchChanges(event.data, event.resultExtensions))
+            ];
         return [
             genericToolItem(state?.itemId ?? itemId('tool', event.callId), event.toolName, 'FAILED', state?.input, event.message ?? event.code, event.code, event.truncated === true, undefined, state?.subagentTitle, state?.subagentDetails)
         ];
@@ -335,6 +331,9 @@ export class MarAgentConversationNormalizer {
             toolName,
             callId,
             summary: observation.result.content,
+            ...(parseToolResultExtensions(observation.resultExtensions)
+                ? { resultExtensions: parseToolResultExtensions(observation.resultExtensions) }
+                : {}),
             ...(observation.result.truncated === undefined
                 ? {}
                 : { truncated: observation.result.truncated }),
@@ -346,39 +345,10 @@ export class MarAgentConversationNormalizer {
         const eventTitle = compactRunnerText(typeof eventDescription === 'string' ? eventDescription : '', 500);
         if (eventTitle.length > 0)
             this.#subagentTitles.set(event.agentId, eventTitle);
-        const title = eventTitle || this.#subagentTitles.get(event.agentId) || 'Subagent';
-        const details = mergeSubagentDetails(this.#subagentDetails.get(event.agentId), subagentDetails(event));
+        const details = mergeSubagentDetails(this.#subagentDetails.get(event.agentId), withoutSubagentLatestMessage(subagentDetails(event)) ?? {});
         if (Object.keys(details).length > 0)
             this.#subagentDetails.set(event.agentId, details);
-        const latestText = typeof details.latestMessage?.text === 'string' ? details.latestMessage.text : undefined;
-        const outputSummary = event.type === 'subagent.completed'
-            ? latestText === undefined
-                ? event.errorMessage === undefined
-                    ? null
-                    : boundedToolSummary(event.errorMessage)
-                : boundedToolSummary(latestText)
-            : null;
-        const lifecycle = {
-            status: event.type === 'subagent.started'
-                ? 'IN_PROGRESS'
-                : event.status === 'completed'
-                    ? 'COMPLETED'
-                    : event.status === 'cancelled'
-                        ? 'CANCELLED'
-                        : event.status === 'interrupted'
-                            ? 'INTERRUPTED'
-                            : 'FAILED',
-            outputSummary,
-            errorCode: event.type === 'subagent.completed' && event.status === 'failed'
-                ? (event.errorCode ?? 'MAR_AGENT_SUBAGENT_FAILED')
-                : null,
-            truncated: latestText !== undefined && outputSummary !== latestText
-        };
-        this.#subagentLifecycles.set(event.agentId, lifecycle);
-        const start = this.#subagentStarts.get(event.agentId);
-        if (start === undefined)
-            return [];
-        return [subagentStartItem(start, event.agentId, title, details, lifecycle)];
+        return [];
     }
 }
 function codeModeToolResults(event) {
@@ -422,6 +392,7 @@ function codeModeCallResults(value) {
             {
                 source: { callId: call.callId, toolName: call.toolName, input: call.input },
                 outcome: call.status,
+                resultExtensions: call.resultExtensions,
                 result: {
                     content: result.content,
                     ...('data' in result ? { data: result.data } : {}),
@@ -582,15 +553,6 @@ function genericToolItem(id, toolName, status, input, outputSummary = null, erro
         merge: true
     };
 }
-function subagentStartItem(start, agentId, title, details, lifecycle) {
-    return genericToolItem(start.itemId, 'agent_start', lifecycle.status, start.input, lifecycle.outputSummary, lifecycle.errorCode, lifecycle.truncated, {
-        agentId,
-        description: title,
-        ...details,
-        ...(lifecycle.errorCode === null ? {} : { errorCode: lifecycle.errorCode }),
-        ...(lifecycle.outputSummary === null ? {} : { errorMessage: lifecycle.outputSummary })
-    }, title, details);
-}
 function commandItem(command, status) {
     return {
         itemId: command.itemId,
@@ -623,7 +585,23 @@ function applyCommandResult(command, result) {
 function fileChangeItem(id, status, changes) {
     return { itemId: id, kind: 'file_change', status, payload: { changes }, merge: true };
 }
-function patchChanges(value) {
+function patchChanges(value, extensions) {
+    const evidence = (parseToolResultExtensions(extensions) ?? []).flatMap((extension) => extension.entries);
+    if (evidence.length)
+        return evidence.map((entry) => ({
+            path: entry.path,
+            change: entry.change.toUpperCase(),
+            additions: entry.additions,
+            deletions: entry.deletions,
+            changeId: entry.changeId,
+            diffAvailable: entry.diff.status === 'available',
+            diff: entry.diff.status === 'available'
+                ? { ...entry.diff, source: 'TOOL_CHANGE' }
+                : {
+                    ...entry.diff,
+                    reason: entry.diff.reason === 'unsupported-content' ? 'binary' : entry.diff.reason
+                }
+        }));
     const files = record(value)?.files;
     if (!Array.isArray(files))
         return [];
@@ -723,6 +701,7 @@ function marAgentSubagentProjection(toolName, input, output, knownTitle, knownDe
                 : ''), 500);
     return {
         subagentOperation: operation,
+        ...(operation === 'STATUS' ? { subagentWait: inputData?.waitMs !== 0 } : {}),
         subagentId: marAgentAgentId(input) ?? marAgentAgentId(controlOutput) ?? null,
         ...(title.length === 0 ? {} : { title }),
         ...subagentPayload(details),
@@ -762,20 +741,6 @@ function marAgentSubagentOperation(toolName) {
         return 'CANCEL';
     return undefined;
 }
-function subagentControlStatus(value) {
-    const status = structuredRecord(value)?.status;
-    if (status === 'queued' || status === 'running')
-        return 'IN_PROGRESS';
-    if (status === 'completed')
-        return 'COMPLETED';
-    if (status === 'cancelled')
-        return 'CANCELLED';
-    if (status === 'interrupted')
-        return 'INTERRUPTED';
-    if (status === 'failed')
-        return 'FAILED';
-    return 'COMPLETED';
-}
 function subagentDetails(value) {
     const data = structuredRecord(value);
     if (data === undefined)

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

@@ -57,6 +57,19 @@ export class MarAgentHostedConversationRuntime {
             await mcp?.close().catch(() => undefined);
         }
     }
+    async readToolResultResource(input) {
+        const catalog = await this.#openCatalog({ homeDirectory: input.homeDirectory });
+        try {
+            return await catalog.readToolResultResource(input.sessionId, {
+                resourceRef: input.resourceRef,
+                ...(input.cursor === undefined ? {} : { cursor: input.cursor }),
+                ...(input.maxBytes === undefined ? {} : { maxBytes: input.maxBytes })
+            });
+        }
+        finally {
+            await catalog.close();
+        }
+    }
     async history(input) {
         const catalog = await this.#openCatalog({ homeDirectory: input.homeDirectory });
         try {
@@ -147,6 +160,17 @@ export class MarAgentHostedConversationRuntime {
                             models: sdkModelConfigurations(models.filter((model) => input.models.some((candidate) => candidate.id === model.id))),
                             currentModelId: input.modelId,
                             prompt: input.userPrompt,
+                            ...(input.onModelUsage === undefined
+                                ? {}
+                                : {
+                                    onModelUsage: (usage) => input.onModelUsage({
+                                        ...usage,
+                                        sessionId: input.sessionId,
+                                        executionId: execution.executionId,
+                                        purpose: 'title',
+                                        agentRole: 'root'
+                                    })
+                                }),
                             signal: titleController.signal
                         }).catch(() => undefined);
                     await this.#onEvent?.(input.conversationId, event);
@@ -302,6 +326,9 @@ export class MarAgentHostedConversationRuntime {
                 ...(this.#webFetch === undefined ? {} : { webFetch: this.#webFetch })
             }));
             host = this.#createHost({
+                ...('onModelUsage' in input && input.onModelUsage !== undefined
+                    ? { modelUsage: input.onModelUsage }
+                    : {}),
                 extensions,
                 mode: 'node',
                 homeDirectory: input.homeDirectory,

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

@@ -12,7 +12,7 @@ import { boundedConversationItemId } from '../codex/conversation-parser.js';
 import { parseSecretEnvironment } from '../../util/secret-environment.js';
 import { canonicalJson } from '../../util/canonical-json.js';
 import { MarAgentMcpClientCache } from './mcp-client-pool.js';
-import { MarAgentConversationNormalizer } from './conversation-normalizer.js';
+import { MarAgentConversationNormalizer, normalizeMarAgentUsage } from './conversation-normalizer.js';
 import { parseRunnerImageAttachments } from '../../util/node-operation-parsers.js';
 import { runnerErrorProjection } from '../../util/runner-error.js';
 import { MarAgentRuntimeModelFactory, sdkModelConfigurations, closeImageCredentialProviders } from './runtime-model-factory.js';
@@ -435,6 +435,13 @@ export class MarAgentManagedRunController {
                         models: sdkModelConfigurations(executionModels),
                         currentModelId: input.model.id,
                         prompt: input.input,
+                        onModelUsage: (usage) => this.host.emit(input.runId, 'run.usage', normalizeMarAgentUsage({
+                            ...usage,
+                            sessionId: session.id,
+                            executionId: handle.executionId,
+                            purpose: 'title',
+                            agentRole: 'root'
+                        })),
                         signal: titleController.signal
                     }).catch((error) => {
                         if (!titleController.signal.aborted)
@@ -635,6 +642,11 @@ export class MarAgentManagedRunController {
             releaseEnvironment = this.#retainEnvironment?.(input.secretEnvironment ?? {});
             const mcp = mcpLease.pool;
             const localHost = new LocalAgentHost({
+                modelUsage: (usage) => {
+                    const runId = runtime?.activeRunId;
+                    if (runId !== undefined)
+                        this.host.emit(runId, 'run.usage', normalizeMarAgentUsage(usage));
+                },
                 mode: 'node',
                 homeDirectory: homedir(),
                 workspace: input.cwd,

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

@@ -76,6 +76,11 @@ export class MarAgentRuntimeModelFactory {
                         ? {}
                         : { responsesTransport: configuration.responsesTransport }),
                     responsesToolNamespace: configuration.responsesToolNamespace,
+                    ...(configuration.responsesOptionalParameters === undefined
+                        ? {}
+                        : {
+                            responsesOptionalParameters: configuration.responsesOptionalParameters
+                        }),
                     responsesPreviousResponseId: configuration.responsesPreviousResponseId,
                     enabled: configuration.enabled
                 };

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

@@ -71,6 +71,21 @@ export class MarAgentRunner extends AbstractRunner {
         let registeredIndex = 0;
         return entry.images.map((image) => image.readable ? registeredImages[registeredIndex++] : undefined);
     }
+    async readToolResultResource(session, input) {
+        if (!session.externalSessionId)
+            throw new Error('SESSION_NOT_FOUND');
+        const catalog = await openMarAgentSessionCatalog({ homeDirectory: this.homeDirectory });
+        try {
+            return await catalog.readToolResultResource(session.externalSessionId, {
+                resourceRef: input.resourceRef,
+                ...(input.cursor === undefined ? {} : { cursor: input.cursor }),
+                ...(input.maxBytes === undefined ? {} : { maxBytes: input.maxBytes })
+            });
+        }
+        finally {
+            await catalog.close();
+        }
+    }
     profile(capabilities) {
         if (!this.available(capabilities))
             return undefined;

package/dist/runner/opencode/conversation-parser.js

@@ -1,6 +1,55 @@
 import { boundedConversationItemId, compactRunnerText } from '../codex/conversation-parser.js';
 import { publicGoalHistoryText } from '../../service/goal-runtime.js';
 import { normalizeOpenCodeTool } from './tool-normalizer.js';
+import { RunnerUsageTracker, usageToken, usageTokenSum } from '../../service/runner-usage-tracker.js';
+export class OpenCodeUsageNormalizer {
+    tracker;
+    messages = new Map();
+    constructor(identity, publish) {
+        this.tracker = new RunnerUsageTracker(identity, publish);
+    }
+    observe(value, startedAt) {
+        if (startedAt === undefined)
+            return;
+        const event = record(value), properties = record(event?.properties), info = record(properties?.info);
+        if (event?.type === 'message.updated' &&
+            info?.role === 'assistant' &&
+            typeof info.id === 'string' &&
+            typeof record(info.time)?.created === 'number' &&
+            Number(record(info.time)?.created) >= startedAt)
+            this.messages.set(info.id, {
+                ...(typeof info.modelID === 'string' ? { model: info.modelID } : {}),
+                ...(typeof info.providerID === 'string' ? { provider: info.providerID } : {})
+            });
+        const part = record(properties?.part);
+        if (event?.type !== 'message.part.updated' ||
+            part?.type !== 'step-finish' ||
+            typeof part.id !== 'string' ||
+            typeof part.messageID !== 'string')
+            return;
+        const model = this.messages.get(part.messageID);
+        if (!model)
+            return;
+        const tokens = record(part.tokens), cache = record(tokens?.cache);
+        const input = usageToken(tokens?.input), output = usageToken(tokens?.output), read = usageToken(cache?.read), write = usageToken(cache?.write), reasoning = usageToken(tokens?.reasoning);
+        const inputTokens = input === undefined ? undefined : usageTokenSum(input, read ?? '0', write ?? '0');
+        const outputTokens = output === undefined ? undefined : usageTokenSum(output, reasoning ?? '0');
+        this.tracker.snapshot(part.id, {
+            purpose: 'conversation',
+            agentRole: 'root',
+            ...(model.model ? { actualModel: model.model } : {}),
+            ...(model.provider ? { provider: model.provider } : {}),
+            ...(inputTokens === undefined ? {} : { inputTokens }),
+            ...(outputTokens === undefined ? {} : { outputTokens }),
+            ...(read === undefined ? {} : { cacheReadTokens: read }),
+            ...(write === undefined ? {} : { cacheWriteTokens: write }),
+            ...(reasoning === undefined ? {} : { reasoningTokens: reasoning })
+        }, true, 'partial');
+    }
+    finish(state) {
+        this.tracker.finish(state);
+    }
+}
 export function openCodeUserMessagePreview(messages) {
     for (const message of messages) {
         const entry = record(message);

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

@@ -1,3 +1,4 @@
+import { OpenCodeUsageNormalizer } from './conversation-parser.js';
 import { parseComposerTags } from '@myagentroam/protocol';
 import { nodeExecutionEnvironment } from '../../node-execution-environment.js';
 import { parseSecretEnvironment } from '../../util/secret-environment.js';
@@ -11,6 +12,7 @@ export class OpenCodeManagedRunController {
     runner;
     host;
     interactionTimeoutMs;
+    usage = new Map();
     permissions = new Map();
     questions = new Map();
     startingCwds = new Map();
@@ -316,6 +318,12 @@ export class OpenCodeManagedRunController {
                 : undefined;
         if (sessionID !== nativeSessionId)
             return;
+        let usage = this.usage.get(runId);
+        if (!usage) {
+            usage = new OpenCodeUsageNormalizer(runId, (value) => this.host.emit(runId, 'run.usage', value));
+            this.usage.set(runId, usage);
+        }
+        usage.observe(value, execution?.responseStartedAt);
         if (event?.type === 'session.idle') {
             if (!this.promptAdmitted.has(runId)) {
                 this.pendingIdle.add(runId);
@@ -630,6 +638,10 @@ export class OpenCodeManagedRunController {
         const client = execution?.client ?? this.startingClients.get(runId);
         if (execution === undefined && cwd === undefined && client === undefined)
             return;
+        this.usage
+            .get(runId)
+            ?.finish(status === 'SUCCEEDED' ? 'succeeded' : status === 'FAILED' ? 'failed' : 'cancelled');
+        this.usage.delete(runId);
         execution?.abort.abort();
         this.runner.execution.delete(runId);
         this.startingCwds.delete(runId);

package/dist/service/continuous-run-coordinator.js

@@ -328,6 +328,7 @@ export class ContinuousRunCoordinator {
                 return;
             }
             this.options.control('run.start', {
+                ...(pending.usageGrant === undefined ? {} : { usageGrant: pending.usageGrant }),
                 runId: executionId,
                 sessionId: pending.sessionId,
                 workspaceId: pending.workspaceId,

package/dist/service/hosted-conversation-node-service.js

@@ -1,8 +1,9 @@
+import { modelUsageGrantSchema } from '@myagentroam/protocol';
 import { createHash, randomUUID } from 'node:crypto';
 import { constants } from 'node:fs';
 import { lstat, mkdir, open, readFile, rename, rm, utimes } from 'node:fs/promises';
 import { isAbsolute, join, relative, resolve, sep } from 'node:path';
-import { conversationTurnSchema, conversationTemplateDraftSchema, conversationTemplateSummarySchema, hostedConversationConfigUpdateInputSchema, hostedConversationCreateInputSchema, hostedConversationDeleteResultSchema, hostedConversationFileDeleteInputSchema, hostedConversationFileDeleteResultSchema, hostedConversationFileReadInputSchema, hostedConversationFileReadResultSchema, hostedConversationFilesSchema, hostedConversationHistoryInputSchema, hostedConversationHistoryPageSchema, hostedConversationIdInputSchema, hostedConversationImageReadInputSchema, hostedConversationListInputSchema, hostedConversationListPageSchema, hostedConversationMessageInputSchema, hostedConversationMetadataUpdateInputSchema, hostedConversationRollbackInputSchema, hostedConversationSnapshotSchema, hostedConversationSummarySchema, hostedConversationUnwatchInputSchema, hostedConversationUploadChunkInputSchema, hostedConversationUploadControlInputSchema, hostedConversationUploadCreateInputSchema, hostedConversationUploadPreflightInputSchema, hostedConversationUploadPreflightResultSchema, hostedConversationUploadSchema, hostedConversationWatchInputSchema, marAgentRuntimeModelConfigurationSchema, mcpInstallationConfigurationSchema, mcpRuntimeDescriptorSchema, resolveMarAgentDefaultReasoningEffort } from '@myagentroam/protocol';
+import { toolResultResourceInputSchema, toolResultResourcePageSchema, conversationTurnSchema, conversationTemplateDraftSchema, conversationTemplateSummarySchema, hostedConversationConfigUpdateInputSchema, hostedConversationCreateInputSchema, hostedConversationDeleteResultSchema, hostedConversationFileDeleteInputSchema, hostedConversationFileDeleteResultSchema, hostedConversationFileReadInputSchema, hostedConversationFileReadResultSchema, hostedConversationFilesSchema, hostedConversationHistoryInputSchema, hostedConversationHistoryPageSchema, hostedConversationIdInputSchema, hostedConversationImageReadInputSchema, hostedConversationListInputSchema, hostedConversationListPageSchema, hostedConversationMessageInputSchema, hostedConversationMetadataUpdateInputSchema, hostedConversationRollbackInputSchema, hostedConversationSnapshotSchema, hostedConversationSummarySchema, hostedConversationUnwatchInputSchema, hostedConversationUploadChunkInputSchema, hostedConversationUploadControlInputSchema, hostedConversationUploadCreateInputSchema, hostedConversationUploadPreflightInputSchema, hostedConversationUploadPreflightResultSchema, hostedConversationUploadSchema, hostedConversationWatchInputSchema, marAgentRuntimeModelConfigurationSchema, mcpInstallationConfigurationSchema, mcpRuntimeDescriptorSchema, resolveMarAgentDefaultReasoningEffort } from '@myagentroam/protocol';
 import { hostedConversationGeneratedImagesDisplayDirectory, hostedConversationImageRunId, marAgentGeneratedImagesDirectory } from '../runner/mar-agent/generated-images.js';
 import { sessionTitleFromFirstMessage } from '../util/node-operation-parsers.js';
 import { safeErrorCode } from '../util/safe-error.js';
@@ -70,6 +71,7 @@ export class HostedConversationNodeService {
             'conversation.hosted.config.update': (raw) => this.updateConfiguration(raw),
             'conversation.hosted.metadata.update': (raw) => this.updateMetadata(raw),
             'conversation.hosted.image.read': (raw) => this.readImage(raw),
+            'conversation.hosted.tool-resource.read': (raw) => this.readToolResource(raw),
             'conversation.hosted.files.list': (raw) => this.listFiles(raw),
             'conversation.hosted.file.read': (raw) => this.readFile(raw),
             'conversation.hosted.file.delete': (raw) => this.deleteFile(raw),
@@ -503,6 +505,9 @@ export class HostedConversationNodeService {
         let runtimeEventsAccepted = false;
         const handle = await this.options.runtime
             .startRun({
+            ...(payload.usageGrant === undefined || this.options.modelUsage === undefined
+                ? {}
+                : { onModelUsage: (usage) => this.options.modelUsage(payload.usageGrant, usage) }),
             conversationId: conversation.id,
             sessionId: conversation.sessionId,
             clientMessageId: input.clientMessageId,
@@ -874,6 +879,25 @@ export class HostedConversationNodeService {
             files: this.options.store.listFiles(payload.userId, input.conversationId)
         });
     }
+    async readToolResource(raw) {
+        const payload = hostedRequest(raw);
+        const { conversationId } = hostedConversationIdInputSchema.parse(payload.data);
+        const conversation = this.options.store.requireConversation(payload.userId, conversationId);
+        const paths = this.options.store.pathsForConversation(payload.userId, conversation.id);
+        const data = payload.data;
+        const input = toolResultResourceInputSchema.parse({
+            resourceRef: data.resourceRef,
+            cursor: data.cursor,
+            maxBytes: data.maxBytes
+        });
+        if (!this.options.runtime.readToolResultResource)
+            throw new Error('TOOL_RESOURCE_UNSUPPORTED');
+        return toolResultResourcePageSchema.parse(await this.options.runtime.readToolResultResource({
+            homeDirectory: paths.homeDirectory,
+            sessionId: conversation.sessionId,
+            ...input
+        }));
+    }
     async readImage(raw) {
         const payload = hostedRequest(raw);
         const input = hostedConversationImageReadInputSchema.parse(payload.data);
@@ -1638,7 +1662,7 @@ export class HostedConversationNodeService {
 function hostedRequest(raw) {
     if (!record(raw))
         throw new Error('HOSTED_CONVERSATION_NOT_AUTHORIZED');
-    const { __requestUserId, __template, __marAgentModel, __marAgentModels, __marAgentCompact, __marAgentRuntimeScopeId, __workspaceWatchSessionHash, __templateDeleted, ...data } = raw;
+    const { __usageGrant, __requestUserId, __template, __marAgentModel, __marAgentModels, __marAgentCompact, __marAgentRuntimeScopeId, __workspaceWatchSessionHash, __templateDeleted, ...data } = raw;
     if (typeof __requestUserId !== 'number' ||
         !Number.isSafeInteger(__requestUserId) ||
         __requestUserId <= 0)
@@ -1650,6 +1674,9 @@ function hostedRequest(raw) {
         throw new Error('HOSTED_CONVERSATION_NOT_AUTHORIZED');
     return {
         data,
+        ...(__usageGrant === undefined
+            ? {}
+            : { usageGrant: modelUsageGrantSchema.parse(__usageGrant) }),
         userId: __requestUserId,
         ...(__template === undefined ? {} : { template: __template }),
         ...(__marAgentModel === undefined ? {} : { model: __marAgentModel }),

package/dist/service/mar-agent-model-transport-test-service.js

@@ -61,11 +61,26 @@ function modelTestErrorProjection(error) {
     if (typeof candidate.code !== 'string' || typeof candidate.message !== 'string')
         return runnerErrorProjection(error, 'MAR_AGENT_MODEL_CONNECTION_FAILED');
     const prefix = `${candidate.code}: `;
-    return runnerErrorProjection({
+    const projection = runnerErrorProjection({
         code: candidate.code,
         message: candidate.message.startsWith(prefix)
             ? candidate.message.slice(prefix.length)
             : candidate.message,
         status: candidate.details?.['status']
     }, 'MAR_AGENT_MODEL_CONNECTION_FAILED');
+    const details = candidate.details;
+    return {
+        ...projection,
+        ...(typeof details?.['body'] === 'string' && typeof details['bodyTruncated'] === 'boolean'
+            ? {
+                response: {
+                    body: details['body'],
+                    bodyTruncated: details['bodyTruncated'],
+                    contentType: details['contentType'] ?? null,
+                    requestId: details['requestId'] ?? null,
+                    retryAfter: details['retryAfter'] ?? null
+                }
+            }
+            : {})
+    };
 }