@keystrokehq/keystroke 0.1.20 → 0.1.22

package/dist/agent.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_dist = require("./dist-BKL5duJl.cjs");
 const require_dist$1 = require("./dist-DqZUy3u_.cjs");
-const require_dist$2 = require("./dist-BFCT4aiu.cjs");
+const require_dist$2 = require("./dist-D69ocJ7u.cjs");
 const require_dist$3 = require("./dist-D2U-6NPJ.cjs");
 let zod = require("zod");
 let node_async_hooks = require("node:async_hooks");
@@ -1609,8 +1609,53 @@ async function resolveAgentWorkspaceRoot(agentId, sessionId, options) {
 		sessionRoot
 	};
 }
+const subagentParameters = zod.z.object({ message: zod.z.string().describe("Task or question for the subagent") });
+function defaultToMessage(params) {
+	if (typeof params === "object" && params !== null && "message" in params) {
+		const message = params.message;
+		if (typeof message === "string" && message.length > 0) return message;
+	}
+	throw new Error("Subagent tool params must include a non-empty \"message\" string.");
+}
+function toSubagentTool(agent) {
+	const name = agent.slug;
+	return require_dist.defineTool({
+		name,
+		label: name,
+		description: agent.description ?? name,
+		parameters: subagentParameters,
+		async execute(toolCallId, params, signal) {
+			if (signal?.aborted) throw new Error("Operation aborted");
+			const result = await require_dist$2.withSpan({
+				kind: "tool_call",
+				name,
+				refId: toolCallId,
+				metadata: {
+					tool: name,
+					type: "subagent"
+				}
+			}, async () => runDirectAgentPrompt(agent, agent.slug, { message: defaultToMessage(params) }, { tracing: { trigger: "subagent" } }));
+			if (result.error) throw new Error(result.error);
+			return {
+				content: [{
+					type: "text",
+					text: result.text
+				}],
+				details: {
+					sessionId: result.sessionId,
+					error: result.error
+				}
+			};
+		}
+	});
+}
+function assertUniqueToolName(seen, tool) {
+	if (seen.has(tool.name)) throw new Error(`Duplicate agent tool name "${tool.name}" in tools[]`);
+	seen.add(tool.name);
+}
 async function resolveAgentTools(tools, resolver, options) {
 	const prepared = [];
+	const seenNames = /* @__PURE__ */ new Set();
 	const mcpToolSet = {};
 	const mcpConnections = [];
 	for (const item of tools) {
@@ -1621,7 +1666,7 @@ async function resolveAgentTools(tools, resolver, options) {
 			continue;
 		}
 		if (require_dist$1.isAction(item)) {
-			prepared.push(require_dist$1.resolveActionTool(item, {
+			const tool = require_dist$1.resolveActionTool(item, {
 				resolveCredentials: (requirements, consumer, contextOverride) => require_dist$2.resolveActionCredentials(requirements, {
 					resolveCredentials: resolver.resolve.bind(resolver),
 					consumer,
@@ -1633,9 +1678,24 @@ async function resolveAgentTools(tools, resolver, options) {
 					id: item.slug
 				},
 				mcpCredentialContext: options?.mcpCredentialContext
-			}));
+			});
+			assertUniqueToolName(seenNames, tool);
+			prepared.push(tool);
+			continue;
+		}
+		if (require_dist$2.isWorkflow(item)) {
+			const tool = require_dist$2.resolveWorkflowTool(item);
+			assertUniqueToolName(seenNames, tool);
+			prepared.push(tool);
 			continue;
 		}
+		if (isAgent(item)) {
+			const tool = toSubagentTool(item);
+			assertUniqueToolName(seenNames, tool);
+			prepared.push(tool);
+			continue;
+		}
+		assertUniqueToolName(seenNames, item);
 		prepared.push(item);
 	}
 	return {
@@ -1791,6 +1851,11 @@ function normalizeAgentDefinition(input, options = {}) {
 		...input.web !== void 0 ? { web: input.web } : {}
 	};
 }
+const AGENT = Symbol.for("keystroke.agent");
+function isAgent(value) {
+	if (typeof value !== "object" || value === null) return false;
+	return value[AGENT] === true;
+}
 /**
 * Define an agent: normalized config plus a pipeline that builds sandbox + pi runtime on demand.
 */
@@ -1814,57 +1879,11 @@ function defineAgent(input) {
 				});
 			}
 			return runDirectAgentPrompt(agent, slug, promptInput, runPrompt);
-		})
+		}),
+		[AGENT]: true
 	};
 	return agent;
 }
-const SUBAGENT_TOOL = Symbol.for("keystroke.subagent.tool");
-function getSubagentToolMetadata(tool) {
-	return tool[SUBAGENT_TOOL];
-}
-function defaultToMessage(params) {
-	if (typeof params === "object" && params !== null && "message" in params) {
-		const message = params.message;
-		if (typeof message === "string" && message.length > 0) return message;
-	}
-	throw new Error("Subagent tool params must include a \"message\" string, or pass toMessage to defineSubagentTool.");
-}
-function defineSubagentTool(input) {
-	const { agent, inherit, toMessage = defaultToMessage, ...toolDef } = input;
-	const metadata = {
-		agent,
-		inherit
-	};
-	const subagentTool = require_dist.defineTool({
-		...toolDef,
-		description: toolDef.description ?? toolDef.label,
-		async execute(toolCallId, params, signal) {
-			if (signal?.aborted) throw new Error("Operation aborted");
-			const result = await require_dist$2.withSpan({
-				kind: "tool_call",
-				name: toolDef.name,
-				refId: toolCallId,
-				metadata: {
-					tool: toolDef.name,
-					type: "subagent"
-				}
-			}, async () => runDirectAgentPrompt(agent, agent.slug, { message: toMessage(params) }, { tracing: { trigger: "subagent" } }));
-			if (result.error) throw new Error(result.error);
-			return {
-				content: [{
-					type: "text",
-					text: result.text
-				}],
-				details: {
-					sessionId: result.sessionId,
-					error: result.error
-				}
-			};
-		}
-	});
-	subagentTool[SUBAGENT_TOOL] = metadata;
-	return subagentTool;
-}
 const STATIC_MODEL_IDS = new Set([
 	"alibaba/qwen-3-14b",
 	"alibaba/qwen-3-235b",
@@ -2262,10 +2281,10 @@ async function runLlm(opts, hooks) {
 	return runPromptText(opts, hooks);
 }
 //#endregion
+exports.AGENT = AGENT;
 exports.AgentCreateInputSchema = AgentCreateInputSchema;
 exports.AgentModelIdSchema = AgentModelIdSchema;
 exports.DEFAULT_THINKING_LEVEL = DEFAULT_THINKING_LEVEL;
-exports.SUBAGENT_TOOL = SUBAGENT_TOOL;
 exports.SessionAgentMismatchError = SessionAgentMismatchError;
 exports.ThinkingLevelSchema = ThinkingLevelSchema;
 exports.agentModelIdsFromStoredManifest = agentModelIdsFromStoredManifest;
@@ -2275,9 +2294,8 @@ exports.connectMcpServer = require_dist$2.connectMcpServer;
 exports.connectMcpStdio = require_dist$2.connectMcpStdio;
 exports.defineAgent = defineAgent;
 exports.defineMcp = require_dist$2.defineMcp;
-exports.defineSubagentTool = defineSubagentTool;
 exports.defineTool = require_dist.defineTool;
-exports.getSubagentToolMetadata = getSubagentToolMetadata;
+exports.isAgent = isAgent;
 exports.isMcp = require_dist$2.isMcp;
 exports.loadAssetManifest = require_dist$3.loadAssetManifest;
 exports.modelSupportsMediaType = require_dist.modelSupportsMediaType;