@myagentroam/agent 0.10.19 → 0.10.21

package/dist/index.d.ts

@@ -11,7 +11,7 @@ export { testMarAgentModelTransport } from './agent-core/model/transport-test.js
 export type { AccessMode, ExecutionMode, ExecutionResult, MarAgentImageMetadata, RolloutBudgetOptions, RunInput, RunInputImage } from './agent-core/runtime/contracts.js';
 export type { MarAgentEvent } from './agent-core/runtime/events.js';
 export { createMarAgent } from './agent-core/sdk/agent.js';
-export { generateModelText, type GenerateModelTextInput } from './shared/model-text.js';
+export { generateModelText, type GenerateModelTextInput, type GenerateModelTextResult } from './shared/model-text.js';
 export type { CoreAgentExtensionContext, CoreSessionExtensionContext, CoreRuntimeExtension, CoreExtensionSnapshot, CoreExtensionSource, CoreExtensionDiagnostic, CoreDomainOperations, CoreDomainFacts, CoreHookRegistrar, CoreCapabilitySnapshot, CoreCommandSpec, CorePromptSection, CoreServiceDeclaration, CoreServiceDependency } from './agent-core/extensions/contracts.js';
 export type { CoreDisposer, CoreResourceRegistration, CoreResourceScope } from './agent-core/extensions/resources.js';
 export type { CoreHookOptions, CoreInterceptor } from './agent-core/extensions/hooks.js';

package/dist/shared/model-text.d.ts

@@ -1,19 +1,26 @@
 import { type MarAgentModelConfiguration, type MarAgentReasoningEffort } from '../agent-core/model/configuration.js';
 import type { ModelAttemptDiagnostic, ModelUsage } from '../agent-core/model/contracts.js';
 import type { CoreCompactMessage } from '../agent-core/extensions/compaction.js';
+import type { ClientToolDefinition, ToolCall } from '../agent-core/tools/contracts.js';
 export interface GenerateModelTextInput {
     readonly onModelUsage?: (usage: import('../agent-core/model/usage-observer.js').ModelRequestUsage) => Promise<void> | void;
     readonly onModelUsageFailure?: () => void;
     readonly model: MarAgentModelConfiguration;
     readonly system: string;
     readonly messages: readonly CoreCompactMessage[];
+    /** Declarative client tools only. Returned calls are never executed or continued here. */
+    readonly tools?: readonly ClientToolDefinition[];
+    readonly promptCacheKey?: string;
+    readonly cachePrefixMessages?: number;
     readonly reasoningEffort?: MarAgentReasoningEffort;
     readonly outputLimit?: number;
     readonly signal: AbortSignal;
     readonly onAttemptDiagnostic?: (diagnostic: ModelAttemptDiagnostic) => Promise<void> | void;
 }
-/** One tool-free request using the SDK transports. Credential providers remain caller-owned. */
-export declare function generateModelText(input: GenerateModelTextInput): Promise<{
-    text: string;
-    usage?: ModelUsage;
-} | undefined>;
+export interface GenerateModelTextResult {
+    readonly text: string;
+    readonly toolCalls?: readonly ToolCall[];
+    readonly usage?: ModelUsage;
+}
+/** One request using the SDK transports, without tool execution or a Session. */
+export declare function generateModelText(input: GenerateModelTextInput): Promise<GenerateModelTextResult | undefined>;

package/dist/shared/model-text.js

@@ -3,16 +3,20 @@ import { MarAgentError } from '../agent-core/error.js';
 import { AnthropicMessagesAdapter } from '../agent-core/model/anthropic-messages.js';
 import { OpenAiResponsesAdapter } from '../agent-core/model/openai-responses.js';
 import { resolveModelDefaultReasoningEffort } from '../agent-core/model/configuration.js';
-/** One tool-free request using the SDK transports. Credential providers remain caller-owned. */
+/** One request using the SDK transports, without tool execution or a Session. */
 export async function generateModelText(input) {
     input.signal.throwIfAborted();
     if (!input.model.enabled)
         return undefined;
+    const tools = input.tools ?? [];
+    // Standalone calls expose only the caller's declared client tools, never hosted search.
+    const model = { ...input.model, hostedWebSearch: false };
     const adapter = input.model.protocol === 'OPENAI_RESPONSES'
-        ? new OpenAiResponsesAdapter(input.model)
-        : new AnthropicMessagesAdapter(input.model);
+        ? new OpenAiResponsesAdapter(model)
+        : new AnthropicMessagesAdapter(model);
     let text = '';
     let completed = false;
+    const toolCalls = [];
     let usage;
     try {
         for await (const event of adapter.start({
@@ -23,11 +27,15 @@ export async function generateModelText(input) {
                 ? {}
                 : { onModelUsageFailure: input.onModelUsageFailure }),
             system: input.system,
+            ...(input.cachePrefixMessages === undefined
+                ? {}
+                : { cachePrefixMessages: input.cachePrefixMessages }),
             messages: input.messages,
-            tools: [],
-            allowTools: false,
-            toolChoice: 'none',
+            tools,
+            allowTools: tools.length > 0,
+            toolChoice: tools.length > 0 ? 'auto' : 'none',
             reasoningEffort: input.reasoningEffort ?? resolveModelDefaultReasoningEffort(input.model),
+            ...(input.promptCacheKey === undefined ? {} : { promptCacheKey: input.promptCacheKey }),
             ...(input.onAttemptDiagnostic ? { onAttemptDiagnostic: input.onAttemptDiagnostic } : {}),
             ...(input.outputLimit === undefined ? {} : { outputLimit: input.outputLimit })
         }, input.signal)) {
@@ -37,12 +45,22 @@ export async function generateModelText(input) {
             else if (event.type === 'usage')
                 usage = event.usage;
             else if (event.type === 'completed')
-                completed = event.reason === 'completed';
-            else if (event.type === 'client_tool.call')
-                throw new MarAgentError('MAR_AGENT_MODEL_PROTOCOL_ERROR', 'Text generation returned a tool call while tools were disabled.');
+                completed =
+                    event.reason === 'completed' || (event.reason === 'tool_use' && toolCalls.length > 0);
+            else if (event.type === 'client_tool.call') {
+                if (!tools.some((tool) => tool.name === event.name) || event.argumentError !== undefined)
+                    throw new MarAgentError('MAR_AGENT_MODEL_PROTOCOL_ERROR', 'Standalone generation returned an undeclared tool or invalid tool arguments.');
+                toolCalls.push({ name: event.name, callId: event.callId, arguments: event.arguments });
+            }
         }
         input.signal.throwIfAborted();
-        return completed && text ? { text, ...(usage === undefined ? {} : { usage }) } : undefined;
+        return completed && (text || toolCalls.length > 0)
+            ? {
+                text,
+                ...(toolCalls.length > 0 ? { toolCalls } : {}),
+                ...(usage === undefined ? {} : { usage })
+            }
+            : undefined;
     }
     finally {
         await adapter.close?.();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/agent",
-  "version": "0.10.19",
+  "version": "0.10.21",
   "description": "Embeddable MAR coding agent SDK and CLI.",
   "license": "Apache-2.0",
   "type": "module",