@agent-native/core 0.160.1 → 0.161.1

package/dist/agent/tool-approval-migrations.js

@@ -35,6 +35,8 @@ export const AGENT_TOOL_APPROVAL_INDEX_SQL = `CREATE INDEX IF NOT EXISTS idx_age
   ON agent_tool_approvals(owner_email, org_id, thread_id, tool_name, call_id, status)`;
 export const AGENT_TOOL_APPROVAL_LOGICAL_INDEX_SQL = `CREATE INDEX IF NOT EXISTS idx_agent_tool_approvals_logical
   ON agent_tool_approvals(owner_email, org_id, thread_id, turn_id, tool_name, approval_key_hash, status)`;
+export const AGENT_TOOL_APPROVAL_RECOVERY_INDEX_SQL = `CREATE INDEX IF NOT EXISTS idx_agent_tool_approvals_recovery
+  ON agent_tool_approvals(owner_email, org_id, thread_id, approval_key_hash, status, turn_id)`;
 /**
  * Durable approval grants are created and consumed on request paths, but their
  * schema belongs to the release migration boundary in production.
@@ -58,4 +60,12 @@ ${AGENT_TOOL_APPROVAL_INDEX_SQL}`,
             sqlite: AGENT_TOOL_APPROVAL_LOGICAL_INDEX_SQL,
         },
     },
+    {
+        version: 3,
+        name: "agent-tool-approvals-recovery-index",
+        sql: {
+            postgres: AGENT_TOOL_APPROVAL_RECOVERY_INDEX_SQL,
+            sqlite: AGENT_TOOL_APPROVAL_RECOVERY_INDEX_SQL,
+        },
+    },
 ];

package/dist/agent/tool-approval-store.d.ts

@@ -9,6 +9,18 @@ export interface AgentToolApprovalBinding {
     expiresAt?: number;
 }
 export declare function hashAgentToolApprovalKey(approvalKey: string): string;
+/**
+ * Recover the durable scope for an approval continuation when a transport
+ * drops the original turn id. A single pending logical turn is safe to
+ * recover; multiple turns are deliberately ambiguous and stay unmatched.
+ */
+export declare function resolveAgentToolApprovalTurnId(binding: {
+    ownerEmail: string;
+    orgId?: string | null;
+    threadId?: string | null;
+    requestedTurnId?: string | null;
+    approvalKeys: readonly string[];
+}): Promise<string | null>;
 export declare function createAgentToolApproval(binding: AgentToolApprovalBinding): Promise<void>;
 /**
  * Atomically consume the server-created approval for one logical tool call.

package/dist/agent/tool-approval-store.js

@@ -1,7 +1,7 @@
 import { createHash, randomUUID } from "node:crypto";
 import { getDbExec, isPostgres, retryOnDdlRace } from "../db/client.js";
 import { ensureIndexExists, ensureTableExists } from "../db/ddl-guard.js";
-import { AGENT_TOOL_APPROVAL_INDEX_SQL, AGENT_TOOL_APPROVAL_LOGICAL_INDEX_SQL, AGENT_TOOL_APPROVAL_TABLE_SQL, } from "./tool-approval-migrations.js";
+import { AGENT_TOOL_APPROVAL_INDEX_SQL, AGENT_TOOL_APPROVAL_LOGICAL_INDEX_SQL, AGENT_TOOL_APPROVAL_RECOVERY_INDEX_SQL, AGENT_TOOL_APPROVAL_TABLE_SQL, } from "./tool-approval-migrations.js";
 const APPROVAL_TTL_MS = 15 * 60_000;
 const APPROVAL_CLEANUP_AGE_MS = 24 * 60 * 60_000;
 let initPromise;
@@ -13,12 +13,14 @@ async function ensureAgentToolApprovalTable() {
                 await ensureTableExists("agent_tool_approvals", createSql);
                 await ensureIndexExists("idx_agent_tool_approvals_binding", AGENT_TOOL_APPROVAL_INDEX_SQL);
                 await ensureIndexExists("idx_agent_tool_approvals_logical", AGENT_TOOL_APPROVAL_LOGICAL_INDEX_SQL);
+                await ensureIndexExists("idx_agent_tool_approvals_recovery", AGENT_TOOL_APPROVAL_RECOVERY_INDEX_SQL);
                 return;
             }
             const client = getDbExec();
             await retryOnDdlRace(() => client.execute(createSql));
             await retryOnDdlRace(() => client.execute(AGENT_TOOL_APPROVAL_INDEX_SQL));
             await retryOnDdlRace(() => client.execute(AGENT_TOOL_APPROVAL_LOGICAL_INDEX_SQL));
+            await retryOnDdlRace(() => client.execute(AGENT_TOOL_APPROVAL_RECOVERY_INDEX_SQL));
         })().catch((error) => {
             initPromise = undefined;
             throw error;
@@ -29,6 +31,49 @@ async function ensureAgentToolApprovalTable() {
 export function hashAgentToolApprovalKey(approvalKey) {
     return createHash("sha256").update(approvalKey).digest("hex");
 }
+/**
+ * Recover the durable scope for an approval continuation when a transport
+ * drops the original turn id. A single pending logical turn is safe to
+ * recover; multiple turns are deliberately ambiguous and stay unmatched.
+ */
+export async function resolveAgentToolApprovalTurnId(binding) {
+    const approvalKeys = [...new Set(binding.approvalKeys)].slice(0, 200);
+    if (!binding.threadId || approvalKeys.length === 0)
+        return null;
+    await ensureAgentToolApprovalTable();
+    const now = Date.now();
+    const hashes = approvalKeys.map(hashAgentToolApprovalKey);
+    const placeholders = hashes.map(() => "?").join(", ");
+    const result = await getDbExec().execute({
+        sql: `SELECT turn_id FROM agent_tool_approvals
+      WHERE owner_email = ?
+        AND ((org_id IS NULL AND CAST(? AS TEXT) IS NULL) OR org_id = ?)
+        AND ((thread_id IS NULL AND CAST(? AS TEXT) IS NULL) OR thread_id = ?)
+        AND approval_key_hash IN (${placeholders})
+        AND status = 'pending'
+        AND expires_at > ?
+        AND turn_id IS NOT NULL`,
+        args: [
+            binding.ownerEmail,
+            binding.orgId ?? null,
+            binding.orgId ?? null,
+            binding.threadId,
+            binding.threadId,
+            ...hashes,
+            now,
+        ],
+    });
+    const turnIds = new Set((result.rows ?? [])
+        .map((row) => {
+        const value = row.turn_id;
+        return typeof value === "string" && value.trim() ? value.trim() : null;
+    })
+        .filter((turnId) => turnId !== null));
+    const requestedTurnId = binding.requestedTurnId?.trim();
+    if (requestedTurnId && turnIds.has(requestedTurnId))
+        return requestedTurnId;
+    return turnIds.size === 1 ? [...turnIds][0] : null;
+}
 export async function createAgentToolApproval(binding) {
     await ensureAgentToolApprovalTable();
     const now = Date.now();

package/dist/agent/types.d.ts

@@ -232,7 +232,9 @@ export interface AgentChatRequest {
      * `approval_required`; the client re-issues the turn (typically an empty
      * continuation) with the approved call's key here so the gate lets it run.
      * Keys not present here keep the action paused. The model never sees or sets
-     * this — it is supplied by the human's approve affordance.
+     * this — it is supplied by the human's approve affordance. Clients should
+     * preserve the original turnId; the server can recover one uniquely pending
+     * durable grant when a transport drops it, but refuses ambiguous matches.
      */
     approvedToolCalls?: string[];
 }

package/dist/client/AssistantChat.js

@@ -4094,7 +4094,9 @@ const AssistantChatInner = forwardRef(function AssistantChatInner({ emptyStateTe
         !authError &&
         showEmptyState &&
         !isRestoring;
-    const threadRestoreErrorSurface = threadRestoreError ? (_jsxs("div", { role: "alert", className: "flex max-w-[320px] flex-col items-center gap-3 rounded-lg border border-border bg-muted/30 px-4 py-3 text-center", children: [_jsx(IconRefresh, { className: "h-5 w-5 text-muted-foreground" }), _jsx("p", { className: "text-sm text-muted-foreground", children: t("agentChat.message.restoreRequestFailed") }), _jsx("button", { type: "button", onClick: retryThreadRestore, className: "rounded-md border border-border px-3 py-1.5 text-xs font-medium text-foreground hover:bg-accent", children: t("agentChat.common.retry") })] })) : null;
+    const threadRestoreErrorSurface = threadRestoreError ? (_jsxs("div", { role: "alert", className: "flex max-w-[320px] flex-col items-center gap-3 rounded-lg border border-border bg-muted/30 px-4 py-3 text-center", children: [_jsx(IconRefresh, { className: "h-5 w-5 text-muted-foreground" }), _jsx("p", { className: "text-sm text-muted-foreground", children: threadRestoreError === "not-found"
+                    ? t("agentChat.message.threadNotFound")
+                    : t("agentChat.message.restoreRequestFailed") }), _jsx("button", { type: "button", onClick: retryThreadRestore, className: "rounded-md border border-border px-3 py-1.5 text-xs font-medium text-foreground hover:bg-accent", children: t("agentChat.common.retry") })] })) : null;
     // Clarifying-question surface: the `ask-question` action writes a
     // GuidedQuestionPayload to application_state under "guided-questions". The
     // hook polls that key, and on submit/skip composes the answer as a normal

package/dist/client/error-format.js

@@ -1,4 +1,5 @@
 import { GATEWAY_UNAVAILABLE_VISITOR_MESSAGE } from "../agent/engine/credential-errors.js";
+import { BUILDER_GATEWAY_INTERNAL_ERROR_CODE } from "../agent/engine/error-detail.js";
 /**
  * Append a Builder CTA markdown link to gateway errors that users can fix
  * outside the app. Used by both
@@ -21,6 +22,13 @@ const OPEN_BUILDER_SPACE_SETTINGS_LABEL = "Open Builder space settings";
 const START_NEW_CHAT_LABEL = "Start new chat";
 const UPGRADE_AT_BUILDER_LABEL = "Upgrade at builder.io";
 const BUILDER_AUTHENTICATION_ERROR = "Builder rejected the connected credentials. Reconnect Builder.io (free tier available) in Settings, then retry.";
+/**
+ * The gateway's unhandled-500 envelope is an internal correlation id and an
+ * apology: nothing the reader can act on, and nothing that says whether the
+ * failure was theirs. Say where it broke and keep the raw sentence in
+ * `details`, which is the only place the error id is useful.
+ */
+const GATEWAY_INTERNAL_ERROR_MESSAGE = "The model gateway hit an internal error before the agent could answer. Retry in a moment, and quote the error id below if it keeps happening.";
 function isSafeUpgradeUrl(url) {
     try {
         const parsed = new URL(url);
@@ -104,6 +112,10 @@ const KNOWN_CHAT_ERROR_KEYS = new Map([
         "The model gateway returned no error details and the chat couldn't recover. Wait a moment and retry, or start a new chat if it keeps happening.",
         "agentChat.errorMessages.gatewayNoDetails",
     ],
+    [
+        GATEWAY_INTERNAL_ERROR_MESSAGE,
+        "agentChat.errorMessages.gatewayInternalError",
+    ],
     [
         "The agent connection timed out before it could finish. You can continue from the partial work or retry.",
         "agentChat.errorMessages.inactivityTimeout",
@@ -233,6 +245,9 @@ export function normalizeChatError(errorMessage, errorCode) {
             details: text,
         };
     }
+    if (code === BUILDER_GATEWAY_INTERNAL_ERROR_CODE) {
+        return { message: GATEWAY_INTERNAL_ERROR_MESSAGE, details: text };
+    }
     if (code === "builder_auth_error") {
         return {
             message: BUILDER_AUTHENTICATION_ERROR,

package/dist/client/sse-event-processor.js

@@ -1,4 +1,5 @@
 import { LLM_MISSING_CREDENTIALS_ERROR_CODE, LLM_MISSING_CREDENTIALS_MESSAGE, } from "../agent/engine/credential-errors.js";
+import { BUILDER_GATEWAY_INTERNAL_ERROR_CODE } from "../agent/engine/error-detail.js";
 import { emitChatFirstOpenApp } from "./chat-first.js";
 import { formatChatErrorText, normalizeChatError } from "./error-format.js";
 import { humanizeToolLabelText, humanizeToolName, isToolCallActive, runningToolLabel, } from "./tool-display.js";
@@ -529,6 +530,9 @@ function isAutoRecoverableError(ev, errMsg) {
         code === "http_408" ||
         code === "http_429" ||
         code === "http_500" ||
+        // The gateway's unhandled-500 envelope delivered in-stream instead of as a
+        // status. Recoverable for the same reason `http_500` is.
+        code === BUILDER_GATEWAY_INTERNAL_ERROR_CODE ||
         code === "http_502" ||
         code === "http_503" ||
         code === "http_504" ||

package/dist/collab/struct-routes.d.ts

@@ -13,8 +13,8 @@
  * Body: { json: any, fieldName?: string, type?: "map"|"array", requestSource?: string }
  */
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/localization/core-messages/ar-SA.js

@@ -260,6 +260,7 @@ const messages = {
     "errorMessages.builderAuthentication": "رفض Builder بيانات الاعتماد المتصلة. أعد الاتصال بـ Builder.io من الإعدادات، ثم أعد المحاولة.",
     "errorMessages.builderModelUnauthorized": "رفض المزوّد الذي يشغّل هذا النموذج الطلب. اختر نموذجًا آخر، ثم أعد المحاولة.",
     "errorMessages.errorPrefix": "خطأ: {{message}}",
+    "errorMessages.gatewayInternalError": "حدث خطأ داخلي في بوابة النموذج قبل أن يتمكن الوكيل من الإجابة. أعد المحاولة بعد قليل، وإذا تكرر الأمر فأرفق معرّف الخطأ الظاهر أدناه.",
     "errorMessages.gatewayNoDetails": "لم تُرجع بوابة النموذج أي تفاصيل عن الخطأ وتعذّر على المحادثة الاسترداد. انتظر قليلًا ثم أعد المحاولة، أو ابدأ محادثة جديدة إذا استمرت المشكلة.",
     "errorMessages.inactivityTimeout": "انتهت مهلة اتصال الوكيل قبل أن يتمكن من الإكمال. يمكنك المتابعة من العمل الجزئي أو إعادة المحاولة.",
     "errorMessages.invalidToolSchema": "كان مخطط إحدى الأدوات غير صالح، لذلك رفض النموذج الطلب قبل بدئه. يمكن تخطي الأداة غير الصالحة وإعادة محاولة الطلب.",
@@ -324,6 +325,7 @@ const messages = {
     "message.restoreFailed": "فشلت الاستعادة ({{status}}).",
     "message.restoreQuestion": "هل تريد الاستعادة إلى هنا؟",
     "message.restoreRequestFailed": "فشل طلب الاستعادة.",
+    "message.threadNotFound": "لم تعد سلسلة الدردشة هذه متاحة. ابدأ دردشة جديدة أو أعد المحاولة إذا كان ذلك غير متوقع.",
     "message.restoring": "جارٍ الاستعادة...",
     "message.revertHere": "الرجوع إلى هنا",
     "message.sentAt": "أُرسلت في {{time}}",

package/dist/localization/core-messages/de-DE.js

@@ -94,6 +94,7 @@ const messages = {
     "message.restoreFailed": "Wiederherstellung fehlgeschlagen ({{status}}).",
     "message.restoreQuestion": "Bis hierher wiederherstellen?",
     "message.restoreRequestFailed": "Wiederherstellungsanfrage fehlgeschlagen.",
+    "message.threadNotFound": "Dieser Chat-Thread ist nicht mehr verfügbar. Starte einen neuen Chat oder versuche es erneut, falls das unerwartet war.",
     "message.restoring": "Wird wiederhergestellt...",
     "message.revertHere": "Bis hierher zurücksetzen",
     "message.sentAt": "Gesendet {{time}}",
@@ -388,6 +389,7 @@ const messages = {
     "errorMessages.builderAuthentication": "Builder hat die verbundenen Anmeldedaten abgelehnt. Verbinde Builder.io in den Einstellungen erneut und versuche es dann noch einmal.",
     "errorMessages.builderModelUnauthorized": "Der Anbieter hinter diesem Modell hat die Anfrage abgelehnt. Wähle ein anderes Modell und versuche es erneut.",
     "errorMessages.errorPrefix": "Fehler: {{message}}",
+    "errorMessages.gatewayInternalError": "Das Modell-Gateway hat einen internen Fehler ausgelöst, bevor der Agent antworten konnte. Versuchen Sie es in einem Moment erneut und geben Sie die untenstehende Fehler-ID an, wenn es weiterhin auftritt.",
     "errorMessages.gatewayNoDetails": "Das Modell-Gateway hat keine Fehlerdetails zurückgegeben und der Chat konnte nicht fortgesetzt werden. Warte einen Moment und versuche es erneut. Falls das Problem bestehen bleibt, starte einen neuen Chat.",
     "errorMessages.inactivityTimeout": "Die Verbindung zum Agenten wurde wegen Zeitüberschreitung beendet, bevor er fertig war. Du kannst mit dem Teilergebnis fortfahren oder es erneut versuchen.",
     "errorMessages.invalidToolSchema": "Ein Tool-Schema war ungültig. Deshalb hat das Modell die Anfrage abgelehnt, bevor sie gestartet wurde. Das ungültige Tool kann übersprungen und die Anfrage erneut gesendet werden.",

package/dist/localization/core-messages/en-US.d.ts

@@ -252,6 +252,7 @@ declare const messages: {
     readonly "errorMessages.builderAuthentication": "Builder rejected the connected credentials. Reconnect Builder.io in Settings, then retry.";
     readonly "errorMessages.builderModelUnauthorized": "The provider behind this model rejected the request. Pick a different model, then retry.";
     readonly "errorMessages.errorPrefix": "Error: {{message}}";
+    readonly "errorMessages.gatewayInternalError": "The model gateway hit an internal error before the agent could answer. Retry in a moment, and quote the error id below if it keeps happening.";
     readonly "errorMessages.gatewayNoDetails": "The model gateway returned no error details and the chat couldn't recover. Wait a moment and retry, or start a new chat if it keeps happening.";
     readonly "errorMessages.inactivityTimeout": "The agent connection timed out before it could finish. You can continue from the partial work or retry.";
     readonly "errorMessages.invalidToolSchema": "A tool schema was invalid, so the model rejected the request before it started. The invalid tool can be skipped and the request retried.";
@@ -312,6 +313,7 @@ declare const messages: {
     readonly "message.restoreFailed": "Restore failed ({{status}}).";
     readonly "message.restoreQuestion": "Restore to here?";
     readonly "message.restoreRequestFailed": "Restore request failed.";
+    readonly "message.threadNotFound": "This chat thread is no longer available. Start a new chat or retry if this was unexpected.";
     readonly "message.restoring": "Restoring...";
     readonly "message.revertHere": "Revert to here";
     readonly "message.sentAt": "Sent {{time}}";

package/dist/localization/core-messages/en-US.js

@@ -252,6 +252,7 @@ const messages = {
     "errorMessages.builderAuthentication": "Builder rejected the connected credentials. Reconnect Builder.io in Settings, then retry.",
     "errorMessages.builderModelUnauthorized": "The provider behind this model rejected the request. Pick a different model, then retry.",
     "errorMessages.errorPrefix": "Error: {{message}}",
+    "errorMessages.gatewayInternalError": "The model gateway hit an internal error before the agent could answer. Retry in a moment, and quote the error id below if it keeps happening.",
     "errorMessages.gatewayNoDetails": "The model gateway returned no error details and the chat couldn't recover. Wait a moment and retry, or start a new chat if it keeps happening.",
     "errorMessages.inactivityTimeout": "The agent connection timed out before it could finish. You can continue from the partial work or retry.",
     "errorMessages.invalidToolSchema": "A tool schema was invalid, so the model rejected the request before it started. The invalid tool can be skipped and the request retried.",
@@ -312,6 +313,7 @@ const messages = {
     "message.restoreFailed": "Restore failed ({{status}}).",
     "message.restoreQuestion": "Restore to here?",
     "message.restoreRequestFailed": "Restore request failed.",
+    "message.threadNotFound": "This chat thread is no longer available. Start a new chat or retry if this was unexpected.",
     "message.restoring": "Restoring...",
     "message.revertHere": "Revert to here",
     "message.sentAt": "Sent {{time}}",

package/dist/localization/core-messages/es-ES.js

@@ -94,6 +94,7 @@ const messages = {
     "message.restoreFailed": "Error al restaurar ({{status}}).",
     "message.restoreQuestion": "¿Restaurar hasta aquí?",
     "message.restoreRequestFailed": "Error en la solicitud de restauración.",
+    "message.threadNotFound": "Este hilo de chat ya no está disponible. Inicia un chat nuevo o inténtalo de nuevo si esto no era esperado.",
     "message.restoring": "Restaurando...",
     "message.revertHere": "Revertir hasta aquí",
     "message.sentAt": "Enviado a las {{time}}",
@@ -395,6 +396,7 @@ const messages = {
     "errorMessages.builderAuthentication": "Builder rechazó las credenciales conectadas. Vuelve a conectar Builder.io en Ajustes e inténtalo de nuevo.",
     "errorMessages.builderModelUnauthorized": "El proveedor de este modelo rechazó la solicitud. Elige otro modelo y vuelve a intentarlo.",
     "errorMessages.errorPrefix": "Error: {{message}}",
+    "errorMessages.gatewayInternalError": "La pasarela del modelo tuvo un error interno antes de que el agente pudiera responder. Vuelve a intentarlo en un momento e indica el id de error de abajo si sigue ocurriendo.",
     "errorMessages.gatewayNoDetails": "La pasarela del modelo no devolvió detalles del error y el chat no pudo recuperarse. Espera un momento y vuelve a intentarlo. Si el problema continúa, inicia un chat nuevo.",
     "errorMessages.inactivityTimeout": "La conexión del agente expiró antes de que pudiera finalizar. Puedes continuar desde el trabajo parcial o volver a intentarlo.",
     "errorMessages.invalidToolSchema": "El esquema de una herramienta no era válido, así que el modelo rechazó la solicitud antes de iniciarla. Puedes omitir la herramienta no válida y volver a intentarlo.",

package/dist/localization/core-messages/fr-FR.js

@@ -94,6 +94,7 @@ const messages = {
     "message.restoreFailed": "Échec de la restauration ({{status}}).",
     "message.restoreQuestion": "Restaurer jusqu’ici ?",
     "message.restoreRequestFailed": "Échec de la demande de restauration.",
+    "message.threadNotFound": "Ce fil de discussion n’est plus disponible. Démarrez une nouvelle discussion ou réessayez si cela est inattendu.",
     "message.restoring": "Restauration...",
     "message.revertHere": "Revenir jusqu’ici",
     "message.sentAt": "Envoyé à {{time}}",
@@ -395,6 +396,7 @@ const messages = {
     "errorMessages.builderAuthentication": "Builder a rejeté les identifiants connectés. Reconnectez Builder.io dans les paramètres, puis réessayez.",
     "errorMessages.builderModelUnauthorized": "Le fournisseur de ce modèle a rejeté la demande. Choisissez un autre modèle, puis réessayez.",
     "errorMessages.errorPrefix": "Erreur : {{message}}",
+    "errorMessages.gatewayInternalError": "La passerelle du modèle a rencontré une erreur interne avant que l'agent puisse répondre. Réessayez dans un instant et indiquez l'identifiant d'erreur ci-dessous si cela persiste.",
     "errorMessages.gatewayNoDetails": "La passerelle du modèle n’a fourni aucun détail sur l’erreur et la discussion n’a pas pu reprendre. Patientez un instant et réessayez. Si le problème persiste, démarrez une nouvelle discussion.",
     "errorMessages.inactivityTimeout": "La connexion à l’agent a expiré avant la fin. Vous pouvez poursuivre à partir du travail partiel ou réessayer.",
     "errorMessages.invalidToolSchema": "Le schéma d’un outil n’était pas valide. Le modèle a donc rejeté la demande avant son démarrage. Vous pouvez ignorer cet outil et réessayer.",

package/dist/localization/core-messages/hi-IN.js

@@ -252,6 +252,7 @@ const messages = {
     "errorMessages.builderAuthentication": "Builder ने कनेक्ट किए गए क्रेडेंशियल अस्वीकार कर दिए। सेटिंग्स में Builder.io को दोबारा कनेक्ट करें, फिर से प्रयास करें।",
     "errorMessages.builderModelUnauthorized": "इस मॉडल के पीछे मौजूद प्रदाता ने अनुरोध अस्वीकार कर दिया। कोई दूसरा मॉडल चुनें, फिर से प्रयास करें।",
     "errorMessages.errorPrefix": "त्रुटि: {{message}}",
+    "errorMessages.gatewayInternalError": "एजेंट के उत्तर देने से पहले मॉडल गेटवे में एक आंतरिक त्रुटि आई। कुछ देर में फिर कोशिश करें, और बार-बार होने पर नीचे दिया गया error id बताएं।",
     "errorMessages.gatewayNoDetails": "मॉडल गेटवे ने त्रुटि का कोई विवरण नहीं दिया और चैट रिकवर नहीं हो सकी। कुछ देर रुककर फिर से प्रयास करें या समस्या बनी रहने पर नई चैट शुरू करें।",
     "errorMessages.inactivityTimeout": "एजेंट का कनेक्शन काम पूरा होने से पहले समय सीमा पर पहुँच गया। आप आंशिक काम से जारी रख सकते हैं या फिर से प्रयास कर सकते हैं।",
     "errorMessages.invalidToolSchema": "एक टूल स्कीमा अमान्य था, इसलिए मॉडल ने अनुरोध शुरू होने से पहले ही अस्वीकार कर दिया। अमान्य टूल को छोड़कर अनुरोध दोबारा किया जा सकता है।",
@@ -312,6 +313,7 @@ const messages = {
     "message.restoreFailed": "पुनर्स्थापना विफल रही ({{status}})।",
     "message.restoreQuestion": "यहाँ तक पुनर्स्थापित करें?",
     "message.restoreRequestFailed": "पुनर्स्थापना अनुरोध विफल रहा।",
+    "message.threadNotFound": "यह चैट थ्रेड अब उपलब्ध नहीं है। नई चैट शुरू करें या यदि यह अप्रत्याशित है तो फिर कोशिश करें।",
     "message.restoring": "पुनर्स्थापित किया जा रहा है...",
     "message.revertHere": "यहाँ तक वापस जाएँ",
     "message.sentAt": "{{time}} पर भेजा गया",

package/dist/localization/core-messages/ja-JP.js

@@ -250,6 +250,7 @@ const messages = {
     "errorMessages.builderAuthentication": "Builder が接続済みの認証情報を拒否しました。設定で Builder.io に再接続してから再試行してください。",
     "errorMessages.builderModelUnauthorized": "このモデルのプロバイダーがリクエストを拒否しました。別のモデルを選択して再試行してください。",
     "errorMessages.errorPrefix": "エラー：{{message}}",
+    "errorMessages.gatewayInternalError": "エージェントが応答する前にモデルゲートウェイで内部エラーが発生しました。少し待ってから再試行し、繰り返す場合は下のエラー ID を伝えてください。",
     "errorMessages.gatewayNoDetails": "モデルゲートウェイからエラーの詳細が返されず、チャットを復旧できませんでした。少し待ってから再試行し、繰り返し発生する場合は新しいチャットを開始してください。",
     "errorMessages.inactivityTimeout": "エージェントとの接続が完了前にタイムアウトしました。途中までの作業から続行するか、再試行できます。",
     "errorMessages.invalidToolSchema": "ツールのスキーマが無効だったため、モデルは開始前にリクエストを拒否しました。無効なツールをスキップして再試行できます。",
@@ -309,6 +310,7 @@ const messages = {
     "message.restoreFailed": "復元に失敗しました（{{status}}）。",
     "message.restoreQuestion": "ここまで復元しますか？",
     "message.restoreRequestFailed": "復元リクエストに失敗しました。",
+    "message.threadNotFound": "このチャットスレッドは利用できなくなりました。新しいチャットを開始するか、想定外の場合は再試行してください。",
     "message.restoring": "復元中...",
     "message.revertHere": "ここまで戻す",
     "message.sentAt": "{{time}} に送信",

package/dist/localization/core-messages/ko-KR.js

@@ -250,6 +250,7 @@ const messages = {
     "errorMessages.builderAuthentication": "Builder가 연결된 자격 증명을 거부했습니다. 설정에서 Builder.io를 다시 연결한 후 다시 시도하세요.",
     "errorMessages.builderModelUnauthorized": "이 모델의 제공업체가 요청을 거부했습니다. 다른 모델을 선택한 후 다시 시도하세요.",
     "errorMessages.errorPrefix": "오류: {{message}}",
+    "errorMessages.gatewayInternalError": "에이전트가 답변하기 전에 모델 게이트웨이에서 내부 오류가 발생했습니다. 잠시 후 다시 시도하고, 계속 발생하면 아래 오류 ID를 알려 주세요.",
     "errorMessages.gatewayNoDetails": "모델 게이트웨이가 오류 세부 정보를 반환하지 않아 채팅을 복구할 수 없습니다. 잠시 후 다시 시도하고, 문제가 계속되면 새 채팅을 시작하세요.",
     "errorMessages.inactivityTimeout": "에이전트 연결이 완료 전에 시간 초과되었습니다. 부분적으로 완료된 작업에서 계속하거나 다시 시도할 수 있습니다.",
     "errorMessages.invalidToolSchema": "도구 스키마가 올바르지 않아 모델이 요청 시작 전에 거부했습니다. 올바르지 않은 도구를 건너뛰고 요청을 다시 시도할 수 있습니다.",
@@ -309,6 +310,7 @@ const messages = {
     "message.restoreFailed": "복원 실패({{status}}).",
     "message.restoreQuestion": "여기로 복원하시겠습니까?",
     "message.restoreRequestFailed": "복원 요청에 실패했습니다.",
+    "message.threadNotFound": "이 채팅 스레드는 더 이상 사용할 수 없습니다. 새 채팅을 시작하거나 예상치 못한 문제라면 다시 시도하세요.",
     "message.restoring": "복원 중...",
     "message.revertHere": "여기로 되돌리기",
     "message.sentAt": "{{time}}에 전송",

package/dist/localization/core-messages/pt-BR.js

@@ -94,6 +94,7 @@ const messages = {
     "message.restoreFailed": "Falha ao restaurar ({{status}}).",
     "message.restoreQuestion": "Restaurar até aqui?",
     "message.restoreRequestFailed": "Falha na solicitação de restauração.",
+    "message.threadNotFound": "Esta conversa não está mais disponível. Inicie uma nova conversa ou tente novamente se isso for inesperado.",
     "message.restoring": "Restaurando...",
     "message.revertHere": "Reverter até aqui",
     "message.sentAt": "Enviado às {{time}}",
@@ -395,6 +396,7 @@ const messages = {
     "errorMessages.builderAuthentication": "O Builder rejeitou as credenciais conectadas. Reconecte Builder.io em Configurações e tente novamente.",
     "errorMessages.builderModelUnauthorized": "O provedor por trás deste modelo rejeitou a solicitação. Escolha um modelo diferente e tente novamente.",
     "errorMessages.errorPrefix": "Erro: {{message}}",
+    "errorMessages.gatewayInternalError": "O gateway do modelo teve um erro interno antes de o agente poder responder. Tente novamente em instantes e informe o id de erro abaixo se continuar acontecendo.",
     "errorMessages.gatewayNoDetails": "O gateway do modelo não retornou detalhes do erro, e o chat não pôde ser recuperado. Aguarde um momento e tente novamente. Se o problema persistir, inicie um novo chat.",
     "errorMessages.inactivityTimeout": "A conexão com o agente expirou antes da conclusão. Você pode continuar a partir do trabalho parcial ou tentar novamente.",
     "errorMessages.invalidToolSchema": "O esquema de uma ferramenta era inválido, então o modelo rejeitou a solicitação antes de iniciá-la. Você pode ignorar a ferramenta inválida e tentar novamente.",

package/dist/localization/core-messages/zh-CN.js

@@ -250,6 +250,7 @@ const messages = {
     "errorMessages.builderAuthentication": "Builder 拒绝了已连接的凭据。请在设置中重新连接 Builder.io，然后重试。",
     "errorMessages.builderModelUnauthorized": "此模型背后的提供商拒绝了请求。请选择其他模型后重试。",
     "errorMessages.errorPrefix": "错误：{{message}}",
+    "errorMessages.gatewayInternalError": "模型网关在智能体作答前发生内部错误。请稍后重试；如果持续出现，请提供下方的错误 ID。",
     "errorMessages.gatewayNoDetails": "模型网关未返回错误详情，聊天无法恢复。请稍等片刻后重试；如果问题持续出现，请开始新聊天。",
     "errorMessages.inactivityTimeout": "智能体连接在完成前超时。您可以从已完成的部分继续，也可以重试。",
     "errorMessages.invalidToolSchema": "工具架构无效，因此模型在请求开始前拒绝了该请求。可以跳过无效工具并重试请求。",
@@ -309,6 +310,7 @@ const messages = {
     "message.restoreFailed": "恢复失败（{{status}}）。",
     "message.restoreQuestion": "恢复到此处？",
     "message.restoreRequestFailed": "恢复请求失败。",
+    "message.threadNotFound": "此聊天线程已不可用。请开始新聊天；如果这是意外情况，也可以重试。",
     "message.restoring": "正在恢复...",
     "message.revertHere": "还原到此处",
     "message.sentAt": "发送于 {{time}}",

package/dist/localization/core-messages/zh-TW.js

@@ -250,6 +250,7 @@ const messages = {
     "errorMessages.builderAuthentication": "Builder 拒絕了已連線的憑證。請在設定中重新連線至 Builder.io，然後重試。",
     "errorMessages.builderModelUnauthorized": "這個模型背後的供應商拒絕了要求。請選擇其他模型後重試。",
     "errorMessages.errorPrefix": "錯誤：{{message}}",
+    "errorMessages.gatewayInternalError": "模型閘道在代理回答前發生內部錯誤。請稍後重試；若持續發生，請提供下方的錯誤 ID。",
     "errorMessages.gatewayNoDetails": "模型閘道未傳回錯誤詳細資訊，聊天無法復原。請稍候再試；如果問題持續發生，請開始新聊天。",
     "errorMessages.inactivityTimeout": "代理連線在完成前逾時。您可以從已完成的部分繼續，也可以重試。",
     "errorMessages.invalidToolSchema": "工具結構描述無效，因此模型在要求開始前便拒絕了要求。您可以略過無效工具並重試要求。",
@@ -309,6 +310,7 @@ const messages = {
     "message.restoreFailed": "還原失敗（{{status}}）。",
     "message.restoreQuestion": "要還原到這裡嗎？",
     "message.restoreRequestFailed": "還原要求失敗。",
+    "message.threadNotFound": "此聊天串已無法使用。請開始新的聊天；如果這是意外情況，也可以重試。",
     "message.restoring": "正在還原...",
     "message.revertHere": "還原到這裡",
     "message.sentAt": "傳送於 {{time}}",

package/dist/localization/core-messages.d.ts

@@ -254,6 +254,7 @@ export declare const englishAgentChatMessages: {
     readonly "errorMessages.builderAuthentication": "Builder rejected the connected credentials. Reconnect Builder.io in Settings, then retry.";
     readonly "errorMessages.builderModelUnauthorized": "The provider behind this model rejected the request. Pick a different model, then retry.";
     readonly "errorMessages.errorPrefix": "Error: {{message}}";
+    readonly "errorMessages.gatewayInternalError": "The model gateway hit an internal error before the agent could answer. Retry in a moment, and quote the error id below if it keeps happening.";
     readonly "errorMessages.gatewayNoDetails": "The model gateway returned no error details and the chat couldn't recover. Wait a moment and retry, or start a new chat if it keeps happening.";
     readonly "errorMessages.inactivityTimeout": "The agent connection timed out before it could finish. You can continue from the partial work or retry.";
     readonly "errorMessages.invalidToolSchema": "A tool schema was invalid, so the model rejected the request before it started. The invalid tool can be skipped and the request retried.";
@@ -314,6 +315,7 @@ export declare const englishAgentChatMessages: {
     readonly "message.restoreFailed": "Restore failed ({{status}}).";
     readonly "message.restoreQuestion": "Restore to here?";
     readonly "message.restoreRequestFailed": "Restore request failed.";
+    readonly "message.threadNotFound": "This chat thread is no longer available. Start a new chat or retry if this was unexpected.";
     readonly "message.restoring": "Restoring...";
     readonly "message.revertHere": "Revert to here";
     readonly "message.sentAt": "Sent {{time}}";

package/dist/observability/routes.d.ts

@@ -41,27 +41,27 @@ export declare function createObservabilityHandler(): import("h3").EventHandlerW
     thumbsUpRate: number;
     avgEvalScore: number;
 } | {
-    error?: undefined;
-    ok?: undefined;
     summary: import("./types.js").TraceSummary;
     spans: import("./types.js").TraceSpan[];
     id?: undefined;
-} | {
     error?: undefined;
     ok?: undefined;
+} | {
     summary?: undefined;
     spans?: undefined;
     id: string;
-} | {
+    error?: undefined;
     ok?: undefined;
+} | {
     summary?: undefined;
     spans?: undefined;
     id?: undefined;
     error: any;
+    ok?: undefined;
 } | {
-    error?: undefined;
     summary?: undefined;
     spans?: undefined;
     id?: undefined;
     ok: boolean;
+    error?: undefined;
 }>>;

package/dist/resources/handlers.d.ts

@@ -48,8 +48,8 @@ export declare function handleUpdateResource(event: any): Promise<import("./stor
 }>;
 /** DELETE /_agent-native/resources/:id — delete a resource */
 export declare function handleDeleteResource(event: any): Promise<{
-    error: string;
     ok?: undefined;
+    error: string;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/scripts/resources/read.js

@@ -6,8 +6,8 @@
  * Usage:
  *   pnpm action resource-read --path <path> [--scope personal|shared|workspace]
  */
-import { resourceGetByPath, ensurePersonalDefaults, SHARED_OWNER, WORKSPACE_OWNER, } from "../../resources/store.js";
-import { getAmbientUserEmail, getRequestUserEmail, } from "../../server/request-context.js";
+import { resourceGetByPath, ensurePersonalDefaults, sharedResourceOwner, WORKSPACE_OWNER, } from "../../resources/store.js";
+import { getAmbientUserEmail, getRequestOrgId, getRequestUserEmail, } from "../../server/request-context.js";
 import { parseArgs, fail } from "../utils.js";
 export default async function resourceReadScript(args) {
     const parsed = parseArgs(args);
@@ -44,7 +44,7 @@ Options:
         return;
     }
     if (scope === "shared") {
-        const resource = await resourceGetByPath(SHARED_OWNER, resourcePath);
+        const resource = await resourceGetByPath(sharedResourceOwner(getRequestOrgId()), resourcePath);
         if (!resource) {
             console.log(`Resource not found: ${resourcePath} (scope: shared). You can create it with resource-write.`);
             return;
@@ -63,7 +63,7 @@ Options:
         console.log(`Resource not found: ${resourcePath} (scope: personal). You can create it with resource-write.`);
         return;
     }
-    const shared = await resourceGetByPath(SHARED_OWNER, resourcePath);
+    const shared = await resourceGetByPath(sharedResourceOwner(getRequestOrgId()), resourcePath);
     if (shared) {
         process.stdout.write(shared.content);
         return;

package/dist/scripts/resources/save-memory.js

@@ -6,7 +6,7 @@
  * and maintains a `memory/MEMORY.md` index.
  */
 import { resourcePut, resourceGetByPath } from "../../resources/store.js";
-import { getAmbientUserEmail, getRequestUserEmail, } from "../../server/request-context.js";
+import { getAmbientUserEmail, getRequestRunContext, getRequestUserEmail, } from "../../server/request-context.js";
 import { parseArgs, fail } from "../utils.js";
 const VALID_TYPES = ["user", "feedback", "project", "reference"];
 const EMPTY_INDEX = `# Memory Index
@@ -26,7 +26,9 @@ export default async function saveMemoryScript(args) {
     const content = parsed.content;
     if (!content)
         fail("--content is required");
-    const owner = getRequestUserEmail() ?? getAmbientUserEmail();
+    const owner = getRequestRunContext()?.owner ??
+        getRequestUserEmail() ??
+        getAmbientUserEmail();
     if (!owner) {
         fail("save-memory requires an authenticated user (request context or AGENT_USER_EMAIL env var).");
     }
@@ -76,5 +78,16 @@ ${content}`;
         console.log(`Warning: Memory index has ${lineCount} lines (recommended: <200). Consider consolidating or removing old memories.`);
     }
     await resourcePut(owner, indexPath, updatedIndex, "text/markdown");
+    // Do not report success until both writes are visible through the resource
+    // read path. This catches storage or ownership mismatches that would
+    // otherwise leave the caller believing a memory was saved.
+    const persistedMemory = await resourceGetByPath(owner, memoryPath);
+    if (persistedMemory?.content !== fileContent) {
+        fail(`save-memory could not verify persisted memory "${name}".`);
+    }
+    const persistedIndex = await resourceGetByPath(owner, indexPath);
+    if (persistedIndex?.content !== updatedIndex) {
+        fail("save-memory could not verify persisted memory index.");
+    }
     console.log(`Saved memory "${name}" (${type}): ${description}`);
 }

package/dist/scripts/resources/write.js

@@ -6,8 +6,8 @@
  * Usage:
  *   pnpm action resource-write --path <path> --content <content> [--scope personal|shared] [--mime <mime-type>] [--visibility workspace|agent_scratch]
  */
-import { canWriteLocalWorkspaceResourcePath, resourcePut, SHARED_OWNER, WORKSPACE_OWNER, } from "../../resources/store.js";
-import { getAmbientUserEmail, getRequestUserEmail, } from "../../server/request-context.js";
+import { canWriteLocalWorkspaceResourcePath, resourcePut, sharedResourceOwner, WORKSPACE_OWNER, } from "../../resources/store.js";
+import { getAmbientUserEmail, getRequestOrgId, getRequestUserEmail, } from "../../server/request-context.js";
 import { parseArgs, fail } from "../utils.js";
 const EXTENSION_MIME_MAP = {
     ".md": "text/markdown",
@@ -101,7 +101,7 @@ Options:
     const expiresAt = parseOptionalNumber(parsed["expires-at"] ?? parsed.expiresAt, "--expires-at");
     let owner;
     if (scope === "shared") {
-        owner = SHARED_OWNER;
+        owner = sharedResourceOwner(getRequestOrgId());
     }
     else if (scope === "workspace") {
         owner = WORKSPACE_OWNER;