@agent-native/core 0.7.80 → 0.7.82

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

@@ -1,7 +1,8 @@
 import { runWithRequestContext, getRequestOrgId, getRequestUserEmail, getRequestRunContext, ensureRequestRunContext, } from "./request-context.js";
 import { getSetting, putSetting } from "../settings/store.js";
 import { getH3App, markDefaultPluginProvided, trackPluginInit, } from "./framework-request-handler.js";
-import { createProductionAgentHandler, runAgentLoop, actionsToEngineTools, getActiveRunForThreadAsync, abortRun, subscribeToRun, } from "../agent/production-agent.js";
+import { createProductionAgentHandler, runAgentLoop, actionsToEngineTools, getActiveRunForThreadAsync, abortRun, subscribeToRun, appendAgentLoopContinuation, } from "../agent/production-agent.js";
+import { resolveRunSoftTimeoutMs } from "../agent/run-manager.js";
 import { resolveEngine, createAnthropicEngine } from "../agent/engine/index.js";
 import { DEFAULT_MODEL } from "../agent/default-model.js";
 import { attachToolSearch } from "../agent/tool-search.js";
@@ -10,13 +11,13 @@ import { discoverAgents } from "./agent-discovery.js";
 import { loadSchemaPromptBlock } from "./schema-prompt.js";
 import { buildAssistantMessage, extractThreadMeta, } from "../agent/thread-data-builder.js";
 import { defineEventHandler, setResponseStatus, setResponseHeader, getMethod, getQuery, getHeader, } from "h3";
-import { getSession, DEV_MODE_USER_EMAIL } from "./auth.js";
+import { getSession } from "./auth.js";
 import { getOrigin } from "./google-oauth.js";
 import { createThread, forkThread, getThread, listThreads, searchThreads, updateThreadData, withThreadDataLock, deleteThread, setThreadQueuedMessages, } from "../chat-threads/store.js";
-import { resourceListAccessible, resourceList, resourceGet, resourceGetByPath, ensurePersonalDefaults, SHARED_OWNER, } from "../resources/store.js";
+import { resourceList, resourceGet, resourceGetByPath, ensurePersonalDefaults, SHARED_OWNER, } from "../resources/store.js";
 import nodePath from "node:path";
 import { readBody } from "./h3-helpers.js";
-import { getBuilderBrowserConnectUrl } from "./builder-browser.js";
+import { getBuilderBrowserConnectUrl, isBuilderBranchingEnabled, } from "./builder-browser.js";
 import { captureCliOutput } from "./cli-capture.js";
 import { withConfiguredAppBasePath } from "./app-base-path.js";
 import { appendA2AArtifactLinks, buildA2ARecoverableArtifactMessage, } from "../a2a/artifact-response.js";
@@ -72,6 +73,69 @@ function resolveArtifactBaseUrl(event) {
     catch { }
     return undefined;
 }
+async function runAgentLoopDirectWithSoftTimeout(opts, softTimeoutMs) {
+    const timeoutMs = resolveRunSoftTimeoutMs(softTimeoutMs);
+    if (timeoutMs <= 0)
+        return runAgentLoop(opts);
+    const upstreamSignal = opts.signal;
+    const usage = {
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadTokens: 0,
+        cacheWriteTokens: 0,
+        model: opts.model,
+    };
+    const addUsage = (next) => {
+        usage.inputTokens += next.inputTokens;
+        usage.outputTokens += next.outputTokens;
+        usage.cacheReadTokens += next.cacheReadTokens;
+        usage.cacheWriteTokens += next.cacheWriteTokens;
+        usage.model = next.model;
+    };
+    while (!upstreamSignal.aborted) {
+        const controller = new AbortController();
+        const abortFromUpstream = () => controller.abort();
+        if (upstreamSignal.aborted) {
+            controller.abort();
+        }
+        else {
+            upstreamSignal.addEventListener("abort", abortFromUpstream, {
+                once: true,
+            });
+        }
+        let softTimedOut = false;
+        const timer = setTimeout(() => {
+            if (controller.signal.aborted)
+                return;
+            softTimedOut = true;
+            controller.abort();
+        }, timeoutMs);
+        try {
+            const nextUsage = await runAgentLoop({
+                ...opts,
+                signal: controller.signal,
+            });
+            addUsage(nextUsage);
+            if (softTimedOut && !upstreamSignal.aborted) {
+                appendAgentLoopContinuation(opts.messages, "run_timeout");
+                continue;
+            }
+            return usage;
+        }
+        catch (err) {
+            if (softTimedOut && !upstreamSignal.aborted) {
+                appendAgentLoopContinuation(opts.messages, "run_timeout");
+                continue;
+            }
+            throw err;
+        }
+        finally {
+            clearTimeout(timer);
+            upstreamSignal.removeEventListener("abort", abortFromUpstream);
+        }
+    }
+    return usage;
+}
 export function assembleA2AFinalResponse(events, toolResults, options = {}) {
     const responseText = collectFinalResponseTextFromAgentEvents(events);
     const finalText = appendA2AArtifactLinks(responseText, [...toolResults], {
@@ -723,6 +787,7 @@ function createBuilderBrowserTool(deps) {
                 return JSON.stringify({
                     kind: "connect-builder-card",
                     configured,
+                    builderEnabled: isBuilderBranchingEnabled(),
                     connectUrl: getBuilderBrowserConnectUrl(deps.getOrigin()),
                     orgName: creds.orgName || null,
                     prompt,
@@ -2281,7 +2346,7 @@ export function createAgentChatPlugin(options) {
                     let lastRecoverableArtifactText = "";
                     const controller = new AbortController();
                     console.log(`[A2A] Starting agent loop: ${a2aTools.length} tools, prompt ${systemPrompt.length} chars`);
-                    await runAgentLoop({
+                    await runAgentLoopDirectWithSoftTimeout({
                         engine: a2aEngine,
                         model,
                         systemPrompt,
@@ -2326,7 +2391,7 @@ export function createAgentChatPlugin(options) {
                             }
                         },
                         signal: controller.signal,
-                    });
+                    }, options?.runSoftTimeoutMs);
                     const { responseText, finalText } = assembleA2AFinalResponse(a2aEvents, a2aToolResults, { event: context.event });
                     console.log(`[A2A] Loop complete. Text: ${responseText.slice(0, 100)}...`);
                     // Yield the final accumulated text
@@ -2415,10 +2480,10 @@ export function createAgentChatPlugin(options) {
                             ...toolActions,
                         });
                     const mcpTools = actionsToEngineTools(mcpActions);
-                    const resources = await loadResourcesForPrompt(DEV_MODE_USER_EMAIL, lazyContext);
+                    const resources = await loadResourcesForPrompt(SHARED_OWNER, lazyContext);
                     const schemaBlock = lazyContext
                         ? ""
-                        : await buildSchemaBlock(DEV_MODE_USER_EMAIL, devActiveMcp);
+                        : await buildSchemaBlock(SHARED_OWNER, devActiveMcp);
                     // Build the MCP handler's own prompt — always use the shell-based
                     // dev prompt in dev mode because mcpActions routes template actions
                     // through shell (`devScriptsForA2A`), regardless of `nativeActionsInDev`.
@@ -2442,7 +2507,7 @@ export function createAgentChatPlugin(options) {
                             schemaBlock;
                     let accumulatedText = "";
                     const controller = new AbortController();
-                    await runAgentLoop({
+                    await runAgentLoopDirectWithSoftTimeout({
                         engine: mcpEngine,
                         model,
                         systemPrompt,
@@ -2456,7 +2521,7 @@ export function createAgentChatPlugin(options) {
                                 accumulatedText += event.text;
                         },
                         signal: controller.signal,
-                    });
+                    }, options?.runSoftTimeoutMs);
                     return accumulatedText || "(no response)";
                 },
             });
@@ -2818,6 +2883,7 @@ export function createAgentChatPlugin(options) {
                 },
                 model: options?.model ?? DEFAULT_MODEL,
                 apiKey: options?.apiKey,
+                runSoftTimeoutMs: options?.runSoftTimeoutMs,
                 skipFilesContext: leanPrompt,
                 onEngineResolved: (engine, model) => {
                     const runCtx = ensureRequestRunContext();
@@ -2899,6 +2965,7 @@ export function createAgentChatPlugin(options) {
                     },
                     model: options?.model,
                     apiKey: options?.apiKey,
+                    runSoftTimeoutMs: options?.runSoftTimeoutMs,
                     skipFilesContext: leanPrompt,
                     onEngineResolved: (engine, model) => {
                         const runCtx = ensureRequestRunContext();
@@ -2978,7 +3045,7 @@ export function createAgentChatPlugin(options) {
                 }
                 const trimmedKey = key.trim();
                 const ownerEmail = await getOwnerFromEvent(event);
-                if (!ownerEmail || ownerEmail === DEV_MODE_USER_EMAIL) {
+                if (!ownerEmail) {
                     setResponseStatus(event, 401);
                     return { error: "Authentication required" };
                 }
@@ -3042,9 +3109,7 @@ export function createAgentChatPlugin(options) {
                 }
                 // Query resources
                 try {
-                    const resources = currentDevMode
-                        ? await resourceListAccessible(DEV_MODE_USER_EMAIL)
-                        : await resourceList(SHARED_OWNER);
+                    const resources = await resourceList(SHARED_OWNER);
                     for (const r of resources) {
                         if (!seen.has(r.path)) {
                             seen.add(r.path);
@@ -3127,9 +3192,7 @@ export function createAgentChatPlugin(options) {
                 }
                 // Query resources with skills/ prefix
                 try {
-                    const resourceSkills = currentDevMode
-                        ? await resourceListAccessible(DEV_MODE_USER_EMAIL, "skills/")
-                        : await resourceList(SHARED_OWNER, "skills/");
+                    const resourceSkills = await resourceList(SHARED_OWNER, "skills/");
                     for (const r of resourceSkills) {
                         // Try to get content to parse frontmatter
                         let skillName = r.path.split("/").pop()?.replace(/\.md$/, "") || r.path;
@@ -3238,9 +3301,7 @@ export function createAgentChatPlugin(options) {
                     // 1. Resources from SQL (fast — flush first)
                     sources.push((async () => {
                         try {
-                            const resources = currentDevMode
-                                ? await resourceListAccessible(DEV_MODE_USER_EMAIL)
-                                : await resourceList(SHARED_OWNER);
+                            const resources = await resourceList(SHARED_OWNER);
                             flush(resources.map((r) => {
                                 const isShared = r.owner === SHARED_OWNER;
                                 return {