@inkeep/agents-cli 0.59.3 → 0.60.0

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

@@ -1,6 +1,13 @@
-import { addStringProperty, addValueToObject, convertJsonSchemaToZodSafe, createFactoryDefinition, toCamelCase } from "../utils.js";
+import { codeExpression } from "../utils/code-values.js";
+import { buildComponentFileName, toCamelCase } from "../utils/naming.js";
+import { addStringProperty, addValueToObject } from "../utils/factory-writer.js";
+import { convertJsonSchemaToZodSafe } from "../utils/schema-rendering.js";
+import "../utils/index.js";
+import { collectReferencedSubAgentComponentIds } from "../collector-common.js";
+import { generateFactorySourceFile } from "../simple-factory-generator.js";
 import { FullProjectDefinitionSchema } from "@inkeep/agents-core";
 import { z } from "zod";
+import { join } from "node:path";
 
 //#region src/commands/pull-v4/generators/data-component-generator.ts
 const MySchema = FullProjectDefinitionSchema.shape.dataComponents.unwrap().valueType.omit({ id: true });
@@ -11,29 +18,27 @@ const DataComponentSchema = z.strictObject({
 	props: z.unknown()
 });
 function generateDataComponentDefinition({ tenantId, id, projectId, createdAt, updatedAt, ...data }) {
-	const result = DataComponentSchema.safeParse(data);
-	if (!result.success) throw new Error(`Validation failed for data component:\n${z.prettifyError(result.error)}`);
-	const parsed = result.data;
-	const props = parsed.props;
-	const { sourceFile, configObject } = createFactoryDefinition({
-		importName: "dataComponent",
-		variableName: toCamelCase(parsed.dataComponentId)
+	return generateFactorySourceFile(data, {
+		schema: DataComponentSchema,
+		factory: {
+			importName: "dataComponent",
+			variableName: (parsed) => toCamelCase(parsed.dataComponentId)
+		},
+		render({ parsed, sourceFile, configObject }) {
+			const props = parsed.props;
+			if (props !== void 0) sourceFile.addImportDeclaration({
+				namedImports: ["z"],
+				moduleSpecifier: "zod"
+			});
+			writeDataComponentConfig(configObject, parsed, props);
+		}
 	});
-	if (props !== void 0) sourceFile.addImportDeclaration({
-		namedImports: ["z"],
-		moduleSpecifier: "zod"
-	});
-	writeDataComponentConfig(configObject, parsed, props);
-	return sourceFile;
 }
 function writeDataComponentConfig(configObject, data, props) {
 	addStringProperty(configObject, "id", data.dataComponentId);
 	addStringProperty(configObject, "name", data.name);
 	if (typeof data.description === "string") addStringProperty(configObject, "description", data.description);
-	if (props !== void 0) configObject.addPropertyAssignment({
-		name: "props",
-		initializer: convertJsonSchemaToZodSafe(props)
-	});
+	if (props !== void 0) addValueToObject(configObject, "props", codeExpression(convertJsonSchemaToZodSafe(props)));
 	if (data.render) addRenderProperty(configObject, data.render);
 }
 function addRenderProperty(configObject, render) {
@@ -42,7 +47,38 @@ function addRenderProperty(configObject, render) {
 		mockData: render.mockData
 	});
 }
+const task = {
+	type: "data-component",
+	collect(context) {
+		const recordsByDataComponentId = /* @__PURE__ */ new Map();
+		for (const [dataComponentId, dataComponent] of Object.entries(context.project.dataComponents ?? {})) recordsByDataComponentId.set(dataComponentId, {
+			id: dataComponentId,
+			filePath: context.resolver.resolveOutputFilePath("dataComponents", dataComponentId, join(context.paths.dataComponentsDir, buildComponentFileName(dataComponentId, dataComponent.name ?? void 0))),
+			payload: {
+				dataComponentId,
+				...dataComponent
+			}
+		});
+		for (const dataComponentId of collectReferencedSubAgentComponentIds(context, "dataComponents")) {
+			if (recordsByDataComponentId.has(dataComponentId)) continue;
+			recordsByDataComponentId.set(dataComponentId, {
+				id: dataComponentId,
+				filePath: context.resolver.resolveOutputFilePath("dataComponents", dataComponentId, join(context.paths.dataComponentsDir, `${dataComponentId}.ts`)),
+				payload: {
+					dataComponentId,
+					name: dataComponentId,
+					props: {
+						type: "object",
+						properties: {}
+					}
+				}
+			});
+		}
+		return [...recordsByDataComponentId.values()];
+	},
+	generate: generateDataComponentDefinition
+};
 
 //#endregion
-export { generateDataComponentDefinition };
+export { generateDataComponentDefinition, task };
 //# sourceMappingURL=data-component-generator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"data-component-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/data-component-generator.ts"],"sourcesContent":["import { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport type { ObjectLiteralExpression, SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport {\n  addStringProperty,\n  addValueToObject,\n  convertJsonSchemaToZodSafe,\n  createFactoryDefinition,\n  toCamelCase,\n} from '../utils';\n\nconst MySchema = FullProjectDefinitionSchema.shape.dataComponents.unwrap().valueType.omit({\n  id: true,\n});\n\nconst DataComponentSchema = z.strictObject({\n  dataComponentId: z.string().nonempty(),\n  ...MySchema.shape,\n  description: z.preprocess((v) => v || undefined, MySchema.shape.description),\n  // Each property must have a \"description\" for LLM compatibility\n  props: z.unknown(),\n});\n\ntype DataComponentInput = z.input<typeof DataComponentSchema>;\ntype DataComponentOutput = z.output<typeof DataComponentSchema>;\n\nexport function generateDataComponentDefinition({\n  tenantId,\n  id,\n  projectId,\n  createdAt,\n  updatedAt,\n  ...data\n}: DataComponentInput & Record<string, unknown>): SourceFile {\n  const result = DataComponentSchema.safeParse(data);\n  if (!result.success) {\n    throw new Error(`Validation failed for data component:\\n${z.prettifyError(result.error)}`);\n  }\n\n  const parsed = result.data;\n  const props = parsed.props;\n  const { sourceFile, configObject } = createFactoryDefinition({\n    importName: 'dataComponent',\n    variableName: toCamelCase(parsed.dataComponentId),\n  });\n\n  if (props !== undefined) {\n    sourceFile.addImportDeclaration({\n      namedImports: ['z'],\n      moduleSpecifier: 'zod',\n    });\n  }\n\n  writeDataComponentConfig(configObject, parsed, props);\n\n  return sourceFile;\n}\n\nfunction writeDataComponentConfig(\n  configObject: ObjectLiteralExpression,\n  data: DataComponentOutput,\n  props: unknown\n): void {\n  addStringProperty(configObject, 'id', data.dataComponentId);\n  addStringProperty(configObject, 'name', data.name);\n\n  if (typeof data.description === 'string') {\n    addStringProperty(configObject, 'description', data.description);\n  }\n\n  if (props !== undefined) {\n    configObject.addPropertyAssignment({\n      name: 'props',\n      initializer: convertJsonSchemaToZodSafe(props),\n    });\n  }\n\n  if (data.render) {\n    addRenderProperty(configObject, data.render);\n  }\n}\n\nfunction addRenderProperty(\n  configObject: ObjectLiteralExpression,\n  render: NonNullable<DataComponentOutput['render']>\n): void {\n  if (render.component) {\n    addValueToObject(configObject, 'render', {\n      component: render.component,\n      mockData: render.mockData,\n    });\n  }\n}\n"],"mappings":";;;;;AAWA,MAAM,WAAW,4BAA4B,MAAM,eAAe,QAAQ,CAAC,UAAU,KAAK,EACxF,IAAI,MACL,CAAC;AAEF,MAAM,sBAAsB,EAAE,aAAa;CACzC,iBAAiB,EAAE,QAAQ,CAAC,UAAU;CACtC,GAAG,SAAS;CACZ,aAAa,EAAE,YAAY,MAAM,KAAK,QAAW,SAAS,MAAM,YAAY;CAE5E,OAAO,EAAE,SAAS;CACnB,CAAC;AAKF,SAAgB,gCAAgC,EAC9C,UACA,IACA,WACA,WACA,WACA,GAAG,QACwD;CAC3D,MAAM,SAAS,oBAAoB,UAAU,KAAK;AAClD,KAAI,CAAC,OAAO,QACV,OAAM,IAAI,MAAM,0CAA0C,EAAE,cAAc,OAAO,MAAM,GAAG;CAG5F,MAAM,SAAS,OAAO;CACtB,MAAM,QAAQ,OAAO;CACrB,MAAM,EAAE,YAAY,iBAAiB,wBAAwB;EAC3D,YAAY;EACZ,cAAc,YAAY,OAAO,gBAAgB;EAClD,CAAC;AAEF,KAAI,UAAU,OACZ,YAAW,qBAAqB;EAC9B,cAAc,CAAC,IAAI;EACnB,iBAAiB;EAClB,CAAC;AAGJ,0BAAyB,cAAc,QAAQ,MAAM;AAErD,QAAO;;AAGT,SAAS,yBACP,cACA,MACA,OACM;AACN,mBAAkB,cAAc,MAAM,KAAK,gBAAgB;AAC3D,mBAAkB,cAAc,QAAQ,KAAK,KAAK;AAElD,KAAI,OAAO,KAAK,gBAAgB,SAC9B,mBAAkB,cAAc,eAAe,KAAK,YAAY;AAGlE,KAAI,UAAU,OACZ,cAAa,sBAAsB;EACjC,MAAM;EACN,aAAa,2BAA2B,MAAM;EAC/C,CAAC;AAGJ,KAAI,KAAK,OACP,mBAAkB,cAAc,KAAK,OAAO;;AAIhD,SAAS,kBACP,cACA,QACM;AACN,KAAI,OAAO,UACT,kBAAiB,cAAc,UAAU;EACvC,WAAW,OAAO;EAClB,UAAU,OAAO;EAClB,CAAC"}
+{"version":3,"file":"data-component-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/data-component-generator.ts"],"sourcesContent":["import { join } from 'node:path';\nimport { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport type { ObjectLiteralExpression, SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport { collectReferencedSubAgentComponentIds } from '../collector-common';\nimport type { GenerationTask } from '../generation-types';\nimport { generateFactorySourceFile } from '../simple-factory-generator';\nimport {\n  addStringProperty,\n  addValueToObject,\n  buildComponentFileName,\n  codeExpression,\n  convertJsonSchemaToZodSafe,\n  toCamelCase,\n} from '../utils';\n\nconst MySchema = FullProjectDefinitionSchema.shape.dataComponents.unwrap().valueType.omit({\n  id: true,\n});\n\nconst DataComponentSchema = z.strictObject({\n  dataComponentId: z.string().nonempty(),\n  ...MySchema.shape,\n  description: z.preprocess((v) => v || undefined, MySchema.shape.description),\n  // Each property must have a \"description\" for LLM compatibility\n  props: z.unknown(),\n});\n\ntype DataComponentInput = z.input<typeof DataComponentSchema>;\ntype DataComponentOutput = z.output<typeof DataComponentSchema>;\n\nexport function generateDataComponentDefinition({\n  tenantId,\n  id,\n  projectId,\n  createdAt,\n  updatedAt,\n  ...data\n}: DataComponentInput & Record<string, unknown>): SourceFile {\n  return generateFactorySourceFile(data, {\n    schema: DataComponentSchema,\n    factory: {\n      importName: 'dataComponent',\n      variableName: (parsed) => toCamelCase(parsed.dataComponentId),\n    },\n    render({ parsed, sourceFile, configObject }) {\n      const props = parsed.props;\n      if (props !== undefined) {\n        sourceFile.addImportDeclaration({\n          namedImports: ['z'],\n          moduleSpecifier: 'zod',\n        });\n      }\n\n      writeDataComponentConfig(configObject, parsed, props);\n    },\n  });\n}\n\nfunction writeDataComponentConfig(\n  configObject: ObjectLiteralExpression,\n  data: DataComponentOutput,\n  props: unknown\n): void {\n  addStringProperty(configObject, 'id', data.dataComponentId);\n  addStringProperty(configObject, 'name', data.name);\n\n  if (typeof data.description === 'string') {\n    addStringProperty(configObject, 'description', data.description);\n  }\n\n  if (props !== undefined) {\n    addValueToObject(configObject, 'props', codeExpression(convertJsonSchemaToZodSafe(props)));\n  }\n\n  if (data.render) {\n    addRenderProperty(configObject, data.render);\n  }\n}\n\nfunction addRenderProperty(\n  configObject: ObjectLiteralExpression,\n  render: NonNullable<DataComponentOutput['render']>\n): void {\n  if (render.component) {\n    addValueToObject(configObject, 'render', {\n      component: render.component,\n      mockData: render.mockData,\n    });\n  }\n}\n\nexport const task = {\n  type: 'data-component',\n  collect(context) {\n    const recordsByDataComponentId = new Map<\n      string,\n      ReturnType<\n        GenerationTask<Parameters<typeof generateDataComponentDefinition>[0]>['collect']\n      >[number]\n    >();\n\n    for (const [dataComponentId, dataComponent] of Object.entries(\n      context.project.dataComponents ?? {}\n    )) {\n      recordsByDataComponentId.set(dataComponentId, {\n        id: dataComponentId,\n        filePath: context.resolver.resolveOutputFilePath(\n          'dataComponents',\n          dataComponentId,\n          join(\n            context.paths.dataComponentsDir,\n            buildComponentFileName(dataComponentId, dataComponent.name ?? undefined)\n          )\n        ),\n        payload: {\n          dataComponentId,\n          ...dataComponent,\n        } as Parameters<typeof generateDataComponentDefinition>[0],\n      });\n    }\n\n    for (const dataComponentId of collectReferencedSubAgentComponentIds(\n      context,\n      'dataComponents'\n    )) {\n      if (recordsByDataComponentId.has(dataComponentId)) {\n        continue;\n      }\n\n      recordsByDataComponentId.set(dataComponentId, {\n        id: dataComponentId,\n        filePath: context.resolver.resolveOutputFilePath(\n          'dataComponents',\n          dataComponentId,\n          join(context.paths.dataComponentsDir, `${dataComponentId}.ts`)\n        ),\n        payload: {\n          dataComponentId,\n          name: dataComponentId,\n          props: { type: 'object', properties: {} },\n        } as Parameters<typeof generateDataComponentDefinition>[0],\n      });\n    }\n\n    return [...recordsByDataComponentId.values()];\n  },\n  generate: generateDataComponentDefinition,\n} satisfies GenerationTask<Parameters<typeof generateDataComponentDefinition>[0]>;\n"],"mappings":";;;;;;;;;;;;AAgBA,MAAM,WAAW,4BAA4B,MAAM,eAAe,QAAQ,CAAC,UAAU,KAAK,EACxF,IAAI,MACL,CAAC;AAEF,MAAM,sBAAsB,EAAE,aAAa;CACzC,iBAAiB,EAAE,QAAQ,CAAC,UAAU;CACtC,GAAG,SAAS;CACZ,aAAa,EAAE,YAAY,MAAM,KAAK,QAAW,SAAS,MAAM,YAAY;CAE5E,OAAO,EAAE,SAAS;CACnB,CAAC;AAKF,SAAgB,gCAAgC,EAC9C,UACA,IACA,WACA,WACA,WACA,GAAG,QACwD;AAC3D,QAAO,0BAA0B,MAAM;EACrC,QAAQ;EACR,SAAS;GACP,YAAY;GACZ,eAAe,WAAW,YAAY,OAAO,gBAAgB;GAC9D;EACD,OAAO,EAAE,QAAQ,YAAY,gBAAgB;GAC3C,MAAM,QAAQ,OAAO;AACrB,OAAI,UAAU,OACZ,YAAW,qBAAqB;IAC9B,cAAc,CAAC,IAAI;IACnB,iBAAiB;IAClB,CAAC;AAGJ,4BAAyB,cAAc,QAAQ,MAAM;;EAExD,CAAC;;AAGJ,SAAS,yBACP,cACA,MACA,OACM;AACN,mBAAkB,cAAc,MAAM,KAAK,gBAAgB;AAC3D,mBAAkB,cAAc,QAAQ,KAAK,KAAK;AAElD,KAAI,OAAO,KAAK,gBAAgB,SAC9B,mBAAkB,cAAc,eAAe,KAAK,YAAY;AAGlE,KAAI,UAAU,OACZ,kBAAiB,cAAc,SAAS,eAAe,2BAA2B,MAAM,CAAC,CAAC;AAG5F,KAAI,KAAK,OACP,mBAAkB,cAAc,KAAK,OAAO;;AAIhD,SAAS,kBACP,cACA,QACM;AACN,KAAI,OAAO,UACT,kBAAiB,cAAc,UAAU;EACvC,WAAW,OAAO;EAClB,UAAU,OAAO;EAClB,CAAC;;AAIN,MAAa,OAAO;CAClB,MAAM;CACN,QAAQ,SAAS;EACf,MAAM,2CAA2B,IAAI,KAKlC;AAEH,OAAK,MAAM,CAAC,iBAAiB,kBAAkB,OAAO,QACpD,QAAQ,QAAQ,kBAAkB,EAAE,CACrC,CACC,0BAAyB,IAAI,iBAAiB;GAC5C,IAAI;GACJ,UAAU,QAAQ,SAAS,sBACzB,kBACA,iBACA,KACE,QAAQ,MAAM,mBACd,uBAAuB,iBAAiB,cAAc,QAAQ,OAAU,CACzE,CACF;GACD,SAAS;IACP;IACA,GAAG;IACJ;GACF,CAAC;AAGJ,OAAK,MAAM,mBAAmB,sCAC5B,SACA,iBACD,EAAE;AACD,OAAI,yBAAyB,IAAI,gBAAgB,CAC/C;AAGF,4BAAyB,IAAI,iBAAiB;IAC5C,IAAI;IACJ,UAAU,QAAQ,SAAS,sBACzB,kBACA,iBACA,KAAK,QAAQ,MAAM,mBAAmB,GAAG,gBAAgB,KAAK,CAC/D;IACD,SAAS;KACP;KACA,MAAM;KACN,OAAO;MAAE,MAAM;MAAU,YAAY,EAAE;MAAE;KAC1C;IACF,CAAC;;AAGJ,SAAO,CAAC,GAAG,yBAAyB,QAAQ,CAAC;;CAE/C,UAAU;CACX"}

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

@@ -1,43 +1,39 @@
-import { addValueToObject, createFactoryDefinition } from "../utils.js";
-import { FullProjectDefinitionSchema } from "@inkeep/agents-core";
+import { collectEnvironmentCredentialReferenceIds } from "../collector-common.js";
+import { generateFactorySourceFile } from "../simple-factory-generator.js";
 import { z } from "zod";
+import { join } from "node:path";
 
 //#region src/commands/pull-v4/generators/environment-generator.ts
-const EnvironmentCredentialSchema = FullProjectDefinitionSchema.shape.credentialReferences.unwrap().valueType.omit({
-	createdBy: true,
-	toolId: true,
-	userId: true
-});
-const EnvironmentSettingsSchema = z.looseObject({ credentials: z.record(z.string(), EnvironmentCredentialSchema).nullable().optional() });
 const EnvironmentIndexSchema = z.array(z.string());
-function generateEnvironmentSettingsDefinition(environmentName, environmentData) {
-	const environmentNameResult = z.string().nonempty().safeParse(environmentName);
-	if (!environmentNameResult.success) throw new Error(`Validation failed for environment name:\n${z.prettifyError(environmentNameResult.error)}`);
-	const result = EnvironmentSettingsSchema.safeParse(environmentData);
-	if (!result.success) throw new Error(`Validation failed for environment settings:\n${z.prettifyError(result.error)}`);
-	const parsed = result.data;
-	const { sourceFile, configObject } = createFactoryDefinition({
-		importName: "registerEnvironmentSettings",
-		variableName: environmentNameResult.data
-	});
-	addValueToObject(configObject, "credentials", parsed.credentials ?? {});
-	return sourceFile;
-}
 function generateEnvironmentIndexDefinition(environments) {
-	const result = EnvironmentIndexSchema.safeParse(environments);
-	if (!result.success) throw new Error(`Validation failed for environments index:\n${z.prettifyError(result.error)}`);
-	const { sourceFile, configObject } = createFactoryDefinition({
-		importName: "createEnvironmentSettings",
-		variableName: "envSettings"
-	});
-	for (const environmentName of result.data) sourceFile.addImportDeclaration({
-		namedImports: [environmentName],
-		moduleSpecifier: `./${environmentName}.env`
+	return generateFactorySourceFile(environments, {
+		schema: EnvironmentIndexSchema,
+		factory: {
+			importName: "createEnvironmentSettings",
+			variableName: () => "envSettings"
+		},
+		render({ parsed, sourceFile, configObject }) {
+			for (const environmentName of parsed) sourceFile.addImportDeclaration({
+				namedImports: [environmentName],
+				moduleSpecifier: `./${environmentName}.env`
+			});
+			for (const environmentName of parsed) configObject.addShorthandPropertyAssignment({ name: environmentName });
+		}
 	});
-	for (const environmentName of result.data) configObject.addShorthandPropertyAssignment({ name: environmentName });
-	return sourceFile;
 }
+const task = {
+	type: "environment-index",
+	collect(context) {
+		if (collectEnvironmentCredentialReferenceIds(context.project).length === 0) return [];
+		return [{
+			id: "index",
+			filePath: context.resolver.resolveOutputFilePath("environments", "index", join(context.paths.environmentsDir, "index.ts")),
+			payload: ["development"]
+		}];
+	},
+	generate: generateEnvironmentIndexDefinition
+};
 
 //#endregion
-export { generateEnvironmentIndexDefinition, generateEnvironmentSettingsDefinition };
+export { generateEnvironmentIndexDefinition, task };
 //# sourceMappingURL=environment-generator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"environment-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/environment-generator.ts"],"sourcesContent":["import { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport type { SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport { addValueToObject, createFactoryDefinition } from '../utils';\n\nconst EnvironmentCredentialSchema = FullProjectDefinitionSchema.shape.credentialReferences\n  .unwrap()\n  .valueType.omit({\n    createdBy: true,\n    toolId: true,\n    userId: true,\n  });\n\nconst EnvironmentSettingsSchema = z.looseObject({\n  credentials: z.record(z.string(), EnvironmentCredentialSchema).nullable().optional(),\n});\n\nconst EnvironmentIndexSchema = z.array(z.string());\n\ntype EnvironmentSettingsInput = z.input<typeof EnvironmentSettingsSchema>;\ntype EnvironmentIndexInput = z.input<typeof EnvironmentIndexSchema>;\n\nexport function generateEnvironmentSettingsDefinition(\n  environmentName: string,\n  environmentData: EnvironmentSettingsInput\n): SourceFile {\n  const environmentNameSchema = z.string().nonempty();\n  const environmentNameResult = environmentNameSchema.safeParse(environmentName);\n  if (!environmentNameResult.success) {\n    throw new Error(\n      `Validation failed for environment name:\\n${z.prettifyError(environmentNameResult.error)}`\n    );\n  }\n\n  const result = EnvironmentSettingsSchema.safeParse(environmentData);\n  if (!result.success) {\n    throw new Error(\n      `Validation failed for environment settings:\\n${z.prettifyError(result.error)}`\n    );\n  }\n\n  const parsed = result.data;\n  const { sourceFile, configObject } = createFactoryDefinition({\n    importName: 'registerEnvironmentSettings',\n    variableName: environmentNameResult.data,\n  });\n\n  addValueToObject(configObject, 'credentials', parsed.credentials ?? {});\n\n  return sourceFile;\n}\n\nexport function generateEnvironmentIndexDefinition(\n  environments: EnvironmentIndexInput\n): SourceFile {\n  const result = EnvironmentIndexSchema.safeParse(environments);\n  if (!result.success) {\n    throw new Error(`Validation failed for environments index:\\n${z.prettifyError(result.error)}`);\n  }\n\n  const { sourceFile, configObject } = createFactoryDefinition({\n    importName: 'createEnvironmentSettings',\n    variableName: 'envSettings',\n  });\n\n  for (const environmentName of result.data) {\n    sourceFile.addImportDeclaration({\n      namedImports: [environmentName],\n      moduleSpecifier: `./${environmentName}.env`,\n    });\n  }\n\n  for (const environmentName of result.data) {\n    configObject.addShorthandPropertyAssignment({ name: environmentName });\n  }\n\n  return sourceFile;\n}\n"],"mappings":";;;;;AAKA,MAAM,8BAA8B,4BAA4B,MAAM,qBACnE,QAAQ,CACR,UAAU,KAAK;CACd,WAAW;CACX,QAAQ;CACR,QAAQ;CACT,CAAC;AAEJ,MAAM,4BAA4B,EAAE,YAAY,EAC9C,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,4BAA4B,CAAC,UAAU,CAAC,UAAU,EACrF,CAAC;AAEF,MAAM,yBAAyB,EAAE,MAAM,EAAE,QAAQ,CAAC;AAKlD,SAAgB,sCACd,iBACA,iBACY;CAEZ,MAAM,wBADwB,EAAE,QAAQ,CAAC,UAAU,CACC,UAAU,gBAAgB;AAC9E,KAAI,CAAC,sBAAsB,QACzB,OAAM,IAAI,MACR,4CAA4C,EAAE,cAAc,sBAAsB,MAAM,GACzF;CAGH,MAAM,SAAS,0BAA0B,UAAU,gBAAgB;AACnE,KAAI,CAAC,OAAO,QACV,OAAM,IAAI,MACR,gDAAgD,EAAE,cAAc,OAAO,MAAM,GAC9E;CAGH,MAAM,SAAS,OAAO;CACtB,MAAM,EAAE,YAAY,iBAAiB,wBAAwB;EAC3D,YAAY;EACZ,cAAc,sBAAsB;EACrC,CAAC;AAEF,kBAAiB,cAAc,eAAe,OAAO,eAAe,EAAE,CAAC;AAEvE,QAAO;;AAGT,SAAgB,mCACd,cACY;CACZ,MAAM,SAAS,uBAAuB,UAAU,aAAa;AAC7D,KAAI,CAAC,OAAO,QACV,OAAM,IAAI,MAAM,8CAA8C,EAAE,cAAc,OAAO,MAAM,GAAG;CAGhG,MAAM,EAAE,YAAY,iBAAiB,wBAAwB;EAC3D,YAAY;EACZ,cAAc;EACf,CAAC;AAEF,MAAK,MAAM,mBAAmB,OAAO,KACnC,YAAW,qBAAqB;EAC9B,cAAc,CAAC,gBAAgB;EAC/B,iBAAiB,KAAK,gBAAgB;EACvC,CAAC;AAGJ,MAAK,MAAM,mBAAmB,OAAO,KACnC,cAAa,+BAA+B,EAAE,MAAM,iBAAiB,CAAC;AAGxE,QAAO"}
+{"version":3,"file":"environment-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/environment-generator.ts"],"sourcesContent":["import { join } from 'node:path';\nimport type { SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport { collectEnvironmentCredentialReferenceIds } from '../collector-common';\nimport type { GenerationTask } from '../generation-types';\nimport { generateFactorySourceFile } from '../simple-factory-generator';\n\nconst EnvironmentIndexSchema = z.array(z.string());\n\ntype EnvironmentIndexInput = z.input<typeof EnvironmentIndexSchema>;\n\nexport function generateEnvironmentIndexDefinition(\n  environments: EnvironmentIndexInput\n): SourceFile {\n  return generateFactorySourceFile(environments, {\n    schema: EnvironmentIndexSchema,\n    factory: {\n      importName: 'createEnvironmentSettings',\n      variableName: () => 'envSettings',\n    },\n    render({ parsed, sourceFile, configObject }) {\n      for (const environmentName of parsed) {\n        sourceFile.addImportDeclaration({\n          namedImports: [environmentName],\n          moduleSpecifier: `./${environmentName}.env`,\n        });\n      }\n\n      for (const environmentName of parsed) {\n        configObject.addShorthandPropertyAssignment({ name: environmentName });\n      }\n    },\n  });\n}\n\nexport const task = {\n  type: 'environment-index',\n  collect(context) {\n    const credentialReferenceIds = collectEnvironmentCredentialReferenceIds(context.project);\n    if (credentialReferenceIds.length === 0) {\n      return [];\n    }\n\n    return [\n      {\n        id: 'index',\n        filePath: context.resolver.resolveOutputFilePath(\n          'environments',\n          'index',\n          join(context.paths.environmentsDir, 'index.ts')\n        ),\n        payload: ['development'] as Parameters<typeof generateEnvironmentIndexDefinition>[0],\n      },\n    ];\n  },\n  generate: generateEnvironmentIndexDefinition,\n} satisfies GenerationTask<Parameters<typeof generateEnvironmentIndexDefinition>[0]>;\n"],"mappings":";;;;;;AAOA,MAAM,yBAAyB,EAAE,MAAM,EAAE,QAAQ,CAAC;AAIlD,SAAgB,mCACd,cACY;AACZ,QAAO,0BAA0B,cAAc;EAC7C,QAAQ;EACR,SAAS;GACP,YAAY;GACZ,oBAAoB;GACrB;EACD,OAAO,EAAE,QAAQ,YAAY,gBAAgB;AAC3C,QAAK,MAAM,mBAAmB,OAC5B,YAAW,qBAAqB;IAC9B,cAAc,CAAC,gBAAgB;IAC/B,iBAAiB,KAAK,gBAAgB;IACvC,CAAC;AAGJ,QAAK,MAAM,mBAAmB,OAC5B,cAAa,+BAA+B,EAAE,MAAM,iBAAiB,CAAC;;EAG3E,CAAC;;AAGJ,MAAa,OAAO;CAClB,MAAM;CACN,QAAQ,SAAS;AAEf,MAD+B,yCAAyC,QAAQ,QAAQ,CAC7D,WAAW,EACpC,QAAO,EAAE;AAGX,SAAO,CACL;GACE,IAAI;GACJ,UAAU,QAAQ,SAAS,sBACzB,gBACA,SACA,KAAK,QAAQ,MAAM,iBAAiB,WAAW,CAChD;GACD,SAAS,CAAC,cAAc;GACzB,CACF;;CAEH,UAAU;CACX"}

package/dist/commands/pull-v4/generators/environment-settings-generator.js

@@ -0,0 +1,57 @@
+import { asRecord, collectEnvironmentCredentialReferenceIds } from "../collector-common.js";
+import { generateSimpleFactoryDefinition, validateGeneratorInput } from "../simple-factory-generator.js";
+import { FullProjectDefinitionSchema } from "@inkeep/agents-core";
+import { z } from "zod";
+import { join } from "node:path";
+
+//#region src/commands/pull-v4/generators/environment-settings-generator.ts
+const EnvironmentCredentialSchema = FullProjectDefinitionSchema.shape.credentialReferences.unwrap().valueType.omit({
+	createdBy: true,
+	toolId: true,
+	userId: true
+});
+const EnvironmentSettingsSchema = z.looseObject({ credentials: z.record(z.string(), EnvironmentCredentialSchema).nullable().optional() });
+function generateEnvironmentSettingsDefinition(environmentName, environmentData) {
+	const validatedEnvironmentName = validateGeneratorInput(environmentName, {
+		schema: z.string().nonempty(),
+		errorLabel: "environment name"
+	});
+	return generateSimpleFactoryDefinition(environmentData, {
+		schema: EnvironmentSettingsSchema,
+		factory: {
+			importName: "registerEnvironmentSettings",
+			variableName: () => validatedEnvironmentName
+		},
+		buildConfig(parsed) {
+			return { credentials: parsed.credentials ?? {} };
+		}
+	});
+}
+const task = {
+	type: "environment-settings",
+	collect(context) {
+		const credentialReferenceIds = collectEnvironmentCredentialReferenceIds(context.project);
+		if (credentialReferenceIds.length === 0) return [];
+		const credentials = {};
+		for (const credentialReferenceId of credentialReferenceIds) {
+			const credentialData = context.project.credentialReferences?.[credentialReferenceId];
+			const credentialRecord = asRecord(credentialData);
+			credentials[credentialReferenceId] = credentialRecord ? {
+				...credentialRecord,
+				id: credentialReferenceId
+			} : { id: credentialReferenceId };
+		}
+		return [{
+			id: "development",
+			filePath: context.resolver.resolveOutputFilePath("environments", "development", join(context.paths.environmentsDir, "development.env.ts")),
+			payload: { credentials }
+		}];
+	},
+	generate(payload) {
+		return generateEnvironmentSettingsDefinition("development", payload);
+	}
+};
+
+//#endregion
+export { generateEnvironmentSettingsDefinition, task };
+//# sourceMappingURL=environment-settings-generator.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"environment-settings-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/environment-settings-generator.ts"],"sourcesContent":["import { join } from 'node:path';\nimport { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport type { SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport { asRecord, collectEnvironmentCredentialReferenceIds } from '../collector-common';\nimport type { GenerationTask } from '../generation-types';\nimport {\n  generateSimpleFactoryDefinition,\n  validateGeneratorInput,\n} from '../simple-factory-generator';\n\nconst EnvironmentCredentialSchema = FullProjectDefinitionSchema.shape.credentialReferences\n  .unwrap()\n  .valueType.omit({\n    createdBy: true,\n    toolId: true,\n    userId: true,\n  });\nconst EnvironmentSettingsSchema = z.looseObject({\n  credentials: z.record(z.string(), EnvironmentCredentialSchema).nullable().optional(),\n});\ntype EnvironmentSettingsInput = z.input<typeof EnvironmentSettingsSchema>;\n\nexport function generateEnvironmentSettingsDefinition(\n  environmentName: string,\n  environmentData: EnvironmentSettingsInput\n): SourceFile {\n  const validatedEnvironmentName = validateGeneratorInput(environmentName, {\n    schema: z.string().nonempty(),\n    errorLabel: 'environment name',\n  });\n\n  return generateSimpleFactoryDefinition(environmentData, {\n    schema: EnvironmentSettingsSchema,\n    factory: {\n      importName: 'registerEnvironmentSettings',\n      variableName: () => validatedEnvironmentName,\n    },\n    buildConfig(parsed) {\n      return {\n        credentials: parsed.credentials ?? {},\n      };\n    },\n  });\n}\n\nexport const task = {\n  type: 'environment-settings',\n  collect(context) {\n    const credentialReferenceIds = collectEnvironmentCredentialReferenceIds(context.project);\n    if (credentialReferenceIds.length === 0) {\n      return [];\n    }\n\n    const credentials: Record<string, unknown> = {};\n    for (const credentialReferenceId of credentialReferenceIds) {\n      const credentialData = context.project.credentialReferences?.[credentialReferenceId];\n      const credentialRecord = asRecord(credentialData);\n      credentials[credentialReferenceId] = credentialRecord\n        ? { ...credentialRecord, id: credentialReferenceId }\n        : { id: credentialReferenceId };\n    }\n\n    return [\n      {\n        id: 'development',\n        filePath: context.resolver.resolveOutputFilePath(\n          'environments',\n          'development',\n          join(context.paths.environmentsDir, 'development.env.ts')\n        ),\n        payload: {\n          credentials,\n        } as Parameters<typeof generateEnvironmentSettingsDefinition>[1],\n      },\n    ];\n  },\n  generate(payload) {\n    return generateEnvironmentSettingsDefinition('development', payload);\n  },\n} satisfies GenerationTask<Parameters<typeof generateEnvironmentSettingsDefinition>[1]>;\n"],"mappings":";;;;;;;AAWA,MAAM,8BAA8B,4BAA4B,MAAM,qBACnE,QAAQ,CACR,UAAU,KAAK;CACd,WAAW;CACX,QAAQ;CACR,QAAQ;CACT,CAAC;AACJ,MAAM,4BAA4B,EAAE,YAAY,EAC9C,aAAa,EAAE,OAAO,EAAE,QAAQ,EAAE,4BAA4B,CAAC,UAAU,CAAC,UAAU,EACrF,CAAC;AAGF,SAAgB,sCACd,iBACA,iBACY;CACZ,MAAM,2BAA2B,uBAAuB,iBAAiB;EACvE,QAAQ,EAAE,QAAQ,CAAC,UAAU;EAC7B,YAAY;EACb,CAAC;AAEF,QAAO,gCAAgC,iBAAiB;EACtD,QAAQ;EACR,SAAS;GACP,YAAY;GACZ,oBAAoB;GACrB;EACD,YAAY,QAAQ;AAClB,UAAO,EACL,aAAa,OAAO,eAAe,EAAE,EACtC;;EAEJ,CAAC;;AAGJ,MAAa,OAAO;CAClB,MAAM;CACN,QAAQ,SAAS;EACf,MAAM,yBAAyB,yCAAyC,QAAQ,QAAQ;AACxF,MAAI,uBAAuB,WAAW,EACpC,QAAO,EAAE;EAGX,MAAM,cAAuC,EAAE;AAC/C,OAAK,MAAM,yBAAyB,wBAAwB;GAC1D,MAAM,iBAAiB,QAAQ,QAAQ,uBAAuB;GAC9D,MAAM,mBAAmB,SAAS,eAAe;AACjD,eAAY,yBAAyB,mBACjC;IAAE,GAAG;IAAkB,IAAI;IAAuB,GAClD,EAAE,IAAI,uBAAuB;;AAGnC,SAAO,CACL;GACE,IAAI;GACJ,UAAU,QAAQ,SAAS,sBACzB,gBACA,eACA,KAAK,QAAQ,MAAM,iBAAiB,qBAAqB,CAC1D;GACD,SAAS,EACP,aACD;GACF,CACF;;CAEH,SAAS,SAAS;AAChB,SAAO,sCAAsC,eAAe,QAAQ;;CAEvE"}

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

@@ -1,6 +1,14 @@
-import { addValueToObject, createFactoryDefinition, toCamelCase } from "../utils.js";
+import { codeReference } from "../utils/code-values.js";
+import { toCamelCase } from "../utils/naming.js";
+import { addValueToObject } from "../utils/factory-writer.js";
+import "../utils/index.js";
+import { asRecord } from "../collector-common.js";
+import { buildSequentialNameFileNames, resolveExternalAgentNamingSeed } from "../generation-resolver.js";
+import { generateSimpleFactoryDefinition } from "../simple-factory-generator.js";
+import { addNamedImports, applyImportPlan, createImportPlan } from "../import-plan.js";
 import { FullProjectDefinitionSchema } from "@inkeep/agents-core";
 import { z } from "zod";
+import { join } from "node:path";
 
 //#region src/commands/pull-v4/generators/external-agent-generator.ts
 const MySchema = FullProjectDefinitionSchema.shape.externalAgents.unwrap().valueType.omit({ id: true });
@@ -10,30 +18,50 @@ const ExternalAgentSchema = z.strictObject({
 	...MySchema.shape
 });
 function generateExternalAgentDefinition({ id, tenantId, projectId, createdAt, updatedAt, ...data }) {
-	const result = ExternalAgentSchema.safeParse(data);
-	if (!result.success) throw new Error(`Validation failed for external agent:\n${z.prettifyError(result.error)}`);
-	const { externalAgentReferenceName, externalAgentId, credentialReferenceId, ...parsed } = result.data;
-	const { sourceFile, configObject } = createFactoryDefinition({
-		importName: "externalAgent",
-		variableName: externalAgentReferenceName ?? toCamelCase(externalAgentId)
+	return generateSimpleFactoryDefinition(data, {
+		schema: ExternalAgentSchema,
+		factory: {
+			importName: "externalAgent",
+			variableName: (parsed) => parsed.externalAgentReferenceName ?? toCamelCase(parsed.externalAgentId)
+		},
+		buildConfig(parsed) {
+			const { externalAgentReferenceName: _externalAgentReferenceName, externalAgentId, credentialReferenceId: _credentialReferenceId, ...rest } = parsed;
+			return {
+				id: externalAgentId,
+				...rest
+			};
+		},
+		finalize({ parsed, sourceFile, configObject }) {
+			if (!parsed.credentialReferenceId) return;
+			const credentialReferenceName = toCamelCase(parsed.credentialReferenceId);
+			const importPlan = createImportPlan();
+			addNamedImports(importPlan, `../credentials/${parsed.credentialReferenceId}`, credentialReferenceName);
+			applyImportPlan(sourceFile, importPlan);
+			addValueToObject(configObject, "credentialReference", codeReference(credentialReferenceName));
+		}
 	});
-	for (const [key, value] of Object.entries({
-		id: externalAgentId,
-		...parsed
-	})) addValueToObject(configObject, key, value);
-	if (credentialReferenceId) {
-		sourceFile.addImportDeclaration({
-			namedImports: [toCamelCase(credentialReferenceId)],
-			moduleSpecifier: `../credentials/${credentialReferenceId}`
-		});
-		configObject.addPropertyAssignment({
-			name: "credentialReference",
-			initializer: toCamelCase(credentialReferenceId)
-		});
-	}
-	return sourceFile;
 }
+const task = {
+	type: "external-agent",
+	collect(context) {
+		const externalAgentEntries = Object.entries(context.project.externalAgents ?? {});
+		const fileNamesByExternalAgentId = buildSequentialNameFileNames(externalAgentEntries.map(([externalAgentId, externalAgentData]) => [externalAgentId, { name: resolveExternalAgentNamingSeed(externalAgentId, externalAgentData) }]));
+		return externalAgentEntries.map(([externalAgentId, externalAgentData]) => {
+			const externalAgentRecord = asRecord(externalAgentData) ?? {};
+			return {
+				id: externalAgentId,
+				filePath: context.resolver.resolveOutputFilePath("externalAgents", externalAgentId, join(context.paths.externalAgentsDir, fileNamesByExternalAgentId[externalAgentId])),
+				payload: {
+					externalAgentId,
+					externalAgentReferenceName: context.resolver.getExternalAgentReferenceName(externalAgentId),
+					...externalAgentRecord
+				}
+			};
+		});
+	},
+	generate: generateExternalAgentDefinition
+};
 
 //#endregion
-export { generateExternalAgentDefinition };
+export { generateExternalAgentDefinition, task };
 //# sourceMappingURL=external-agent-generator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"external-agent-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/external-agent-generator.ts"],"sourcesContent":["import { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport type { SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport { addValueToObject, createFactoryDefinition, toCamelCase } from '../utils';\n\nconst MySchema = FullProjectDefinitionSchema.shape.externalAgents.unwrap().valueType.omit({\n  id: true,\n});\n\nconst ExternalAgentSchema = z.strictObject({\n  externalAgentId: z.string().nonempty(),\n  externalAgentReferenceName: z.string().optional(),\n  ...MySchema.shape,\n});\n\ntype ExternalAgentInput = z.input<typeof ExternalAgentSchema>;\n\nexport function generateExternalAgentDefinition({\n  id,\n  tenantId,\n  projectId,\n  createdAt,\n  updatedAt,\n  ...data\n}: ExternalAgentInput & Record<string, unknown>): SourceFile {\n  const result = ExternalAgentSchema.safeParse(data);\n  if (!result.success) {\n    throw new Error(`Validation failed for external agent:\\n${z.prettifyError(result.error)}`);\n  }\n\n  const { externalAgentReferenceName, externalAgentId, credentialReferenceId, ...parsed } =\n    result.data;\n  const { sourceFile, configObject } = createFactoryDefinition({\n    importName: 'externalAgent',\n    variableName: externalAgentReferenceName ?? toCamelCase(externalAgentId),\n  });\n\n  for (const [key, value] of Object.entries({\n    id: externalAgentId,\n    ...parsed,\n  })) {\n    addValueToObject(configObject, key, value);\n  }\n  if (credentialReferenceId) {\n    sourceFile.addImportDeclaration({\n      namedImports: [toCamelCase(credentialReferenceId)],\n      moduleSpecifier: `../credentials/${credentialReferenceId}`,\n    });\n    configObject.addPropertyAssignment({\n      name: 'credentialReference',\n      initializer: toCamelCase(credentialReferenceId),\n    });\n  }\n  return sourceFile;\n}\n"],"mappings":";;;;;AAKA,MAAM,WAAW,4BAA4B,MAAM,eAAe,QAAQ,CAAC,UAAU,KAAK,EACxF,IAAI,MACL,CAAC;AAEF,MAAM,sBAAsB,EAAE,aAAa;CACzC,iBAAiB,EAAE,QAAQ,CAAC,UAAU;CACtC,4BAA4B,EAAE,QAAQ,CAAC,UAAU;CACjD,GAAG,SAAS;CACb,CAAC;AAIF,SAAgB,gCAAgC,EAC9C,IACA,UACA,WACA,WACA,WACA,GAAG,QACwD;CAC3D,MAAM,SAAS,oBAAoB,UAAU,KAAK;AAClD,KAAI,CAAC,OAAO,QACV,OAAM,IAAI,MAAM,0CAA0C,EAAE,cAAc,OAAO,MAAM,GAAG;CAG5F,MAAM,EAAE,4BAA4B,iBAAiB,uBAAuB,GAAG,WAC7E,OAAO;CACT,MAAM,EAAE,YAAY,iBAAiB,wBAAwB;EAC3D,YAAY;EACZ,cAAc,8BAA8B,YAAY,gBAAgB;EACzE,CAAC;AAEF,MAAK,MAAM,CAAC,KAAK,UAAU,OAAO,QAAQ;EACxC,IAAI;EACJ,GAAG;EACJ,CAAC,CACA,kBAAiB,cAAc,KAAK,MAAM;AAE5C,KAAI,uBAAuB;AACzB,aAAW,qBAAqB;GAC9B,cAAc,CAAC,YAAY,sBAAsB,CAAC;GAClD,iBAAiB,kBAAkB;GACpC,CAAC;AACF,eAAa,sBAAsB;GACjC,MAAM;GACN,aAAa,YAAY,sBAAsB;GAChD,CAAC;;AAEJ,QAAO"}
+{"version":3,"file":"external-agent-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/external-agent-generator.ts"],"sourcesContent":["import { join } from 'node:path';\nimport { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport type { SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport { asRecord } from '../collector-common';\nimport {\n  buildSequentialNameFileNames,\n  resolveExternalAgentNamingSeed,\n} from '../generation-resolver';\nimport type { GenerationTask } from '../generation-types';\nimport { addNamedImports, applyImportPlan, createImportPlan } from '../import-plan';\nimport { generateSimpleFactoryDefinition } from '../simple-factory-generator';\nimport { addValueToObject, codeReference, toCamelCase } from '../utils';\n\nconst MySchema = FullProjectDefinitionSchema.shape.externalAgents.unwrap().valueType.omit({\n  id: true,\n});\n\nconst ExternalAgentSchema = z.strictObject({\n  externalAgentId: z.string().nonempty(),\n  externalAgentReferenceName: z.string().optional(),\n  ...MySchema.shape,\n});\n\ntype ExternalAgentInput = z.input<typeof ExternalAgentSchema>;\n\nexport function generateExternalAgentDefinition({\n  id,\n  tenantId,\n  projectId,\n  createdAt,\n  updatedAt,\n  ...data\n}: ExternalAgentInput & Record<string, unknown>): SourceFile {\n  return generateSimpleFactoryDefinition(data, {\n    schema: ExternalAgentSchema,\n    factory: {\n      importName: 'externalAgent',\n      variableName: (parsed) =>\n        parsed.externalAgentReferenceName ?? toCamelCase(parsed.externalAgentId),\n    },\n    buildConfig(parsed) {\n      const {\n        externalAgentReferenceName: _externalAgentReferenceName,\n        externalAgentId,\n        credentialReferenceId: _credentialReferenceId,\n        ...rest\n      } = parsed;\n      return {\n        id: externalAgentId,\n        ...rest,\n      };\n    },\n    finalize({ parsed, sourceFile, configObject }) {\n      if (!parsed.credentialReferenceId) {\n        return;\n      }\n\n      const credentialReferenceName = toCamelCase(parsed.credentialReferenceId);\n      const importPlan = createImportPlan();\n      addNamedImports(\n        importPlan,\n        `../credentials/${parsed.credentialReferenceId}`,\n        credentialReferenceName\n      );\n      applyImportPlan(sourceFile, importPlan);\n      addValueToObject(configObject, 'credentialReference', codeReference(credentialReferenceName));\n    },\n  });\n}\n\nexport const task = {\n  type: 'external-agent',\n  collect(context) {\n    const externalAgentEntries = Object.entries(context.project.externalAgents ?? {});\n    const fileNamesByExternalAgentId = buildSequentialNameFileNames(\n      externalAgentEntries.map(([externalAgentId, externalAgentData]) => [\n        externalAgentId,\n        { name: resolveExternalAgentNamingSeed(externalAgentId, externalAgentData) },\n      ])\n    );\n\n    return externalAgentEntries.map(([externalAgentId, externalAgentData]) => {\n      const externalAgentRecord = asRecord(externalAgentData) ?? {};\n      return {\n        id: externalAgentId,\n        filePath: context.resolver.resolveOutputFilePath(\n          'externalAgents',\n          externalAgentId,\n          join(context.paths.externalAgentsDir, fileNamesByExternalAgentId[externalAgentId])\n        ),\n        payload: {\n          externalAgentId,\n          externalAgentReferenceName:\n            context.resolver.getExternalAgentReferenceName(externalAgentId),\n          ...externalAgentRecord,\n        } as Parameters<typeof generateExternalAgentDefinition>[0],\n      };\n    });\n  },\n  generate: generateExternalAgentDefinition,\n} satisfies GenerationTask<Parameters<typeof generateExternalAgentDefinition>[0]>;\n"],"mappings":";;;;;;;;;;;;;AAcA,MAAM,WAAW,4BAA4B,MAAM,eAAe,QAAQ,CAAC,UAAU,KAAK,EACxF,IAAI,MACL,CAAC;AAEF,MAAM,sBAAsB,EAAE,aAAa;CACzC,iBAAiB,EAAE,QAAQ,CAAC,UAAU;CACtC,4BAA4B,EAAE,QAAQ,CAAC,UAAU;CACjD,GAAG,SAAS;CACb,CAAC;AAIF,SAAgB,gCAAgC,EAC9C,IACA,UACA,WACA,WACA,WACA,GAAG,QACwD;AAC3D,QAAO,gCAAgC,MAAM;EAC3C,QAAQ;EACR,SAAS;GACP,YAAY;GACZ,eAAe,WACb,OAAO,8BAA8B,YAAY,OAAO,gBAAgB;GAC3E;EACD,YAAY,QAAQ;GAClB,MAAM,EACJ,4BAA4B,6BAC5B,iBACA,uBAAuB,wBACvB,GAAG,SACD;AACJ,UAAO;IACL,IAAI;IACJ,GAAG;IACJ;;EAEH,SAAS,EAAE,QAAQ,YAAY,gBAAgB;AAC7C,OAAI,CAAC,OAAO,sBACV;GAGF,MAAM,0BAA0B,YAAY,OAAO,sBAAsB;GACzE,MAAM,aAAa,kBAAkB;AACrC,mBACE,YACA,kBAAkB,OAAO,yBACzB,wBACD;AACD,mBAAgB,YAAY,WAAW;AACvC,oBAAiB,cAAc,uBAAuB,cAAc,wBAAwB,CAAC;;EAEhG,CAAC;;AAGJ,MAAa,OAAO;CAClB,MAAM;CACN,QAAQ,SAAS;EACf,MAAM,uBAAuB,OAAO,QAAQ,QAAQ,QAAQ,kBAAkB,EAAE,CAAC;EACjF,MAAM,6BAA6B,6BACjC,qBAAqB,KAAK,CAAC,iBAAiB,uBAAuB,CACjE,iBACA,EAAE,MAAM,+BAA+B,iBAAiB,kBAAkB,EAAE,CAC7E,CAAC,CACH;AAED,SAAO,qBAAqB,KAAK,CAAC,iBAAiB,uBAAuB;GACxE,MAAM,sBAAsB,SAAS,kBAAkB,IAAI,EAAE;AAC7D,UAAO;IACL,IAAI;IACJ,UAAU,QAAQ,SAAS,sBACzB,kBACA,iBACA,KAAK,QAAQ,MAAM,mBAAmB,2BAA2B,iBAAiB,CACnF;IACD,SAAS;KACP;KACA,4BACE,QAAQ,SAAS,8BAA8B,gBAAgB;KACjE,GAAG;KACJ;IACF;IACD;;CAEJ,UAAU;CACX"}

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

@@ -1,6 +1,13 @@
-import { addValueToObject, createFactoryDefinition, toToolReferenceName } from "../utils.js";
+import { codeExpression } from "../utils/code-values.js";
+import { toToolReferenceName } from "../utils/naming.js";
+import { addValueToObject } from "../utils/factory-writer.js";
+import "../utils/index.js";
+import { stripExtension } from "../collector-common.js";
+import { buildSequentialNameFileNames, collectFunctionToolEntries } from "../generation-resolver.js";
+import { generateSimpleFactoryDefinition } from "../simple-factory-generator.js";
 import { FullProjectDefinitionSchema } from "@inkeep/agents-core";
 import { z } from "zod";
+import { join } from "node:path";
 
 //#region src/commands/pull-v4/generators/function-tool-generator.ts
 const MySchema = FullProjectDefinitionSchema.shape.functions.unwrap().valueType.omit({ id: true });
@@ -16,21 +23,50 @@ const FunctionToolSchema = z.strictObject({
 	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 { functionToolId, executeCode, ...parsed } = result.data;
-	const { sourceFile, configObject } = createFactoryDefinition({
-		importName: "functionTool",
-		variableName: toToolReferenceName(parsed.name || functionToolId)
+	return generateSimpleFactoryDefinition(data, {
+		schema: FunctionToolSchema,
+		factory: {
+			importName: "functionTool",
+			variableName: (parsed) => toToolReferenceName(parsed.name || parsed.functionToolId)
+		},
+		buildConfig(parsed) {
+			const { functionToolId: _functionToolId, executeCode: _executeCode, ...rest } = parsed;
+			return rest;
+		},
+		finalize({ parsed, configObject }) {
+			if (!parsed.executeCode) return;
+			addValueToObject(configObject, "execute", codeExpression(parsed.executeCode));
+		}
 	});
-	for (const [k, v] of Object.entries(parsed)) addValueToObject(configObject, k, v);
-	if (executeCode) configObject.addPropertyAssignment({
-		name: "execute",
-		initializer: executeCode
-	});
-	return sourceFile;
 }
+const task = {
+	type: "function-tool",
+	collect(context) {
+		const functionToolEntries = collectFunctionToolEntries(context.project);
+		if (!functionToolEntries.length) return [];
+		const fileNamesByFunctionToolId = buildSequentialNameFileNames(functionToolEntries.map(({ functionToolId, fileName }) => [functionToolId, { name: fileName }]));
+		return functionToolEntries.map(({ functionToolId, functionToolData, functionData }) => {
+			const modulePath = stripExtension(fileNamesByFunctionToolId[functionToolId]);
+			const functionToolName = typeof functionToolData.name === "string" && functionToolData.name.length > 0 ? functionToolData.name : typeof functionData.name === "string" && functionData.name.length > 0 ? functionData.name : void 0;
+			const functionToolDescription = typeof functionToolData.description === "string" ? functionToolData.description : typeof functionData.description === "string" ? functionData.description : void 0;
+			return {
+				id: functionToolId,
+				filePath: context.resolver.resolveOutputFilePath("functionTools", functionToolId, join(context.paths.toolsDir, `${modulePath}.ts`)),
+				payload: {
+					functionToolId,
+					...functionToolName && { name: functionToolName },
+					...functionToolDescription !== void 0 && { description: functionToolDescription },
+					...functionData.inputSchema !== void 0 && { inputSchema: functionData.inputSchema },
+					...functionData.schema !== void 0 && { schema: functionData.schema },
+					...functionData.executeCode !== void 0 && { executeCode: functionData.executeCode },
+					...functionData.dependencies !== void 0 && { dependencies: functionData.dependencies }
+				}
+			};
+		});
+	},
+	generate: generateFunctionToolDefinition
+};
 
 //#endregion
-export { generateFunctionToolDefinition };
+export { generateFunctionToolDefinition, task };
 //# sourceMappingURL=function-tool-generator.js.map

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

@@ -1 +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"}
+{"version":3,"file":"function-tool-generator.js","names":[],"sources":["../../../../src/commands/pull-v4/generators/function-tool-generator.ts"],"sourcesContent":["import { join } from 'node:path';\nimport { FullProjectDefinitionSchema } from '@inkeep/agents-core';\nimport type { SourceFile } from 'ts-morph';\nimport { z } from 'zod';\nimport { stripExtension } from '../collector-common';\nimport { buildSequentialNameFileNames, collectFunctionToolEntries } from '../generation-resolver';\nimport type { GenerationTask } from '../generation-types';\nimport { generateSimpleFactoryDefinition } from '../simple-factory-generator';\nimport { addValueToObject, codeExpression, 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  return generateSimpleFactoryDefinition(data, {\n    schema: FunctionToolSchema,\n    factory: {\n      importName: 'functionTool',\n      variableName: (parsed) => toToolReferenceName(parsed.name || parsed.functionToolId),\n    },\n    buildConfig(parsed) {\n      const { functionToolId: _functionToolId, executeCode: _executeCode, ...rest } = parsed;\n      return rest;\n    },\n    finalize({ parsed, configObject }) {\n      if (!parsed.executeCode) {\n        return;\n      }\n\n      addValueToObject(configObject, 'execute', codeExpression(parsed.executeCode));\n    },\n  });\n}\n\nexport const task = {\n  type: 'function-tool',\n  collect(context) {\n    const functionToolEntries = collectFunctionToolEntries(context.project);\n    if (!functionToolEntries.length) {\n      return [];\n    }\n\n    const fileNamesByFunctionToolId = buildSequentialNameFileNames(\n      functionToolEntries.map(({ functionToolId, fileName }) => [\n        functionToolId,\n        { name: fileName },\n      ])\n    );\n\n    return functionToolEntries.map(({ functionToolId, functionToolData, functionData }) => {\n      const modulePath = stripExtension(fileNamesByFunctionToolId[functionToolId]);\n      const functionToolName =\n        typeof functionToolData.name === 'string' && functionToolData.name.length > 0\n          ? functionToolData.name\n          : typeof functionData.name === 'string' && functionData.name.length > 0\n            ? functionData.name\n            : undefined;\n      const functionToolDescription =\n        typeof functionToolData.description === 'string'\n          ? functionToolData.description\n          : typeof functionData.description === 'string'\n            ? functionData.description\n            : undefined;\n\n      return {\n        id: functionToolId,\n        filePath: context.resolver.resolveOutputFilePath(\n          'functionTools',\n          functionToolId,\n          join(context.paths.toolsDir, `${modulePath}.ts`)\n        ),\n        payload: {\n          functionToolId,\n          ...(functionToolName && { name: functionToolName }),\n          ...(functionToolDescription !== undefined && { description: functionToolDescription }),\n          ...(functionData.inputSchema !== undefined && { inputSchema: functionData.inputSchema }),\n          ...(functionData.schema !== undefined && { schema: functionData.schema }),\n          ...(functionData.executeCode !== undefined && { executeCode: functionData.executeCode }),\n          ...(functionData.dependencies !== undefined && {\n            dependencies: functionData.dependencies,\n          }),\n        } as Parameters<typeof generateFunctionToolDefinition>[0],\n      };\n    });\n  },\n  generate: generateFunctionToolDefinition,\n} satisfies GenerationTask<Parameters<typeof generateFunctionToolDefinition>[0]>;\n"],"mappings":";;;;;;;;;;;;AAUA,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;AAClF,QAAO,gCAAgC,MAAM;EAC3C,QAAQ;EACR,SAAS;GACP,YAAY;GACZ,eAAe,WAAW,oBAAoB,OAAO,QAAQ,OAAO,eAAe;GACpF;EACD,YAAY,QAAQ;GAClB,MAAM,EAAE,gBAAgB,iBAAiB,aAAa,cAAc,GAAG,SAAS;AAChF,UAAO;;EAET,SAAS,EAAE,QAAQ,gBAAgB;AACjC,OAAI,CAAC,OAAO,YACV;AAGF,oBAAiB,cAAc,WAAW,eAAe,OAAO,YAAY,CAAC;;EAEhF,CAAC;;AAGJ,MAAa,OAAO;CAClB,MAAM;CACN,QAAQ,SAAS;EACf,MAAM,sBAAsB,2BAA2B,QAAQ,QAAQ;AACvE,MAAI,CAAC,oBAAoB,OACvB,QAAO,EAAE;EAGX,MAAM,4BAA4B,6BAChC,oBAAoB,KAAK,EAAE,gBAAgB,eAAe,CACxD,gBACA,EAAE,MAAM,UAAU,CACnB,CAAC,CACH;AAED,SAAO,oBAAoB,KAAK,EAAE,gBAAgB,kBAAkB,mBAAmB;GACrF,MAAM,aAAa,eAAe,0BAA0B,gBAAgB;GAC5E,MAAM,mBACJ,OAAO,iBAAiB,SAAS,YAAY,iBAAiB,KAAK,SAAS,IACxE,iBAAiB,OACjB,OAAO,aAAa,SAAS,YAAY,aAAa,KAAK,SAAS,IAClE,aAAa,OACb;GACR,MAAM,0BACJ,OAAO,iBAAiB,gBAAgB,WACpC,iBAAiB,cACjB,OAAO,aAAa,gBAAgB,WAClC,aAAa,cACb;AAER,UAAO;IACL,IAAI;IACJ,UAAU,QAAQ,SAAS,sBACzB,iBACA,gBACA,KAAK,QAAQ,MAAM,UAAU,GAAG,WAAW,KAAK,CACjD;IACD,SAAS;KACP;KACA,GAAI,oBAAoB,EAAE,MAAM,kBAAkB;KAClD,GAAI,4BAA4B,UAAa,EAAE,aAAa,yBAAyB;KACrF,GAAI,aAAa,gBAAgB,UAAa,EAAE,aAAa,aAAa,aAAa;KACvF,GAAI,aAAa,WAAW,UAAa,EAAE,QAAQ,aAAa,QAAQ;KACxE,GAAI,aAAa,gBAAgB,UAAa,EAAE,aAAa,aAAa,aAAa;KACvF,GAAI,aAAa,iBAAiB,UAAa,EAC7C,cAAc,aAAa,cAC5B;KACF;IACF;IACD;;CAEJ,UAAU;CACX"}