@inkeep/agents-cli 0.58.10 → 0.58.12

package/dist/commands/pull-v4/generators/function-tool-generator.js

@@ -1,48 +1,36 @@
-import { addValueToObject, createFactoryDefinition, toCamelCase } from "../utils.js";
+import { addValueToObject, createFactoryDefinition, toToolReferenceName } from "../utils.js";
+import { FullProjectDefinitionSchema } from "@inkeep/agents-core";
 import { z } from "zod";
 
 //#region src/commands/pull-v4/generators/function-tool-generator.ts
-const FunctionToolSchema = z.looseObject({
-	functionToolId: z.string().nonempty(),
-	name: z.string().nonempty(),
-	description: z.string().optional(),
-	inputSchema: z.unknown().optional(),
-	schema: z.unknown().optional(),
-	executeCode: z.string().optional(),
-	execute: z.string().optional()
-}).superRefine((value, context) => {
-	if (value.inputSchema === void 0 && value.schema === void 0) context.addIssue({
-		code: "custom",
-		message: "inputSchema is required",
-		path: ["inputSchema"]
-	});
-	if (value.executeCode === void 0 && value.execute === void 0) context.addIssue({
-		code: "custom",
-		message: "executeCode is required",
-		path: ["executeCode"]
-	});
+const MySchema = FullProjectDefinitionSchema.shape.functions.unwrap().valueType.omit({ id: true });
+const MySchema2 = FullProjectDefinitionSchema.shape.functionTools.unwrap().valueType.omit({
+	id: true,
+	functionId: true
+});
+const FunctionToolSchema = z.strictObject({
+	...MySchema.shape,
+	...MySchema2.shape,
+	name: z.preprocess((v) => v ?? "", MySchema2.shape.name),
+	description: z.preprocess((v) => v || void 0, MySchema2.shape.description),
+	functionToolId: z.string().nonempty()
 });
 function generateFunctionToolDefinition(data) {
 	const result = FunctionToolSchema.safeParse(data);
 	if (!result.success) throw new Error(`Validation failed for function tool:\n${z.prettifyError(result.error)}`);
-	const parsed = result.data;
+	const { functionToolId, executeCode, ...parsed } = result.data;
 	const { sourceFile, configObject } = createFactoryDefinition({
 		importName: "functionTool",
-		variableName: toCamelCase(parsed.functionToolId)
+		variableName: toToolReferenceName(parsed.name || functionToolId)
 	});
-	writeFunctionToolConfig(configObject, parsed);
-	return sourceFile;
-}
-function writeFunctionToolConfig(configObject, { functionToolId, executeCode, inputSchema, schema, ...rest }) {
-	for (const [k, v] of Object.entries({
-		...rest,
-		inputSchema: inputSchema ?? schema
-	})) addValueToObject(configObject, k, v);
+	for (const [k, v] of Object.entries(parsed)) addValueToObject(configObject, k, v);
 	if (executeCode) configObject.addPropertyAssignment({
 		name: "execute",
 		initializer: executeCode
 	});
+	return sourceFile;
 }
 
 //#endregion
-export { generateFunctionToolDefinition };
+export { generateFunctionToolDefinition };
+//# sourceMappingURL=function-tool-generator.js.map

package/dist/commands/pull-v4/generators/function-tool-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"function-tool-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/function-tool-generator.ts"],"sourcesContent":["import { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport type { SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport { addValueToObject, createFactoryDefinition, toToolReferenceName } from '../utils';\n\nconst MySchema = FullProjectDefinitionSchema.shape.functions.unwrap().valueType.omit({\n  id: true,\n});\nconst MySchema2 = FullProjectDefinitionSchema.shape.functionTools.unwrap().valueType.omit({\n  id: true,\n  functionId: true,\n});\n\nconst FunctionToolSchema = z.strictObject({\n  ...MySchema.shape,\n  ...MySchema2.shape,\n  name: z.preprocess((v) => v ?? '', MySchema2.shape.name),\n  // Even empty description should exist, otherwise agent-sdk show type error\n  // dependencies: z.preprocess(\n  //   (v) => (v && Object.keys(v).length && v) || undefined,\n  //   MySchema.shape.dependencies\n  // ),\n  description: z.preprocess((v) => v || undefined, MySchema2.shape.description),\n  functionToolId: z.string().nonempty(),\n});\n\ntype FunctionToolInput = z.input<typeof FunctionToolSchema>;\n\nexport function generateFunctionToolDefinition(data: FunctionToolInput): SourceFile {\n  const result = FunctionToolSchema.safeParse(data);\n  if (!result.success) {\n    throw new Error(`Validation failed for function tool:\\n${z.prettifyError(result.error)}`);\n  }\n\n  const { functionToolId, executeCode, ...parsed } = result.data;\n  const { sourceFile, configObject } = createFactoryDefinition({\n    importName: 'functionTool',\n    variableName: toToolReferenceName(parsed.name || functionToolId),\n  });\n\n  for (const [k, v] of Object.entries(parsed)) {\n    addValueToObject(configObject, k, v);\n  }\n  if (executeCode) {\n    configObject.addPropertyAssignment({\n      name: 'execute',\n      initializer: executeCode,\n    });\n  }\n  return sourceFile;\n}\n"],"mappings":";;;;;AAKA,MAAM,WAAW,4BAA4B,MAAM,UAAU,QAAQ,CAAC,UAAU,KAAK,EACnF,IAAI,MACL,CAAC;AACF,MAAM,YAAY,4BAA4B,MAAM,cAAc,QAAQ,CAAC,UAAU,KAAK;CACxF,IAAI;CACJ,YAAY;CACb,CAAC;AAEF,MAAM,qBAAqB,EAAE,aAAa;CACxC,GAAG,SAAS;CACZ,GAAG,UAAU;CACb,MAAM,EAAE,YAAY,MAAM,KAAK,IAAI,UAAU,MAAM,KAAK;CAMxD,aAAa,EAAE,YAAY,MAAM,KAAK,QAAW,UAAU,MAAM,YAAY;CAC7E,gBAAgB,EAAE,QAAQ,CAAC,UAAU;CACtC,CAAC;AAIF,SAAgB,+BAA+B,MAAqC;CAClF,MAAM,SAAS,mBAAmB,UAAU,KAAK;AACjD,KAAI,CAAC,OAAO,QACV,OAAM,IAAI,MAAM,yCAAyC,EAAE,cAAc,OAAO,MAAM,GAAG;CAG3F,MAAM,EAAE,gBAAgB,aAAa,GAAG,WAAW,OAAO;CAC1D,MAAM,EAAE,YAAY,iBAAiB,wBAAwB;EAC3D,YAAY;EACZ,cAAc,oBAAoB,OAAO,QAAQ,eAAe;EACjE,CAAC;AAEF,MAAK,MAAM,CAAC,GAAG,MAAM,OAAO,QAAQ,OAAO,CACzC,kBAAiB,cAAc,GAAG,EAAE;AAEtC,KAAI,YACF,cAAa,sBAAsB;EACjC,MAAM;EACN,aAAa;EACd,CAAC;AAEJ,QAAO"}

package/dist/commands/pull-v4/generators/mcp-tool-generator.js

@@ -1,91 +1,50 @@
-import { addValueToObject, createFactoryDefinition, formatInlineLiteral, formatStringLiteral, toCamelCase } from "../utils.js";
+import { addValueToObject, createFactoryDefinition, formatStringLiteral, toToolReferenceName } from "../utils.js";
+import { FullProjectDefinitionSchema } from "@inkeep/agents-core";
 import { z } from "zod";
 
 //#region src/commands/pull-v4/generators/mcp-tool-generator.ts
-const McpToolSchema = z.object({
+const MySchema = FullProjectDefinitionSchema.shape.tools.valueType.omit({
+	id: true,
+	lastError: true
+});
+const McpToolSchema = z.strictObject({
 	mcpToolId: z.string().nonempty(),
-	name: z.string().nonempty(),
-	description: z.string().nullable().optional(),
-	config: z.looseObject({ mcp: z.looseObject({
-		server: z.looseObject({ url: z.string().optional() }).optional(),
-		transport: z.unknown().optional(),
-		activeTools: z.array(z.unknown()).optional()
-	}).optional() }).optional(),
-	serverUrl: z.string().optional(),
-	transport: z.object({ type: z.string() }).optional(),
-	activeTools: z.array(z.unknown()).optional(),
-	imageUrl: z.string().nullish().transform((value) => value ?? void 0),
-	headers: z.unknown().optional(),
-	credential: z.unknown().optional(),
-	credentialReferenceId: z.string().nullish()
-}).superRefine((value, context) => {
-	if (!resolveServerUrl(value)) context.addIssue({
-		code: "custom",
-		message: "serverUrl is required (from config.mcp.server.url or serverUrl)",
-		path: ["serverUrl"]
-	});
+	...MySchema.shape,
+	description: z.preprocess((v) => v ?? void 0, MySchema.shape.description),
+	headers: z.preprocess((v) => v ?? void 0, MySchema.shape.headers),
+	capabilities: z.preprocess((v) => v && Object.keys(v).length && v || void 0, MySchema.shape.capabilities),
+	imageUrl: z.preprocess((v) => v || void 0, MySchema.shape.imageUrl),
+	credential: z.record(z.string(), z.unknown()).optional()
 });
-function generateMcpToolDefinition(data) {
+function generateMcpToolDefinition({ tenantId, id, projectId, createdAt, updatedAt, lastError, ...data }) {
 	const result = McpToolSchema.safeParse(data);
 	if (!result.success) throw new Error(`Validation failed for MCP tool:\n${z.prettifyError(result.error)}`);
-	const parsed = result.data;
+	const { credentialReferenceId, config, mcpToolId, ...parsed } = result.data;
 	const { sourceFile, configObject } = createFactoryDefinition({
 		importName: "mcpTool",
-		variableName: toCamelCase(parsed.mcpToolId)
-	});
-	if (parsed.credentialReferenceId && parsed.credential === void 0) sourceFile.addImportDeclaration({
-		namedImports: ["envSettings"],
-		moduleSpecifier: "../environments"
+		variableName: toToolReferenceName(parsed.name)
 	});
-	writeMcpToolConfig(configObject, parsed);
-	return sourceFile;
-}
-function writeMcpToolConfig(configObject, { mcpToolId, description, serverUrl, config, transport, activeTools, credential, credentialReferenceId, ...rest }) {
+	const activeTools = config?.mcp?.activeTools;
 	for (const [k, v] of Object.entries({
 		id: mcpToolId,
-		...rest,
-		description: description ?? void 0,
-		serverUrl: resolveServerUrl({
-			config,
-			serverUrl
-		}),
-		transport: resolveTransport({
-			config,
-			transport
-		}),
-		activeTools: resolveActiveTools({
-			config,
-			activeTools
-		})
+		...parsed,
+		serverUrl: config?.mcp?.server?.url,
+		transport: config?.mcp?.transport,
+		...activeTools?.length && { activeTools }
 	})) addValueToObject(configObject, k, v);
-	if (credential !== void 0 && credential !== null) {
-		if (typeof credential === "string") {
-			configObject.addPropertyAssignment({
-				name: "credential",
-				initializer: credential
-			});
-			return;
-		}
+	if (credentialReferenceId) {
+		sourceFile.addImportDeclaration({
+			namedImports: ["envSettings"],
+			moduleSpecifier: "../environments"
+		});
 		configObject.addPropertyAssignment({
 			name: "credential",
-			initializer: formatInlineLiteral(credential)
+			initializer: `envSettings.getEnvironmentCredential(${formatStringLiteral(credentialReferenceId)})`
 		});
-		return;
 	}
-	if (credentialReferenceId) configObject.addPropertyAssignment({
-		name: "credential",
-		initializer: `envSettings.getEnvironmentCredential(${formatStringLiteral(credentialReferenceId)})`
-	});
-}
-function resolveServerUrl(data) {
-	return data.config?.mcp?.server?.url ?? data.serverUrl;
-}
-function resolveTransport(data) {
-	return data.config?.mcp?.transport ?? data.transport;
-}
-function resolveActiveTools(data) {
-	return data.config?.mcp?.activeTools ?? data.activeTools;
+	return sourceFile;
 }
 
 //#endregion
-export { generateMcpToolDefinition };
+export { generateMcpToolDefinition };
+//# sourceMappingURL=mcp-tool-generator.js.map

package/dist/commands/pull-v4/generators/mcp-tool-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-tool-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/mcp-tool-generator.ts"],"sourcesContent":["import { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport type { SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport {\n  addValueToObject,\n  createFactoryDefinition,\n  formatStringLiteral,\n  toToolReferenceName,\n} from '../utils';\n\nconst MySchema = FullProjectDefinitionSchema.shape.tools.valueType.omit({\n  id: true,\n  lastError: true,\n});\n\nconst McpToolSchema = z.strictObject({\n  mcpToolId: z.string().nonempty(),\n  ...MySchema.shape,\n  description: z.preprocess((v) => v ?? undefined, MySchema.shape.description),\n  headers: z.preprocess((v) => v ?? undefined, MySchema.shape.headers),\n  capabilities: z.preprocess(\n    (v) => (v && Object.keys(v).length && v) || undefined,\n    MySchema.shape.capabilities\n  ),\n  imageUrl: z.preprocess((v) => v || undefined, MySchema.shape.imageUrl),\n  // Additional field\n  credential: z.record(z.string(), z.unknown()).optional(),\n});\n\ntype McpToolInput = z.input<typeof McpToolSchema>;\n\nexport function generateMcpToolDefinition({\n  tenantId,\n  id,\n  projectId,\n  createdAt,\n  updatedAt,\n  lastError,\n  ...data\n}: McpToolInput & Record<string, unknown>): SourceFile {\n  const result = McpToolSchema.safeParse(data);\n  if (!result.success) {\n    throw new Error(`Validation failed for MCP tool:\\n${z.prettifyError(result.error)}`);\n  }\n\n  const { credentialReferenceId, config, mcpToolId, ...parsed } = result.data;\n  const { sourceFile, configObject } = createFactoryDefinition({\n    importName: 'mcpTool',\n    variableName: toToolReferenceName(parsed.name),\n  });\n\n  const activeTools = config?.mcp?.activeTools;\n  for (const [k, v] of Object.entries({\n    id: mcpToolId,\n    ...parsed,\n    serverUrl: config?.mcp?.server?.url,\n    transport: config?.mcp?.transport,\n    ...(activeTools?.length && { activeTools }),\n  })) {\n    addValueToObject(configObject, k, v);\n  }\n\n  if (credentialReferenceId) {\n    sourceFile.addImportDeclaration({\n      namedImports: ['envSettings'],\n      moduleSpecifier: '../environments',\n    });\n    configObject.addPropertyAssignment({\n      name: 'credential',\n      initializer: `envSettings.getEnvironmentCredential(${formatStringLiteral(credentialReferenceId)})`,\n    });\n  }\n  return sourceFile;\n}\n"],"mappings":";;;;;AAUA,MAAM,WAAW,4BAA4B,MAAM,MAAM,UAAU,KAAK;CACtE,IAAI;CACJ,WAAW;CACZ,CAAC;AAEF,MAAM,gBAAgB,EAAE,aAAa;CACnC,WAAW,EAAE,QAAQ,CAAC,UAAU;CAChC,GAAG,SAAS;CACZ,aAAa,EAAE,YAAY,MAAM,KAAK,QAAW,SAAS,MAAM,YAAY;CAC5E,SAAS,EAAE,YAAY,MAAM,KAAK,QAAW,SAAS,MAAM,QAAQ;CACpE,cAAc,EAAE,YACb,MAAO,KAAK,OAAO,KAAK,EAAE,CAAC,UAAU,KAAM,QAC5C,SAAS,MAAM,aAChB;CACD,UAAU,EAAE,YAAY,MAAM,KAAK,QAAW,SAAS,MAAM,SAAS;CAEtE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAC,UAAU;CACzD,CAAC;AAIF,SAAgB,0BAA0B,EACxC,UACA,IACA,WACA,WACA,WACA,WACA,GAAG,QACkD;CACrD,MAAM,SAAS,cAAc,UAAU,KAAK;AAC5C,KAAI,CAAC,OAAO,QACV,OAAM,IAAI,MAAM,oCAAoC,EAAE,cAAc,OAAO,MAAM,GAAG;CAGtF,MAAM,EAAE,uBAAuB,QAAQ,WAAW,GAAG,WAAW,OAAO;CACvE,MAAM,EAAE,YAAY,iBAAiB,wBAAwB;EAC3D,YAAY;EACZ,cAAc,oBAAoB,OAAO,KAAK;EAC/C,CAAC;CAEF,MAAM,cAAc,QAAQ,KAAK;AACjC,MAAK,MAAM,CAAC,GAAG,MAAM,OAAO,QAAQ;EAClC,IAAI;EACJ,GAAG;EACH,WAAW,QAAQ,KAAK,QAAQ;EAChC,WAAW,QAAQ,KAAK;EACxB,GAAI,aAAa,UAAU,EAAE,aAAa;EAC3C,CAAC,CACA,kBAAiB,cAAc,GAAG,EAAE;AAGtC,KAAI,uBAAuB;AACzB,aAAW,qBAAqB;GAC9B,cAAc,CAAC,cAAc;GAC7B,iBAAiB;GAClB,CAAC;AACF,eAAa,sBAAsB;GACjC,MAAM;GACN,aAAa,wCAAwC,oBAAoB,sBAAsB,CAAC;GACjG,CAAC;;AAEJ,QAAO"}

package/dist/commands/pull-v4/generators/project-generator.js

@@ -1,4 +1,5 @@
-import { addReferenceGetterProperty, addValueToObject, convertNullToUndefined, createFactoryDefinition, createUniqueReferenceName, formatStringLiteral, hasReferences, resolveReferenceName, toCamelCase } from "../utils.js";
+import { addReferenceGetterProperty, addValueToObject, buildComponentFileName, createFactoryDefinition, createUniqueReferenceName, formatStringLiteral, hasReferences, resolveReferenceName, toCamelCase } from "../utils.js";
+import { FullProjectDefinitionSchema } from "@inkeep/agents-core";
 import { z } from "zod";
 
 //#region src/commands/pull-v4/generators/project-generator.ts
@@ -11,19 +12,25 @@ const ReferenceOverridesSchema = z.object({
 	artifactComponents: ReferenceNameByIdSchema.optional(),
 	credentialReferences: ReferenceNameByIdSchema.optional()
 });
-const ProjectSchema = z.looseObject({
+const ReferencePathOverridesSchema = z.object({
+	agents: ReferenceNameByIdSchema.optional(),
+	tools: ReferenceNameByIdSchema.optional(),
+	externalAgents: ReferenceNameByIdSchema.optional(),
+	dataComponents: ReferenceNameByIdSchema.optional(),
+	artifactComponents: ReferenceNameByIdSchema.optional(),
+	credentialReferences: ReferenceNameByIdSchema.optional()
+});
+const MySchema = FullProjectDefinitionSchema.pick({
+	name: true,
+	description: true,
+	models: true,
+	stopWhen: true
+});
+const ProjectSchema = z.strictObject({
 	projectId: z.string().nonempty(),
-	name: z.string().nonempty(),
-	description: z.string().optional(),
-	models: z.looseObject({
-		base: z.looseObject({ model: z.string().nonempty() }),
-		structuredOutput: z.looseObject({}).optional(),
-		summarizer: z.looseObject({}).optional()
-	}),
-	stopWhen: z.preprocess(convertNullToUndefined, z.strictObject({
-		transferCountIs: z.int().optional(),
-		stepCountIs: z.int().optional()
-	}).optional()),
+	...MySchema.shape,
+	description: z.preprocess((v) => v || void 0, MySchema.shape.description),
+	stopWhen: z.preprocess((v) => v && Object.keys(v).length && v || void 0, MySchema.shape.stopWhen),
 	skills: z.array(z.string()).optional(),
 	agents: z.array(z.string()).optional(),
 	tools: z.array(z.string()).optional(),
@@ -31,7 +38,8 @@ const ProjectSchema = z.looseObject({
 	dataComponents: z.array(z.string()).optional(),
 	artifactComponents: z.array(z.string()).optional(),
 	credentialReferences: z.array(z.string()).optional(),
-	referenceOverrides: ReferenceOverridesSchema.optional()
+	referenceOverrides: ReferenceOverridesSchema.optional(),
+	referencePathOverrides: ReferencePathOverridesSchema.optional()
 });
 function generateProjectDefinition(data) {
 	const result = ProjectSchema.safeParse(data);
@@ -51,7 +59,8 @@ ${z.prettifyError(result.error)}`);
 			moduleSpecifier: "node:path"
 		});
 	}
-	const { projectId, skills, agents, tools, externalAgents, dataComponents, artifactComponents, credentialReferences, referenceOverrides, ...rest } = parsed;
+	const { projectId, skills, agents, tools, externalAgents, dataComponents, artifactComponents, credentialReferences, referenceOverrides, referencePathOverrides, ...rest } = parsed;
+	const credentialReferenceResolved = hasReferences(credentialReferences) ? createResolvedReferences(credentialReferences, referenceOverrides?.credentialReferences, referencePathOverrides?.credentialReferences, reservedReferenceNames, "CredentialReference", "numeric") : void 0;
 	for (const [key, value] of Object.entries({
 		id: projectId,
 		...rest
@@ -61,32 +70,32 @@ ${z.prettifyError(result.error)}`);
 		initializer: `() => loadSkills(path.join(${formatStringLiteral(projectId)}, 'skills'))`
 	});
 	if (hasReferences(agents)) {
-		const resolvedReferences = createResolvedReferences(agents, referenceOverrides?.agents, reservedReferenceNames, "Agent");
+		const resolvedReferences = createResolvedReferences(agents, referenceOverrides?.agents, referencePathOverrides?.agents, reservedReferenceNames, "Agent");
 		addReferenceImports(sourceFile, resolvedReferences, "./agents");
 		addReferenceGetterProperty(configObject, "agents", toReferenceNames(resolvedReferences));
 	}
 	if (hasReferences(tools)) {
-		const resolvedReferences = createResolvedReferences(tools, referenceOverrides?.tools, reservedReferenceNames, "Tool");
+		const resolvedReferences = createResolvedReferences(tools, referenceOverrides?.tools, referencePathOverrides?.tools, reservedReferenceNames, "Tool", "numeric-for-duplicates");
 		addReferenceImports(sourceFile, resolvedReferences, "./tools");
 		addReferenceGetterProperty(configObject, "tools", toReferenceNames(resolvedReferences));
 	}
 	if (hasReferences(externalAgents)) {
-		const resolvedReferences = createResolvedReferences(externalAgents, referenceOverrides?.externalAgents, reservedReferenceNames, "ExternalAgent");
+		const resolvedReferences = createResolvedReferences(externalAgents, referenceOverrides?.externalAgents, referencePathOverrides?.externalAgents, reservedReferenceNames, "ExternalAgent");
 		addReferenceImports(sourceFile, resolvedReferences, "./external-agents");
 		addReferenceGetterProperty(configObject, "externalAgents", toReferenceNames(resolvedReferences));
 	}
 	if (hasReferences(dataComponents)) {
-		const resolvedReferences = createResolvedReferences(dataComponents, referenceOverrides?.dataComponents, reservedReferenceNames, "DataComponent");
+		const resolvedReferences = createResolvedReferences(dataComponents, referenceOverrides?.dataComponents, referencePathOverrides?.dataComponents, reservedReferenceNames, "DataComponent");
 		addReferenceImports(sourceFile, resolvedReferences, "./data-components");
 		addReferenceGetterProperty(configObject, "dataComponents", toReferenceNames(resolvedReferences));
 	}
 	if (hasReferences(artifactComponents)) {
-		const resolvedReferences = createResolvedReferences(artifactComponents, referenceOverrides?.artifactComponents, reservedReferenceNames, "ArtifactComponent");
+		const resolvedReferences = createResolvedReferences(artifactComponents, referenceOverrides?.artifactComponents, referencePathOverrides?.artifactComponents, reservedReferenceNames, "ArtifactComponent");
 		addReferenceImports(sourceFile, resolvedReferences, "./artifact-components");
 		addReferenceGetterProperty(configObject, "artifactComponents", toReferenceNames(resolvedReferences));
 	}
 	if (hasReferences(credentialReferences)) {
-		const resolvedReferences = createResolvedReferences(credentialReferences, referenceOverrides?.credentialReferences, reservedReferenceNames, "CredentialReference");
+		const resolvedReferences = credentialReferenceResolved ?? [];
 		addReferenceImports(sourceFile, resolvedReferences, "./credentials");
 		addReferenceGetterProperty(configObject, "credentialReferences", toReferenceNames(resolvedReferences));
 	}
@@ -98,28 +107,52 @@ function addReferenceImports(sourceFile, references, basePath) {
 			name: reference.importName,
 			alias: reference.localName
 		}],
-		moduleSpecifier: `${basePath}/${reference.id}`
+		moduleSpecifier: `${basePath}/${reference.modulePath}`
 	});
 }
 function toReferenceNames(references) {
 	return references.map((reference) => reference.localName);
 }
-function createResolvedReferences(references, referenceOverrides, reservedReferenceNames, suffix) {
+function createResolvedReferences(references, referenceOverrides, referencePathOverrides, reservedReferenceNames, suffix, collisionStrategy = "descriptive") {
 	const seenIds = /* @__PURE__ */ new Set();
-	const resolvedReferences = [];
+	const normalizedReferences = [];
 	for (const referenceId of references) {
 		if (seenIds.has(referenceId)) continue;
 		seenIds.add(referenceId);
-		const importName = resolveReferenceName(referenceId, [referenceOverrides]);
-		const localName = createUniqueReferenceName(importName, reservedReferenceNames, suffix);
-		resolvedReferences.push({
+		normalizedReferences.push({
 			id: referenceId,
-			importName,
-			localName
+			importName: resolveReferenceName(referenceId, [referenceOverrides]),
+			modulePath: resolveReferenceModulePath(referenceId, referencePathOverrides?.[referenceId])
 		});
 	}
-	return resolvedReferences;
+	const importNameCounts = /* @__PURE__ */ new Map();
+	for (const reference of normalizedReferences) importNameCounts.set(reference.importName, (importNameCounts.get(reference.importName) ?? 0) + 1);
+	return normalizedReferences.map((reference) => {
+		const localName = collisionStrategy === "numeric" || collisionStrategy === "numeric-for-duplicates" && (importNameCounts.get(reference.importName) ?? 0) > 1 ? createNumericReferenceName(reference.importName, reservedReferenceNames) : createUniqueReferenceName(reference.importName, reservedReferenceNames, suffix);
+		return {
+			id: reference.id,
+			importName: reference.importName,
+			localName,
+			modulePath: reference.modulePath
+		};
+	});
+}
+function createNumericReferenceName(baseName, reservedNames) {
+	if (!reservedNames.has(baseName)) {
+		reservedNames.add(baseName);
+		return baseName;
+	}
+	let index = 1;
+	while (reservedNames.has(`${baseName}${index}`)) index += 1;
+	const uniqueName = `${baseName}${index}`;
+	reservedNames.add(uniqueName);
+	return uniqueName;
+}
+function resolveReferenceModulePath(referenceId, referencePathOverride) {
+	if (referencePathOverride && referencePathOverride.length > 0) return referencePathOverride.replace(/\.tsx?$/, "");
+	return buildComponentFileName(referenceId).replace(/\.tsx?$/, "");
 }
 
 //#endregion
-export { generateProjectDefinition };
+export { generateProjectDefinition };
+//# sourceMappingURL=project-generator.js.map

package/dist/commands/pull-v4/generators/project-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/project-generator.ts"],"sourcesContent":["import { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport type { SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport {\n  addReferenceGetterProperty,\n  addValueToObject,\n  buildComponentFileName,\n  createFactoryDefinition,\n  createUniqueReferenceName,\n  formatStringLiteral,\n  hasReferences,\n  resolveReferenceName,\n  toCamelCase,\n} from '../utils';\n\nconst ReferenceNameByIdSchema = z.record(z.string(), z.string().nonempty());\n\nconst ReferenceOverridesSchema = z.object({\n  agents: ReferenceNameByIdSchema.optional(),\n  tools: ReferenceNameByIdSchema.optional(),\n  externalAgents: ReferenceNameByIdSchema.optional(),\n  dataComponents: ReferenceNameByIdSchema.optional(),\n  artifactComponents: ReferenceNameByIdSchema.optional(),\n  credentialReferences: ReferenceNameByIdSchema.optional(),\n});\n\nconst ReferencePathOverridesSchema = z.object({\n  agents: ReferenceNameByIdSchema.optional(),\n  tools: ReferenceNameByIdSchema.optional(),\n  externalAgents: ReferenceNameByIdSchema.optional(),\n  dataComponents: ReferenceNameByIdSchema.optional(),\n  artifactComponents: ReferenceNameByIdSchema.optional(),\n  credentialReferences: ReferenceNameByIdSchema.optional(),\n});\n\ninterface ResolvedReference {\n  id: string;\n  importName: string;\n  localName: string;\n  modulePath: string;\n}\n\ntype CollisionStrategy = 'descriptive' | 'numeric' | 'numeric-for-duplicates';\n\nconst MySchema = FullProjectDefinitionSchema.pick({\n  name: true,\n  description: true,\n  models: true,\n  stopWhen: true,\n});\n\nconst ProjectSchema = z.strictObject({\n  projectId: z.string().nonempty(),\n  ...MySchema.shape,\n  description: z.preprocess((v) => v || undefined, MySchema.shape.description),\n  // Invalid input: expected object, received null\n  stopWhen: z.preprocess(\n    (v) => (v && Object.keys(v).length && v) || undefined,\n    MySchema.shape.stopWhen\n  ),\n  skills: z.array(z.string()).optional(),\n  agents: z.array(z.string()).optional(),\n  tools: z.array(z.string()).optional(),\n  externalAgents: z.array(z.string()).optional(),\n  dataComponents: z.array(z.string()).optional(),\n  artifactComponents: z.array(z.string()).optional(),\n  credentialReferences: z.array(z.string()).optional(),\n  referenceOverrides: ReferenceOverridesSchema.optional(),\n  referencePathOverrides: ReferencePathOverridesSchema.optional(),\n});\n\ntype ProjectInput = z.input<typeof ProjectSchema>;\n\nexport function generateProjectDefinition(data: ProjectInput): SourceFile {\n  const result = ProjectSchema.safeParse(data);\n  if (!result.success) {\n    throw new Error(`Validation failed for project:\n${z.prettifyError(result.error)}`);\n  }\n\n  const parsed = result.data;\n  const projectVariableName = toCamelCase(parsed.projectId);\n  const { sourceFile, configObject } = createFactoryDefinition({\n    importName: 'project',\n    variableName: projectVariableName,\n  });\n  const reservedReferenceNames = new Set([projectVariableName]);\n  if (hasReferences(parsed.skills)) {\n    sourceFile.getImportDeclarationOrThrow('@inkeep/agents-sdk').addNamedImport('loadSkills');\n    sourceFile.addImportDeclaration({\n      defaultImport: 'path',\n      moduleSpecifier: 'node:path',\n    });\n  }\n\n  const {\n    projectId,\n    skills,\n    agents,\n    tools,\n    externalAgents,\n    dataComponents,\n    artifactComponents,\n    credentialReferences,\n    referenceOverrides,\n    referencePathOverrides,\n    ...rest\n  } = parsed;\n\n  const credentialReferenceResolved = hasReferences(credentialReferences)\n    ? createResolvedReferences(\n        credentialReferences,\n        referenceOverrides?.credentialReferences,\n        referencePathOverrides?.credentialReferences,\n        reservedReferenceNames,\n        'CredentialReference',\n        'numeric'\n      )\n    : undefined;\n\n  for (const [key, value] of Object.entries({\n    id: projectId,\n    ...rest,\n  })) {\n    addValueToObject(configObject, key, value);\n  }\n\n  if (hasReferences(skills)) {\n    configObject.addPropertyAssignment({\n      name: 'skills',\n      initializer: `() => loadSkills(path.join(${formatStringLiteral(projectId)}, 'skills'))`,\n    });\n  }\n\n  if (hasReferences(agents)) {\n    const resolvedReferences = createResolvedReferences(\n      agents,\n      referenceOverrides?.agents,\n      referencePathOverrides?.agents,\n      reservedReferenceNames,\n      'Agent'\n    );\n    addReferenceImports(sourceFile, resolvedReferences, './agents');\n    addReferenceGetterProperty(configObject, 'agents', toReferenceNames(resolvedReferences));\n  }\n\n  if (hasReferences(tools)) {\n    const resolvedReferences = createResolvedReferences(\n      tools,\n      referenceOverrides?.tools,\n      referencePathOverrides?.tools,\n      reservedReferenceNames,\n      'Tool',\n      'numeric-for-duplicates'\n    );\n    addReferenceImports(sourceFile, resolvedReferences, './tools');\n    addReferenceGetterProperty(configObject, 'tools', toReferenceNames(resolvedReferences));\n  }\n\n  if (hasReferences(externalAgents)) {\n    const resolvedReferences = createResolvedReferences(\n      externalAgents,\n      referenceOverrides?.externalAgents,\n      referencePathOverrides?.externalAgents,\n      reservedReferenceNames,\n      'ExternalAgent'\n    );\n    addReferenceImports(sourceFile, resolvedReferences, './external-agents');\n    addReferenceGetterProperty(\n      configObject,\n      'externalAgents',\n      toReferenceNames(resolvedReferences)\n    );\n  }\n\n  if (hasReferences(dataComponents)) {\n    const resolvedReferences = createResolvedReferences(\n      dataComponents,\n      referenceOverrides?.dataComponents,\n      referencePathOverrides?.dataComponents,\n      reservedReferenceNames,\n      'DataComponent'\n    );\n    addReferenceImports(sourceFile, resolvedReferences, './data-components');\n    addReferenceGetterProperty(\n      configObject,\n      'dataComponents',\n      toReferenceNames(resolvedReferences)\n    );\n  }\n\n  if (hasReferences(artifactComponents)) {\n    const resolvedReferences = createResolvedReferences(\n      artifactComponents,\n      referenceOverrides?.artifactComponents,\n      referencePathOverrides?.artifactComponents,\n      reservedReferenceNames,\n      'ArtifactComponent'\n    );\n    addReferenceImports(sourceFile, resolvedReferences, './artifact-components');\n    addReferenceGetterProperty(\n      configObject,\n      'artifactComponents',\n      toReferenceNames(resolvedReferences)\n    );\n  }\n\n  if (hasReferences(credentialReferences)) {\n    const resolvedReferences = credentialReferenceResolved ?? [];\n    addReferenceImports(sourceFile, resolvedReferences, './credentials');\n    addReferenceGetterProperty(\n      configObject,\n      'credentialReferences',\n      toReferenceNames(resolvedReferences)\n    );\n  }\n\n  return sourceFile;\n}\n\nfunction addReferenceImports(\n  sourceFile: SourceFile,\n  references: ResolvedReference[],\n  basePath: string\n): void {\n  for (const reference of references) {\n    sourceFile.addImportDeclaration({\n      namedImports: [\n        reference.importName === reference.localName\n          ? reference.importName\n          : { name: reference.importName, alias: reference.localName },\n      ],\n      moduleSpecifier: `${basePath}/${reference.modulePath}`,\n    });\n  }\n}\n\nfunction toReferenceNames(references: ResolvedReference[]): string[] {\n  return references.map((reference) => reference.localName);\n}\n\nfunction createResolvedReferences(\n  references: string[],\n  referenceOverrides: Record<string, string> | undefined,\n  referencePathOverrides: Record<string, string> | undefined,\n  reservedReferenceNames: Set<string>,\n  suffix: string,\n  collisionStrategy: CollisionStrategy = 'descriptive'\n): ResolvedReference[] {\n  const seenIds = new Set<string>();\n  const normalizedReferences: Array<{\n    id: string;\n    importName: string;\n    modulePath: string;\n  }> = [];\n\n  for (const referenceId of references) {\n    if (seenIds.has(referenceId)) {\n      continue;\n    }\n    seenIds.add(referenceId);\n\n    normalizedReferences.push({\n      id: referenceId,\n      importName: resolveReferenceName(referenceId, [referenceOverrides]),\n      modulePath: resolveReferenceModulePath(referenceId, referencePathOverrides?.[referenceId]),\n    });\n  }\n\n  const importNameCounts = new Map<string, number>();\n  for (const reference of normalizedReferences) {\n    importNameCounts.set(\n      reference.importName,\n      (importNameCounts.get(reference.importName) ?? 0) + 1\n    );\n  }\n\n  return normalizedReferences.map((reference) => {\n    const shouldUseNumeric =\n      collisionStrategy === 'numeric' ||\n      (collisionStrategy === 'numeric-for-duplicates' &&\n        (importNameCounts.get(reference.importName) ?? 0) > 1);\n\n    const localName = shouldUseNumeric\n      ? createNumericReferenceName(reference.importName, reservedReferenceNames)\n      : createUniqueReferenceName(reference.importName, reservedReferenceNames, suffix);\n\n    return {\n      id: reference.id,\n      importName: reference.importName,\n      localName,\n      modulePath: reference.modulePath,\n    };\n  });\n}\n\nfunction createNumericReferenceName(baseName: string, reservedNames: Set<string>): string {\n  if (!reservedNames.has(baseName)) {\n    reservedNames.add(baseName);\n    return baseName;\n  }\n\n  let index = 1;\n  while (reservedNames.has(`${baseName}${index}`)) {\n    index += 1;\n  }\n\n  const uniqueName = `${baseName}${index}`;\n  reservedNames.add(uniqueName);\n  return uniqueName;\n}\n\nfunction resolveReferenceModulePath(\n  referenceId: string,\n  referencePathOverride: string | undefined\n): string {\n  if (referencePathOverride && referencePathOverride.length > 0) {\n    return referencePathOverride.replace(/\\.tsx?$/, '');\n  }\n\n  const fileName = buildComponentFileName(referenceId);\n  return fileName.replace(/\\.tsx?$/, '');\n}\n"],"mappings":"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"}

package/dist/commands/pull-v4/generators/skill-generator.js

@@ -1,8 +1,10 @@
+import { FullProjectDefinitionSchema } from "@inkeep/agents-core";
 import { join } from "node:path";
 import { stringify } from "yaml";
 import { mkdir, writeFile } from "node:fs/promises";
 
 //#region src/commands/pull-v4/generators/skill-generator.ts
+FullProjectDefinitionSchema.shape.skills.unwrap().valueType;
 function formatMetadata(metadata) {
 	return `metadata:\n${stringify(metadata).split("\n").filter((line) => line.trim() !== "").map((line) => `  ${line}`).join("\n")}`;
 }
@@ -20,4 +22,5 @@ async function generateSkills(skills, skillsDir) {
 }
 
 //#endregion
-export { generateSkills };
+export { generateSkills };
+//# sourceMappingURL=skill-generator.js.map

package/dist/commands/pull-v4/generators/skill-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skill-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/skill-generator.ts"],"sourcesContent":["import { mkdir, writeFile } from 'node:fs/promises';\nimport { join } from 'node:path';\nimport { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport { stringify } from 'yaml';\nimport type { z } from 'zod';\n\nconst MySchema = FullProjectDefinitionSchema.shape.skills.unwrap().valueType;\n\ntype SkillInput = z.input<typeof MySchema>;\n\ntype SkillMap = Record<string, SkillInput>;\n\nfunction formatMetadata(metadata: NonNullable<SkillInput['metadata']>): string {\n  const yaml = stringify(metadata);\n  const indented = yaml\n    .split('\\n')\n    .filter((line) => line.trim() !== '')\n    .map((line) => `  ${line}`)\n    .join('\\n');\n  return `metadata:\\n${indented}`;\n}\n\nexport async function generateSkills(skills: SkillMap, skillsDir: string): Promise<void> {\n  await mkdir(skillsDir, { recursive: true });\n\n  for (const [skillId, skill] of Object.entries(skills)) {\n    const parts: string[] = ['---', `name: ${JSON.stringify(skill.name)}`];\n    parts.push(`description: ${JSON.stringify(skill.description ?? '')}`);\n\n    if (skill.metadata && Object.keys(skill.metadata).length > 0) {\n      parts.push(formatMetadata(skill.metadata));\n    }\n\n    parts.push('---', '', skill.content || '');\n\n    const skillDir = join(skillsDir, skillId);\n    await mkdir(skillDir, { recursive: true });\n\n    const filePath = join(skillDir, 'SKILL.md');\n    await writeFile(filePath, parts.join('\\n'), 'utf8');\n  }\n}\n"],"mappings":";;;;;;AAMiB,4BAA4B,MAAM,OAAO,QAAQ,CAAC;AAMnE,SAAS,eAAe,UAAuD;AAO7E,QAAO,cANM,UAAU,SAAS,CAE7B,MAAM,KAAK,CACX,QAAQ,SAAS,KAAK,MAAM,KAAK,GAAG,CACpC,KAAK,SAAS,KAAK,OAAO,CAC1B,KAAK,KAAK;;AAIf,eAAsB,eAAe,QAAkB,WAAkC;AACvF,OAAM,MAAM,WAAW,EAAE,WAAW,MAAM,CAAC;AAE3C,MAAK,MAAM,CAAC,SAAS,UAAU,OAAO,QAAQ,OAAO,EAAE;EACrD,MAAM,QAAkB,CAAC,OAAO,SAAS,KAAK,UAAU,MAAM,KAAK,GAAG;AACtE,QAAM,KAAK,gBAAgB,KAAK,UAAU,MAAM,eAAe,GAAG,GAAG;AAErE,MAAI,MAAM,YAAY,OAAO,KAAK,MAAM,SAAS,CAAC,SAAS,EACzD,OAAM,KAAK,eAAe,MAAM,SAAS,CAAC;AAG5C,QAAM,KAAK,OAAO,IAAI,MAAM,WAAW,GAAG;EAE1C,MAAM,WAAW,KAAK,WAAW,QAAQ;AACzC,QAAM,MAAM,UAAU,EAAE,WAAW,MAAM,CAAC;AAG1C,QAAM,UADW,KAAK,UAAU,WAAW,EACjB,MAAM,KAAK,KAAK,EAAE,OAAO"}

package/dist/commands/pull-v4/generators/status-component-generator.js

@@ -1,35 +1,35 @@
 import { addValueToObject, convertJsonSchemaToZodSafe, createFactoryDefinition, toCamelCase } from "../utils.js";
+import { FullProjectDefinitionSchema } from "@inkeep/agents-core";
 import { z } from "zod";
 
 //#region src/commands/pull-v4/generators/status-component-generator.ts
-const StatusComponentSchema = z.looseObject({
+const MySchema = FullProjectDefinitionSchema.shape.statusUpdates.unwrap().shape.statusComponents.unwrap().element;
+const StatusComponentSchema = z.strictObject({
 	statusComponentId: z.string().nonempty(),
-	type: z.string().nonempty(),
-	description: z.string().optional(),
-	detailsSchema: z.unknown().optional(),
-	schema: z.unknown().optional()
+	...MySchema.shape
 });
-function generateStatusComponentDefinition(data) {
+function generateStatusComponentDefinition({ id, ...data }) {
 	const result = StatusComponentSchema.safeParse(data);
 	if (!result.success) throw new Error(`Validation failed for status component:\n${z.prettifyError(result.error)}`);
-	const parsed = result.data;
-	const detailsSchema = parsed.detailsSchema !== void 0 ? parsed.detailsSchema : parsed.schema;
+	const { statusComponentId, detailsSchema, ...rest } = result.data;
 	const { sourceFile, configObject } = createFactoryDefinition({
 		importName: "statusComponent",
-		variableName: toCamelCase(parsed.statusComponentId)
+		variableName: toCamelCase(statusComponentId)
 	});
-	if (detailsSchema !== void 0) sourceFile.addImportDeclaration({
-		namedImports: ["z"],
-		moduleSpecifier: "zod"
-	});
-	const { statusComponentId, id, detailsSchema: _, schema: _2, ...rest } = parsed;
 	for (const [k, v] of Object.entries(rest)) addValueToObject(configObject, k, v);
-	if (detailsSchema) configObject.addPropertyAssignment({
-		name: "detailsSchema",
-		initializer: convertJsonSchemaToZodSafe(detailsSchema)
-	});
+	if (detailsSchema) {
+		sourceFile.addImportDeclaration({
+			namedImports: ["z"],
+			moduleSpecifier: "zod"
+		});
+		configObject.addPropertyAssignment({
+			name: "detailsSchema",
+			initializer: convertJsonSchemaToZodSafe(detailsSchema)
+		});
+	}
 	return sourceFile;
 }
 
 //#endregion
-export { generateStatusComponentDefinition };
+export { generateStatusComponentDefinition };
+//# sourceMappingURL=status-component-generator.js.map

package/dist/commands/pull-v4/generators/status-component-generator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"status-component-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/status-component-generator.ts"],"sourcesContent":["import { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport type { SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport {\n  addValueToObject,\n  convertJsonSchemaToZodSafe,\n  createFactoryDefinition,\n  toCamelCase,\n} from '../utils';\n\nconst MySchema = FullProjectDefinitionSchema.shape.statusUpdates\n  .unwrap()\n  .shape.statusComponents.unwrap().element;\n\nconst StatusComponentSchema = z.strictObject({\n  statusComponentId: z.string().nonempty(),\n  ...MySchema.shape,\n});\n\ntype StatusComponentInput = z.input<typeof StatusComponentSchema>;\n\nexport function generateStatusComponentDefinition({\n  id,\n  ...data\n}: StatusComponentInput & Record<string, unknown>): SourceFile {\n  const result = StatusComponentSchema.safeParse(data);\n  if (!result.success) {\n    throw new Error(`Validation failed for status component:\\n${z.prettifyError(result.error)}`);\n  }\n\n  const { statusComponentId, detailsSchema, ...rest } = result.data;\n\n  const { sourceFile, configObject } = createFactoryDefinition({\n    importName: 'statusComponent',\n    variableName: toCamelCase(statusComponentId),\n  });\n\n  for (const [k, v] of Object.entries(rest)) {\n    addValueToObject(configObject, k, v);\n  }\n  if (detailsSchema) {\n    sourceFile.addImportDeclaration({\n      namedImports: ['z'],\n      moduleSpecifier: 'zod',\n    });\n    configObject.addPropertyAssignment({\n      name: 'detailsSchema',\n      initializer: convertJsonSchemaToZodSafe(detailsSchema),\n    });\n  }\n\n  return sourceFile;\n}\n"],"mappings":";;;;;AAUA,MAAM,WAAW,4BAA4B,MAAM,cAChD,QAAQ,CACR,MAAM,iBAAiB,QAAQ,CAAC;AAEnC,MAAM,wBAAwB,EAAE,aAAa;CAC3C,mBAAmB,EAAE,QAAQ,CAAC,UAAU;CACxC,GAAG,SAAS;CACb,CAAC;AAIF,SAAgB,kCAAkC,EAChD,IACA,GAAG,QAC0D;CAC7D,MAAM,SAAS,sBAAsB,UAAU,KAAK;AACpD,KAAI,CAAC,OAAO,QACV,OAAM,IAAI,MAAM,4CAA4C,EAAE,cAAc,OAAO,MAAM,GAAG;CAG9F,MAAM,EAAE,mBAAmB,eAAe,GAAG,SAAS,OAAO;CAE7D,MAAM,EAAE,YAAY,iBAAiB,wBAAwB;EAC3D,YAAY;EACZ,cAAc,YAAY,kBAAkB;EAC7C,CAAC;AAEF,MAAK,MAAM,CAAC,GAAG,MAAM,OAAO,QAAQ,KAAK,CACvC,kBAAiB,cAAc,GAAG,EAAE;AAEtC,KAAI,eAAe;AACjB,aAAW,qBAAqB;GAC9B,cAAc,CAAC,IAAI;GACnB,iBAAiB;GAClB,CAAC;AACF,eAAa,sBAAsB;GACjC,MAAM;GACN,aAAa,2BAA2B,cAAc;GACvD,CAAC;;AAGJ,QAAO"}

package/dist/commands/pull-v4/generators/sub-agent-generator.helpers.js

@@ -0,0 +1,84 @@
+import { formatInlineLiteral, isPlainObject, resolveReferenceName, toCamelCase } from "../utils.js";
+
+//#region src/commands/pull-v4/generators/sub-agent-generator.helpers.ts
+function resolveSubAgentName(subAgentId, name) {
+	if (name !== void 0) return name;
+	return subAgentId.replace(/[-_]/g, " ").replace(/([a-z])([A-Z])/g, "$1 $2").replace(/\b\w/g, (char) => char.toUpperCase());
+}
+function resolveSubAgentVariableName(subAgentId, name) {
+	return toCamelCase(name || subAgentId);
+}
+function collectCanUseReferences(canUse, toolReferenceOverrides) {
+	if (!Array.isArray(canUse)) return [];
+	const references = [];
+	for (const item of canUse) {
+		if (typeof item === "string") {
+			references.push(resolveReferenceName(item, [toolReferenceOverrides]));
+			continue;
+		}
+		if (!isPlainObject(item)) continue;
+		const toolId = typeof item.toolId === "string" ? item.toolId : void 0;
+		if (!toolId) continue;
+		const toolReference = resolveReferenceName(toolId, [toolReferenceOverrides]);
+		const withConfig = {};
+		const selectedTools = Array.isArray(item.toolSelection) && item.toolSelection.length ? item.toolSelection : Array.isArray(item.selectedTools) && item.selectedTools.length ? item.selectedTools : void 0;
+		if (selectedTools) withConfig.selectedTools = selectedTools;
+		if (isPlainObject(item.headers) && Object.keys(item.headers).length) withConfig.headers = item.headers;
+		if (isPlainObject(item.toolPolicies) && Object.keys(item.toolPolicies).length) withConfig.toolPolicies = item.toolPolicies;
+		if (Object.keys(withConfig).length > 0) {
+			references.push(`${toolReference}.with(${formatInlineLiteral(withConfig)})`);
+			continue;
+		}
+		references.push(toolReference);
+	}
+	return references;
+}
+function collectCanDelegateToReferences(canDelegateTo, referenceOverrides) {
+	if (!Array.isArray(canDelegateTo)) return [];
+	const references = [];
+	for (const item of canDelegateTo) {
+		if (typeof item === "string") {
+			references.push(resolveReferenceName(item, [
+				referenceOverrides.subAgents,
+				referenceOverrides.agents,
+				referenceOverrides.externalAgents
+			]));
+			continue;
+		}
+		if (!isPlainObject(item)) continue;
+		const subAgentId = typeof item.subAgentId === "string" ? item.subAgentId : void 0;
+		const agentId = typeof item.agentId === "string" ? item.agentId : void 0;
+		const externalAgentId = typeof item.externalAgentId === "string" ? item.externalAgentId : void 0;
+		const targetId = subAgentId || agentId || externalAgentId;
+		if (!targetId) continue;
+		const targetReference = subAgentId ? resolveReferenceName(subAgentId, [referenceOverrides.subAgents]) : agentId ? resolveReferenceName(agentId, [referenceOverrides.agents]) : resolveReferenceName(targetId, [referenceOverrides.externalAgents]);
+		if (isPlainObject(item.headers) && Object.keys(item.headers).length > 0) {
+			references.push(`${targetReference}.with(${formatInlineLiteral({ headers: item.headers })})`);
+			continue;
+		}
+		references.push(targetReference);
+	}
+	return references;
+}
+function collectSkills(skills) {
+	if (!Array.isArray(skills)) return [];
+	const formattedSkills = [];
+	for (const skill of skills) {
+		if (typeof skill === "string") {
+			formattedSkills.push(formatInlineLiteral(skill));
+			continue;
+		}
+		if (!isPlainObject(skill)) continue;
+		const skillId = typeof skill.id === "string" ? skill.id : typeof skill.skillId === "string" ? skill.skillId : void 0;
+		if (!skillId) continue;
+		const formattedSkill = { id: skillId };
+		if (typeof skill.index === "number" && Number.isInteger(skill.index)) formattedSkill.index = skill.index;
+		if (typeof skill.alwaysLoaded === "boolean") formattedSkill.alwaysLoaded = skill.alwaysLoaded;
+		formattedSkills.push(formatInlineLiteral(formattedSkill));
+	}
+	return formattedSkills;
+}
+
+//#endregion
+export { collectCanDelegateToReferences, collectCanUseReferences, collectSkills, resolveSubAgentName, resolveSubAgentVariableName };
+//# sourceMappingURL=sub-agent-generator.helpers.js.map

package/dist/commands/pull-v4/generators/sub-agent-generator.helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sub-agent-generator.helpers.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/sub-agent-generator.helpers.ts"],"sourcesContent":["import { formatInlineLiteral, isPlainObject, resolveReferenceName, toCamelCase } from '../utils';\n\ninterface DelegateReferenceOverrides {\n  subAgents?: Record<string, string>;\n  agents?: Record<string, string>;\n  externalAgents?: Record<string, string>;\n}\n\nexport function resolveSubAgentName(subAgentId: string, name?: string): string {\n  if (name !== undefined) {\n    return name;\n  }\n\n  return subAgentId\n    .replace(/[-_]/g, ' ')\n    .replace(/([a-z])([A-Z])/g, '$1 $2')\n    .replace(/\\b\\w/g, (char) => char.toUpperCase());\n}\n\nexport function resolveSubAgentVariableName(subAgentId: string, name?: string): string {\n  const seed = name || subAgentId;\n  return toCamelCase(seed);\n}\n\nexport function collectCanUseReferences(\n  canUse?: unknown[],\n  toolReferenceOverrides?: Record<string, string>\n): string[] {\n  if (!Array.isArray(canUse)) {\n    return [];\n  }\n\n  const references: string[] = [];\n  for (const item of canUse) {\n    if (typeof item === 'string') {\n      references.push(resolveReferenceName(item, [toolReferenceOverrides]));\n      continue;\n    }\n\n    if (!isPlainObject(item)) {\n      continue;\n    }\n\n    const toolId = typeof item.toolId === 'string' ? item.toolId : undefined;\n    if (!toolId) {\n      continue;\n    }\n\n    const toolReference = resolveReferenceName(toolId, [toolReferenceOverrides]);\n    const withConfig: Record<string, unknown> = {};\n    const selectedTools =\n      Array.isArray(item.toolSelection) && item.toolSelection.length\n        ? item.toolSelection\n        : Array.isArray(item.selectedTools) && item.selectedTools.length\n          ? item.selectedTools\n          : undefined;\n\n    if (selectedTools) {\n      withConfig.selectedTools = selectedTools;\n    }\n\n    if (isPlainObject(item.headers) && Object.keys(item.headers).length) {\n      withConfig.headers = item.headers;\n    }\n\n    if (isPlainObject(item.toolPolicies) && Object.keys(item.toolPolicies).length) {\n      withConfig.toolPolicies = item.toolPolicies;\n    }\n\n    if (Object.keys(withConfig).length > 0) {\n      references.push(`${toolReference}.with(${formatInlineLiteral(withConfig)})`);\n      continue;\n    }\n\n    references.push(toolReference);\n  }\n\n  return references;\n}\n\nexport function collectCanDelegateToReferences(\n  canDelegateTo: unknown[] | undefined,\n  referenceOverrides: DelegateReferenceOverrides\n): string[] {\n  if (!Array.isArray(canDelegateTo)) {\n    return [];\n  }\n\n  const references: string[] = [];\n  for (const item of canDelegateTo) {\n    if (typeof item === 'string') {\n      references.push(\n        resolveReferenceName(item, [\n          referenceOverrides.subAgents,\n          referenceOverrides.agents,\n          referenceOverrides.externalAgents,\n        ])\n      );\n      continue;\n    }\n\n    if (!isPlainObject(item)) {\n      continue;\n    }\n\n    const subAgentId = typeof item.subAgentId === 'string' ? item.subAgentId : undefined;\n    const agentId = typeof item.agentId === 'string' ? item.agentId : undefined;\n    const externalAgentId =\n      typeof item.externalAgentId === 'string' ? item.externalAgentId : undefined;\n    const targetId = subAgentId || agentId || externalAgentId;\n\n    if (!targetId) {\n      continue;\n    }\n\n    const targetReference = subAgentId\n      ? resolveReferenceName(subAgentId, [referenceOverrides.subAgents])\n      : agentId\n        ? resolveReferenceName(agentId, [referenceOverrides.agents])\n        : resolveReferenceName(targetId, [referenceOverrides.externalAgents]);\n\n    if (isPlainObject(item.headers) && Object.keys(item.headers).length > 0) {\n      references.push(\n        `${targetReference}.with(${formatInlineLiteral({\n          headers: item.headers,\n        })})`\n      );\n      continue;\n    }\n\n    references.push(targetReference);\n  }\n\n  return references;\n}\n\nexport function collectSkills(skills?: unknown[]): string[] {\n  if (!Array.isArray(skills)) {\n    return [];\n  }\n\n  const formattedSkills: string[] = [];\n  for (const skill of skills) {\n    if (typeof skill === 'string') {\n      formattedSkills.push(formatInlineLiteral(skill));\n      continue;\n    }\n\n    if (!isPlainObject(skill)) {\n      continue;\n    }\n\n    const skillId =\n      typeof skill.id === 'string'\n        ? skill.id\n        : typeof skill.skillId === 'string'\n          ? skill.skillId\n          : undefined;\n    if (!skillId) {\n      continue;\n    }\n\n    const formattedSkill: Record<string, unknown> = { id: skillId };\n    if (typeof skill.index === 'number' && Number.isInteger(skill.index)) {\n      formattedSkill.index = skill.index;\n    }\n    if (typeof skill.alwaysLoaded === 'boolean') {\n      formattedSkill.alwaysLoaded = skill.alwaysLoaded;\n    }\n\n    formattedSkills.push(formatInlineLiteral(formattedSkill));\n  }\n\n  return formattedSkills;\n}\n"],"mappings":"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"}