veryfront 0.1.1069 → 0.1.1071

package/esm/deno.js

@@ -1,6 +1,6 @@
 export default {
     "name": "veryfront",
-    "version": "0.1.1069",
+    "version": "0.1.1071",
     "license": "Apache-2.0",
     "nodeModulesDir": "auto",
     "minimumDependencyAge": {
@@ -458,7 +458,7 @@ export default {
         "lint:ban-test-only": "deno run --allow-read scripts/lint/ban-test-only.ts",
         "lint:sanitizer-baseline": "deno run --allow-read scripts/lint/check-sanitizer-baseline.ts",
         "lint:skipped-tests": "deno run --allow-read scripts/lint/check-skipped-tests-baseline.ts",
-        "test:scripts": "deno test --config=scripts/test.deno.json --no-check --allow-read --allow-write --allow-run scripts/build/dnt-polyfill.test.ts scripts/build/generate-sbom.test.ts scripts/build/npm-dependency-sources.test.ts scripts/build/npm-extension-package-metadata.test.ts scripts/build/npm-package-metadata.test.ts scripts/build/npm-react-shims.test.ts scripts/docs/docs-coverage.test.ts scripts/docs/generate-api-reference.test.ts scripts/docs/guide-validation.test.ts scripts/lint/audit-core-deps.test.ts scripts/lint/audit-dependency-boundaries.test.ts scripts/lint/audit-extension-capabilities.test.ts scripts/lint/audit-extension-contracts.test.ts scripts/lint/audit-deps.test.ts scripts/lint/check-circular-baseline.test.ts scripts/lint/ban-test-only.test.ts scripts/lint/check-sanitizer-baseline.test.ts scripts/lint/check-skipped-tests-baseline.test.ts scripts/lint/check-coverage.test.ts scripts/security/audit-npm.test.ts scripts/security/submit-dependency-snapshot.test.ts",
+        "test:scripts": "deno test --config=scripts/test.deno.json --no-check --allow-read --allow-write --allow-run scripts/ci/publish-npm-packages.test.ts scripts/build/dnt-polyfill.test.ts scripts/build/generate-sbom.test.ts scripts/build/npm-dependency-sources.test.ts scripts/build/npm-extension-package-metadata.test.ts scripts/build/npm-package-metadata.test.ts scripts/build/npm-react-shims.test.ts scripts/docs/docs-coverage.test.ts scripts/docs/generate-api-reference.test.ts scripts/docs/guide-validation.test.ts scripts/lint/audit-core-deps.test.ts scripts/lint/audit-dependency-boundaries.test.ts scripts/lint/audit-extension-capabilities.test.ts scripts/lint/audit-extension-contracts.test.ts scripts/lint/audit-deps.test.ts scripts/lint/check-circular-baseline.test.ts scripts/lint/ban-test-only.test.ts scripts/lint/check-sanitizer-baseline.test.ts scripts/lint/check-skipped-tests-baseline.test.ts scripts/lint/check-coverage.test.ts scripts/security/audit-npm.test.ts scripts/security/submit-dependency-snapshot.test.ts",
         "test:cross-runtime": "deno run --allow-all src/platform/compat/cross-runtime.test.ts",
         "test:node": "node ./tests/node/run-tests.mjs 'src/**/*.test.ts'",
         "test:bun": "node ./tests/bun/run-tests.mjs src/",

package/esm/src/agent/runtime/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/agent/runtime/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EACL,KAAK,WAAW,EAEhB,KAAK,aAAa,EAGlB,KAAK,OAAO,EAIZ,KAAK,QAAQ,EAGd,MAAM,aAAa,CAAC;AAIrB,OAAO,EAAqB,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AA0DpE,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,iBAAiB,EACjB,uBAAuB,EACvB,iBAAiB,EACjB,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EACV,8BAA8B,EAC9B,gBAAgB,EAChB,wBAAwB,GACzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,qBAAqB,EACrB,iBAAiB,EACjB,aAAa,EACb,aAAa,GACd,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACzE,OAAO,EACL,sBAAsB,EACtB,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAC/B,KAAK,mBAAmB,EACxB,0BAA0B,EAC1B,iCAAiC,EACjC,6BAA6B,GAC9B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC5E,YAAY,EACV,mBAAmB,EACnB,eAAe,EACf,iBAAiB,GAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,EAC7B,2BAA2B,EAC3B,2BAA2B,EAC3B,gCAAgC,EAChC,4BAA4B,EAC5B,2BAA2B,EAC3B,6BAA6B,EAC7B,KAAK,+BAA+B,GACrC,MAAM,+BAA+B,CAAC;AAsBvC,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,KAAK,iBAAiB,GACvB,MAAM,+BAA+B,CAAC;AAiVvC,+BAA+B;AAC/B,qBAAa,YAAY;IACvB,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,MAAM,CAAuB;gBAEzB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW;IAW3C;;;;;;;OAOG;YACW,mBAAmB;YAMnB,qBAAqB;YAcrB,mBAAmB;YAsBnB,gBAAgB;IAS9B;;OAEG;IACG,QAAQ,CACZ,KAAK,EAAE,MAAM,GAAG,OAAO,EAAE,EACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,aAAa,CAAC,EAAE,MAAM,EACtB,uBAAuB,CAAC,EAAE,MAAM,GAC/B,OAAO,CAAC,aAAa,CAAC;IAqDzB;;;OAGG;IACG,MAAM,CACV,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,SAAS,CAAC,EAAE;QACV,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;QAC1C,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;QAClC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,KAAK,IAAI,CAAC;KAC9C,EACD,aAAa,CAAC,EAAE,MAAM,EACtB,uBAAuB,CAAC,EAAE,MAAM,EAChC,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IA0JtC;;OAEG;YACW,gBAAgB;IA8b9B;;;;OAIG;YACW,yBAAyB;IAqiBvC;;OAEG;YACW,eAAe;IAgC7B;;OAEG;YACW,mBAAmB;IAOjC;;OAEG;IACH,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,sBAAsB;IAoB9B;;OAEG;IACH,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC;IAI5B;;OAEG;IACG,cAAc,IAAI,OAAO,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC;QACtB,eAAe,EAAE,MAAM,CAAC;QACxB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAIF;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAGnC"}

package/esm/src/agent/runtime/index.js

@@ -16,7 +16,7 @@ import { generateId } from "../../utils/id.js";
 import { detectPlatform, getPlatformCapabilities } from "../../platform/core-platform.js";
 import { createAgentMemory } from "../memory/index.js";
 import { serverLogger } from "../../utils/index.js";
-import { addSpanEvent, setActiveSpanAttributes as setOtelActiveSpanAttributes, setSpanAttributes, withSpan, } from "../../observability/tracing/otlp-setup.js";
+import { addSpanEvent, setActiveSpanAttributes as setOtelActiveSpanAttributes, setActiveSpanErrorStatus as setOtelActiveSpanErrorStatus, setSpanAttributes, withSpan, } from "../../observability/tracing/otlp-setup.js";
 import { convertToTextGenerationRuntimeRequestMessages } from "./text-generation-runtime-message-converter.js";
 import { convertToolsToRuntimeTools } from "./model-tool-converter.js";
 import { getRuntimeRemoteToolSources } from "./mcp-server-tool-sources.js";
@@ -208,6 +208,9 @@ async function traceConfiguredToolExecution(input) {
         try {
             const result = await executeConfiguredTool(input.toolName, input.args, input.toolsConfig, input.context, input.allowedRemoteToolNames, input.remoteToolSources);
             const resultError = getToolResultError(result);
+            if (resultError !== undefined) {
+                setOtelActiveSpanErrorStatus(resultError);
+            }
             setOtelActiveSpanAttributes(buildRuntimeToolTraceAttributes({
                 mode: input.mode,
                 agentId: input.agentId,
@@ -256,6 +259,9 @@ async function traceProviderExecutedTool(input) {
     const status = input.isError === true ? "failed" : "completed";
     const errorMessage = input.isError === true ? stringifyToolError(input.result) : undefined;
     await withSpan("agent.tool_execute", async () => {
+        if (errorMessage !== undefined) {
+            setOtelActiveSpanErrorStatus(errorMessage);
+        }
         setOtelActiveSpanAttributes(buildRuntimeToolTraceAttributes({
             ...input,
             status,
@@ -540,6 +546,7 @@ export class AgentRuntime {
             const remoteToolSources = getRuntimeRemoteToolSources(this.config);
             let currentSystemPrompt = systemPrompt;
             let currentRuntimeContext = runtimeContext;
+            let agentWriteFinalResponseToolGuardEnabled = false;
             for (let step = 0; step < maxSteps; step++) {
                 this.status = "thinking";
                 addSpanEvent(loopSpan, "step_start", { step });
@@ -568,7 +575,10 @@ export class AgentRuntime {
                 currentSystemPrompt = preparedStep.systemPrompt;
                 currentRuntimeContext = preparedStep.runtimeContext;
                 const toolContext = preparedStep.toolContext;
-                const tools = preparedStep.tools;
+                const tools = agentWriteFinalResponseToolGuardEnabled
+                    ? preparedStep.tools.filter((tool) => !shouldHideProjectToolAfterAgentWriteSuccess(tool.name))
+                    : preparedStep.tools;
+                const stepProviderTools = agentWriteFinalResponseToolGuardEnabled ? [] : providerTools;
                 const temperature = this.resolveTemperature(temperatureModelString ?? effectiveModel, providerOptions);
                 const response = await withSpan("agent.generate_text", async (span) => {
                     setSpanAttributes(span, {
@@ -581,7 +591,7 @@ export class AgentRuntime {
                         messages: convertToTextGenerationRuntimeRequestMessages(currentMessages),
                         tools: convertToolsToRuntimeTools(tools, {
                             model: effectiveModel,
-                            providerTools,
+                            providerTools: stepProviderTools,
                         }),
                         experimental_repairToolCall: repairToolCall,
                         maxOutputTokens: this.resolveMaxOutputTokens(effectiveModel, maxOutputTokensOverride),
@@ -714,6 +724,13 @@ export class AgentRuntime {
                             toolCall.error = generatedToolResult.isError === true
                                 ? stringifyToolError(generatedToolResult.result)
                                 : undefined;
+                            if (toolCall.error !== undefined) {
+                                setOtelActiveSpanErrorStatus(toolCall.error);
+                            }
+                            if (generatedToolResult.isError !== true &&
+                                shouldHideProjectToolAfterAgentWriteSuccess(tc.toolName)) {
+                                agentWriteFinalResponseToolGuardEnabled = true;
+                            }
                             setSpanAttributes(toolSpan, compactRuntimeTraceAttributes({
                                 "tool.status": generatedToolResult.isError === true ? "failed" : "completed",
                                 "tool.provider_executed": generatedToolResult.providerExecuted === true,
@@ -791,6 +808,9 @@ export class AgentRuntime {
                                 context: executionContext,
                             });
                             const resultError = getToolResultError(result);
+                            if (resultError !== undefined) {
+                                setOtelActiveSpanErrorStatus(resultError);
+                            }
                             toolCall.status = resultError === undefined ? "completed" : "error";
                             toolCall.result = result;
                             toolCall.error = resultError;
@@ -806,6 +826,9 @@ export class AgentRuntime {
                                 }),
                             }));
                             if (resultError === undefined) {
+                                if (shouldHideProjectToolAfterAgentWriteSuccess(tc.toolName)) {
+                                    agentWriteFinalResponseToolGuardEnabled = true;
+                                }
                                 // Track skill policy from successful load_skill results
                                 if (tc.toolName === LOAD_SKILL_TOOL_ID) {
                                     activeSkillId = extractSkillId(result);

package/esm/src/agent/runtime/tool-result-continuation.d.ts.map

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

package/esm/src/agent/runtime/tool-result-continuation.js

@@ -1,4 +1,5 @@
 import { stripLeadingEmptyObjectPlaceholder } from "../streaming/data-stream.js";
+import { hasToolExecutionErrorMarker } from "../../tool/result.js";
 import { parseToolArgs } from "./tool-helpers.js";
 import { stringifyToolError } from "./error-utils.js";
 function getMcpToolErrorMessage(result) {
@@ -15,14 +16,21 @@ function getMcpToolErrorMessage(result) {
     return record.error;
 }
 export function getToolResultError(result) {
-    if (!result || typeof result !== "object" || !("error" in result)) {
+    if (!hasToolExecutionErrorMarker(result)) {
         return undefined;
     }
     const mcpToolErrorMessage = getMcpToolErrorMessage(result);
     if (mcpToolErrorMessage !== undefined) {
         return mcpToolErrorMessage;
     }
-    return stringifyToolError(result.error);
+    const record = result;
+    if (typeof record.error === "string") {
+        return stringifyToolError(record.error);
+    }
+    if (typeof record.message === "string" && record.message.trim().length > 0) {
+        return record.message;
+    }
+    return "Tool execution failed";
 }
 export function createToolResultMessage(toolCallId, toolName, result, providerExecuted = false) {
     return {

package/esm/src/cache/cache-key-builder.d.ts

@@ -10,10 +10,40 @@ type MultiProjectRequestContextType = {
     environmentName?: string | null;
 };
 export type { CacheKeyContext };
+export interface RegistryScopeContext {
+    scopeId: string;
+    /** Whether completed discovery is safe to retain for this immutable source. */
+    immutable: boolean;
+}
 export declare function getContentHashKey(prefix: string, filePath: string, contentHash: string, suffix?: string): string;
 export declare function runWithCacheKeyContext<T>(ctx: CacheKeyContext, fn: () => T): T;
+/**
+ * Suppress an inherited explicit cache scope for a callback. This is used when
+ * a restored tenant has a mutable source (for example, a production
+ * environment without a pinned release) that cannot safely use distributed
+ * caching. Ambient request context remains available for in-process registry
+ * isolation.
+ */
+export declare function runWithoutCacheKeyContext<T>(fn: () => T): T;
 export declare function getCurrentCacheKeyContext(): CacheKeyContext;
 export declare function tryGetCacheKeyContext(): CacheKeyContext | null;
+/**
+ * Returns a stable scope identifier for in-process registry isolation.
+ *
+ * Unlike tryGetCacheKeyContext(), this function does NOT return null when the
+ * request context lacks a field that would be required for a safe distributed
+ * cache key (e.g. productionMode=true without a releaseId). For in-process
+ * registries (ProjectScopedRegistryManager), project identity and the active
+ * content source still provide a safe process-local scope. Collapsing to
+ * "__default__" would let concurrent projects overwrite one another's
+ * registered skills, tools, and agents.
+ *
+ * Returns null only when no project identity is available at all (e.g. CLI /
+ * local dev without a multi-project context), in which case the caller should
+ * fall back to DEFAULT_SCOPE_ID.
+ */
+export declare function tryGetRegistryScopeContext(): RegistryScopeContext | null;
+export declare function tryGetRegistryScopeId(): string | null;
 export declare function getProjectScopedKey(prefix: string, resourceKey: string): string | null;
 export declare function getProjectScopedKeyAlways(prefix: string, resourceKey: string): string | null;
 export declare function extractCacheKeyContext(handlerCtx: HandlerContext): CacheKeyContext | null;

package/esm/src/cache/cache-key-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache-key-builder.d.ts","sourceRoot":"","sources":["../../../src/src/cache/cache-key-builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,KAAK,eAAe,EAAyB,MAAM,oBAAoB,CAAC;AAIjF,KAAK,8BAA8B,GAAG;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,CAAC;AAIF,YAAY,EAAE,eAAe,EAAE,CAAC;AAQhC,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,CAER;AAED,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAE9E;AAED,wBAAgB,yBAAyB,IAAI,eAAe,CAQ3D;AA+CD,wBAAgB,qBAAqB,IAAI,eAAe,GAAG,IAAI,CAQ9D;AAMD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKtF;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK5F;AAED,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,cAAc,GAAG,eAAe,GAAG,IAAI,CAyBzF;AAED,YAAY,EAAE,8BAA8B,IAAI,0BAA0B,EAAE,CAAC"}
+{"version":3,"file":"cache-key-builder.d.ts","sourceRoot":"","sources":["../../../src/src/cache/cache-key-builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,KAAK,eAAe,EAAyB,MAAM,oBAAoB,CAAC;AAIjF,KAAK,8BAA8B,GAAG;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACjC,CAAC;AAIF,YAAY,EAAE,eAAe,EAAE,CAAC;AAEhC,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,+EAA+E;IAC/E,SAAS,EAAE,OAAO,CAAC;CACpB;AAQD,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,CAER;AAED,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAE9E;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAE3D;AAED,wBAAgB,yBAAyB,IAAI,eAAe,CAQ3D;AA+CD,wBAAgB,qBAAqB,IAAI,eAAe,GAAG,IAAI,CAQ9D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,0BAA0B,IAAI,oBAAoB,GAAG,IAAI,CAwCxE;AAED,wBAAgB,qBAAqB,IAAI,MAAM,GAAG,IAAI,CAErD;AAMD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKtF;AAED,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK5F;AAED,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,cAAc,GAAG,eAAe,GAAG,IAAI,CAyBzF;AAED,YAAY,EAAE,8BAA8B,IAAI,0BAA0B,EAAE,CAAC"}

package/esm/src/cache/cache-key-builder.js

@@ -14,6 +14,16 @@ export function getContentHashKey(prefix, filePath, contentHash, suffix) {
 export function runWithCacheKeyContext(ctx, fn) {
     return cacheKeyContextStorage.run(validateCacheKeyContext(ctx), fn);
 }
+/**
+ * Suppress an inherited explicit cache scope for a callback. This is used when
+ * a restored tenant has a mutable source (for example, a production
+ * environment without a pinned release) that cannot safely use distributed
+ * caching. Ambient request context remains available for in-process registry
+ * isolation.
+ */
+export function runWithoutCacheKeyContext(fn) {
+    return cacheKeyContextStorage.run(null, fn);
+}
 export function getCurrentCacheKeyContext() {
     const ctx = cacheKeyContextStorage.getStore();
     if (ctx)
@@ -73,6 +83,61 @@ export function tryGetCacheKeyContext() {
         return null;
     return extractCacheKeyContextFromMultiProjectContext(reqCtx);
 }
+/**
+ * Returns a stable scope identifier for in-process registry isolation.
+ *
+ * Unlike tryGetCacheKeyContext(), this function does NOT return null when the
+ * request context lacks a field that would be required for a safe distributed
+ * cache key (e.g. productionMode=true without a releaseId). For in-process
+ * registries (ProjectScopedRegistryManager), project identity and the active
+ * content source still provide a safe process-local scope. Collapsing to
+ * "__default__" would let concurrent projects overwrite one another's
+ * registered skills, tools, and agents.
+ *
+ * Returns null only when no project identity is available at all (e.g. CLI /
+ * local dev without a multi-project context), in which case the caller should
+ * fall back to DEFAULT_SCOPE_ID.
+ */
+export function tryGetRegistryScopeContext() {
+    // Explicit contexts are authoritative for workflows and other callers that
+    // intentionally override ambient filesystem tenancy.
+    const cacheCtx = cacheKeyContextStorage.getStore();
+    if (cacheCtx) {
+        return {
+            scopeId: `${cacheCtx.projectId}:${cacheCtx.mode}:${cacheCtx.versionId}`,
+            immutable: cacheCtx.mode === "production",
+        };
+    }
+    const reqCtx = getRequestContextFn()?.();
+    if (reqCtx) {
+        const projectId = reqCtx.projectId || reqCtx.projectSlug;
+        if (!projectId)
+            return null;
+        if (reqCtx.productionMode) {
+            if (reqCtx.releaseId) {
+                return {
+                    scopeId: `${projectId}:production:${reqCtx.releaseId}`,
+                    immutable: true,
+                };
+            }
+            // Match ProxyFSAdapterManager's canonical default so registry,
+            // discovery, and adapter caches all describe the same content source.
+            const environmentName = reqCtx.environmentName || "production";
+            return {
+                scopeId: `${projectId}:production:environment:${environmentName}`,
+                immutable: false,
+            };
+        }
+        return {
+            scopeId: `${projectId}:preview:${reqCtx.branch || "main"}`,
+            immutable: false,
+        };
+    }
+    return null;
+}
+export function tryGetRegistryScopeId() {
+    return tryGetRegistryScopeContext()?.scopeId ?? null;
+}
 function buildProjectScopedKey(prefix, resourceKey, ctx) {
     return `${prefix}:${ctx.projectId}:${ctx.mode}:${ctx.versionId}:${resourceKey}`;
 }

package/esm/src/cache/keys/builders/render.d.ts

@@ -35,7 +35,7 @@ export declare function buildRenderCacheKey(cachePrefix: string, contentKey: str
 export declare function buildComponentCacheKey(projectId: string, filePath: string, contentHash: string): string;
 export declare function buildLayoutComponentCacheKey(projectId: string, componentPath: string, hash: string, contentSourceId: string): string;
 export declare function buildErrorPageCacheKey(projectId: string | undefined, projectDir: string, pageType: string): string;
-export declare function buildProxyManagerCacheKey(projectSlug: string, productionMode: boolean, releaseId: string | null, branch: string | null): string;
+export declare function buildProxyManagerCacheKey(projectSlug: string, productionMode: boolean, releaseId: string | null, branch: string | null, environmentName?: string | null): string;
 /**
  * Build a query-aware cache key that is safe for multi-tenant caching.
  *

package/esm/src/cache/keys/builders/render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../../../src/src/cache/keys/builders/render.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAIlF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAI7D,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,SAAS,GAAG,YAAY,EACrC,UAAU,EAAE,MAAM;AAClB;;;;;GAKG;AACH,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAGR;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,SAAS,GAAG,YAAY,EACrC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACjC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACnC,MAAM,CAaR;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEnF;AAED,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,MAAM,CAER;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,MAAM,GACtB,MAAM,CAER;AAED,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CAER;AAED,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,MAAM,CAaR;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,GAAG,CAAC,EAAE,GAAG,EACT,OAAO,CAAC,EAAE,sBAAsB,GAC/B,MAAM,CAMR"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../../../src/src/cache/keys/builders/render.ts"],"names":[],"mappings":"AAAA;;;;;;;kFAOkF;AAIlF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAI7D,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,SAAS,GAAG,YAAY,EACrC,UAAU,EAAE,MAAM;AAClB;;;;;GAKG;AACH,eAAe,CAAC,EAAE,MAAM,GACvB,MAAM,CAGR;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,SAAS,GAAG,YAAY,EACrC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACjC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GACnC,MAAM,CAaR;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEnF;AAED,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,GAClB,MAAM,CAER;AAED,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,EACZ,eAAe,EAAE,MAAM,GACtB,MAAM,CAER;AAED,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM,CAER;AAED,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,OAAO,EACvB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,GAC9B,MAAM,CAgBR;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,GAAG,CAAC,EAAE,GAAG,EACT,OAAO,CAAC,EAAE,sBAAsB,GAC/B,MAAM,CAMR"}

package/esm/src/cache/keys/builders/render.js

@@ -61,15 +61,18 @@ export function buildLayoutComponentCacheKey(projectId, componentPath, hash, con
 export function buildErrorPageCacheKey(projectId, projectDir, pageType) {
     return `${CacheKeyPrefix.ERROR_PAGE}:${projectId ?? projectDir}:${pageType}`;
 }
-export function buildProxyManagerCacheKey(projectSlug, productionMode, releaseId, branch) {
+export function buildProxyManagerCacheKey(projectSlug, productionMode, releaseId, branch, environmentName) {
     const mode = productionMode ? "production" : "preview";
     if (productionMode) {
-        if (!releaseId) {
+        if (releaseId) {
+            return `${CacheKeyPrefix.PROXY}:${projectSlug}:${mode}:${releaseId}`;
+        }
+        if (!environmentName) {
             throw CACHE_INVARIANT_VIOLATION.create({
-                detail: `Missing releaseId in production for ${projectSlug}`,
+                detail: `Missing releaseId or environmentName in production for ${projectSlug}`,
             });
         }
-        return `${CacheKeyPrefix.PROXY}:${projectSlug}:${mode}:${releaseId}`;
+        return `${CacheKeyPrefix.PROXY}:${projectSlug}:${mode}:environment:${environmentName}`;
     }
     return `${CacheKeyPrefix.PROXY}:${projectSlug}:${mode}:${branch ?? "main"}`;
 }

package/esm/src/observability/tracing/otlp-setup.d.ts

@@ -52,6 +52,8 @@ export declare function setSpanAttributes(span: unknown, attributes: Record<stri
 export declare function addSpanEvent(span: unknown, name: string, attributes?: Record<string, AttributeValue>): void;
 /** Sets active span attributes. */
 export declare function setActiveSpanAttributes(attributes: Record<string, AttributeValue>): void;
+/** Marks the active span as failed. */
+export declare function setActiveSpanErrorStatus(error: unknown): void;
 /** Context for with. */
 export declare function withContext<T>(spanContext: unknown, fn: () => Promise<T>): Promise<T>;
 /** Context for get trace. */

package/esm/src/observability/tracing/otlp-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otlp-setup.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/tracing/otlp-setup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"otlp-setup.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/tracing/otlp-setup.ts"],"names":[],"mappings":"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"}

package/esm/src/observability/tracing/otlp-setup.js

@@ -106,7 +106,6 @@ export async function withSpan(name, fn, attributes, options) {
     const spanContext = shimTrace.setSpan(parentContext, span);
     try {
         const result = await shimContext.with(spanContext, () => fn(span));
-        span.setStatus({ code: SpanStatusCode.OK });
         return result;
     }
     catch (error) {
@@ -200,6 +199,13 @@ export function setActiveSpanAttributes(attributes) {
     for (const [key, value] of Object.entries(attributes))
         span.setAttribute(key, value);
 }
+/** Marks the active span as failed. */
+export function setActiveSpanErrorStatus(error) {
+    const span = shimTrace.getActiveSpan?.();
+    if (!span)
+        return;
+    setSpanErrorStatus(span, error);
+}
 /** Context for with. */
 export async function withContext(spanContext, fn) {
     return shimContext.with(spanContext, fn);

package/esm/src/platform/adapters/fs/veryfront/proxy-manager.d.ts

@@ -22,8 +22,8 @@ export declare class ProxyFSAdapterManager {
     private createAdapter;
     private evictLeastRecentlyUsed;
     private cleanupIdleAdapters;
-    hasAdapter(projectSlug: string, productionMode?: boolean, releaseId?: string | null, branch?: string | null): boolean;
-    evictAdapter(projectSlug: string, productionMode?: boolean, releaseId?: string | null, branch?: string | null): void;
+    hasAdapter(projectSlug: string, productionMode?: boolean, releaseId?: string | null, branch?: string | null, environmentName?: string | null): boolean;
+    evictAdapter(projectSlug: string, productionMode?: boolean, releaseId?: string | null, branch?: string | null, environmentName?: string | null): void;
     getStats(): {
         adapters: number;
         stats: Record<string, CacheStats>;

package/esm/src/platform/adapters/fs/veryfront/proxy-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-manager.d.ts","sourceRoot":"","sources":["../../../../../../src/src/platform/adapters/fs/veryfront/proxy-manager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAA0B,MAAM,YAAY,CAAC;AAetF,UAAU,2BAA2B;IACnC,UAAU,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAoCD,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACjC,cAAc,UAAQ,GACrB,MAAM,GAAG,IAAI,CAgBf;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,eAAe,CAAkD;IACzE,OAAO,CAAC,oBAAoB,CAAyC;IACrE,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,YAAY,CAAC,CAAiC;gBAE1C,MAAM,EAAE,2BAA2B;IAkBzC,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,OAAO,EACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,EAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC,kBAAkB,CAAC;IAkK9B,OAAO,CAAC,oBAAoB;IAuC5B,OAAO,CAAC,wBAAwB;IAyChC,OAAO,CAAC,aAAa;IAyJrB,OAAO,CAAC,sBAAsB;IAsB9B,OAAO,CAAC,mBAAmB;IAY3B,UAAU,CACR,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,EACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO;IAUV,YAAY,CACV,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,EACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GACrB,IAAI;IAmBP,QAAQ,IAAI;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;KAAE;IAUnE,OAAO,IAAI,IAAI;CAoBhB"}
+{"version":3,"file":"proxy-manager.d.ts","sourceRoot":"","sources":["../../../../../../src/src/platform/adapters/fs/veryfront/proxy-manager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,eAAe,EAA0B,MAAM,YAAY,CAAC;AAetF,UAAU,2BAA2B;IACnC,UAAU,EAAE,eAAe,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAoCD,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACjC,cAAc,UAAQ,GACrB,MAAM,GAAG,IAAI,CAgBf;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,QAAQ,CAAqC;IACrD,OAAO,CAAC,eAAe,CAAkD;IACzE,OAAO,CAAC,oBAAoB,CAAyC;IACrE,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,YAAY,CAAC,CAAiC;gBAE1C,MAAM,EAAE,2BAA2B;IAkBzC,UAAU,CACd,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,MAAM,EACb,SAAS,CAAC,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,OAAO,EACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,EAC/B,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC,kBAAkB,CAAC;IAmK9B,OAAO,CAAC,oBAAoB;IAuC5B,OAAO,CAAC,wBAAwB;IAyChC,OAAO,CAAC,aAAa;IAyJrB,OAAO,CAAC,sBAAsB;IAsB9B,OAAO,CAAC,mBAAmB;IAY3B,UAAU,CACR,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,EACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,EACtB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,GAC9B,OAAO;IAcV,YAAY,CACV,WAAW,EAAE,MAAM,EACnB,cAAc,CAAC,EAAE,OAAO,EACxB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,EACzB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,EACtB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,GAC9B,IAAI;IAuBP,QAAQ,IAAI;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;KAAE;IAUnE,OAAO,IAAI,IAAI;CAoBhB"}

package/esm/src/platform/adapters/fs/veryfront/proxy-manager.js

@@ -104,7 +104,7 @@ export class ProxyFSAdapterManager {
                 detail: `[ProxyFSAdapterManager] Invalid getAdapter parameters: ${detailMessage}`,
             });
         }
-        const cacheKey = buildProxyManagerCacheKey(projectSlug, effectiveProductionMode, effectiveReleaseId, effectiveBranch);
+        const cacheKey = buildProxyManagerCacheKey(projectSlug, effectiveProductionMode, effectiveReleaseId, effectiveBranch, effectiveEnvironmentName);
         logger.debug("getAdapter called", {
             projectSlug,
             productionMode: effectiveProductionMode,
@@ -250,7 +250,7 @@ export class ProxyFSAdapterManager {
             },
             invalidationCallbacks: createDefaultInvalidationCallbacks({
                 ...this.baseConfig.invalidationCallbacks,
-                evictCurrentAdapter: () => this.evictAdapter(projectSlug, productionMode, releaseId, branch),
+                evictCurrentAdapter: () => this.evictAdapter(projectSlug, productionMode, releaseId, branch, environmentName),
             }),
         };
         const adapter = new VeryfrontFSAdapter(config);
@@ -374,12 +374,18 @@ export class ProxyFSAdapterManager {
             this.adapters.delete(cacheKey);
         }
     }
-    hasAdapter(projectSlug, productionMode, releaseId, branch) {
-        const cacheKey = buildProxyManagerCacheKey(projectSlug, productionMode ?? false, releaseId ?? null, branch ?? null);
+    hasAdapter(projectSlug, productionMode, releaseId, branch, environmentName) {
+        const effectiveProductionMode = productionMode ?? false;
+        const effectiveEnvironmentName = environmentName ??
+            (effectiveProductionMode ? "production" : null);
+        const cacheKey = buildProxyManagerCacheKey(projectSlug, effectiveProductionMode, releaseId ?? null, branch ?? null, effectiveEnvironmentName);
         return this.adapters.has(cacheKey);
     }
-    evictAdapter(projectSlug, productionMode, releaseId, branch) {
-        const cacheKey = buildProxyManagerCacheKey(projectSlug, productionMode ?? false, releaseId ?? null, branch ?? null);
+    evictAdapter(projectSlug, productionMode, releaseId, branch, environmentName) {
+        const effectiveProductionMode = productionMode ?? false;
+        const effectiveEnvironmentName = environmentName ??
+            (effectiveProductionMode ? "production" : null);
+        const cacheKey = buildProxyManagerCacheKey(projectSlug, effectiveProductionMode, releaseId ?? null, branch ?? null, effectiveEnvironmentName);
         const adapter = this.adapters.get(cacheKey);
         if (!adapter) {
             logger.debug("No adapter to evict", { cacheKey });

package/esm/src/registry/project-scoped-registry-manager.d.ts

@@ -22,6 +22,19 @@
  *
  * @module
  */
+/**
+ * Stage project-scoped registry mutations and publish them as one synchronous
+ * commit after the callback succeeds. Reads inside the callback see staged
+ * state; concurrent requests keep seeing the previous live state.
+ * The commit is an authoritative replacement, so it linearizes after and may
+ * supersede live writes made to the same scope while staging is in progress.
+ * Use this for complete discovery generations, not incremental updates.
+ *
+ * Nested calls participate in the existing transaction. If a nested tenant
+ * context changes the registry scope, the first registry access throws rather
+ * than committing data into the wrong tenant.
+ */
+export declare function runWithRegistryTransaction<T>(fn: () => Promise<T>): Promise<T>;
 /**
  * Base class for project-scoped registries.
  * Provides isolation between projects while allowing
@@ -37,6 +50,10 @@ export declare class ProjectScopedRegistryManager<T> {
      * Falls back to default for CLI/test scenarios.
      */
     private getCurrentScopeId;
+    /** Return a transaction-local copy of the target registry when staging. */
+    private getTransactionRegistry;
+    /** Read the active registry, routing transaction access to its staged copy. */
+    private getActiveScopeRegistry;
     /**
      * Get or create registry for a specific project.
      */

package/esm/src/registry/project-scoped-registry-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-scoped-registry-manager.d.ts","sourceRoot":"","sources":["../../../src/src/registry/project-scoped-registry-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAgBH;;;;GAIG;AACH,qBAAa,4BAA4B,CAAC,CAAC;IAI7B,OAAO,CAAC,YAAY;IAHhC,OAAO,CAAC,iBAAiB,CAAqC;IAC9D,OAAO,CAAC,cAAc,CAAwB;gBAE1B,YAAY,EAAE,MAAM;IAExC;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IASxB;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI;IAcnC;;;OAGG;IACH,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI;IASzC;;;OAGG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAK9B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAKjC;;OAEG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAMxB;;OAEG;IACH,SAAS,IAAI,MAAM,EAAE;IAOrB;;OAEG;IACH,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAUxB;;OAEG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAU3B;;OAEG;IACH,KAAK,IAAI,IAAI;IAIb;;OAEG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAcrC;;OAEG;IACH,QAAQ,IAAI,IAAI;IAMhB;;OAEG;IACH,QAAQ,IAAI;QACV,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;QACnB,mBAAmB,EAAE,MAAM,CAAC;KAC7B;CAeF"}
+{"version":3,"file":"project-scoped-registry-manager.d.ts","sourceRoot":"","sources":["../../../src/src/registry/project-scoped-registry-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AA6BH;;;;;;;;;;;GAWG;AACH,wBAAsB,0BAA0B,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CA4BpF;AAED;;;;GAIG;AACH,qBAAa,4BAA4B,CAAC,CAAC;IAI7B,OAAO,CAAC,YAAY;IAHhC,OAAO,CAAC,iBAAiB,CAAqC;IAC9D,OAAO,CAAC,cAAc,CAAwB;gBAE1B,YAAY,EAAE,MAAM;IAExC;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAIzB,2EAA2E;IAC3E,OAAO,CAAC,sBAAsB;IAsC9B,+EAA+E;IAC/E,OAAO,CAAC,sBAAsB;IAI9B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAYxB;;OAEG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI;IAcnC;;;OAGG;IACH,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI;IAYzC;;;OAGG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAK9B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAKjC;;OAEG;IACH,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAMxB;;OAEG;IACH,SAAS,IAAI,MAAM,EAAE;IAOrB;;OAEG;IACH,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAUxB;;OAEG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IAU3B;;OAEG;IACH,KAAK,IAAI,IAAI;IASb;;OAEG;IACH,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAqBrC;;OAEG;IACH,QAAQ,IAAI,IAAI;IAahB;;OAEG;IACH,QAAQ,IAAI;QACV,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;QACnB,mBAAmB,EAAE,MAAM,CAAC;KAC7B;CAeF"}

package/esm/src/registry/project-scoped-registry-manager.js

@@ -22,15 +22,58 @@
  *
  * @module
  */
-import { tryGetCacheKeyContext } from "../cache/cache-key-builder.js";
+import { tryGetRegistryScopeId } from "../cache/cache-key-builder.js";
 import { agentLogger } from "../utils/logger/logger.js";
+import { AsyncLocalStorage } from "node:async_hooks";
 const DEFAULT_SCOPE_ID = "__default__";
+const registryTransactionStorage = new AsyncLocalStorage();
 function buildRegistryScopeId() {
-    const cacheContext = tryGetCacheKeyContext();
-    if (!cacheContext) {
-        return DEFAULT_SCOPE_ID;
-    }
-    return `${cacheContext.projectId}:${cacheContext.mode}:${cacheContext.versionId}`;
+    // tryGetRegistryScopeId() returns a project-isolated key even when
+    // tryGetCacheKeyContext() would return null (e.g. control-plane runs for an
+    // environment source without a pinned releaseId). Without this, all such
+    // runs collapse to "__default__", so concurrent projects can overwrite one
+    // another's registered primitives.
+    return tryGetRegistryScopeId() ?? DEFAULT_SCOPE_ID;
+}
+/**
+ * Stage project-scoped registry mutations and publish them as one synchronous
+ * commit after the callback succeeds. Reads inside the callback see staged
+ * state; concurrent requests keep seeing the previous live state.
+ * The commit is an authoritative replacement, so it linearizes after and may
+ * supersede live writes made to the same scope while staging is in progress.
+ * Use this for complete discovery generations, not incremental updates.
+ *
+ * Nested calls participate in the existing transaction. If a nested tenant
+ * context changes the registry scope, the first registry access throws rather
+ * than committing data into the wrong tenant.
+ */
+export async function runWithRegistryTransaction(fn) {
+    const existing = registryTransactionStorage.getStore();
+    if (existing?.state === "active")
+        return await fn();
+    const transaction = {
+        targetScopeId: buildRegistryScopeId(),
+        stages: new Map(),
+        state: "active",
+    };
+    return await registryTransactionStorage.run(transaction, async () => {
+        try {
+            const result = await fn();
+            // Map replacement is synchronous. No other request can observe a partial
+            // commit between managers in this JavaScript turn.
+            for (const stage of transaction.stages.values()) {
+                stage.commit();
+            }
+            transaction.state = "committed";
+            transaction.stages.clear();
+            return result;
+        }
+        catch (error) {
+            transaction.state = "aborted";
+            transaction.stages.clear();
+            throw error;
+        }
+    });
 }
 /**
  * Base class for project-scoped registries.
@@ -51,10 +94,50 @@ export class ProjectScopedRegistryManager {
     getCurrentScopeId() {
         return buildRegistryScopeId();
     }
+    /** Return a transaction-local copy of the target registry when staging. */
+    getTransactionRegistry(scopeId) {
+        const transaction = registryTransactionStorage.getStore();
+        if (!transaction)
+            return undefined;
+        if (transaction.state === "committed")
+            return undefined;
+        if (transaction.state === "aborted") {
+            throw new Error(`[${this.registryName}] Registry transaction already aborted for scope ` +
+                `"${transaction.targetScopeId}"`);
+        }
+        if (scopeId !== transaction.targetScopeId) {
+            throw new Error(`[${this.registryName}] Registry scope changed during transaction: ` +
+                `expected "${transaction.targetScopeId}", got "${scopeId}"`);
+        }
+        const existing = transaction.stages.get(this);
+        if (existing)
+            return existing.registry;
+        const registry = new Map(this.registriesByScope.get(scopeId));
+        const stage = {
+            registry,
+            commit: () => {
+                if (registry.size === 0) {
+                    this.registriesByScope.delete(scopeId);
+                }
+                else {
+                    this.registriesByScope.set(scopeId, registry);
+                }
+            },
+        };
+        transaction.stages.set(this, stage);
+        return registry;
+    }
+    /** Read the active registry, routing transaction access to its staged copy. */
+    getActiveScopeRegistry(scopeId) {
+        return this.getTransactionRegistry(scopeId) ?? this.registriesByScope.get(scopeId);
+    }
     /**
      * Get or create registry for a specific project.
      */
     getScopeRegistry(scopeId) {
+        const staged = this.getTransactionRegistry(scopeId);
+        if (staged)
+            return staged;
         const existing = this.registriesByScope.get(scopeId);
         if (existing)
             return existing;
@@ -79,6 +162,9 @@ export class ProjectScopedRegistryManager {
      * Use for framework-provided tools, not user-defined ones.
      */
     registerShared(id, item) {
+        // Shared framework infrastructure is intentionally process-wide and is
+        // published immediately even inside a project transaction. Project
+        // discovery must never use this method for tenant-owned definitions.
         if (this.sharedRegistry.has(id)) {
             agentLogger.debug(`[${this.registryName}] Shared "${id}" already registered. Overwriting.`);
         }
@@ -91,7 +177,7 @@ export class ProjectScopedRegistryManager {
      */
     get(id) {
         const scopeId = this.getCurrentScopeId();
-        return this.registriesByScope.get(scopeId)?.get(id) ?? this.sharedRegistry.get(id);
+        return this.getActiveScopeRegistry(scopeId)?.get(id) ?? this.sharedRegistry.get(id);
     }
     /**
      * Get item registered in the current project's own scope, without falling
@@ -101,14 +187,14 @@ export class ProjectScopedRegistryManager {
      */
     getOwn(id) {
         const scopeId = this.getCurrentScopeId();
-        return this.registriesByScope.get(scopeId)?.get(id);
+        return this.getActiveScopeRegistry(scopeId)?.get(id);
     }
     /**
      * Check if item exists for the current project.
      */
     has(id) {
         const scopeId = this.getCurrentScopeId();
-        return (this.registriesByScope.get(scopeId)?.has(id) ?? false) ||
+        return (this.getActiveScopeRegistry(scopeId)?.has(id) ?? false) ||
             this.sharedRegistry.has(id);
     }
     /**
@@ -116,7 +202,7 @@ export class ProjectScopedRegistryManager {
      */
     getAllIds() {
         const scopeId = this.getCurrentScopeId();
-        const projectIds = this.registriesByScope.get(scopeId)?.keys() ?? [];
+        const projectIds = this.getActiveScopeRegistry(scopeId)?.keys() ?? [];
         const sharedIds = this.sharedRegistry.keys();
         return Array.from(new Set([...projectIds, ...sharedIds]));
     }
@@ -125,7 +211,7 @@ export class ProjectScopedRegistryManager {
      */
     getAll() {
         const scopeId = this.getCurrentScopeId();
-        const projectRegistry = this.registriesByScope.get(scopeId);
+        const projectRegistry = this.getActiveScopeRegistry(scopeId);
         if (!projectRegistry)
             return new Map(this.sharedRegistry);
         const result = new Map(this.sharedRegistry);
@@ -138,7 +224,7 @@ export class ProjectScopedRegistryManager {
      */
     delete(id) {
         const scopeId = this.getCurrentScopeId();
-        const registry = this.registriesByScope.get(scopeId);
+        const registry = this.getActiveScopeRegistry(scopeId);
         if (!registry?.has(id))
             return false;
         registry.delete(id);
@@ -149,12 +235,21 @@ export class ProjectScopedRegistryManager {
      * Clear all items for the current project.
      */
     clear() {
+        const staged = this.getTransactionRegistry(this.getCurrentScopeId());
+        if (staged) {
+            staged.clear();
+            return;
+        }
         this.clearProject(this.getCurrentScopeId());
     }
     /**
      * Clear a specific project's registry.
      */
     clearProject(projectId) {
+        const transaction = registryTransactionStorage.getStore();
+        if (transaction && transaction.state !== "committed") {
+            throw new Error(`[${this.registryName}] clearProject() is not supported during a registry transaction`);
+        }
         let cleared = false;
         for (const scopeId of Array.from(this.registriesByScope.keys())) {
             if (scopeId === projectId || scopeId.startsWith(`${projectId}:`)) {
@@ -170,6 +265,10 @@ export class ProjectScopedRegistryManager {
      * Clear everything (for testing).
      */
     clearAll() {
+        const transaction = registryTransactionStorage.getStore();
+        if (transaction && transaction.state !== "committed") {
+            throw new Error(`[${this.registryName}] clearAll() is not supported during a registry transaction`);
+        }
         this.registriesByScope.clear();
         this.sharedRegistry.clear();
         agentLogger.debug(`[${this.registryName}] Cleared all registries`);
@@ -185,7 +284,7 @@ export class ProjectScopedRegistryManager {
             projectCount: this.registriesByScope.size,
             sharedCount: this.sharedRegistry.size,
             totalItems,
-            currentProjectItems: this.registriesByScope.get(scopeId)?.size ?? 0,
+            currentProjectItems: this.getActiveScopeRegistry(scopeId)?.size ?? 0,
         };
     }
 }

package/esm/src/server/handlers/request/api/project-discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-discovery.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/handlers/request/api/project-discovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAKtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAyHrD;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,CAgF1F"}
+{"version":3,"file":"project-discovery.d.ts","sourceRoot":"","sources":["../../../../../../src/src/server/handlers/request/api/project-discovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAMtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAyHrD;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,CAmF1F"}

package/esm/src/server/handlers/request/api/project-discovery.js

@@ -1,6 +1,7 @@
 import { serverLogger } from "../../../../utils/index.js";
 import { clearTrackedAgents, createProjectDiscoveryConfig } from "../../../../discovery/index.js";
-import { tryGetCacheKeyContext } from "../../../../cache/cache-key-builder.js";
+import { tryGetRegistryScopeContext } from "../../../../cache/cache-key-builder.js";
+import { runWithRegistryTransaction } from "../../../../registry/project-scoped-registry-manager.js";
 import { sanitizeUrlCredentials } from "../../../../utils/logger/redact.js";
 const logger = serverLogger.component("api-wrapper");
 const discoveredProjects = new Map();
@@ -61,9 +62,9 @@ function summarizeDiscoveryFailures(errors, projectDir) {
 }
 /** Build a discovery cache key that incorporates the release/version. */
 function discoveryKey(ctx) {
-    const cacheContext = tryGetCacheKeyContext();
-    if (cacheContext) {
-        return `${cacheContext.projectId}:${cacheContext.mode}:${cacheContext.versionId}`;
+    const registryScope = tryGetRegistryScopeContext();
+    if (registryScope) {
+        return registryScope.scopeId;
     }
     const slug = ctx.projectSlug ?? ctx.projectDir;
     const environment = ctx.enriched?.environment ?? ctx.resolvedEnvironment ??
@@ -76,9 +77,9 @@ function discoveryKey(ctx) {
     return `${slug}:preview:${branch}`;
 }
 function shouldCacheCompletedDiscovery(ctx) {
-    const cacheContext = tryGetCacheKeyContext();
-    if (cacheContext) {
-        return cacheContext.mode === "production";
+    const registryScope = tryGetRegistryScopeContext();
+    if (registryScope) {
+        return registryScope.immutable;
     }
     const environment = ctx.enriched?.environment ?? ctx.resolvedEnvironment ??
         (ctx.releaseId ? "production" : "preview");
@@ -101,41 +102,44 @@ export async function ensureProjectDiscovery(ctx) {
             const { clearTranspileCache, discoverAll } = await import("../../../../discovery/index.js");
             const { agentRegistry } = await import("../../../../agent/composition/composition.js");
             const { toolRegistry } = await import("../../../../tool/registry.js");
-            // Clear stale entries for this project scope before re-discovery.
-            // This prevents agents/tools removed in a new release from lingering.
-            clearTrackedAgents();
-            clearTranspileCache();
-            agentRegistry.clear();
-            toolRegistry.clear();
-            const discoveryOptions = createProjectDiscoveryConfig({
-                projectDir: ctx.projectDir,
-                config: ctx.config,
-                fsAdapter: ctx.adapter.fs,
-            });
-            const result = await discoverAll(discoveryOptions);
-            const shouldWarnOnEmptyAiDiscovery = discoveryOptions.toolDirs.length > 0 ||
-                discoveryOptions.agentDirs.length > 0;
-            const logData = {
-                projectSlug: ctx.projectSlug,
-                releaseId: ctx.releaseId,
-                agents: result.agents.size,
-                tools: result.tools.size,
-                errors: result.errors.length,
-            };
-            if (result.errors.length > 0) {
-                logger.warn("Primitive discovery completed with errors", {
-                    ...logData,
-                    failures: summarizeDiscoveryFailures(result.errors, ctx.projectDir),
-                    omittedErrors: Math.max(0, result.errors.length - MAX_DISCOVERY_FAILURES_TO_LOG),
+            return await runWithRegistryTransaction(async () => {
+                // Clear stale entries in a transaction-local copy. Concurrent runs keep
+                // using the prior live registry until discovery succeeds and the staged
+                // replacement is committed atomically.
+                clearTrackedAgents();
+                clearTranspileCache();
+                agentRegistry.clear();
+                toolRegistry.clear();
+                const discoveryOptions = createProjectDiscoveryConfig({
+                    projectDir: ctx.projectDir,
+                    config: ctx.config,
+                    fsAdapter: ctx.adapter.fs,
                 });
-            }
-            else if (result.agents.size === 0 && result.tools.size === 0 && shouldWarnOnEmptyAiDiscovery) {
-                logger.info("Primitive discovery found 0 agents and 0 tools", logData);
-            }
-            else {
-                logger.info("Primitive discovery completed", logData);
-            }
-            return result;
+                const result = await discoverAll(discoveryOptions);
+                const shouldWarnOnEmptyAiDiscovery = discoveryOptions.toolDirs.length > 0 ||
+                    discoveryOptions.agentDirs.length > 0;
+                const logData = {
+                    projectSlug: ctx.projectSlug,
+                    releaseId: ctx.releaseId,
+                    agents: result.agents.size,
+                    tools: result.tools.size,
+                    errors: result.errors.length,
+                };
+                if (result.errors.length > 0) {
+                    logger.warn("Primitive discovery completed with errors", {
+                        ...logData,
+                        failures: summarizeDiscoveryFailures(result.errors, ctx.projectDir),
+                        omittedErrors: Math.max(0, result.errors.length - MAX_DISCOVERY_FAILURES_TO_LOG),
+                    });
+                }
+                else if (result.agents.size === 0 && result.tools.size === 0 && shouldWarnOnEmptyAiDiscovery) {
+                    logger.info("Primitive discovery found 0 agents and 0 tools", logData);
+                }
+                else {
+                    logger.info("Primitive discovery completed", logData);
+                }
+                return result;
+            });
         })(),
     };
     discoveredProjects.set(key, discovery);

package/esm/src/tool/remote-mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"remote-mcp.d.ts","sourceRoot":"","sources":["../../../src/src/tool/remote-mcp.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAkB,oBAAoB,EAAE,MAAM,YAAY,CAAC;AASzF,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,oBAAoB,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAEnF,oDAAoD;AACpD,MAAM,WAAW,yBAAyB;IACxC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,eAAe,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IACnD,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAqbD,qCAAqC;AACrC,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,yBAAyB,GAChC,gBAAgB,CA0FlB"}
+{"version":3,"file":"remote-mcp.d.ts","sourceRoot":"","sources":["../../../src/src/tool/remote-mcp.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAkB,oBAAoB,EAAE,MAAM,YAAY,CAAC;AASzF,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,EAAE,oBAAoB,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAEnF,oDAAoD;AACpD,MAAM,WAAW,yBAAyB;IACxC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO,CAAC,EAAE,eAAe,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IACnD,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAucD,qCAAqC;AACrC,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,yBAAyB,GAChC,gBAAgB,CA0FlB"}

package/esm/src/tool/remote-mcp.js

@@ -139,6 +139,18 @@ function normalizeKnownToolError(value, toolName, endpoint, context) {
         message: `${label} needs to be reconnected before this tool can run.`,
     };
 }
+function preserveToolExecutionErrorMarker(value) {
+    if (isRecord(value) && !Array.isArray(value)) {
+        return hasToolExecutionErrorMarker(value) ? value : { ...value, isError: true };
+    }
+    return {
+        isError: true,
+        message: typeof value === "string" && value.trim().length > 0
+            ? value
+            : "Remote MCP tool returned an error",
+        ...(value === undefined ? {} : { output: value }),
+    };
+}
 function isReconnectRequiredToolOutput(value) {
     return isRecord(value) && value.error === "reconnect_required";
 }
@@ -296,7 +308,7 @@ function normalizeCallToolResult(input) {
             const errorBody = "structuredContent" in result
                 ? result.structuredContent
                 : parseJsonText(text) ?? { error: "tool_error", message: text };
-            return normalizeKnownToolError(errorBody, input.toolName, input.endpoint, input.context);
+            return preserveToolExecutionErrorMarker(normalizeKnownToolError(errorBody, input.toolName, input.endpoint, input.context));
         }
         if ("structuredContent" in result) {
             return result.structuredContent;
@@ -305,7 +317,7 @@ function normalizeCallToolResult(input) {
     }
     if (isError) {
         const errorBody = "structuredContent" in result ? result.structuredContent : result;
-        return normalizeKnownToolError(errorBody, input.toolName, input.endpoint, input.context);
+        return preserveToolExecutionErrorMarker(normalizeKnownToolError(errorBody, input.toolName, input.endpoint, input.context));
     }
     if ("structuredContent" in result) {
         return result.structuredContent;

package/esm/src/utils/version-constant.d.ts

@@ -1,3 +1,3 @@
 /** Shared version value. */
-export declare const VERSION = "0.1.1069";
+export declare const VERSION = "0.1.1071";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,4 +1,4 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
 /** Shared version value. */
-export const VERSION = "0.1.1069";
+export const VERSION = "0.1.1071";

package/esm/src/workflow/executor/step-executor.d.ts.map

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

package/esm/src/workflow/executor/step-executor.js

@@ -1,5 +1,6 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-import { runWithCacheKeyContext, } from "../../cache/cache-key-builder.js";
+import { runWithCacheKeyContext, runWithoutCacheKeyContext, } from "../../cache/cache-key-builder.js";
+import { runWithRequestContext } from "../../platform/adapters/fs/veryfront/request-context.js";
 import { ensureError } from "../../errors/veryfront-error.js";
 import { isVeryfrontError } from "../../errors/http-error.js";
 import { AGENT_NOT_FOUND, INITIALIZATION_ERROR, INVALID_ARGUMENT, ORCHESTRATION_ERROR, RESOURCE_NOT_FOUND, TIMEOUT_ERROR, } from "../../errors/error-registry.js";
@@ -22,10 +23,16 @@ export function getWorkflowTenant() {
 }
 function cacheKeyContextFromWorkflowTenant(tenant) {
     const mode = tenant.productionMode ? "production" : "preview";
+    // Environment sources are mutable and have no immutable version segment.
+    // A synthetic "latest" distributed-cache bucket can mix different source
+    // snapshots, so these tenants use request context for registry isolation and
+    // deliberately skip distributed caching.
+    if (mode === "production" && !tenant.releaseId)
+        return null;
     return {
-        projectId: tenant.projectId || tenant.projectSlug || "default",
+        projectId: tenant.projectId || tenant.projectSlug,
         mode,
-        versionId: mode === "production" ? (tenant.releaseId || "latest") : (tenant.branch || "main"),
+        versionId: mode === "production" ? tenant.releaseId : (tenant.branch || "main"),
     };
 }
 /**
@@ -35,7 +42,20 @@ function cacheKeyContextFromWorkflowTenant(tenant) {
 export function runWithWorkflowTenant(tenant, fn) {
     if (!tenant)
         return fn();
-    return workflowTenantStorage.run(tenant, () => runWithCacheKeyContext(cacheKeyContextFromWorkflowTenant(tenant), fn));
+    return workflowTenantStorage.run(tenant, () => runWithRequestContext({
+        projectSlug: tenant.projectSlug,
+        token: tenant.token,
+        projectId: tenant.projectId,
+        productionMode: tenant.productionMode,
+        releaseId: tenant.releaseId,
+        branch: tenant.branch,
+        environmentName: tenant.environmentName,
+    }, () => {
+        const cacheContext = cacheKeyContextFromWorkflowTenant(tenant);
+        return cacheContext
+            ? runWithCacheKeyContext(cacheContext, fn)
+            : runWithoutCacheKeyContext(fn);
+    }));
 }
 /** Default initial delay before first retry attempt */
 const DEFAULT_RETRY_INITIAL_DELAY_MS = 1_000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.1069",
+  "version": "0.1.1071",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",
@@ -328,10 +328,10 @@
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3",
     "ws": "8.21.0",
-    "@veryfront/ext-bundler-esbuild": "0.1.1069",
-    "@veryfront/ext-content-mdx": "0.1.1069",
-    "@veryfront/ext-css-tailwind": "0.1.1069",
-    "@veryfront/ext-parser-babel": "0.1.1069"
+    "@veryfront/ext-bundler-esbuild": "0.1.1071",
+    "@veryfront/ext-content-mdx": "0.1.1071",
+    "@veryfront/ext-css-tailwind": "0.1.1071",
+    "@veryfront/ext-parser-babel": "0.1.1071"
   },
   "devDependencies": {
     "@types/node": "20.9.0"