veryfront 0.1.1237 → 0.1.1239

package/esm/extensions/ext-observability-sentry/src/policy.d.ts

@@ -3,6 +3,7 @@ export declare const DEFAULT_FINGERPRINT = "{{ default }}";
 export type SentryPolicyScope = {
     setContext(name: string, context: Record<string, unknown>): void;
     setFingerprint(fingerprint: string[]): void;
+    setLevel?(level: "error" | "warning"): void;
     setTag(key: string, value: string): void;
 };
 export type SentryPolicySdk = {
@@ -14,6 +15,7 @@ export type SentryPolicyEvent = {
     breadcrumbs?: unknown;
     exception?: {
         values?: Array<{
+            type?: string;
             value?: string;
             stacktrace?: {
                 frames?: Array<{

package/esm/extensions/ext-observability-sentry/src/policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-observability-sentry/src/policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACxB,MAAM,0DAA0D,CAAC;AAElE,eAAO,MAAM,mBAAmB,kBAAkB,CAAC;AAWnD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACjE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC5C,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IACzC,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE;QACV,MAAM,CAAC,EAAE,KAAK,CAAC;YACb,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,UAAU,CAAC,EAAE;gBACX,MAAM,CAAC,EAAE,KAAK,CAAC;oBACb,QAAQ,CAAC,EAAE,MAAM,CAAC;oBAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;iBACnB,CAAC,CAAC;aACJ,CAAC;SACH,CAAC,CAAC;KACJ,CAAC;IACF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,eAAe,EACpB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,uBAAuB,GAC/B,MAAM,GAAG,SAAS,CAWpB;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,EACnC,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CAMlB;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,iBAAiB,EACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,uBAAuB,GAC/B,IAAI,CAoBN;AAED,wBAAgB,kBAAkB,CAAC,MAAM,SAAS,iBAAiB,EACjE,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,iBAAiB,CAwB5B;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAOzD;AAED,wBAAgB,kCAAkC,CAChD,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,GACpD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAU3C;AAOD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAW5D"}
+{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../../../src/extensions/ext-observability-sentry/src/policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACxB,MAAM,0DAA0D,CAAC;AAElE,eAAO,MAAM,mBAAmB,kBAAkB,CAAC;AA2CnD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACjE,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAG5C,QAAQ,CAAC,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,CAAC;IAC5C,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IACzC,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE;QACV,MAAM,CAAC,EAAE,KAAK,CAAC;YACb,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,UAAU,CAAC,EAAE;gBACX,MAAM,CAAC,EAAE,KAAK,CAAC;oBACb,QAAQ,CAAC,EAAE,MAAM,CAAC;oBAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;iBACnB,CAAC,CAAC;aACJ,CAAC;SACH,CAAC,CAAC;KACJ,CAAC;IACF,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE;QACT,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,eAAe,EACpB,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,uBAAuB,GAC/B,MAAM,GAAG,SAAS,CAWpB;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,EACnC,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,OAAO,CAAC,CAMlB;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,iBAAiB,EACxB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,uBAAuB,GAC/B,IAAI,CAsBN;AAED,wBAAgB,kBAAkB,CAAC,MAAM,SAAS,iBAAiB,EACjE,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,iBAAiB,CA6B5B;AAwMD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAOzD;AAED,wBAAgB,kCAAkC,CAChD,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,GACpD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAU3C;AAOD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAW5D"}

package/esm/extensions/ext-observability-sentry/src/policy.js

@@ -1,4 +1,33 @@
 export const DEFAULT_FINGERPRINT = "{{ default }}";
+const DB_ERROR_FINGERPRINT = "veryfront-db-error";
+// pgbouncer reports these through the wire protocol, so postgres.js surfaces them as a
+// PostgresError whose message ends with "(<code>)".
+const PGBOUNCER_CONNECTION_ERROR_CODES = [
+    "server_login_retry",
+    "query_wait_timeout",
+];
+// postgres.js `Errors.connection()` builds a plain Error with the message
+// `write <CODE> <host>:<port>` for every client-side connection failure.
+const POSTGRES_JS_CONNECTION_ERROR_PATTERN = /^write (CONNECTION_CLOSED|CONNECTION_DESTROYED|CONNECTION_ENDED|CONNECT_TIMEOUT)(?:\s|$)/;
+const FAILED_QUERY_PREFIX = "Failed query: ";
+const FAILED_QUERY_PARAMS_DELIMITER = "\nparams:";
+const FAILED_QUERY_HEAD_MAX_LENGTH = 200;
+const SQL_DOLLAR_QUOTE_START_PATTERN = /^\$(?:[_\p{ID_Start}][_\p{ID_Continue}]*)?\$/u;
+// PostgreSQL's lexer accepts any high byte in a dollar-quote tag and imposes no length limit, so
+// tags outside ECMAScript `ID_Start` (an emoji tag, for example) are still treated as literals and
+// their contents cannot reach the title. The tag must nonetheless look like a tag: free of
+// PostgreSQL lexer whitespace, quotes and further dollar signs. PostgreSQL lexer whitespace is
+// ASCII-only, so a high byte that ECMAScript classifies as whitespace remains a legal tag byte.
+// Without the shape check, a `$` inside an ordinary identifier such as `col$a` swallows the rest
+// of the query.
+const SQL_UNRECOGNIZED_DOLLAR_QUOTE_START_PATTERN = /^\$[^ \t\n\r\f\v'"$]+\$/u;
+// A dollar quote cannot open straight after an identifier character: PostgreSQL prefers the longer
+// identifier match, so `col$tag$inner$tag$` is one identifier rather than `col` followed by a
+// literal. `$` is deliberately absent from this class so that adjacent literals such as
+// `$$a$$$$b$$` still parse as two dollar-quoted strings.
+const SQL_IDENTIFIER_BEFORE_DOLLAR_PATTERN = /[A-Za-z0-9_]|\P{ASCII}/u;
+const SQL_NUMERIC_LITERAL_PATTERN = /^(?:0[xX]_?[0-9A-Fa-f](?:_?[0-9A-Fa-f])*|0[oO]_?[0-7](?:_?[0-7])*|0[bB]_?[01](?:_?[01])*|(?:\d(?:_?\d)*(?:\.(?:\d(?:_?\d)*)?)?|\.\d(?:_?\d)*)(?:[eE][+-]?\d(?:_?\d)*)?)/;
+const SQL_IDENTIFIER_CHAR_PATTERN = /[A-Za-z0-9_$]/;
 const SENTRY_TOKEN_PATTERN = /\bsntrys_[A-Za-z0-9_+/=-]+\b/g;
 const BEARER_TOKEN_PATTERN = /\bBearer\s+[A-Za-z0-9._~+/=-]+\b/gi;
 const JWT_PATTERN = /\b[A-Za-z0-9_-]{16,}\.[A-Za-z0-9_-]{16,}\.[A-Za-z0-9_-]{16,}\b/g;
@@ -32,6 +61,10 @@ export function applySentryScopePolicy(scope, serviceName, context) {
     if (context.processRole)
         scope.setTag("process_role", context.processRole);
     scope.setTag("veryfront.boundary", context.boundary);
+    if (context.errorClass)
+        scope.setTag("veryfront.error_class", context.errorClass);
+    if (context.level)
+        scope.setLevel?.(context.level);
     if (context.method)
         scope.setTag("http.request.method", context.method);
     if (context.requestId)
@@ -52,7 +85,10 @@ export function prepareSentryEvent(event, serviceName) {
         ...event.tags,
         "service.name": serviceName,
     };
-    event.fingerprint = [serviceName, ...(event.fingerprint ?? [DEFAULT_FINGERPRINT])];
+    const dbConnectionErrorCode = detectDbConnectionErrorCode(event);
+    event.fingerprint = dbConnectionErrorCode
+        ? [serviceName, DB_ERROR_FINGERPRINT, dbConnectionErrorCode]
+        : [serviceName, ...(event.fingerprint ?? [DEFAULT_FINGERPRINT])];
     delete event.breadcrumbs;
     delete event.request;
     delete event.user;
@@ -62,8 +98,9 @@ export function prepareSentryEvent(event, serviceName) {
         event.logentry.message = redactSensitiveText(event.logentry.message);
     }
     for (const value of event.exception?.values ?? []) {
-        if (value.value)
-            value.value = redactSensitiveText(value.value);
+        if (value.value) {
+            value.value = normalizeFailedQueryValue(redactSensitiveText(value.value));
+        }
         for (const frame of value.stacktrace?.frames ?? []) {
             if (frame.filename)
                 frame.filename = sanitizeStackFramePath(frame.filename);
@@ -73,6 +110,180 @@ export function prepareSentryEvent(event, serviceName) {
     }
     return event;
 }
+function detectDbConnectionErrorCode(event) {
+    for (const exceptionValue of event.exception?.values ?? []) {
+        const message = exceptionValue.value ?? "";
+        if (exceptionValue.type === "PostgresError") {
+            const trimmedMessage = message.trimEnd();
+            const code = PGBOUNCER_CONNECTION_ERROR_CODES.find((candidate) => trimmedMessage.endsWith(`(${candidate})`));
+            if (code)
+                return code;
+        }
+        if (exceptionValue.type === "Error") {
+            const code = POSTGRES_JS_CONNECTION_ERROR_PATTERN.exec(message)?.[1];
+            if (code)
+                return code;
+        }
+    }
+    return undefined;
+}
+function normalizeFailedQueryValue(value) {
+    if (!value.startsWith(FAILED_QUERY_PREFIX.trimEnd()))
+        return value;
+    const remainder = value.slice(FAILED_QUERY_PREFIX.trimEnd().length);
+    const paramsDelimiterIndex = remainder.indexOf(FAILED_QUERY_PARAMS_DELIMITER);
+    const query = paramsDelimiterIndex === -1 ? remainder : remainder.slice(0, paramsDelimiterIndex);
+    const titleQuery = redactSqlLiteralsForTitle(query)
+        .replace(/\s+/g, " ")
+        .trim();
+    const head = titleQuery
+        .slice(0, FAILED_QUERY_HEAD_MAX_LENGTH)
+        .trimEnd();
+    const truncated = titleQuery.length > FAILED_QUERY_HEAD_MAX_LENGTH;
+    return `${FAILED_QUERY_PREFIX}${head}${truncated ? "…" : ""}`;
+}
+function redactSqlLiteralsForTitle(query) {
+    let redacted = "";
+    let index = 0;
+    while (index < query.length) {
+        const character = query.charAt(index);
+        if ((character === "E" || character === "e") &&
+            query[index + 1] === "'" &&
+            isSqlStringPrefixBoundary(query, index)) {
+            index = findQuotedSqlTokenEnd(query, index + 1, "'", { allowBackslashEscapes: true }).end;
+            redacted += "?";
+            continue;
+        }
+        if ((character === "U" || character === "u") &&
+            query[index + 1] === "&" &&
+            query[index + 2] === "'" &&
+            isSqlStringPrefixBoundary(query, index)) {
+            index = findQuotedSqlTokenEnd(query, index + 2, "'").end;
+            redacted += "?";
+            continue;
+        }
+        if (character === '"') {
+            // Deliberate non-redaction: a double-quoted token is a schema identifier, not data, and
+            // keeping it verbatim is what makes titles group by query shape. An unterminated identifier
+            // is malformed SQL, so redact it rather than emit the rest of the query untouched.
+            const { end, terminated } = findQuotedSqlTokenEnd(query, index, '"');
+            redacted += terminated ? query.slice(index, end) : "?";
+            index = end;
+            continue;
+        }
+        if (character === "'") {
+            // The event does not carry the server's `standard_conforming_strings` setting, and neither
+            // reading of a backslash is safe on its own: escaping exposes the next literal when the
+            // setting is on, not escaping exposes this one when it is off. Bail out on the ambiguous
+            // case instead of picking a side.
+            index = findQuotedSqlTokenEnd(query, index, "'", { bailOnAmbiguousBackslash: true }).end;
+            redacted += "?";
+            continue;
+        }
+        if (character === "$" &&
+            !SQL_IDENTIFIER_BEFORE_DOLLAR_PATTERN.test(query[index - 1] ?? "")) {
+            const dollarQuotedEnd = findDollarQuotedSqlTokenEnd(query, index);
+            if (dollarQuotedEnd !== undefined) {
+                index = dollarQuotedEnd;
+                redacted += "?";
+                continue;
+            }
+        }
+        if (character === "-" && query[index + 1] === "-") {
+            index += 2;
+            while (index < query.length && query[index] !== "\n" && query[index] !== "\r") {
+                index += 1;
+            }
+            redacted += "?";
+            continue;
+        }
+        if (character === "/" && query[index + 1] === "*") {
+            let depth = 1;
+            index += 2;
+            while (index < query.length && depth > 0) {
+                if (query[index] === "/" && query[index + 1] === "*") {
+                    depth += 1;
+                    index += 2;
+                }
+                else if (query[index] === "*" && query[index + 1] === "/") {
+                    depth -= 1;
+                    index += 2;
+                }
+                else {
+                    index += 1;
+                }
+            }
+            redacted += "?";
+            continue;
+        }
+        const canStartNumber = /[0-9]/.test(character) ||
+            (character === "." && /[0-9]/.test(query[index + 1] ?? ""));
+        const previousCharacter = query[index - 1] ?? "";
+        if (canStartNumber && !SQL_IDENTIFIER_CHAR_PATTERN.test(previousCharacter)) {
+            const literal = query.slice(index).match(SQL_NUMERIC_LITERAL_PATTERN)?.[0];
+            const nextCharacter = literal ? query[index + literal.length] ?? "" : "";
+            if (literal && !SQL_IDENTIFIER_CHAR_PATTERN.test(nextCharacter)) {
+                redacted += "?";
+                index += literal.length;
+                continue;
+            }
+        }
+        redacted += character;
+        index += 1;
+    }
+    return redacted;
+}
+function findDollarQuotedSqlTokenEnd(query, start) {
+    const recognizedDelimiter = query.slice(start).match(SQL_DOLLAR_QUOTE_START_PATTERN)?.[0];
+    if (recognizedDelimiter) {
+        const contentStart = start + recognizedDelimiter.length;
+        const closingDelimiter = query.indexOf(recognizedDelimiter, contentStart);
+        return closingDelimiter === -1 ? query.length : closingDelimiter + recognizedDelimiter.length;
+    }
+    if (/[0-9]/.test(query[start + 1] ?? ""))
+        return undefined;
+    const delimiter = query.slice(start).match(SQL_UNRECOGNIZED_DOLLAR_QUOTE_START_PATTERN)?.[0];
+    if (!delimiter)
+        return undefined;
+    const contentStart = start + delimiter.length;
+    const closingDelimiter = query.indexOf(delimiter, contentStart);
+    return closingDelimiter === -1 ? query.length : closingDelimiter + delimiter.length;
+}
+function isSqlStringPrefixBoundary(query, start) {
+    return !SQL_IDENTIFIER_CHAR_PATTERN.test(query[start - 1] ?? "");
+}
+function findQuotedSqlTokenEnd(query, start, quote, options = {}) {
+    let index = start + 1;
+    while (index < query.length) {
+        if (options.allowBackslashEscapes && query[index] === "\\" && index + 1 < query.length) {
+            index += 2;
+            continue;
+        }
+        if (query[index] !== quote) {
+            index += 1;
+            continue;
+        }
+        if (query[index + 1] === quote) {
+            index += 2;
+            continue;
+        }
+        // An ordinary literal means different things on different servers: under
+        // `standard_conforming_strings = off` a backslash escapes the quote that follows it, so an odd
+        // run of backslashes here leaves the literal's extent genuinely ambiguous — the same bytes are
+        // one literal on one server and two on another. Guessing either way emits the other reading's
+        // contents verbatim, so stop and let the caller redact the remainder.
+        if (options.bailOnAmbiguousBackslash && hasOddTrailingBackslashRun(query, index))
+            break;
+        return { end: index + 1, terminated: true };
+    }
+    return { end: query.length, terminated: false };
+}
+function hasOddTrailingBackslashRun(query, index) {
+    let backslashes = 0;
+    while (index - backslashes - 1 >= 0 && query[index - backslashes - 1] === "\\")
+        backslashes += 1;
+    return backslashes % 2 === 1;
+}
 export function redactSensitiveText(value) {
     return value
         .replace(SENTRY_TOKEN_PATTERN, "[REDACTED]")

package/esm/src/agent/conversation/delegation-policy.d.ts

@@ -62,6 +62,8 @@ export declare function extractStarterIntentId(messages: readonly unknown[]): st
 export declare function evaluateStarterIntentTurnPolicy(input: StarterIntentTurnPolicyInput): StarterIntentTurnPolicy;
 /** Add first turn starter intent root ownership reminder helper. */
 export declare function addFirstTurnStarterIntentRootOwnershipReminder(system: string): string;
+export declare function addFirstTurnStarterIntentRootOwnershipReminder(system: ChatSystemMessage[]): ChatSystemMessage[];
+export declare function addFirstTurnStarterIntentRootOwnershipReminder(system: string | ChatSystemMessage[]): string | ChatSystemMessage[];
 /** Check whether starter intent root ownership is required. */
 export declare function isStarterIntentRootOwnershipRequired(value: unknown): boolean;
 /** Should reinforce load skill continuation helper. */

package/esm/src/agent/conversation/delegation-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delegation-policy.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/conversation/delegation-policy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"delegation-policy.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/conversation/delegation-policy.ts"],"names":[],"mappings":"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"}

package/esm/src/agent/conversation/delegation-policy.js

@@ -133,12 +133,22 @@ export function evaluateStarterIntentTurnPolicy(input) {
         shouldBlockImmediateDelegation: keepConversationFirst,
     };
 }
-/** Add first turn starter intent root ownership reminder helper. */
 export function addFirstTurnStarterIntentRootOwnershipReminder(system) {
-    if (system.includes(FIRST_TURN_STARTER_INTENT_ROOT_OWNERSHIP_REMINDER)) {
+    if (typeof system === "string") {
+        return system.includes(FIRST_TURN_STARTER_INTENT_ROOT_OWNERSHIP_REMINDER)
+            ? system
+            : `${system}\n\n${FIRST_TURN_STARTER_INTENT_ROOT_OWNERSHIP_REMINDER}`;
+    }
+    if (system.some((message) => message.content.includes(FIRST_TURN_STARTER_INTENT_ROOT_OWNERSHIP_REMINDER))) {
         return system;
     }
-    return `${system}\n\n${FIRST_TURN_STARTER_INTENT_ROOT_OWNERSHIP_REMINDER}`;
+    return [
+        ...system,
+        {
+            role: "system",
+            content: FIRST_TURN_STARTER_INTENT_ROOT_OWNERSHIP_REMINDER,
+        },
+    ];
 }
 /** Check whether starter intent root ownership is required. */
 export function isStarterIntentRootOwnershipRequired(value) {

package/esm/src/agent/conversation/hosted-terminal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hosted-terminal.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/conversation/hosted-terminal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hosted-terminal.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/conversation/hosted-terminal.ts"],"names":[],"mappings":"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"}

package/esm/src/agent/conversation/hosted-terminal.js

@@ -1,4 +1,5 @@
 import { finalizeConversationAgentRun, } from "./durable.js";
+import { resolveKnownProviderTerminalError } from "../streaming/stream-outcome.js";
 /** Shared conversation hosted stream error terminal error code value. */
 export const CONVERSATION_HOSTED_STREAM_ERROR_TERMINAL_ERROR_CODE = "STREAM_ERROR";
 /** Shared conversation hosted aborted terminal error code value. */
@@ -29,10 +30,13 @@ export function resolveConversationHostedTerminalState(input) {
 }
 /** State for resolve conversation hosted stream error. */
 export function resolveConversationHostedStreamErrorState(error) {
+    const knownProviderError = resolveKnownProviderTerminalError(error);
     return {
         status: "failed",
-        terminalErrorCode: CONVERSATION_HOSTED_STREAM_ERROR_TERMINAL_ERROR_CODE,
-        terminalErrorMessage: error instanceof Error ? error.message : String(error),
+        terminalErrorCode: knownProviderError?.code ??
+            CONVERSATION_HOSTED_STREAM_ERROR_TERMINAL_ERROR_CODE,
+        terminalErrorMessage: knownProviderError?.message ??
+            (error instanceof Error ? error.message : String(error)),
     };
 }
 /** State for dispatch conversation hosted terminal. */

package/esm/src/agent/conversation/run-chunk-mirror.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-chunk-mirror.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/conversation/run-chunk-mirror.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-chunk-mirror.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/conversation/run-chunk-mirror.ts"],"names":[],"mappings":"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"}

package/esm/src/agent/conversation/run-chunk-mirror.js

@@ -103,15 +103,27 @@ async function runHostedChunkMirrorTrace(instrumentation, operationName, operati
     }
     return await operation();
 }
+// Retries are self-healing and back off to only a few seconds, so logging
+// every attempt at error level turns one degraded append window into a Sentry
+// error every few seconds per active run (VERYFRONT-AGENT-3). Escalate only
+// once the failure streak suggests the outage is persistent; terminal
+// stop/disable paths report at error level separately.
+const HOSTED_CHUNK_MIRROR_RETRY_ERROR_THRESHOLD = 5;
 function recordHostedChunkMirrorRetryScheduled(input) {
-    input.instrumentation?.error?.("Durable run mirror flush failed; queued for retry", createHostedChunkMirrorRetryMetadata({
+    const metadata = createHostedChunkMirrorRetryMetadata({
         conversationId: input.conversationId,
         runId: input.runId,
         errorMessage: input.flushAttempt.errorMessage ?? "Conversation run append failed",
         retryDelayMs: input.flushAttempt.retryDelayMs,
         pendingEventCount: input.flushAttempt.pendingEventCount,
         consecutiveFailures: input.flushAttempt.consecutiveFailures,
-    }));
+    });
+    const message = "Durable run mirror flush failed; queued for retry";
+    if (input.flushAttempt.consecutiveFailures >= HOSTED_CHUNK_MIRROR_RETRY_ERROR_THRESHOLD) {
+        input.instrumentation?.error?.(message, metadata);
+        return;
+    }
+    input.instrumentation?.warn?.(message, metadata);
 }
 function recordHostedChunkMirrorHighBacklog(input) {
     input.instrumentation?.warn?.("Durable run mirror backlog is high", {

package/esm/src/agent/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/src/agent/factory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,KAAK,EACL,WAAW,EACX,eAAe,EAKhB,MAAM,YAAY,CAAC;AA6XpB,oBAAoB;AACpB,wBAAgB,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,KAAK,CAoEhD;AAcD;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,GAAG,YAAY,CAAC,GACnD,eAAe,EAAE,CAanB"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/src/agent/factory.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,KAAK,EACL,WAAW,EACX,eAAe,EAMhB,MAAM,YAAY,CAAC;AAkapB,oBAAoB;AACpB,wBAAgB,KAAK,CAAC,MAAM,EAAE,WAAW,GAAG,KAAK,CAoEhD;AAcD;;;;;;;;GAQG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,GAAG,YAAY,CAAC,GACnD,eAAe,EAAE,CAanB"}

package/esm/src/agent/factory.js

@@ -11,8 +11,8 @@ import { agentLogger } from "../utils/index.js";
 import { createError, INVALID_ARGUMENT, toError } from "../errors/index.js";
 import { COMMON_BLOCKED_PATTERNS, securityMiddleware } from "./middleware/security/validator.js";
 import { withSpan } from "../observability/tracing/otlp-setup.js";
-import { resolveConfiguredAgentModel } from "./runtime/model-resolution.js";
-import { setEffectiveAgentSystem } from "./runtime/effective-agent-system.js";
+import { resolveConfiguredAgentModel, resolveModelProviderOptionKey, resolveRuntimeModel, } from "./runtime/model-resolution.js";
+import { createProviderAwareAgentSystemResolver, setEffectiveAgentSystem, } from "./runtime/effective-agent-system.js";
 import { defineSchema } from "../schemas/index.js";
 import { getMessageSchema } from "./schemas/agent.schema.js";
 import { isRequestBodyTooLargeError, readBodyWithLimit, } from "../security/input-validation/limits.js";
@@ -20,8 +20,7 @@ import { DEFAULT_MAX_BODY_SIZE_BYTES } from "../utils/constants/index.js";
 import { ensureBuiltinSchemaValidator } from "../extensions/builtin-schema-validator.js";
 import { buildAgentDelegateTools, createInvokeAgentTool, INVOKE_AGENT_TOOL_ID, } from "./runtime/agent-delegation.js";
 import { normalizeAgentDelegateIds } from "./runtime/agent-delegation-names.js";
-import { buildAgentCallContext } from "./runtime/call-context.js";
-import { flattenSystemInstructions } from "./runtime/tool-inventory.js";
+import { buildAgentCallContext, buildAgentCallContextPreservingRuntimeMarker, } from "./runtime/call-context.js";
 const STREAMING_HEADERS = {
     "Content-Type": "text/event-stream",
     "Cache-Control": "no-cache",
@@ -236,20 +235,32 @@ function resolveToolsConfiguration(input) {
 function createAugmentedSystem(input) {
     const { config, resolveSkillSnapshot } = input;
     const originalSystem = config.system;
-    return async () => {
+    const augmentSystem = (resolvedBase, providerOptionKey, options) => {
         // Owner-aware: omitted selectors advertise every skill visible to this
         // agent (unowned project skills plus its own). Explicit lists, including
         // an empty list, retain their authored catalog selection.
         const snapshot = resolveSkillSnapshot();
-        const basePrompt = (typeof originalSystem === "function" ? await originalSystem() : originalSystem) ??
-            "You are a helpful assistant.";
-        return flattenSystemInstructions(buildAgentCallContext({
-            instructions: basePrompt,
-            skills: snapshot.definitions.map(toRuntimeSkillDefinition),
+        const basePrompt = resolvedBase ?? "You are a helpful assistant.";
+        const preassembledSkillContext = config.__vfPreassembledSkillContext === true;
+        const anthropicProviderAlias = providerOptionKey ??
+            resolveModelProviderOptionKey(resolveRuntimeModel(config.model));
+        const contextInput = {
+            ...(preassembledSkillContext
+                ? {}
+                : { skills: snapshot.definitions.map(toRuntimeSkillDefinition) }),
             ...(config.projectContext ? { projectContext: config.projectContext } : {}),
             ...(config.environmentContext ? { environmentContext: config.environmentContext } : {}),
-        }));
+        };
+        const buildCallContext = options?.preserveRuntimeContextMarker
+            ? buildAgentCallContextPreservingRuntimeMarker
+            : buildAgentCallContext;
+        return buildCallContext({
+            instructions: basePrompt,
+            ...(anthropicProviderAlias ? { anthropicProviderAlias } : {}),
+            ...contextInput,
+        });
     };
+    return createProviderAwareAgentSystemResolver(async (providerOptionKey) => augmentSystem(typeof originalSystem === "function" ? await originalSystem() : originalSystem, providerOptionKey), (resolvedBase, providerOptionKey, options) => Promise.resolve(augmentSystem(resolvedBase, providerOptionKey, options)));
 }
 /** Agent helper. */
 export function agent(config) {

package/esm/src/agent/hosted/chat-runtime-tool-assembly.d.ts

@@ -42,6 +42,8 @@ export type HostedChatRuntimeToolAssemblyResult = {
     toolLoadingMode: RuntimeToolLoadingMode;
     compatibleRemoteToolNames: string[];
     systemInstructions: string;
+    /** Structured system messages preserved for provider dispatch. */
+    systemMessages?: ChatSystemMessage[];
 };
 /** Input payload for prepare hosted chat runtime tool assembly. */
 export type PrepareHostedChatRuntimeToolAssemblyInput<TTraceAttributes extends HostToolTraceAttributes = HostToolTraceAttributes> = {

package/esm/src/agent/hosted/chat-runtime-tool-assembly.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-runtime-tool-assembly.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/chat-runtime-tool-assembly.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"chat-runtime-tool-assembly.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/chat-runtime-tool-assembly.ts"],"names":[],"mappings":"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"}

package/esm/src/agent/hosted/chat-runtime-tool-assembly.js

@@ -186,7 +186,11 @@ export async function prepareHostedChatRuntimeToolAssembly(input) {
     input.taskContext.availableToolNames = modelVisibleToolNames;
     const modelInstructions = input.renderInstructions?.(modelVisibleToolNames) ??
         input.instructions;
-    const systemInstructions = flattenSystemInstructions(withRuntimeToolInventory(modelInstructions, modelVisibleToolNames));
+    const instructionsWithToolInventory = withRuntimeToolInventory(modelInstructions, modelVisibleToolNames);
+    const systemInstructions = flattenSystemInstructions(instructionsWithToolInventory);
+    const systemMessages = typeof modelInstructions === "string"
+        ? undefined
+        : instructionsWithToolInventory;
     if (input.preloadLatestConversationUserText !== false) {
         const latestUserText = await fetchLatestConversationUserText({
             apiUrl: input.apiUrl,
@@ -211,5 +215,6 @@ export async function prepareHostedChatRuntimeToolAssembly(input) {
         toolLoadingMode,
         compatibleRemoteToolNames,
         systemInstructions,
+        ...(systemMessages === undefined ? {} : { systemMessages }),
     };
 }

package/esm/src/agent/hosted/child-fork-execution-runner.d.ts

@@ -1,4 +1,5 @@
 import type { HostToolTraceAttributes } from "../../tool/index.js";
+import type { AgentSystem } from "../types.js";
 import { type HostedDurableChildForkRunContext } from "./child-fork-run-context.js";
 import { type DefaultHostedChildForkToolAssemblyResult } from "./child-requested-tools.js";
 import { type HostedChildForkInstructionsContext } from "./child-fork-instructions.js";
@@ -89,7 +90,7 @@ export type ExecuteHostedChildForkWithPreparedToolsInput<TAttributes extends Hos
     sourceIntegrationPolicy?: SourceIntegrationPolicyManifest;
     maxContinuationSteps?: number;
     resolveSystem?: HostedChildForkRuntimeStepSystemResolver;
-    buildInstructions?: () => string;
+    buildInstructions?: () => AgentSystem;
     onBeforeStop?: StartHostedChildForkRuntimeWithHostToolsInput<TAttributes>["onBeforeStop"];
     runStep?: AgentRuntimeForkStepRunner;
     createRunContext?: (input: HostedChildForkExecutionRunContextFactoryInput<TAttributes>) => HostedDurableChildForkRunContext;

package/esm/src/agent/hosted/child-fork-execution-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"child-fork-execution-runner.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/child-fork-execution-runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"child-fork-execution-runner.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/hosted/child-fork-execution-runner.ts"],"names":[],"mappings":"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"}

package/esm/src/agent/hosted/child-fork-execution-runner.js

@@ -48,11 +48,13 @@ function createForkRunContext(input) {
     });
 }
 function defaultResolveSystem(input) {
+    const currentSystem = input.structuredSystem
+        ? [...input.structuredSystem]
+        : input.system;
     if (!shouldReinforceLoadSkillContinuation([...input.compactedMessages])) {
-        return input.system;
+        return currentSystem;
     }
-    const remindedSystem = addLoadSkillContinuationReminder(input.system);
-    return typeof remindedSystem === "string" ? remindedSystem : input.system;
+    return addLoadSkillContinuationReminder(currentSystem);
 }
 async function executeHostedChildForkToolInputWithoutWriterAuthority(input, runEventWriterCapability) {
     const requestedProjectReference = input.forkInput.project_reference;
@@ -180,6 +182,7 @@ async function executeHostedChildForkWithoutWriterAuthority(input, runContext, s
                 messages,
                 buildInstructions: prepareBuildInstructions,
                 forkToolNames,
+                providerOptionKey: input.provider,
                 resolveSystem: input.resolveSystem ?? defaultResolveSystem,
             }),
             runStep: input.runStep ?? runAgentRuntimeForkStep,