weave-typescript 0.46.0 → 0.47.0

package/dist/weavesql/weavedb/agent_sql.js

@@ -1,29 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listAgentRunEventsQuery = exports.insertAgentRunEventQuery = exports.updateAgentRunStatusQuery = exports.listAgentRunsQuery = exports.getAgentRunQuery = exports.createAgentRunQuery = exports.listAgentTemplateVersionsQuery = exports.getAgentTemplateVersionByIDQuery = exports.getAgentTemplateVersionByNumberQuery = exports.setAgentTemplateLatestVersionQuery = exports.insertAgentTemplateVersionQuery = exports.insertAgentDraftPatchQuery = exports.updateAgentDraftQuery = exports.updateAgentTemplateStatusQuery = exports.updateAgentTemplateDraftMetadataQuery = exports.listAgentTemplatesQuery = exports.getAgentTemplateDraftQuery = exports.getAgentTemplateBySlugQuery = exports.getAgentTemplateByIDQuery = exports.createAgentTemplateDraftQuery = exports.createAgentTemplateQuery = void 0;
-exports.createAgentTemplate = createAgentTemplate;
-exports.createAgentTemplateDraft = createAgentTemplateDraft;
-exports.getAgentTemplateByID = getAgentTemplateByID;
-exports.getAgentTemplateBySlug = getAgentTemplateBySlug;
-exports.getAgentTemplateDraft = getAgentTemplateDraft;
-exports.listAgentTemplates = listAgentTemplates;
-exports.updateAgentTemplateDraftMetadata = updateAgentTemplateDraftMetadata;
-exports.updateAgentTemplateStatus = updateAgentTemplateStatus;
+exports.listAgentRunEventsQuery = exports.insertAgentRunEventQuery = exports.updateAgentRunStatusQuery = exports.listAgentRunsQuery = exports.getAgentRunQuery = exports.createAgentRunQuery = exports.listAgentDefinitionVersionsQuery = exports.getAgentDefinitionVersionByIDQuery = exports.getAgentDefinitionVersionByNumberQuery = exports.setAgentDefinitionLatestVersionQuery = exports.insertAgentDefinitionVersionQuery = exports.insertAgentDraftPatchQuery = exports.updateAgentDraftQuery = exports.updateAgentDefinitionStatusQuery = exports.updateAgentDefinitionDraftMetadataQuery = exports.listAgentDefinitionsQuery = exports.getAgentDefinitionDraftQuery = exports.getAgentDefinitionBySlugQuery = exports.getAgentDefinitionByIDQuery = exports.createAgentDefinitionDraftQuery = exports.createAgentDefinitionQuery = void 0;
+exports.createAgentDefinition = createAgentDefinition;
+exports.createAgentDefinitionDraft = createAgentDefinitionDraft;
+exports.getAgentDefinitionByID = getAgentDefinitionByID;
+exports.getAgentDefinitionBySlug = getAgentDefinitionBySlug;
+exports.getAgentDefinitionDraft = getAgentDefinitionDraft;
+exports.listAgentDefinitions = listAgentDefinitions;
+exports.updateAgentDefinitionDraftMetadata = updateAgentDefinitionDraftMetadata;
+exports.updateAgentDefinitionStatus = updateAgentDefinitionStatus;
 exports.updateAgentDraft = updateAgentDraft;
 exports.insertAgentDraftPatch = insertAgentDraftPatch;
-exports.insertAgentTemplateVersion = insertAgentTemplateVersion;
-exports.setAgentTemplateLatestVersion = setAgentTemplateLatestVersion;
-exports.getAgentTemplateVersionByNumber = getAgentTemplateVersionByNumber;
-exports.getAgentTemplateVersionByID = getAgentTemplateVersionByID;
-exports.listAgentTemplateVersions = listAgentTemplateVersions;
+exports.insertAgentDefinitionVersion = insertAgentDefinitionVersion;
+exports.setAgentDefinitionLatestVersion = setAgentDefinitionLatestVersion;
+exports.getAgentDefinitionVersionByNumber = getAgentDefinitionVersionByNumber;
+exports.getAgentDefinitionVersionByID = getAgentDefinitionVersionByID;
+exports.listAgentDefinitionVersions = listAgentDefinitionVersions;
 exports.createAgentRun = createAgentRun;
 exports.getAgentRun = getAgentRun;
 exports.listAgentRuns = listAgentRuns;
 exports.updateAgentRunStatus = updateAgentRunStatus;
 exports.insertAgentRunEvent = insertAgentRunEvent;
 exports.listAgentRunEvents = listAgentRunEvents;
-exports.createAgentTemplateQuery = `-- name: CreateAgentTemplate :one
-INSERT INTO weave.agent_templates (
+exports.createAgentDefinitionQuery = `-- name: CreateAgentDefinition :one
+INSERT INTO weave.agent_definitions (
     id,
     organization_id,
     slug,
@@ -41,9 +41,9 @@ INSERT INTO weave.agent_templates (
     $7
 )
 RETURNING id, organization_id, slug, name, description, status, created_by_user_id, draft_revision, latest_version_id, latest_version, created_at, updated_at`;
-async function createAgentTemplate(client, args) {
+async function createAgentDefinition(client, args) {
     const result = await client.query({
-        text: exports.createAgentTemplateQuery,
+        text: exports.createAgentDefinitionQuery,
         values: [args.id, args.organizationId, args.slug, args.name, args.description, args.status, args.createdByUserId],
         rowMode: "array"
     });
@@ -66,10 +66,10 @@ async function createAgentTemplate(client, args) {
         updatedAt: row[11]
     };
 }
-exports.createAgentTemplateDraftQuery = `-- name: CreateAgentTemplateDraft :one
-INSERT INTO weave.agent_template_drafts (
+exports.createAgentDefinitionDraftQuery = `-- name: CreateAgentDefinitionDraft :one
+INSERT INTO weave.agent_definition_drafts (
     id,
-    template_id,
+    definition_id,
     organization_id,
     base_version_id,
     revision,
@@ -100,11 +100,11 @@ INSERT INTO weave.agent_template_drafts (
     $14,
     $15
 )
-RETURNING id, template_id, organization_id, base_version_id, revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, updated_by_user_id, created_at, updated_at`;
-async function createAgentTemplateDraft(client, args) {
+RETURNING id, definition_id, organization_id, base_version_id, revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, updated_by_user_id, created_at, updated_at`;
+async function createAgentDefinitionDraft(client, args) {
     const result = await client.query({
-        text: exports.createAgentTemplateDraftQuery,
-        values: [args.id, args.templateId, args.organizationId, args.baseVersionId, args.revision, args.name, args.description, args.instructions, args.modelId, args.providerConfigurationId, args.toolDescriptors, args.inputSchema, args.outputSchema, args.metadata, args.updatedByUserId],
+        text: exports.createAgentDefinitionDraftQuery,
+        values: [args.id, args.definitionId, args.organizationId, args.baseVersionId, args.revision, args.name, args.description, args.instructions, args.modelId, args.providerConfigurationId, args.toolDescriptors, args.inputSchema, args.outputSchema, args.metadata, args.updatedByUserId],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -113,7 +113,7 @@ async function createAgentTemplateDraft(client, args) {
     const row = result.rows[0];
     return {
         id: row[0],
-        templateId: row[1],
+        definitionId: row[1],
         organizationId: row[2],
         baseVersionId: row[3],
         revision: row[4],
@@ -131,14 +131,14 @@ async function createAgentTemplateDraft(client, args) {
         updatedAt: row[16]
     };
 }
-exports.getAgentTemplateByIDQuery = `-- name: GetAgentTemplateByID :one
-SELECT id, organization_id, slug, name, description, status, created_by_user_id, draft_revision, latest_version_id, latest_version, created_at, updated_at FROM weave.agent_templates
+exports.getAgentDefinitionByIDQuery = `-- name: GetAgentDefinitionByID :one
+SELECT id, organization_id, slug, name, description, status, created_by_user_id, draft_revision, latest_version_id, latest_version, created_at, updated_at FROM weave.agent_definitions
 WHERE organization_id = $1
   AND id = $2`;
-async function getAgentTemplateByID(client, args) {
+async function getAgentDefinitionByID(client, args) {
     const result = await client.query({
-        text: exports.getAgentTemplateByIDQuery,
-        values: [args.organizationId, args.templateId],
+        text: exports.getAgentDefinitionByIDQuery,
+        values: [args.organizationId, args.definitionId],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -160,13 +160,13 @@ async function getAgentTemplateByID(client, args) {
         updatedAt: row[11]
     };
 }
-exports.getAgentTemplateBySlugQuery = `-- name: GetAgentTemplateBySlug :one
-SELECT id, organization_id, slug, name, description, status, created_by_user_id, draft_revision, latest_version_id, latest_version, created_at, updated_at FROM weave.agent_templates
+exports.getAgentDefinitionBySlugQuery = `-- name: GetAgentDefinitionBySlug :one
+SELECT id, organization_id, slug, name, description, status, created_by_user_id, draft_revision, latest_version_id, latest_version, created_at, updated_at FROM weave.agent_definitions
 WHERE organization_id = $1
   AND slug = $2`;
-async function getAgentTemplateBySlug(client, args) {
+async function getAgentDefinitionBySlug(client, args) {
     const result = await client.query({
-        text: exports.getAgentTemplateBySlugQuery,
+        text: exports.getAgentDefinitionBySlugQuery,
         values: [args.organizationId, args.slug],
         rowMode: "array"
     });
@@ -189,14 +189,14 @@ async function getAgentTemplateBySlug(client, args) {
         updatedAt: row[11]
     };
 }
-exports.getAgentTemplateDraftQuery = `-- name: GetAgentTemplateDraft :one
-SELECT id, template_id, organization_id, base_version_id, revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, updated_by_user_id, created_at, updated_at FROM weave.agent_template_drafts
+exports.getAgentDefinitionDraftQuery = `-- name: GetAgentDefinitionDraft :one
+SELECT id, definition_id, organization_id, base_version_id, revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, updated_by_user_id, created_at, updated_at FROM weave.agent_definition_drafts
 WHERE organization_id = $1
-  AND template_id = $2`;
-async function getAgentTemplateDraft(client, args) {
+  AND definition_id = $2`;
+async function getAgentDefinitionDraft(client, args) {
     const result = await client.query({
-        text: exports.getAgentTemplateDraftQuery,
-        values: [args.organizationId, args.templateId],
+        text: exports.getAgentDefinitionDraftQuery,
+        values: [args.organizationId, args.definitionId],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -205,7 +205,7 @@ async function getAgentTemplateDraft(client, args) {
     const row = result.rows[0];
     return {
         id: row[0],
-        templateId: row[1],
+        definitionId: row[1],
         organizationId: row[2],
         baseVersionId: row[3],
         revision: row[4],
@@ -223,8 +223,8 @@ async function getAgentTemplateDraft(client, args) {
         updatedAt: row[16]
     };
 }
-exports.listAgentTemplatesQuery = `-- name: ListAgentTemplates :many
-SELECT id, organization_id, slug, name, description, status, created_by_user_id, draft_revision, latest_version_id, latest_version, created_at, updated_at FROM weave.agent_templates
+exports.listAgentDefinitionsQuery = `-- name: ListAgentDefinitions :many
+SELECT id, organization_id, slug, name, description, status, created_by_user_id, draft_revision, latest_version_id, latest_version, created_at, updated_at FROM weave.agent_definitions
 WHERE organization_id = $1
   AND (
       $2::text IS NULL
@@ -232,9 +232,9 @@ WHERE organization_id = $1
   )
 ORDER BY updated_at DESC, created_at DESC
 LIMIT $4 OFFSET $3`;
-async function listAgentTemplates(client, args) {
+async function listAgentDefinitions(client, args) {
     const result = await client.query({
-        text: exports.listAgentTemplatesQuery,
+        text: exports.listAgentDefinitionsQuery,
         values: [args.organizationId, args.status, args.pageOffset, args.pageSize],
         rowMode: "array"
     });
@@ -255,8 +255,8 @@ async function listAgentTemplates(client, args) {
         };
     });
 }
-exports.updateAgentTemplateDraftMetadataQuery = `-- name: UpdateAgentTemplateDraftMetadata :one
-UPDATE weave.agent_templates
+exports.updateAgentDefinitionDraftMetadataQuery = `-- name: UpdateAgentDefinitionDraftMetadata :one
+UPDATE weave.agent_definitions
 SET
     name = $1,
     description = $2,
@@ -265,10 +265,10 @@ SET
 WHERE organization_id = $4
   AND id = $5
 RETURNING id, organization_id, slug, name, description, status, created_by_user_id, draft_revision, latest_version_id, latest_version, created_at, updated_at`;
-async function updateAgentTemplateDraftMetadata(client, args) {
+async function updateAgentDefinitionDraftMetadata(client, args) {
     const result = await client.query({
-        text: exports.updateAgentTemplateDraftMetadataQuery,
-        values: [args.name, args.description, args.draftRevision, args.organizationId, args.templateId],
+        text: exports.updateAgentDefinitionDraftMetadataQuery,
+        values: [args.name, args.description, args.draftRevision, args.organizationId, args.definitionId],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -290,18 +290,18 @@ async function updateAgentTemplateDraftMetadata(client, args) {
         updatedAt: row[11]
     };
 }
-exports.updateAgentTemplateStatusQuery = `-- name: UpdateAgentTemplateStatus :one
-UPDATE weave.agent_templates
+exports.updateAgentDefinitionStatusQuery = `-- name: UpdateAgentDefinitionStatus :one
+UPDATE weave.agent_definitions
 SET
     status = $1,
     updated_at = now()
 WHERE organization_id = $2
   AND id = $3
 RETURNING id, organization_id, slug, name, description, status, created_by_user_id, draft_revision, latest_version_id, latest_version, created_at, updated_at`;
-async function updateAgentTemplateStatus(client, args) {
+async function updateAgentDefinitionStatus(client, args) {
     const result = await client.query({
-        text: exports.updateAgentTemplateStatusQuery,
-        values: [args.status, args.organizationId, args.templateId],
+        text: exports.updateAgentDefinitionStatusQuery,
+        values: [args.status, args.organizationId, args.definitionId],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -324,7 +324,7 @@ async function updateAgentTemplateStatus(client, args) {
     };
 }
 exports.updateAgentDraftQuery = `-- name: UpdateAgentDraft :one
-UPDATE weave.agent_template_drafts
+UPDATE weave.agent_definition_drafts
 SET
     base_version_id = $1::uuid,
     revision = revision + 1,
@@ -340,13 +340,13 @@ SET
     updated_by_user_id = $11,
     updated_at = now()
 WHERE organization_id = $12
-  AND template_id = $13
+  AND definition_id = $13
   AND revision = $14
-RETURNING id, template_id, organization_id, base_version_id, revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, updated_by_user_id, created_at, updated_at`;
+RETURNING id, definition_id, organization_id, base_version_id, revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, updated_by_user_id, created_at, updated_at`;
 async function updateAgentDraft(client, args) {
     const result = await client.query({
         text: exports.updateAgentDraftQuery,
-        values: [args.baseVersionId, args.name, args.description, args.instructions, args.modelId, args.providerConfigurationId, args.toolDescriptors, args.inputSchema, args.outputSchema, args.metadata, args.updatedByUserId, args.organizationId, args.templateId, args.expectedRevision],
+        values: [args.baseVersionId, args.name, args.description, args.instructions, args.modelId, args.providerConfigurationId, args.toolDescriptors, args.inputSchema, args.outputSchema, args.metadata, args.updatedByUserId, args.organizationId, args.definitionId, args.expectedRevision],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -355,7 +355,7 @@ async function updateAgentDraft(client, args) {
     const row = result.rows[0];
     return {
         id: row[0],
-        templateId: row[1],
+        definitionId: row[1],
         organizationId: row[2],
         baseVersionId: row[3],
         revision: row[4],
@@ -374,9 +374,9 @@ async function updateAgentDraft(client, args) {
     };
 }
 exports.insertAgentDraftPatchQuery = `-- name: InsertAgentDraftPatch :one
-INSERT INTO weave.agent_template_draft_patches (
+INSERT INTO weave.agent_definition_draft_patches (
     id,
-    template_id,
+    definition_id,
     organization_id,
     revision,
     patch,
@@ -389,11 +389,11 @@ INSERT INTO weave.agent_template_draft_patches (
     $5,
     $6
 )
-RETURNING id, template_id, organization_id, revision, patch, created_by_user_id, created_at`;
+RETURNING id, definition_id, organization_id, revision, patch, created_by_user_id, created_at`;
 async function insertAgentDraftPatch(client, args) {
     const result = await client.query({
         text: exports.insertAgentDraftPatchQuery,
-        values: [args.id, args.templateId, args.organizationId, args.revision, args.patch, args.createdByUserId],
+        values: [args.id, args.definitionId, args.organizationId, args.revision, args.patch, args.createdByUserId],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -402,7 +402,7 @@ async function insertAgentDraftPatch(client, args) {
     const row = result.rows[0];
     return {
         id: row[0],
-        templateId: row[1],
+        definitionId: row[1],
         organizationId: row[2],
         revision: row[3],
         patch: row[4],
@@ -410,10 +410,10 @@ async function insertAgentDraftPatch(client, args) {
         createdAt: row[6]
     };
 }
-exports.insertAgentTemplateVersionQuery = `-- name: InsertAgentTemplateVersion :one
-INSERT INTO weave.agent_template_versions (
+exports.insertAgentDefinitionVersionQuery = `-- name: InsertAgentDefinitionVersion :one
+INSERT INTO weave.agent_definition_versions (
     id,
-    template_id,
+    definition_id,
     organization_id,
     version,
     source_draft_revision,
@@ -444,11 +444,11 @@ INSERT INTO weave.agent_template_versions (
     $14,
     $15
 )
-RETURNING id, template_id, organization_id, version, source_draft_revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, published_by_user_id, published_at`;
-async function insertAgentTemplateVersion(client, args) {
+RETURNING id, definition_id, organization_id, version, source_draft_revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, published_by_user_id, published_at`;
+async function insertAgentDefinitionVersion(client, args) {
     const result = await client.query({
-        text: exports.insertAgentTemplateVersionQuery,
-        values: [args.id, args.templateId, args.organizationId, args.version, args.sourceDraftRevision, args.name, args.description, args.instructions, args.modelId, args.providerConfigurationId, args.toolDescriptors, args.inputSchema, args.outputSchema, args.metadata, args.publishedByUserId],
+        text: exports.insertAgentDefinitionVersionQuery,
+        values: [args.id, args.definitionId, args.organizationId, args.version, args.sourceDraftRevision, args.name, args.description, args.instructions, args.modelId, args.providerConfigurationId, args.toolDescriptors, args.inputSchema, args.outputSchema, args.metadata, args.publishedByUserId],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -457,7 +457,7 @@ async function insertAgentTemplateVersion(client, args) {
     const row = result.rows[0];
     return {
         id: row[0],
-        templateId: row[1],
+        definitionId: row[1],
         organizationId: row[2],
         version: row[3],
         sourceDraftRevision: row[4],
@@ -474,8 +474,8 @@ async function insertAgentTemplateVersion(client, args) {
         publishedAt: row[15]
     };
 }
-exports.setAgentTemplateLatestVersionQuery = `-- name: SetAgentTemplateLatestVersion :one
-UPDATE weave.agent_templates
+exports.setAgentDefinitionLatestVersionQuery = `-- name: SetAgentDefinitionLatestVersion :one
+UPDATE weave.agent_definitions
 SET
     latest_version_id = $1,
     latest_version = $2,
@@ -483,10 +483,10 @@ SET
 WHERE organization_id = $3
   AND id = $4
 RETURNING id, organization_id, slug, name, description, status, created_by_user_id, draft_revision, latest_version_id, latest_version, created_at, updated_at`;
-async function setAgentTemplateLatestVersion(client, args) {
+async function setAgentDefinitionLatestVersion(client, args) {
     const result = await client.query({
-        text: exports.setAgentTemplateLatestVersionQuery,
-        values: [args.versionId, args.version, args.organizationId, args.templateId],
+        text: exports.setAgentDefinitionLatestVersionQuery,
+        values: [args.versionId, args.version, args.organizationId, args.definitionId],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -508,15 +508,15 @@ async function setAgentTemplateLatestVersion(client, args) {
         updatedAt: row[11]
     };
 }
-exports.getAgentTemplateVersionByNumberQuery = `-- name: GetAgentTemplateVersionByNumber :one
-SELECT id, template_id, organization_id, version, source_draft_revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, published_by_user_id, published_at FROM weave.agent_template_versions
+exports.getAgentDefinitionVersionByNumberQuery = `-- name: GetAgentDefinitionVersionByNumber :one
+SELECT id, definition_id, organization_id, version, source_draft_revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, published_by_user_id, published_at FROM weave.agent_definition_versions
 WHERE organization_id = $1
-  AND template_id = $2
+  AND definition_id = $2
   AND version = $3`;
-async function getAgentTemplateVersionByNumber(client, args) {
+async function getAgentDefinitionVersionByNumber(client, args) {
     const result = await client.query({
-        text: exports.getAgentTemplateVersionByNumberQuery,
-        values: [args.organizationId, args.templateId, args.version],
+        text: exports.getAgentDefinitionVersionByNumberQuery,
+        values: [args.organizationId, args.definitionId, args.version],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -525,7 +525,7 @@ async function getAgentTemplateVersionByNumber(client, args) {
     const row = result.rows[0];
     return {
         id: row[0],
-        templateId: row[1],
+        definitionId: row[1],
         organizationId: row[2],
         version: row[3],
         sourceDraftRevision: row[4],
@@ -542,13 +542,13 @@ async function getAgentTemplateVersionByNumber(client, args) {
         publishedAt: row[15]
     };
 }
-exports.getAgentTemplateVersionByIDQuery = `-- name: GetAgentTemplateVersionByID :one
-SELECT id, template_id, organization_id, version, source_draft_revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, published_by_user_id, published_at FROM weave.agent_template_versions
+exports.getAgentDefinitionVersionByIDQuery = `-- name: GetAgentDefinitionVersionByID :one
+SELECT id, definition_id, organization_id, version, source_draft_revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, published_by_user_id, published_at FROM weave.agent_definition_versions
 WHERE organization_id = $1
   AND id = $2`;
-async function getAgentTemplateVersionByID(client, args) {
+async function getAgentDefinitionVersionByID(client, args) {
     const result = await client.query({
-        text: exports.getAgentTemplateVersionByIDQuery,
+        text: exports.getAgentDefinitionVersionByIDQuery,
         values: [args.organizationId, args.versionId],
         rowMode: "array"
     });
@@ -558,7 +558,7 @@ async function getAgentTemplateVersionByID(client, args) {
     const row = result.rows[0];
     return {
         id: row[0],
-        templateId: row[1],
+        definitionId: row[1],
         organizationId: row[2],
         version: row[3],
         sourceDraftRevision: row[4],
@@ -575,22 +575,22 @@ async function getAgentTemplateVersionByID(client, args) {
         publishedAt: row[15]
     };
 }
-exports.listAgentTemplateVersionsQuery = `-- name: ListAgentTemplateVersions :many
-SELECT id, template_id, organization_id, version, source_draft_revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, published_by_user_id, published_at FROM weave.agent_template_versions
+exports.listAgentDefinitionVersionsQuery = `-- name: ListAgentDefinitionVersions :many
+SELECT id, definition_id, organization_id, version, source_draft_revision, name, description, instructions, model_id, provider_configuration_id, tool_descriptors, input_schema, output_schema, metadata, published_by_user_id, published_at FROM weave.agent_definition_versions
 WHERE organization_id = $1
-  AND template_id = $2
+  AND definition_id = $2
 ORDER BY version DESC
 LIMIT $4 OFFSET $3`;
-async function listAgentTemplateVersions(client, args) {
+async function listAgentDefinitionVersions(client, args) {
     const result = await client.query({
-        text: exports.listAgentTemplateVersionsQuery,
-        values: [args.organizationId, args.templateId, args.pageOffset, args.pageSize],
+        text: exports.listAgentDefinitionVersionsQuery,
+        values: [args.organizationId, args.definitionId, args.pageOffset, args.pageSize],
         rowMode: "array"
     });
     return result.rows.map(row => {
         return {
             id: row[0],
-            templateId: row[1],
+            definitionId: row[1],
             organizationId: row[2],
             version: row[3],
             sourceDraftRevision: row[4],
@@ -612,7 +612,7 @@ exports.createAgentRunQuery = `-- name: CreateAgentRun :one
 INSERT INTO weave.agent_runs (
     id,
     organization_id,
-    agent_template_id,
+    agent_definition_id,
     agent_version_id,
     status,
     created_by_user_id,
@@ -632,11 +632,11 @@ INSERT INTO weave.agent_runs (
     $9::uuid,
     $10
 )
-RETURNING id, organization_id, agent_template_id, agent_version_id, status, created_by_user_id, chat_session_id, workflow_run_id, workflow_step_run_id, input, output, error_code, safe_error_message, created_at, started_at, finished_at`;
+RETURNING id, organization_id, agent_definition_id, agent_version_id, status, created_by_user_id, chat_session_id, workflow_run_id, workflow_step_run_id, input, output, error_code, safe_error_message, created_at, started_at, finished_at`;
 async function createAgentRun(client, args) {
     const result = await client.query({
         text: exports.createAgentRunQuery,
-        values: [args.id, args.organizationId, args.agentTemplateId, args.agentVersionId, args.status, args.createdByUserId, args.chatSessionId, args.workflowRunId, args.workflowStepRunId, args.input],
+        values: [args.id, args.organizationId, args.agentDefinitionId, args.agentVersionId, args.status, args.createdByUserId, args.chatSessionId, args.workflowRunId, args.workflowStepRunId, args.input],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -646,7 +646,7 @@ async function createAgentRun(client, args) {
     return {
         id: row[0],
         organizationId: row[1],
-        agentTemplateId: row[2],
+        agentDefinitionId: row[2],
         agentVersionId: row[3],
         status: row[4],
         createdByUserId: row[5],
@@ -663,7 +663,7 @@ async function createAgentRun(client, args) {
     };
 }
 exports.getAgentRunQuery = `-- name: GetAgentRun :one
-SELECT id, organization_id, agent_template_id, agent_version_id, status, created_by_user_id, chat_session_id, workflow_run_id, workflow_step_run_id, input, output, error_code, safe_error_message, created_at, started_at, finished_at FROM weave.agent_runs
+SELECT id, organization_id, agent_definition_id, agent_version_id, status, created_by_user_id, chat_session_id, workflow_run_id, workflow_step_run_id, input, output, error_code, safe_error_message, created_at, started_at, finished_at FROM weave.agent_runs
 WHERE organization_id = $1
   AND id = $2`;
 async function getAgentRun(client, args) {
@@ -679,7 +679,7 @@ async function getAgentRun(client, args) {
     return {
         id: row[0],
         organizationId: row[1],
-        agentTemplateId: row[2],
+        agentDefinitionId: row[2],
         agentVersionId: row[3],
         status: row[4],
         createdByUserId: row[5],
@@ -696,11 +696,11 @@ async function getAgentRun(client, args) {
     };
 }
 exports.listAgentRunsQuery = `-- name: ListAgentRuns :many
-SELECT id, organization_id, agent_template_id, agent_version_id, status, created_by_user_id, chat_session_id, workflow_run_id, workflow_step_run_id, input, output, error_code, safe_error_message, created_at, started_at, finished_at FROM weave.agent_runs
+SELECT id, organization_id, agent_definition_id, agent_version_id, status, created_by_user_id, chat_session_id, workflow_run_id, workflow_step_run_id, input, output, error_code, safe_error_message, created_at, started_at, finished_at FROM weave.agent_runs
 WHERE organization_id = $1
   AND (
       $2::uuid IS NULL
-      OR agent_template_id = $2::uuid
+      OR agent_definition_id = $2::uuid
   )
   AND (
       $3::text IS NULL
@@ -711,14 +711,14 @@ LIMIT $5 OFFSET $4`;
 async function listAgentRuns(client, args) {
     const result = await client.query({
         text: exports.listAgentRunsQuery,
-        values: [args.organizationId, args.agentTemplateId, args.status, args.pageOffset, args.pageSize],
+        values: [args.organizationId, args.agentDefinitionId, args.status, args.pageOffset, args.pageSize],
         rowMode: "array"
     });
     return result.rows.map(row => {
         return {
             id: row[0],
             organizationId: row[1],
-            agentTemplateId: row[2],
+            agentDefinitionId: row[2],
             agentVersionId: row[3],
             status: row[4],
             createdByUserId: row[5],
@@ -746,7 +746,7 @@ SET
     finished_at = $6::timestamptz
 WHERE organization_id = $7
   AND id = $8
-RETURNING id, organization_id, agent_template_id, agent_version_id, status, created_by_user_id, chat_session_id, workflow_run_id, workflow_step_run_id, input, output, error_code, safe_error_message, created_at, started_at, finished_at`;
+RETURNING id, organization_id, agent_definition_id, agent_version_id, status, created_by_user_id, chat_session_id, workflow_run_id, workflow_step_run_id, input, output, error_code, safe_error_message, created_at, started_at, finished_at`;
 async function updateAgentRunStatus(client, args) {
     const result = await client.query({
         text: exports.updateAgentRunStatusQuery,
@@ -760,7 +760,7 @@ async function updateAgentRunStatus(client, args) {
     return {
         id: row[0],
         organizationId: row[1],
-        agentTemplateId: row[2],
+        agentDefinitionId: row[2],
         agentVersionId: row[3],
         status: row[4],
         createdByUserId: row[5],