@agent-native/core 0.131.5 → 0.131.7

package/dist/server/agent-chat-plugin.js

@@ -5,7 +5,6 @@ import { applyA2AAgentActivityEvent, buildA2AAgentActivityPart, createA2AAgentAc
 import { appendA2AArtifactLinks, buildA2ARecoverableArtifactMessage, } from "../a2a/artifact-response.js";
 import { hasConfiguredA2ASecret, isLoopbackAddress, isTrustedLocalRuntime, } from "../a2a/auth-policy.js";
 import { sanitizeA2ACorrelationId, sanitizeA2ACorrelationMetadata, } from "../a2a/correlation.js";
-import { applyAgentTextEventToBuffer } from "../a2a/response-text.js";
 import { createA2AApproval, updateTaskStatusMessage, } from "../a2a/task-store.js";
 import { canUpdateAgentAppModelDefaultSettings, normalizeAgentAppModelDefaultAppId, readAgentAppModelDefaultSettings, resetAgentAppModelDefaultSettings, writeAgentAppModelDefaultSettings, } from "../agent/app-model-defaults.js";
 import { DEFAULT_ANTHROPIC_MODEL } from "../agent/default-model.js";
@@ -17,6 +16,7 @@ import { callerHasRunAccess, callerHasThreadAccess, } from "../agent/run-ownersh
 import { markTurnAborted, readBackgroundRunClaim } from "../agent/run-store.js";
 import { buildCurrentTimeUserContext, buildRuntimeContextPrompt, } from "../agent/runtime-context.js";
 import { buildAssistantMessage, buildUserMessage, claimQueuedMessage, extractThreadMeta, foldAssistantTurn, hasClaimedQueuedMessage, mergeThreadDataForClientSave, upsertUserMessage, } from "../agent/thread-data-builder.js";
+import { appendThreadDebugHistory } from "../agent/thread-debug-history.js";
 import { attachToolSearch } from "../agent/tool-search.js";
 import { readAppStateForCurrentTab } from "../application-state/script-helpers.js";
 import { runChatThreadDataMigrations } from "../chat-threads/migrations.js";
@@ -102,10 +102,11 @@ import { buildSystemManifestSections, setContextXraySystemSections, } from "../a
 // the ones that were already part of the public surface) so
 // `createAgentChatPlugin` below stays a thinner orchestrator.
 // ---------------------------------------------------------------------------
-import { createA2AEngineToolSurface, filterAgentTools, filterPublicAgentActions, filterDirectA2AActions, filterReadOnlyActions, resolveInitialToolNames, runA2AAgentLoop, runMCPAgentLoop, assembleA2AFinalResponse, buildPublicAgentA2ASkills, buildAuthenticatedAgentA2ASkills, resolveArtifactBaseUrl, } from "./agent-chat/action-filters-a2a.js";
+import { createA2AEngineToolSurface, DEFAULT_DELEGATED_MAX_ITERATIONS, DEFAULT_DELEGATED_MAX_RUN_INPUT_TOKENS, DEFAULT_DELEGATED_MAX_TOOL_RESULT_CHARS, filterAgentTools, filterPublicAgentActions, filterDirectA2AActions, filterReadOnlyActions, resolveInitialToolNames, runA2AAgentLoop, runMCPAgentLoop, assembleA2AFinalResponse, buildPublicAgentA2ASkills, buildAuthenticatedAgentA2ASkills, resolveArtifactBaseUrl, } from "./agent-chat/action-filters-a2a.js";
 import { createBuilderBrowserTool, createTeamTools, } from "./agent-chat/browser-team-tools.js";
 import { createDataWidgetActionEntries, createFrameworkContextEntry, createRefreshScreenEntry, createUrlTools, } from "./agent-chat/context-tools.js";
 import { _agentChatPromptSectionsForTests, buildFrameworkPrompts, buildSchemaBlock, collectFiles, corpusToolNamesTaughtByPrompt, generateActionsPrompt, generateCorpusToolsPrompt, } from "./agent-chat/framework-prompts.js";
+import { resolveA2AAgentDelegationEnabled, } from "./agent-chat/plugin-options.js";
 import { finalizeClaimedAgentChatProcessRunFailure } from "./agent-chat/process-run-failure.js";
 import { loadResourcesForPrompt, promptResourceManifestSections, resourceScopeForOwner, } from "./agent-chat/prompt-resources.js";
 import { shouldDisableRecurringJobsRuntime } from "./agent-chat/recurring-jobs-runtime.js";
@@ -120,6 +121,7 @@ export { assembleA2AFinalResponse };
 export { runA2AAgentLoop };
 export { runMCPAgentLoop };
 export { createA2AEngineToolSurface };
+export { DEFAULT_DELEGATED_MAX_ITERATIONS, DEFAULT_DELEGATED_MAX_RUN_INPUT_TOKENS, DEFAULT_DELEGATED_MAX_TOOL_RESULT_CHARS, };
 export { shouldBlockInProductCodeEditingSurface };
 export { loadRunCodeToolEntries };
 export { shouldDisableRecurringJobsRuntime };
@@ -248,6 +250,7 @@ export function createAgentChatPlugin(options) {
             const canToggle = (env === "development" || env === "test") &&
                 process.env.AGENT_MODE !== "production";
             const routePath = options?.path ?? "/_agent-native/agent-chat";
+            const a2aAgentDelegationEnabled = resolveA2AAgentDelegationEnabled(options);
             // Mutable mode flag — persisted to the `settings` table so a user who
             // toggles to "Production" stays in prod mode across server restarts.
             // Hoisted here (before any tool-registry / handler closures are built)
@@ -1224,34 +1227,41 @@ export function createAgentChatPlugin(options) {
                     // a day rollover (or the resources/extra content changing) only
                     // invalidates the cached prompt prefix as late as possible.
                     const runtimeContext = runtimeContextForEvent(context.event);
-                    const systemPrompt = devActive
-                        ? devPrompt +
-                            SYSTEM_PROMPT_CACHE_SPLIT +
-                            resources +
-                            schemaBlock +
-                            extra +
-                            modelOverlay +
-                            runtimeContext
-                        : basePrompt +
-                            SYSTEM_PROMPT_CACHE_SPLIT +
-                            resources +
-                            schemaBlock +
-                            extra +
-                            modelOverlay +
-                            runtimeContext;
+                    // Delegated turns use native template actions in every environment,
+                    // so they must also receive the native-tool prompt. The interactive
+                    // dev prompt teaches `pnpm action` and would send this receiver back
+                    // into the shell loop the native action surface exists to prevent.
+                    const systemPrompt = basePrompt +
+                        SYSTEM_PROMPT_CACHE_SPLIT +
+                        resources +
+                        schemaBlock +
+                        extra +
+                        modelOverlay +
+                        runtimeContext;
                     if (a2aRunContext)
                         a2aRunContext.systemPrompt = systemPrompt;
-                    // Build tools — same as interactive handler but WITHOUT call-agent
-                    // to prevent infinite recursive A2A loops (agent calling itself).
-                    // In dev mode, template actions are invoked via bash (not native tools),
-                    // so they're omitted from the tool registry — see allScripts comment.
+                    // Build tools — same as interactive handler. Cross-app delegation is
+                    // enabled by default; call-agent carries a bounded visited-app path
+                    // and rejects cycles/excessive hops before dispatch.
+                    // Delegated turns keep template actions as NATIVE tools even in dev,
+                    // unlike the interactive surface (see the allScripts comment). Dev
+                    // routes template actions through bash there to dodge the degenerate
+                    // empty-object tool call some models emit for complex schemas — a
+                    // person can just retry. A delegated caller cannot: with no native
+                    // action the sibling agent shells out, and an A2A turn that misfires
+                    // has no one to correct it, so it retries the same command until the
+                    // repetition guard kills the run minutes later. A rejected `{}` call
+                    // returns a schema error the model can fix on the next step, which is
+                    // strictly better than a shell loop nobody can see.
                     const a2aActions = attachToolSearch(devActive
                         ? {
+                            ...templateScripts,
                             ...resourceScripts,
                             ...docsScripts,
                             ...(lazyContext ? frameworkContextTool : {}),
                             ...urlTools,
                             ...chatScripts,
+                            ...(a2aAgentDelegationEnabled ? callAgentScript : {}),
                             ...fetchTool,
                             ...webSearchTool,
                             ...workspaceFilesTool,
@@ -1275,6 +1285,7 @@ export function createAgentChatPlugin(options) {
                             ...(lazyContext ? frameworkContextTool : {}),
                             ...urlTools,
                             ...chatScripts,
+                            ...(a2aAgentDelegationEnabled ? callAgentScript : {}),
                             ...fetchTool,
                             ...webSearchTool,
                             ...workspaceFilesTool,
@@ -1304,6 +1315,7 @@ export function createAgentChatPlugin(options) {
                     // event stream so pre-tool narration never leaks as the A2A result.
                     const a2aEvents = [];
                     const a2aToolResults = [];
+                    let a2aOutcome;
                     let lastRecoverableArtifactText = "";
                     let activityState = createA2AAgentActivityState();
                     let lastActivityCheckpointAt = 0;
@@ -1356,8 +1368,15 @@ export function createAgentChatPlugin(options) {
                         runId: context.taskId,
                         networkProtocol: "a2a",
                         networkId: context.taskId,
+                        networkPeer: correlation.callerApp,
+                        delegationDepth: correlation.delegationDepth ?? 1,
+                        visitedApps: correlation.visitedApps ??
+                            (correlation.callerApp ? [correlation.callerApp] : []),
                         threadId: context.taskId,
                         turnId: context.taskId,
+                        onOutcome: (outcome) => {
+                            a2aOutcome = outcome;
+                        },
                         send: (event) => {
                             a2aEvents.push(event);
                             const nextActivityState = applyA2AAgentActivityEvent(activityState, event);
@@ -1404,6 +1423,7 @@ export function createAgentChatPlugin(options) {
                         },
                         signal: controller.signal,
                     }, {
+                        delegatedRunPolicy: options?.delegatedRunPolicy,
                         finalResponseGuard: options?.finalResponseGuard,
                         runSoftTimeoutMs: options?.runSoftTimeoutMs,
                     }, {
@@ -1485,7 +1505,7 @@ export function createAgentChatPlugin(options) {
                         };
                         return;
                     }
-                    const { responseText, finalText } = assembleA2AFinalResponse(a2aEvents, a2aToolResults, { event: context.event });
+                    const { responseText, finalText } = assembleA2AFinalResponse(a2aEvents, a2aToolResults, { event: context.event, outcome: a2aOutcome });
                     console.log(`[A2A] Loop complete. Text: ${responseText.slice(0, 100)}...`);
                     // Yield the final accumulated text
                     yield {
@@ -1494,7 +1514,7 @@ export function createAgentChatPlugin(options) {
                             buildA2AAgentActivityPart(activityState),
                             {
                                 type: "text",
-                                text: finalText || "(no response)",
+                                text: finalText,
                             },
                         ],
                     };
@@ -1577,10 +1597,13 @@ export function createAgentChatPlugin(options) {
                             mcpEngine.defaultModel;
                         const model = normalizeModelForEngine(mcpEngine, mcpModelCandidate);
                         // Same actions as A2A — without call-agent to prevent loops.
-                        // In dev mode, template actions go through bash, not native tools.
+                        // `ask_app` is delegated too, so template actions stay native in dev
+                        // here for the same reason as the A2A surface above: an external
+                        // caller cannot nurse a shell command that misfires.
                         const devActiveMcp = isDevMode();
                         const mcpActions = attachToolSearch(devActiveMcp
                             ? {
+                                ...templateScripts,
                                 ...resourceScripts,
                                 ...docsScripts,
                                 ...(lazyContext ? frameworkContextTool : {}),
@@ -1626,34 +1649,20 @@ export function createAgentChatPlugin(options) {
                         const schemaBlock = lazyContext
                             ? ""
                             : await buildSchemaBlock(SHARED_OWNER, databaseToolsMode);
-                        // Build the MCP handler's own prompt — always use the bash-based
-                        // dev prompt in dev mode because mcpActions routes template actions
-                        // through bash (`devScriptsForA2A`), regardless of `nativeActionsInDev`.
-                        const mcpDevPrompt = (options?.devSystemPrompt
-                            ? options.devSystemPrompt +
-                                (options?.systemPrompt ??
-                                    (lazyContext
-                                        ? PROD_FRAMEWORK_PROMPT_COMPACT
-                                        : PROD_FRAMEWORK_PROMPT))
-                            : lazyContext
-                                ? DEV_FRAMEWORK_PROMPT_COMPACT
-                                : DEV_FRAMEWORK_PROMPT) + devActionsPrompt;
                         // Stable-first ordering: runtime-context (which changes daily)
                         // goes last so the cached prompt prefix survives as long as
                         // possible — same pattern as the other prompt-assembly sites in
                         // this plugin (A2A above, prod/anonymous/dev handlers below).
-                        const systemPrompt = devActiveMcp
-                            ? mcpDevPrompt +
-                                SYSTEM_PROMPT_CACHE_SPLIT +
-                                resources +
-                                schemaBlock +
-                                buildRuntimeContextPrompt()
-                            : basePrompt +
-                                SYSTEM_PROMPT_CACHE_SPLIT +
-                                resources +
-                                schemaBlock +
-                                buildRuntimeContextPrompt();
-                        let accumulatedText = "";
+                        // ask_app receives native template actions even in dev, so the
+                        // native-tool prompt is required here for the same reason as A2A.
+                        const systemPrompt = basePrompt +
+                            SYSTEM_PROMPT_CACHE_SPLIT +
+                            resources +
+                            schemaBlock +
+                            buildRuntimeContextPrompt();
+                        const mcpEvents = [];
+                        const mcpToolResults = [];
+                        let mcpOutcome;
                         const controller = new AbortController();
                         await runMCPAgentLoop({
                             engine: mcpEngine,
@@ -1683,11 +1692,23 @@ export function createAgentChatPlugin(options) {
                             networkId: mcpRunId,
                             threadId: mcpRunId,
                             turnId: mcpRunId,
+                            onOutcome: (outcome) => {
+                                mcpOutcome = outcome;
+                            },
                             send: (event) => {
-                                accumulatedText = applyAgentTextEventToBuffer(accumulatedText, event);
+                                mcpEvents.push(event);
+                                if (event.type === "tool_done") {
+                                    mcpToolResults.push({
+                                        tool: event.tool,
+                                        result: event.result,
+                                        isError: event.isError,
+                                        completedSideEffect: event.completedSideEffect,
+                                    });
+                                }
                             },
                             signal: controller.signal,
                         }, {
+                            delegatedRunPolicy: options?.delegatedRunPolicy,
                             finalResponseGuard: options?.finalResponseGuard,
                             runSoftTimeoutMs: options?.runSoftTimeoutMs,
                         }, {
@@ -1704,7 +1725,9 @@ export function createAgentChatPlugin(options) {
                                 delegation: { protocol: "mcp" },
                             },
                         });
-                        return accumulatedText || "(no response)";
+                        return assembleA2AFinalResponse(mcpEvents, mcpToolResults, {
+                            outcome: mcpOutcome,
+                        }).finalText;
                     },
                 });
             }
@@ -1837,11 +1860,7 @@ export function createAgentChatPlugin(options) {
                             engine: runCtx?.engine?.name ?? "unknown",
                             timestamp: Date.now(),
                         };
-                        repo._debug = debug;
-                        const debugRuns = Array.isArray(repo._debugRuns)
-                            ? repo._debugRuns
-                            : [];
-                        repo._debugRuns = [...debugRuns, debug].slice(-50);
+                        repo = appendThreadDebugHistory(repo, debug);
                         const meta = extractThreadMeta(repo);
                         await updateThreadData(threadId, JSON.stringify(repo), meta.title || thread.title, meta.preview || thread.preview, repo.messages.length);
                     }
@@ -3600,13 +3619,17 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
                     const turnId = decodeURIComponent(turnAbortMatch[1]);
                     const body = await readBody(event).catch(() => null);
                     const threadId = typeof body?.threadId === "string" ? body.threadId : "";
+                    const reason = typeof body?.reason === "string" &&
+                        /^[a-z0-9_-]{1,64}$/i.test(body.reason)
+                        ? body.reason
+                        : "user";
                     if (!/^[a-zA-Z0-9_-]{1,160}$/.test(turnId) ||
                         !threadId ||
                         !(await canEditThread(threadId))) {
                         setResponseStatus(event, 404);
                         return { error: "Run not found" };
                     }
-                    await markTurnAborted(threadId, turnId);
+                    await markTurnAborted(threadId, turnId, reason);
                     return { ok: true };
                 }
                 // Route: GET /runs/list?goalId=agent-team|agent-harness