@n8n/instance-ai 1.18.0 → 1.19.0

package/dist/tools/orchestration/agent-target-binding.d.ts

@@ -1,24 +1,40 @@
 import { z } from 'zod';
 import { type AgentPreviewSession } from './agent-preview-session-binding';
 import type { InstanceAiContext } from '../../types';
+export declare const PENDING_AGENT_METADATA_KEY = "instanceAiPendingAgentTarget";
 declare const agentBuilderTargetSchema: z.ZodObject<{
     agentId: z.ZodString;
     projectId: z.ZodString;
     name: z.ZodOptional<z.ZodString>;
+    ref: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     agentId: string;
     projectId: string;
     name?: string | undefined;
+    ref?: string | undefined;
 }, {
     agentId: string;
     projectId: string;
     name?: string | undefined;
+    ref?: string | undefined;
 }>;
 export type AgentBuilderTarget = z.infer<typeof agentBuilderTargetSchema>;
+declare const pendingAgentTargetSchema: z.ZodObject<{
+    projectId: z.ZodString;
+    agentId: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    projectId: string;
+    agentId: string;
+}, {
+    projectId: string;
+    agentId: string;
+}>;
+export type PendingAgentTarget = z.infer<typeof pendingAgentTargetSchema>;
+export declare function readPendingAgentTarget(context: InstanceAiContext): Promise<PendingAgentTarget | undefined>;
+export declare function normalizeAgentRef(value: string): string;
 export declare function resolveAgentBuilderTarget(context: InstanceAiContext): Promise<AgentBuilderTarget | undefined>;
 export declare function saveAgentBuilderTarget(context: InstanceAiContext, target: AgentBuilderTarget, options?: {
     previewSession?: AgentPreviewSession;
 }): Promise<void>;
-export declare function agentNamesMatch(a: string | undefined, b: string | undefined): boolean;
-export declare function findSessionAgentByName(context: InstanceAiContext, name: string): Promise<AgentBuilderTarget | undefined>;
+export declare function getSessionAgentByRef(context: InstanceAiContext, ref: string): Promise<AgentBuilderTarget | undefined>;
 export {};

package/dist/tools/orchestration/agent-target-binding.js

@@ -1,24 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PENDING_AGENT_METADATA_KEY = void 0;
+exports.readPendingAgentTarget = readPendingAgentTarget;
+exports.normalizeAgentRef = normalizeAgentRef;
 exports.resolveAgentBuilderTarget = resolveAgentBuilderTarget;
 exports.saveAgentBuilderTarget = saveAgentBuilderTarget;
-exports.agentNamesMatch = agentNamesMatch;
-exports.findSessionAgentByName = findSessionAgentByName;
+exports.getSessionAgentByRef = getSessionAgentByRef;
 const zod_1 = require("zod");
 const agent_preview_session_binding_1 = require("./agent-preview-session-binding");
 const thread_patch_1 = require("../../storage/thread-patch");
 const METADATA_KEY = 'instanceAiAgentBuilderTarget';
 const REGISTRY_METADATA_KEY = 'instanceAiAgentBuilderTargets';
+exports.PENDING_AGENT_METADATA_KEY = 'instanceAiPendingAgentTarget';
 const agentBuilderTargetSchema = zod_1.z.object({
     agentId: zod_1.z.string(),
     projectId: zod_1.z.string(),
     name: zod_1.z.string().optional(),
+    ref: zod_1.z.string().optional(),
 });
-const agentBuilderTargetRegistrySchema = zod_1.z.array(agentBuilderTargetSchema);
+const agentBuilderTargetRegistrySchema = zod_1.z.record(zod_1.z.string(), agentBuilderTargetSchema);
+const pendingAgentTargetSchema = zod_1.z.object({ projectId: zod_1.z.string(), agentId: zod_1.z.string() });
+async function readPendingAgentTarget(context) {
+    if (!context.threadMemory || !context.threadId)
+        return undefined;
+    try {
+        const thread = await (0, thread_patch_1.getThread)(context.threadMemory, context.threadId);
+        const parsed = pendingAgentTargetSchema.safeParse(thread?.metadata?.[exports.PENDING_AGENT_METADATA_KEY]);
+        return parsed.success ? parsed.data : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function normalizeAgentRef(value) {
+    return value
+        .trim()
+        .toLowerCase()
+        .replace(/[^\p{L}\p{N}]+/gu, '-')
+        .replace(/^-+|-+$/g, '');
+}
 function parseTarget(raw) {
     const parsed = agentBuilderTargetSchema.safeParse(raw);
     return parsed.success ? parsed.data : undefined;
 }
+function parseRegistry(raw) {
+    const parsed = agentBuilderTargetRegistrySchema.safeParse(raw);
+    return parsed.success ? parsed.data : {};
+}
 async function readThreadTarget(context) {
     if (!context.threadMemory || !context.threadId)
         return undefined;
@@ -43,17 +71,30 @@ async function saveAgentBuilderTarget(context, target, options) {
     await (0, thread_patch_1.patchThread)(context.threadMemory, {
         threadId: context.threadId,
         update: ({ metadata = {} }) => {
-            const parsed = agentBuilderTargetRegistrySchema.safeParse(metadata[REGISTRY_METADATA_KEY]);
-            const existingRegistry = parsed.success ? parsed.data : [];
-            const previous = existingRegistry.find((entry) => entry.agentId === target.agentId);
-            const entry = target.name === undefined && previous?.name !== undefined
-                ? { ...target, name: previous.name }
-                : target;
-            const registry = existingRegistry.filter((e) => e.agentId !== target.agentId);
-            registry.push(entry);
+            const { [exports.PENDING_AGENT_METADATA_KEY]: _pendingAgent, ...carriedMetadata } = metadata;
+            const existingRegistry = parseRegistry(metadata[REGISTRY_METADATA_KEY]);
+            const previousByAgentId = Object.values(existingRegistry).find((entry) => entry.agentId === target.agentId);
+            const entry = {
+                ...target,
+                ...(target.name === undefined && previousByAgentId?.name !== undefined
+                    ? { name: previousByAgentId.name }
+                    : {}),
+                ...(target.ref === undefined && previousByAgentId?.ref !== undefined
+                    ? { ref: previousByAgentId.ref }
+                    : {}),
+            };
+            const registry = { ...existingRegistry };
+            if (entry.ref) {
+                const normalized = normalizeAgentRef(entry.ref);
+                for (const [key, existing] of Object.entries(registry)) {
+                    if (existing.agentId === entry.agentId)
+                        delete registry[key];
+                }
+                registry[normalized] = { ...entry, ref: normalized };
+            }
             return {
                 metadata: {
-                    ...metadata,
+                    ...carriedMetadata,
                     [METADATA_KEY]: entry,
                     [REGISTRY_METADATA_KEY]: registry,
                     ...(options?.previewSession
@@ -64,21 +105,11 @@ async function saveAgentBuilderTarget(context, target, options) {
         },
     });
 }
-function agentNamesMatch(a, b) {
-    if (a === undefined || b === undefined)
-        return false;
-    return a.trim().toLowerCase() === b.trim().toLowerCase();
-}
-async function findSessionAgentByName(context, name) {
+async function getSessionAgentByRef(context, ref) {
     if (!context.threadMemory || !context.threadId)
         return undefined;
     const thread = await (0, thread_patch_1.getThread)(context.threadMemory, context.threadId);
-    const parsed = agentBuilderTargetRegistrySchema.safeParse(thread?.metadata?.[REGISTRY_METADATA_KEY]);
-    const registry = parsed.success ? parsed.data : [];
-    for (let i = registry.length - 1; i >= 0; i--) {
-        if (agentNamesMatch(registry[i].name, name))
-            return registry[i];
-    }
-    return undefined;
+    const registry = parseRegistry(thread?.metadata?.[REGISTRY_METADATA_KEY]);
+    return registry[normalizeAgentRef(ref)];
 }
 //# sourceMappingURL=agent-target-binding.js.map

package/dist/tools/orchestration/agent-target-binding.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-target-binding.js","sourceRoot":"","sources":["../../../src/tools/orchestration/agent-target-binding.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-target-binding.js","sourceRoot":"","sources":["../../../src/tools/orchestration/agent-target-binding.ts"],"names":[],"mappings":"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"}

package/dist/tools/orchestration/build-agent.tool.js

@@ -13,6 +13,7 @@ const tool_ids_1 = require("../tool-ids");
 const tracing_utils_1 = require("./tracing-utils");
 const BUILDER_SUB_AGENT_ROLE = 'agent-builder';
 const BUILDER_SUB_AGENT_KIND = 'agent-builder';
+const BUILDER_RUN_CANCELLED_MESSAGE = 'The agent builder run was cancelled.';
 function getErrorCode(error) {
     if (!(0, is_record_1.isRecord)(error))
         return undefined;
@@ -32,17 +33,6 @@ function didUpdateConfig(workSummary) {
     const mutationToolNames = new Set(api_types_1.CONFIG_MUTATION_TOOL_NAMES);
     return workSummary.toolCalls.some((call) => call.succeeded && mutationToolNames.has(call.toolName));
 }
-function trackConfigMutations(context, agentId, workSummary) {
-    const mutationToolNames = new Set(api_types_1.CONFIG_MUTATION_TOOL_NAMES);
-    for (const call of workSummary.toolCalls) {
-        if (!call.succeeded || !mutationToolNames.has(call.toolName))
-            continue;
-        context.trackTelemetry?.('Builder modified agent', {
-            thread_id: context.threadId,
-            agent_id: agentId,
-        });
-    }
-}
 function formatWorkflowContextEnvelope(workflowContext) {
     const lines = workflowContext.map((workflow) => `- ${workflow.name} (id: ${workflow.id})${workflow.description ? `: ${workflow.description}` : ''}`);
     return [
@@ -73,6 +63,7 @@ function builderSessionFor(context, agentId) {
         ...(context.tracing?.onMemoryTaskEvent
             ? { memoryTaskObserver: context.tracing.onMemoryTaskEvent }
             : {}),
+        abortSignal: context.abortSignal,
     };
 }
 function builderAgentIdFor(agentId) {
@@ -85,31 +76,35 @@ const buildAgentInputSchema = zod_1.z.object({
         .describe('The instruction or user message to forward to the agent builder. The builder cannot ' +
         'see this chat — include every requirement, decision, and user answer already ' +
         'gathered in this conversation, not just the latest message.'),
-    name: zod_1.z
+    agentRef: zod_1.z
         .string()
         .optional()
-        .describe('Agent name. A name matching an agent already built in this conversation switches back ' +
-        'to that agent; a new name creates a new agent and makes it the active target. Omit on ' +
-        'follow-up calls for the current agent. Combine with `createNew: true` to force creating ' +
-        'a fresh agent when the name matches one built earlier this conversation.'),
-    createNew: zod_1.z
-        .boolean()
+        .describe('Short stable key you choose once for an agent in this conversation and repeat on ' +
+        'every later call for that same agent (like a workflow source filePath). Prefer a ' +
+        'slug of the display name. A repeated key continues that agent; a fresh key creates ' +
+        'a new one only when no agent is bound yet, or alongside `createNew`. Omit on ' +
+        'follow-ups for the current agent when neither switching nor creating — the active ' +
+        'target is used. When omitted on a create/switch call, the key is derived from `name`.'),
+    name: zod_1.z
+        .string()
         .optional()
-        .describe('Set true when the user asks to create a brand-new agent. Bypasses the same-name ' +
-        'switch-back: with createNew, `name` always creates a fresh agent even if that name ' +
-        'matches one built earlier in this conversation. Requires `name`; never combine with ' +
-        '`agentId`. Omit for edits, follow-ups, and switch-backs.'),
+        .describe('Display name for a new agent (required when creating). Also used as the addressing ' +
+        'key when `agentRef` is omitted. Omit on follow-up calls for the current agent.'),
     agentId: zod_1.z
         .string()
         .optional()
-        .describe('Existing agent id to edit — use the `agentId` returned by earlier build-agent ' +
-        'results. Pass to start editing that agent or to switch the active build target; ' +
-        'omit on follow-up calls. Only pass this when the user explicitly wants to change ' +
-        'that specific existing agent. NEVER pass it for a request to build/create a NEW ' +
-        'agent — even if an agent with the same or a similar name already exists in the ' +
-        'project (duplicate names are allowed). Agents the request merely references — as ' +
-        'sub-agents, delegation targets, or examples — are not the build target: mention ' +
-        'them in `message` instead.'),
+        .describe('Existing agent id to adopt — use when editing an agent that was not built in this ' +
+        'conversation (e.g. from the project list). Once adopted, omit on retries and prefer ' +
+        '`agentRef`. NEVER pass for a request to build a NEW agent. Agents the request merely ' +
+        'references — as sub-agents, delegation targets, or examples — are not the build ' +
+        'target: mention them in `message` instead.'),
+    createNew: zod_1.z
+        .boolean()
+        .optional()
+        .describe('Set to true ONLY when the user explicitly wants an ADDITIONAL agent alongside the one ' +
+        'this conversation is already building. Leave unset otherwise: while a target is ' +
+        'bound, a fresh `agentRef`/`name` continues that agent instead of creating a second ' +
+        'one, so naming the agent for the first time cannot strand it behind a duplicate.'),
     workflowContext: zod_1.z
         .array(zod_1.z.object({ id: zod_1.z.string(), name: zod_1.z.string(), description: zod_1.z.string().optional() }))
         .optional()
@@ -123,7 +118,11 @@ const buildAgentOutputSchema = zod_1.z.object({
     agentId: zod_1.z
         .string()
         .optional()
-        .describe('Id of the agent this turn targeted. Record it and pass it as `agentId` when switching back to this agent later.'),
+        .describe('Id of the agent this turn targeted. Prefer `agentRef` for follow-ups in this conversation; use `agentId` when the ref is unknown.'),
+    agentRef: zod_1.z
+        .string()
+        .optional()
+        .describe('Addressing key for this agent in this conversation. Pass it back as `agentRef` on later calls for the same agent.'),
     agentName: zod_1.z.string().optional().describe('Display name of the targeted agent, when known.'),
     answers: zod_1.z
         .array(api_types_1.questionAnswerSchema)
@@ -135,7 +134,12 @@ const builderCheckpointRefSchema = zod_1.z.object({
     toolCallId: zod_1.z.string(),
     configUpdated: zod_1.z.boolean(),
     target: zod_1.z
-        .object({ agentId: zod_1.z.string(), projectId: zod_1.z.string(), name: zod_1.z.string().optional() })
+        .object({
+        agentId: zod_1.z.string(),
+        projectId: zod_1.z.string(),
+        name: zod_1.z.string().optional(),
+        ref: zod_1.z.string().optional(),
+    })
         .optional(),
 });
 const builderSuspendPayloadSchema = zod_1.z.union([
@@ -183,6 +187,14 @@ function publishAgentBuilderFailure(context, builderAgentId, error) {
     });
     return message;
 }
+function publishAgentBuilderCancelled(context, builderAgentId) {
+    context.eventBus.publish(context.threadId, {
+        type: 'agent-completed',
+        runId: context.runId,
+        agentId: builderAgentId,
+        payload: { role: BUILDER_SUB_AGENT_ROLE, result: '', status: 'cancelled' },
+    });
+}
 async function finishTurn(context, builderAgentId, result, carriedConfigUpdated) {
     if (result.status === 'completed') {
         const text = await result.text;
@@ -206,7 +218,11 @@ async function finishTurn(context, builderAgentId, result, carriedConfigUpdated)
     return { ok: false, error, configUpdated };
 }
 function targetIdentity(target) {
-    return { agentId: target.agentId, ...(target.name ? { agentName: target.name } : {}) };
+    return {
+        agentId: target.agentId,
+        ...(target.ref ? { agentRef: target.ref } : {}),
+        ...(target.name ? { agentName: target.name } : {}),
+    };
 }
 async function runBuilderConsumeLoop(params) {
     const { context, delegate, ctx, target, builderAgentId, turn, carriedConfigUpdated, onSettled, traceInputs, dedupeBase, } = params;
@@ -244,7 +260,13 @@ async function runBuilderConsumeLoop(params) {
         throw error;
     }
     await onSettled?.();
-    trackConfigMutations(context, target.agentId, result.workSummary);
+    if (result.status === 'cancelled') {
+        const cancelled = (0, agents_1.createAbortError)(BUILDER_RUN_CANCELLED_MESSAGE);
+        publishAgentBuilderCancelled(context, builderAgentId);
+        await (0, tracing_utils_1.failTraceRun)(context, traceRun, cancelled);
+        await context.claimSubAgentUsage?.(dedupeBase, result.usage?.usage ?? [], result.status);
+        throw cancelled;
+    }
     try {
         const freshName = await delegate.resolveAgentName(target.agentId);
         if (freshName && freshName !== target.name) {
@@ -313,6 +335,7 @@ async function runBuilderConsumeLoop(params) {
                 agentId: target.agentId,
                 projectId: target.projectId,
                 ...(target.name ? { name: target.name } : {}),
+                ...(target.ref ? { ref: target.ref } : {}),
             },
         },
     });
@@ -386,75 +409,138 @@ async function handleResume(context, domainContext, delegate, ctx) {
         dedupeBase: `${context.runId}:${ctx.toolCallId ?? builderAgentId}:${ref.toolCallId}`,
     });
 }
-const NO_TARGET_INPUT_ERROR = 'Pass name to create a new agent or agentId to edit an existing one.';
-const CREATE_NEW_INPUT_ERROR = 'createNew requires `name` and cannot be combined with `agentId` — pass `name` only to create a new agent.';
+const NO_TARGET_INPUT_ERROR = 'Pass `name` (and optionally `agentRef`) to create a new agent, `agentId` to adopt an existing one, or omit both to continue the current agent.';
+const UNKNOWN_REF_ERROR = 'Unknown `agentRef`. Pass `name` to create a new agent under that key, or `agentId` to adopt an existing agent.';
 const AGENT_ID_NEEDS_PROJECT_ERROR = 'Cannot bind to agentId without an active project context. Start this conversation from within a project.';
-function buildAgentTargetNameMismatchError(agentId, realName, passedName) {
-    return (`Agent ${agentId} is named "${realName}", but name "${passedName}" was passed. ` +
-        `To create a new agent named "${passedName}", pass \`name\` only (no \`agentId\`). ` +
-        `To edit "${realName}", pass \`agentId\` only and put any rename instruction in \`message\`.`);
-}
-function rejectAgentTargetNameMismatch(agentId, realName, passedName) {
-    if (!passedName || !realName || (0, agent_target_binding_1.agentNamesMatch)(passedName, realName)) {
+async function resolveAgentNameSafely(delegate, agentId) {
+    try {
+        return await delegate.resolveAgentName(agentId);
+    }
+    catch {
         return undefined;
     }
-    return { ok: false, error: buildAgentTargetNameMismatchError(agentId, realName, passedName) };
+}
+async function pendingAgentIdFor(context) {
+    const pending = await (0, agent_target_binding_1.readPendingAgentTarget)(context);
+    return pending && pending.projectId === context.projectId ? pending.agentId : undefined;
+}
+function agentRefConflictError(ref, boundAgentId, passedAgentId) {
+    return (`\`agentRef\` "${ref}" is already bound to agent ${boundAgentId} in this conversation, ` +
+        `but \`agentId\` ${passedAgentId} was passed. Continue the bound agent (omit \`agentId\`, ` +
+        'or pass its id), or pick a different `agentRef` for a new agent.');
 }
 async function resolveTargetForCall(domainContext, delegate, input, boundTarget) {
-    if (input.createNew && (input.agentId || !input.name)) {
-        return { ok: false, error: CREATE_NEW_INPUT_ERROR };
+    const keySource = input.agentRef ?? input.name;
+    const key = keySource ? (0, agent_target_binding_1.normalizeAgentRef)(keySource) : undefined;
+    if (key) {
+        const sessionAgent = await (0, agent_target_binding_1.getSessionAgentByRef)(domainContext, key);
+        if (sessionAgent) {
+            if (input.agentId && input.agentId !== sessionAgent.agentId) {
+                return {
+                    ok: false,
+                    error: agentRefConflictError(key, sessionAgent.agentId, input.agentId),
+                };
+            }
+            const target = {
+                ...sessionAgent,
+                ref: key,
+                ...(input.name ? { name: input.name } : {}),
+            };
+            if (boundTarget && boundTarget.agentId === target.agentId) {
+                return {
+                    ok: true,
+                    target: { ...boundTarget, ...target },
+                    bindAfterTurn: false,
+                    mode: 'edit',
+                };
+            }
+            return { ok: true, target, bindAfterTurn: true, mode: 'edit' };
+        }
+        const boundKey = boundTarget?.ref
+            ? (0, agent_target_binding_1.normalizeAgentRef)(boundTarget.ref)
+            : boundTarget?.name
+                ? (0, agent_target_binding_1.normalizeAgentRef)(boundTarget.name)
+                : undefined;
+        if (boundTarget && boundKey === key) {
+            if (input.agentId && input.agentId !== boundTarget.agentId) {
+                return {
+                    ok: false,
+                    error: agentRefConflictError(key, boundTarget.agentId, input.agentId),
+                };
+            }
+            return {
+                ok: true,
+                target: { ...boundTarget, ref: key, ...(input.name ? { name: input.name } : {}) },
+                bindAfterTurn: false,
+                mode: 'edit',
+            };
+        }
+        if (input.agentId) {
+            if (boundTarget && input.agentId === boundTarget.agentId) {
+                return {
+                    ok: true,
+                    target: { ...boundTarget, ref: key, ...(input.name ? { name: input.name } : {}) },
+                    bindAfterTurn: false,
+                    mode: 'edit',
+                };
+            }
+            if (!domainContext.projectId) {
+                return { ok: false, error: AGENT_ID_NEEDS_PROJECT_ERROR };
+            }
+            const name = input.name ?? (await resolveAgentNameSafely(delegate, input.agentId));
+            return {
+                ok: true,
+                target: {
+                    agentId: input.agentId,
+                    projectId: domainContext.projectId,
+                    ref: key,
+                    ...(name ? { name } : {}),
+                },
+                bindAfterTurn: true,
+                mode: 'edit',
+            };
+        }
+        if (input.name) {
+            if (boundTarget && !input.createNew) {
+                return {
+                    ok: true,
+                    target: { ...boundTarget, ref: key },
+                    bindAfterTurn: true,
+                    mode: 'continued',
+                };
+            }
+            const created = await delegate.createAgent(input.name, await pendingAgentIdFor(domainContext));
+            const target = {
+                agentId: created.agentId,
+                projectId: created.projectId,
+                name: input.name,
+                ref: key,
+            };
+            domainContext.agentBuilderTarget = target;
+            await (0, agent_target_binding_1.saveAgentBuilderTarget)(domainContext, target);
+            return { ok: true, target, bindAfterTurn: false, mode: 'create' };
+        }
+        return { ok: false, error: UNKNOWN_REF_ERROR };
     }
     if (input.agentId) {
         if (boundTarget && input.agentId === boundTarget.agentId) {
-            const mismatch = rejectAgentTargetNameMismatch(input.agentId, boundTarget.name, input.name);
-            if (mismatch)
-                return mismatch;
             return { ok: true, target: boundTarget, bindAfterTurn: false, mode: 'edit' };
         }
         if (!domainContext.projectId) {
             return { ok: false, error: AGENT_ID_NEEDS_PROJECT_ERROR };
         }
-        let name;
-        try {
-            name = await delegate.resolveAgentName(input.agentId);
-        }
-        catch {
-            name = undefined;
-        }
-        const mismatch = rejectAgentTargetNameMismatch(input.agentId, name, input.name);
-        if (mismatch)
-            return mismatch;
+        const name = await resolveAgentNameSafely(delegate, input.agentId);
         return {
             ok: true,
             target: {
                 agentId: input.agentId,
                 projectId: domainContext.projectId,
-                ...(name ? { name } : {}),
+                ...(name ? { name, ref: (0, agent_target_binding_1.normalizeAgentRef)(name) } : {}),
             },
             bindAfterTurn: true,
             mode: 'edit',
         };
     }
-    if (input.name) {
-        if (!input.createNew) {
-            if (boundTarget && (0, agent_target_binding_1.agentNamesMatch)(input.name, boundTarget.name)) {
-                return { ok: true, target: boundTarget, bindAfterTurn: false, mode: 'edit' };
-            }
-            const sessionAgent = await (0, agent_target_binding_1.findSessionAgentByName)(domainContext, input.name);
-            if (sessionAgent) {
-                return { ok: true, target: sessionAgent, bindAfterTurn: true, mode: 'edit' };
-            }
-        }
-        const created = await delegate.createAgent(input.name);
-        const target = {
-            agentId: created.agentId,
-            projectId: created.projectId,
-            name: input.name,
-        };
-        domainContext.agentBuilderTarget = target;
-        await (0, agent_target_binding_1.saveAgentBuilderTarget)(domainContext, target);
-        return { ok: true, target, bindAfterTurn: false, mode: 'create' };
-    }
     if (boundTarget) {
         return { ok: true, target: boundTarget, bindAfterTurn: false, mode: 'edit' };
     }
@@ -470,28 +556,30 @@ function createBuildAgentTool(context) {
         'tools. If a workflow build seems to need a utility tool the workspace does not ' +
         'provide, ask the user or use a placeholder; do not route around that by calling ' +
         '`build-agent`. ' +
-        'Pass `name` to start a new agent or `agentId` to edit an existing one; calls ' +
-        'without either keep editing the current agent. Create vs. edit follows user ' +
-        'intent, not name collisions: a request to build a NEW agent always passes `name` ' +
-        'plus `createNew: true` — never `agentId` — even when a same-named agent already exists in the ' +
-        'project. To build ANOTHER agent in the same ' +
-        'conversation, pass its `name` or `agentId` — a name matching an agent already built ' +
-        'in this conversation switches back to it (unless `createNew: true` is passed); an unmatched name creates a new agent and ' +
-        'switches the active target. The builder can also publish or unpublish the target ' +
+        'Address agents in this conversation with `agentRef` (a short stable key you choose, ' +
+        'like a workflow `filePath`). Pass `name` with a fresh key to create the first agent; ' +
+        'repeat the same key to continue. Calls with neither key nor `agentId` keep editing ' +
+        'the current agent, and so does a fresh key once an agent is bound — naming an agent ' +
+        'never silently creates a second one. To build ANOTHER agent in the same ' +
+        'conversation, pass `createNew: true` with a different `agentRef` and `name`. To edit ' +
+        'an agent that was not built here, pass `agentId` (optionally with `agentRef`) once ' +
+        'to adopt it. The builder can also publish or unpublish the target ' +
         'agent when the user asks to publish, activate, make it live/usable, or unpublish — ' +
         'forward that intent in `message`; never tell the user to open the agent editor and ' +
         'click Publish. When the builder needs user input (a choice, a ' +
         'credential, or a chat channel), it surfaces automatically as an interactive card in ' +
         'this chat — do not relay those questions yourself; this tool call resumes with the ' +
         'user’s answer and returns the builder’s reply. Returns the builder’s reply, the ' +
-        'target `agentId`, and whether it updated the agent config. Record the returned ' +
-        '`agentId` and prefer passing it as `agentId` when switching back to that agent — ' +
-        'the `name` path is a fallback for when the id is unknown.')
+        'target `agentRef`/`agentId`, and whether it updated the agent config. Prefer the ' +
+        'returned `agentRef` on later calls for that agent.')
         .input(buildAgentInputSchema)
         .output(buildAgentOutputSchema)
         .suspend(buildAgentSuspendSchema)
         .resume(buildAgentResumeSchema)
         .handler(async (input, ctx) => {
+        if (context.abortSignal.aborted) {
+            throw (0, agents_1.createAbortError)(BUILDER_RUN_CANCELLED_MESSAGE);
+        }
         const domainContext = context.domainContext;
         const delegate = domainContext?.builderDelegate;
         if (!domainContext || !delegate) {