veryfront 0.1.1069 → 0.1.1072

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

@@ -22,15 +22,89 @@
  *
  * @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();
+const registryTransactionLocks = new Map();
+async function acquireRegistryTransactionLock(scopeId) {
+    const previous = registryTransactionLocks.get(scopeId) ?? Promise.resolve();
+    const gate = Promise.withResolvers();
+    const current = previous.then(() => gate.promise);
+    registryTransactionLocks.set(scopeId, current);
+    await previous;
+    let released = false;
+    return () => {
+        if (released)
+            return;
+        released = true;
+        gate.resolve();
+        if (registryTransactionLocks.get(scopeId) === current) {
+            registryTransactionLocks.delete(scopeId);
+        }
+    };
+}
 function buildRegistryScopeId() {
-    const cacheContext = tryGetCacheKeyContext();
-    if (!cacheContext) {
-        return DEFAULT_SCOPE_ID;
+    // 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.
+ * Transactions for the same scope are serialized. Live writes made outside
+ * the transaction while discovery is in flight are journaled alongside staged
+ * mutations and replayed in call order, preserving the previous immediate-
+ * mutation semantics without exposing a partially discovered generation.
+ * 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 targetScopeId = buildRegistryScopeId();
+    const releaseLock = await acquireRegistryTransactionLock(targetScopeId);
+    const transaction = {
+        targetScopeId,
+        stages: new Map(),
+        state: "active",
+    };
+    try {
+        return await registryTransactionStorage.run(transaction, async () => {
+            try {
+                const result = await fn();
+                // Prepare every manager before publishing any of them. Publication is
+                // synchronous, so no request can observe a partial generation.
+                const publications = Array.from(transaction.stages.values(), (stage) => stage.prepare());
+                for (const publication of publications) {
+                    publication.publish();
+                }
+                transaction.state = "committed";
+                transaction.stages.clear();
+                return result;
+            }
+            catch (error) {
+                transaction.state = "aborted";
+                for (const stage of transaction.stages.values()) {
+                    stage.abort();
+                }
+                transaction.stages.clear();
+                throw error;
+            }
+        });
+    }
+    finally {
+        releaseLock();
     }
-    return `${cacheContext.projectId}:${cacheContext.mode}:${cacheContext.versionId}`;
 }
 /**
  * Base class for project-scoped registries.
@@ -39,10 +113,34 @@ function buildRegistryScopeId() {
  */
 export class ProjectScopedRegistryManager {
     registryName;
+    options;
     registriesByScope = new Map();
     sharedRegistry = new Map();
-    constructor(registryName) {
+    activeStagesByScope = new Map();
+    constructor(registryName, options = {}) {
         this.registryName = registryName;
+        this.options = options;
+    }
+    validateRegistration(registry, id, incoming) {
+        if (!registry.has(id))
+            return;
+        this.options.validateRegistration?.(id, registry.get(id), incoming);
+    }
+    applyMutation(registry, mutation, validateRegistration = false) {
+        switch (mutation.type) {
+            case "clear":
+                registry.clear();
+                break;
+            case "delete":
+                registry.delete(mutation.id);
+                break;
+            case "set":
+                if (validateRegistration) {
+                    this.validateRegistration(registry, mutation.id, mutation.item);
+                }
+                registry.set(mutation.id, mutation.item);
+                break;
+        }
     }
     /**
      * Get the current project ID from AsyncLocalStorage context.
@@ -51,6 +149,82 @@ export class ProjectScopedRegistryManager {
     getCurrentScopeId() {
         return buildRegistryScopeId();
     }
+    /** Return the transaction-local stage for this manager and scope. */
+    getTransactionStage(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;
+        const baseRegistry = new Map(this.registriesByScope.get(scopeId));
+        const registry = new Map(baseRegistry);
+        const validationRegistry = new Map(baseRegistry);
+        const mutations = [];
+        let closed = false;
+        const close = () => {
+            if (closed)
+                return;
+            closed = true;
+            const activeStages = this.activeStagesByScope.get(scopeId);
+            activeStages?.delete(stage);
+            if (activeStages?.size === 0)
+                this.activeStagesByScope.delete(scopeId);
+        };
+        const stage = {
+            registry,
+            validateRegistration: (id, incoming) => {
+                this.validateRegistration(validationRegistry, id, incoming);
+            },
+            record: (mutation) => {
+                mutations.push(mutation);
+                this.applyMutation(validationRegistry, mutation);
+            },
+            prepare: () => {
+                const replacement = new Map(baseRegistry);
+                for (const mutation of mutations) {
+                    this.applyMutation(replacement, mutation, true);
+                }
+                return {
+                    publish: () => {
+                        close();
+                        if (replacement.size === 0) {
+                            this.registriesByScope.delete(scopeId);
+                        }
+                        else {
+                            this.registriesByScope.set(scopeId, replacement);
+                        }
+                    },
+                };
+            },
+            abort: close,
+        };
+        transaction.stages.set(this, stage);
+        const activeStages = this.activeStagesByScope.get(scopeId) ?? new Set();
+        activeStages.add(stage);
+        this.activeStagesByScope.set(scopeId, activeStages);
+        return stage;
+    }
+    /** Record a live mutation in any in-flight transaction for this scope. */
+    recordLiveMutation(scopeId, mutation) {
+        for (const stage of this.activeStagesByScope.get(scopeId) ?? []) {
+            stage.record(mutation);
+        }
+    }
+    /** Read the active registry, routing transaction access to its staged copy. */
+    getActiveScopeRegistry(scopeId) {
+        return this.getTransactionStage(scopeId)?.registry ?? this.registriesByScope.get(scopeId);
+    }
     /**
      * Get or create registry for a specific project.
      */
@@ -67,11 +241,21 @@ export class ProjectScopedRegistryManager {
      */
     register(id, item) {
         const scopeId = this.getCurrentScopeId();
-        const registry = this.getScopeRegistry(scopeId);
+        const stage = this.getTransactionStage(scopeId);
+        const registry = stage?.registry ?? this.getScopeRegistry(scopeId);
+        if (stage)
+            stage.validateRegistration(id, item);
+        else
+            this.validateRegistration(registry, id, item);
         if (registry.has(id)) {
             agentLogger.debug(`[${this.registryName}] "${id}" already registered for scope ${scopeId}. Overwriting.`);
         }
         registry.set(id, item);
+        const mutation = { type: "set", id, item };
+        if (stage)
+            stage.record(mutation);
+        else
+            this.recordLiveMutation(scopeId, mutation);
         agentLogger.debug(`[${this.registryName}] Registered "${id}" for scope ${scopeId}`);
     }
     /**
@@ -79,6 +263,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 +278,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 +288,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 +303,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 +312,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,28 +325,50 @@ export class ProjectScopedRegistryManager {
      */
     delete(id) {
         const scopeId = this.getCurrentScopeId();
-        const registry = this.registriesByScope.get(scopeId);
-        if (!registry?.has(id))
+        const stage = this.getTransactionStage(scopeId);
+        const registry = stage?.registry ?? this.registriesByScope.get(scopeId);
+        const existed = registry?.has(id) ?? false;
+        if (!existed && !stage && !this.activeStagesByScope.has(scopeId))
             return false;
-        registry.delete(id);
+        registry?.delete(id);
+        const mutation = { type: "delete", id };
+        if (stage)
+            stage.record(mutation);
+        else
+            this.recordLiveMutation(scopeId, mutation);
         agentLogger.debug(`[${this.registryName}] Deleted "${id}" from scope ${scopeId}`);
-        return true;
+        return existed;
     }
     /**
      * Clear all items for the current project.
      */
     clear() {
-        this.clearProject(this.getCurrentScopeId());
+        const scopeId = this.getCurrentScopeId();
+        const stage = this.getTransactionStage(scopeId);
+        if (stage) {
+            stage.registry.clear();
+            stage.record({ type: "clear" });
+            return;
+        }
+        this.clearProject(scopeId);
     }
     /**
      * 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())) {
+        const scopeIds = new Set([
+            ...this.registriesByScope.keys(),
+            ...this.activeStagesByScope.keys(),
+        ]);
+        for (const scopeId of scopeIds) {
             if (scopeId === projectId || scopeId.startsWith(`${projectId}:`)) {
-                this.registriesByScope.delete(scopeId);
-                cleared = true;
+                cleared = this.registriesByScope.delete(scopeId) || cleared;
+                this.recordLiveMutation(scopeId, { type: "clear" });
             }
         }
         if (cleared) {
@@ -170,6 +379,17 @@ 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`);
+        }
+        const scopeIds = new Set([
+            ...this.registriesByScope.keys(),
+            ...this.activeStagesByScope.keys(),
+        ]);
+        for (const scopeId of scopeIds) {
+            this.recordLiveMutation(scopeId, { type: "clear" });
+        }
         this.registriesByScope.clear();
         this.sharedRegistry.clear();
         agentLogger.debug(`[${this.registryName}] Cleared all registries`);
@@ -185,7 +405,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/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/src/tool/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAiB7E,cAAM,iBAAkB,SAAQ,oBAAoB,CAAC,IAAI,CAAC;IAC/C,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;IAgB/C,mBAAmB,IAAI,cAAc,EAAE;CAGxC;AAED,kCAAkC;AAClC,eAAO,MAAM,YAAY,mBAAqC,CAAC;AAE/D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG,cAAc,CAenE"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/src/tool/registry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAGvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AA2B7E,cAAM,iBAAkB,SAAQ,oBAAoB,CAAC,IAAI,CAAC;IAC/C,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI;IAW/C,mBAAmB,IAAI,cAAc,EAAE;CAGxC;AAED,kCAAkC;AAClC,eAAO,MAAM,YAAY,mBAAqC,CAAC;AAE/D,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG,cAAc,CAenE"}

package/esm/src/tool/registry.js

@@ -3,7 +3,6 @@ import { agentLogger } from "../utils/logger/logger.js";
 import { ScopedRegistryFacade } from "../registry/scoped-registry-facade.js";
 import { ProjectScopedRegistryManager } from "../registry/project-scoped-registry-manager.js";
 import { TOOL_ID_CONFLICT } from "../errors/error-registry/agent.js";
-const toolManager = new ProjectScopedRegistryManager("tool");
 /**
  * Returns true when `incoming` is considered the same definition as `existing`:
  * same object reference, or matching id + description. Equivalent definitions
@@ -14,17 +13,23 @@ function isSameToolDefinition(existing, incoming) {
     return existing === incoming ||
         (existing.id === incoming.id && existing.description === incoming.description);
 }
+function validateToolRegistration(id, existing, incoming) {
+    if (isSameToolDefinition(existing, incoming))
+        return;
+    throw TOOL_ID_CONFLICT.create({
+        detail: `Tool "${id}" is already registered with a different definition. Use a unique tool ID or rename one of the conflicting tools.`,
+    });
+}
+const toolManager = new ProjectScopedRegistryManager("tool", {
+    validateRegistration: validateToolRegistration,
+});
 class ToolRegistryClass extends ScopedRegistryFacade {
     register(id, item) {
-        // Conflict-check against the project's own scope only: a project tool is
-        // allowed to shadow a shared/framework tool with the same ID.
+        // Equivalent-registration diagnostics inspect the project scope only;
+        // the manager enforces conflicts here and again against journaled order.
+        // Shared/framework tools remain intentionally shadowable.
         const existing = this.getOwn(id);
-        if (existing !== undefined && !isSameToolDefinition(existing, item)) {
-            throw TOOL_ID_CONFLICT.create({
-                detail: `Tool "${id}" is already registered with a different definition. Use a unique tool ID or rename one of the conflicting tools.`,
-            });
-        }
-        if (existing !== undefined && existing !== item) {
+        if (existing !== undefined && existing !== item && isSameToolDefinition(existing, item)) {
             agentLogger.debug(`[tool] "${id}" re-registered with equivalent definition; replacing.`);
         }
         super.register(id, item);

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.1072";
 //# 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.1072";

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":"AACA,OAAO,KAAK,EAAE,KAAK,EAAiB,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAehD,OAAO,KAAK,EACV,qBAAqB,EACrB,SAAS,EAGT,eAAe,EACf,YAAY,EACb,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AASpD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,IAAI,qBAAqB,GAAG,SAAS,CAErE;AAYD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EACrC,MAAM,EAAE,qBAAqB,GAAG,SAAS,EACzC,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAMZ;AAoBD,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,CAAC;IACnC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IAClC,IAAI,CAAC,IAAI,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iGAAiG;IACjG,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;IACvD,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3D,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACtD;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,oBAAoB,CAAwB;gBAExC,MAAM,GAAE,kBAAuB;IAIrC,OAAO,CACX,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,eAAe,EACxB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,UAAU,CAAC;IA4EtB,kFAAkF;IAClF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAgD;IAE1F;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAC6B;IAEtE,OAAO,CAAC,gBAAgB;IAqBxB,OAAO,CAAC,mBAAmB;IAY3B,OAAO,CAAC,KAAK;YAKC,YAAY;YASZ,kBAAkB;YA2ClB,wBAAwB;YAqBxB,WAAW;YAYX,YAAY;YAoBZ,WAAW;IAuBzB,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,mBAAmB;IA2B3B,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,OAAO;IAIT,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAMhF,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS;IAI7C,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS;IAI9E,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,SAAS,GAAG,SAAS;IAU7E,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS;CAG9C"}
+{"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;