weave-typescript 0.51.2 → 0.52.0

package/dist/weavesql/weavedb/agent_sql.js

@@ -1,113 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listAgentRunEventsQuery = exports.insertAgentRunEventQuery = exports.updateAgentRunStatusQuery = exports.listAgentRunsQuery = exports.claimAgentRunQuery = exports.getAgentRunQuery = exports.createAgentRunQuery = exports.listAgentDefinitionVersionsQuery = exports.getAgentDefinitionVersionByIDQuery = exports.getAgentDefinitionVersionByNumberQuery = exports.setAgentDefinitionLatestVersionQuery = exports.insertAgentDefinitionVersionQuery = exports.listAgentDraftEventsQuery = exports.insertAgentDraftEventQuery = 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.insertAgentDraftEvent = insertAgentDraftEvent;
-exports.listAgentDraftEvents = listAgentDraftEvents;
-exports.insertAgentDefinitionVersion = insertAgentDefinitionVersion;
-exports.setAgentDefinitionLatestVersion = setAgentDefinitionLatestVersion;
-exports.getAgentDefinitionVersionByNumber = getAgentDefinitionVersionByNumber;
-exports.getAgentDefinitionVersionByID = getAgentDefinitionVersionByID;
-exports.listAgentDefinitionVersions = listAgentDefinitionVersions;
+exports.listAgentRunEventsQuery = exports.createAgentRunEventQuery = exports.updateAgentRunStatusQuery = exports.listAgentRunsQuery = exports.getAgentRunQuery = exports.createAgentRunQuery = exports.upsertDefaultChatAgentQuery = exports.listAgentsQuery = exports.updateAgentQuery = exports.getAgentQuery = exports.createAgentQuery = void 0;
+exports.createAgent = createAgent;
+exports.getAgent = getAgent;
+exports.updateAgent = updateAgent;
+exports.listAgents = listAgents;
+exports.upsertDefaultChatAgent = upsertDefaultChatAgent;
 exports.createAgentRun = createAgentRun;
 exports.getAgentRun = getAgentRun;
-exports.claimAgentRun = claimAgentRun;
 exports.listAgentRuns = listAgentRuns;
 exports.updateAgentRunStatus = updateAgentRunStatus;
-exports.insertAgentRunEvent = insertAgentRunEvent;
+exports.createAgentRunEvent = createAgentRunEvent;
 exports.listAgentRunEvents = listAgentRunEvents;
-exports.createAgentDefinitionQuery = `-- name: CreateAgentDefinition :one
-INSERT INTO weave.agent_definitions (
-    id,
+exports.createAgentQuery = `-- name: CreateAgent :one
+INSERT INTO weave.agent (
     organization_id,
     slug,
     name,
     description,
-    status,
-    created_by_user_id
-) VALUES (
-    $1,
-    $2,
-    $3,
-    $4,
-    $5,
-    $6,
-    $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 createAgentDefinition(client, args) {
-    const result = await client.query({
-        text: exports.createAgentDefinitionQuery,
-        values: [args.id, args.organizationId, args.slug, args.name, args.description, args.status, args.createdByUserId],
-        rowMode: "array"
-    });
-    if (result.rows.length !== 1) {
-        return null;
-    }
-    const row = result.rows[0];
-    return {
-        id: row[0],
-        organizationId: row[1],
-        slug: row[2],
-        name: row[3],
-        description: row[4],
-        status: row[5],
-        createdByUserId: row[6],
-        draftRevision: row[7],
-        latestVersionId: row[8],
-        latestVersion: row[9],
-        createdAt: row[10],
-        updatedAt: row[11]
-    };
-}
-exports.createAgentDefinitionDraftQuery = `-- name: CreateAgentDefinitionDraft :one
-INSERT INTO weave.agent_definition_drafts (
-    id,
-    definition_id,
-    organization_id,
-    base_version_id,
-    revision,
-    name,
-    description,
     instructions,
-    model_id,
-    provider_configuration_id,
-    tool_descriptors,
+    default_model_id,
+    default_generate_config,
+    include_contents,
+    output_key,
     input_schema,
     output_schema,
-    metadata,
-    updated_by_user_id
+    metadata
 ) VALUES (
     $1,
     $2,
     $3,
-    $4::uuid,
+    $4,
     $5,
     $6,
-    $7,
+    COALESCE($7::jsonb, '{}'::jsonb),
     $8,
     $9,
-    $10::uuid,
-    $11,
-    $12,
-    $13,
-    $14,
-    $15
+    $10::jsonb,
+    $11::jsonb,
+    COALESCE($12::jsonb, '{}'::jsonb)
 )
-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) {
+RETURNING id, organization_id, slug, name, description, instructions, default_model_id, default_generate_config, include_contents, output_key, input_schema, output_schema, metadata, created_at, updated_at`;
+async function createAgent(client, args) {
     const result = await client.query({
-        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],
+        text: exports.createAgentQuery,
+        values: [args.organizationId, args.slug, args.name, args.description, args.instructions, args.defaultModelId, args.defaultGenerateConfig, args.includeContents, args.outputKey, args.inputSchema, args.outputSchema, args.metadata],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -116,32 +53,30 @@ async function createAgentDefinitionDraft(client, args) {
     const row = result.rows[0];
     return {
         id: row[0],
-        definitionId: row[1],
-        organizationId: row[2],
-        baseVersionId: row[3],
-        revision: row[4],
-        name: row[5],
-        description: row[6],
-        instructions: row[7],
-        modelId: row[8],
-        providerConfigurationId: row[9],
-        toolDescriptors: row[10],
-        inputSchema: row[11],
-        outputSchema: row[12],
-        metadata: row[13],
-        updatedByUserId: row[14],
-        createdAt: row[15],
-        updatedAt: row[16]
+        organizationId: row[1],
+        slug: row[2],
+        name: row[3],
+        description: row[4],
+        instructions: row[5],
+        defaultModelId: row[6],
+        defaultGenerateConfig: row[7],
+        includeContents: row[8],
+        outputKey: row[9],
+        inputSchema: row[10],
+        outputSchema: row[11],
+        metadata: row[12],
+        createdAt: row[13],
+        updatedAt: row[14]
     };
 }
-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
+exports.getAgentQuery = `-- name: GetAgent :one
+SELECT id, organization_id, slug, name, description, instructions, default_model_id, default_generate_config, include_contents, output_key, input_schema, output_schema, metadata, created_at, updated_at FROM weave.agent
 WHERE organization_id = $1
   AND id = $2`;
-async function getAgentDefinitionByID(client, args) {
+async function getAgent(client, args) {
     const result = await client.query({
-        text: exports.getAgentDefinitionByIDQuery,
-        values: [args.organizationId, args.definitionId],
+        text: exports.getAgentQuery,
+        values: [args.organizationId, args.agentId],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -154,23 +89,38 @@ async function getAgentDefinitionByID(client, args) {
         slug: row[2],
         name: row[3],
         description: row[4],
-        status: row[5],
-        createdByUserId: row[6],
-        draftRevision: row[7],
-        latestVersionId: row[8],
-        latestVersion: row[9],
-        createdAt: row[10],
-        updatedAt: row[11]
+        instructions: row[5],
+        defaultModelId: row[6],
+        defaultGenerateConfig: row[7],
+        includeContents: row[8],
+        outputKey: row[9],
+        inputSchema: row[10],
+        outputSchema: row[11],
+        metadata: row[12],
+        createdAt: row[13],
+        updatedAt: row[14]
     };
 }
-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 getAgentDefinitionBySlug(client, args) {
+exports.updateAgentQuery = `-- name: UpdateAgent :one
+UPDATE weave.agent
+SET slug = $1,
+    name = $2,
+    description = COALESCE($3::text, ''),
+    instructions = COALESCE($4::text, ''),
+    default_model_id = $5,
+    default_generate_config = COALESCE($6::jsonb, '{}'::jsonb),
+    include_contents = $7,
+    output_key = COALESCE($8::text, ''),
+    input_schema = $9::jsonb,
+    output_schema = $10::jsonb,
+    metadata = COALESCE($11::jsonb, '{}'::jsonb)
+WHERE organization_id = $12
+  AND id = $13
+RETURNING id, organization_id, slug, name, description, instructions, default_model_id, default_generate_config, include_contents, output_key, input_schema, output_schema, metadata, created_at, updated_at`;
+async function updateAgent(client, args) {
     const result = await client.query({
-        text: exports.getAgentDefinitionBySlugQuery,
-        values: [args.organizationId, args.slug],
+        text: exports.updateAgentQuery,
+        values: [args.slug, args.name, args.description, args.instructions, args.defaultModelId, args.defaultGenerateConfig, args.includeContents, args.outputKey, args.inputSchema, args.outputSchema, args.metadata, args.organizationId, args.agentId],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -183,62 +133,29 @@ async function getAgentDefinitionBySlug(client, args) {
         slug: row[2],
         name: row[3],
         description: row[4],
-        status: row[5],
-        createdByUserId: row[6],
-        draftRevision: row[7],
-        latestVersionId: row[8],
-        latestVersion: row[9],
-        createdAt: row[10],
-        updatedAt: row[11]
-    };
-}
-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 definition_id = $2`;
-async function getAgentDefinitionDraft(client, args) {
-    const result = await client.query({
-        text: exports.getAgentDefinitionDraftQuery,
-        values: [args.organizationId, args.definitionId],
-        rowMode: "array"
-    });
-    if (result.rows.length !== 1) {
-        return null;
-    }
-    const row = result.rows[0];
-    return {
-        id: row[0],
-        definitionId: row[1],
-        organizationId: row[2],
-        baseVersionId: row[3],
-        revision: row[4],
-        name: row[5],
-        description: row[6],
-        instructions: row[7],
-        modelId: row[8],
-        providerConfigurationId: row[9],
-        toolDescriptors: row[10],
-        inputSchema: row[11],
-        outputSchema: row[12],
-        metadata: row[13],
-        updatedByUserId: row[14],
-        createdAt: row[15],
-        updatedAt: row[16]
+        instructions: row[5],
+        defaultModelId: row[6],
+        defaultGenerateConfig: row[7],
+        includeContents: row[8],
+        outputKey: row[9],
+        inputSchema: row[10],
+        outputSchema: row[11],
+        metadata: row[12],
+        createdAt: row[13],
+        updatedAt: row[14]
     };
 }
-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
+exports.listAgentsQuery = `-- name: ListAgents :many
+SELECT id, organization_id, slug, name, description, instructions, default_model_id, default_generate_config, include_contents, output_key, input_schema, output_schema, metadata, created_at, updated_at
+FROM weave.agent
 WHERE organization_id = $1
-  AND (
-      $2::text IS NULL
-      OR status = $2::text
-  )
-ORDER BY updated_at DESC, created_at DESC
-LIMIT $4 OFFSET $3`;
-async function listAgentDefinitions(client, args) {
+ORDER BY name ASC, id ASC
+LIMIT COALESCE($3::integer, 100)
+OFFSET COALESCE($2::integer, 0)`;
+async function listAgents(client, args) {
     const result = await client.query({
-        text: exports.listAgentDefinitionsQuery,
-        values: [args.organizationId, args.status, args.pageOffset, args.pageSize],
+        text: exports.listAgentsQuery,
+        values: [args.organizationId, args.pageOffset, args.pageSize],
         rowMode: "array"
     });
     return result.rows.map(row => {
@@ -248,345 +165,71 @@ async function listAgentDefinitions(client, args) {
             slug: row[2],
             name: row[3],
             description: row[4],
-            status: row[5],
-            createdByUserId: row[6],
-            draftRevision: row[7],
-            latestVersionId: row[8],
-            latestVersion: row[9],
-            createdAt: row[10],
-            updatedAt: row[11]
+            instructions: row[5],
+            defaultModelId: row[6],
+            defaultGenerateConfig: row[7],
+            includeContents: row[8],
+            outputKey: row[9],
+            inputSchema: row[10],
+            outputSchema: row[11],
+            metadata: row[12],
+            createdAt: row[13],
+            updatedAt: row[14]
         };
     });
 }
-exports.updateAgentDefinitionDraftMetadataQuery = `-- name: UpdateAgentDefinitionDraftMetadata :one
-UPDATE weave.agent_definitions
-SET
-    name = $1,
-    description = $2,
-    draft_revision = $3,
-    updated_at = now()
-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 updateAgentDefinitionDraftMetadata(client, args) {
-    const result = await client.query({
-        text: exports.updateAgentDefinitionDraftMetadataQuery,
-        values: [args.name, args.description, args.draftRevision, args.organizationId, args.definitionId],
-        rowMode: "array"
-    });
-    if (result.rows.length !== 1) {
-        return null;
-    }
-    const row = result.rows[0];
-    return {
-        id: row[0],
-        organizationId: row[1],
-        slug: row[2],
-        name: row[3],
-        description: row[4],
-        status: row[5],
-        createdByUserId: row[6],
-        draftRevision: row[7],
-        latestVersionId: row[8],
-        latestVersion: row[9],
-        createdAt: row[10],
-        updatedAt: row[11]
-    };
-}
-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 updateAgentDefinitionStatus(client, args) {
-    const result = await client.query({
-        text: exports.updateAgentDefinitionStatusQuery,
-        values: [args.status, args.organizationId, args.definitionId],
-        rowMode: "array"
-    });
-    if (result.rows.length !== 1) {
-        return null;
-    }
-    const row = result.rows[0];
-    return {
-        id: row[0],
-        organizationId: row[1],
-        slug: row[2],
-        name: row[3],
-        description: row[4],
-        status: row[5],
-        createdByUserId: row[6],
-        draftRevision: row[7],
-        latestVersionId: row[8],
-        latestVersion: row[9],
-        createdAt: row[10],
-        updatedAt: row[11]
-    };
-}
-exports.updateAgentDraftQuery = `-- name: UpdateAgentDraft :one
-UPDATE weave.agent_definition_drafts
-SET
-    base_version_id = $1::uuid,
-    revision = revision + 1,
-    name = $2,
-    description = $3,
-    instructions = $4,
-    model_id = $5,
-    provider_configuration_id = $6::uuid,
-    tool_descriptors = $7,
-    input_schema = $8,
-    output_schema = $9,
-    metadata = $10,
-    updated_by_user_id = $11,
-    updated_at = now()
-WHERE organization_id = $12
-  AND definition_id = $13
-  AND revision = $14
-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.definitionId, args.expectedRevision],
-        rowMode: "array"
-    });
-    if (result.rows.length !== 1) {
-        return null;
-    }
-    const row = result.rows[0];
-    return {
-        id: row[0],
-        definitionId: row[1],
-        organizationId: row[2],
-        baseVersionId: row[3],
-        revision: row[4],
-        name: row[5],
-        description: row[6],
-        instructions: row[7],
-        modelId: row[8],
-        providerConfigurationId: row[9],
-        toolDescriptors: row[10],
-        inputSchema: row[11],
-        outputSchema: row[12],
-        metadata: row[13],
-        updatedByUserId: row[14],
-        createdAt: row[15],
-        updatedAt: row[16]
-    };
-}
-exports.insertAgentDraftPatchQuery = `-- name: InsertAgentDraftPatch :one
-INSERT INTO weave.agent_definition_draft_patches (
-    id,
-    definition_id,
-    organization_id,
-    revision,
-    patch,
-    created_by_user_id
-) VALUES (
-    $1,
-    $2,
-    $3,
-    $4,
-    $5,
-    $6
-)
-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.definitionId, args.organizationId, args.revision, args.patch, args.createdByUserId],
-        rowMode: "array"
-    });
-    if (result.rows.length !== 1) {
-        return null;
-    }
-    const row = result.rows[0];
-    return {
-        id: row[0],
-        definitionId: row[1],
-        organizationId: row[2],
-        revision: row[3],
-        patch: row[4],
-        createdByUserId: row[5],
-        createdAt: row[6]
-    };
-}
-exports.insertAgentDraftEventQuery = `-- name: InsertAgentDraftEvent :one
-INSERT INTO weave.agent_definition_draft_events (
-    id,
-    definition_id,
+exports.upsertDefaultChatAgentQuery = `-- name: UpsertDefaultChatAgent :one
+INSERT INTO weave.agent (
     organization_id,
-    draft_id,
-    sequence,
-    kind,
-    base_revision,
-    result_revision,
-    changed_fields,
-    source,
-    client_request_id,
-    conflict,
-    created_by_user_id
+    slug,
+    name,
+    description,
+    instructions,
+    default_model_id,
+    default_generate_config,
+    include_contents,
+    output_key,
+    metadata
 ) VALUES (
     $1,
     $2,
     $3,
-    $4,
-    COALESCE(
-        (
-            SELECT max(sequence) + 1
-            FROM weave.agent_definition_draft_events
-            WHERE definition_id = $2
-        ),
-        1
-    ),
+    COALESCE($4::text, ''),
     $5,
     $6,
-    $7::integer,
-    $8::text[],
-    $9,
-    $10,
-    $11::jsonb,
-    $12
+    '{}'::jsonb,
+    'default',
+    '',
+    COALESCE($7::jsonb, '{}'::jsonb)
 )
-RETURNING id, organization_id, definition_id, draft_id, sequence, kind, base_revision, result_revision, changed_fields, source, client_request_id, conflict, created_by_user_id, created_at`;
-async function insertAgentDraftEvent(client, args) {
-    const result = await client.query({
-        text: exports.insertAgentDraftEventQuery,
-        values: [args.id, args.definitionId, args.organizationId, args.draftId, args.kind, args.baseRevision, args.resultRevision, args.changedFields, args.source, args.clientRequestId, args.conflict, args.createdByUserId],
-        rowMode: "array"
-    });
-    if (result.rows.length !== 1) {
-        return null;
-    }
-    const row = result.rows[0];
-    return {
-        id: row[0],
-        organizationId: row[1],
-        definitionId: row[2],
-        draftId: row[3],
-        sequence: row[4],
-        kind: row[5],
-        baseRevision: row[6],
-        resultRevision: row[7],
-        changedFields: row[8],
-        source: row[9],
-        clientRequestId: row[10],
-        conflict: row[11],
-        createdByUserId: row[12],
-        createdAt: row[13]
-    };
-}
-exports.listAgentDraftEventsQuery = `-- name: ListAgentDraftEvents :many
-SELECT id, organization_id, definition_id, draft_id, sequence, kind, base_revision, result_revision, changed_fields, source, client_request_id, conflict, created_by_user_id, created_at FROM weave.agent_definition_draft_events
-WHERE organization_id = $1
-  AND definition_id = $2
-  AND sequence > $3
-ORDER BY sequence
-LIMIT $4`;
-async function listAgentDraftEvents(client, args) {
-    const result = await client.query({
-        text: exports.listAgentDraftEventsQuery,
-        values: [args.organizationId, args.definitionId, args.afterSequence, args.pageSize],
-        rowMode: "array"
-    });
-    return result.rows.map(row => {
-        return {
-            id: row[0],
-            organizationId: row[1],
-            definitionId: row[2],
-            draftId: row[3],
-            sequence: row[4],
-            kind: row[5],
-            baseRevision: row[6],
-            resultRevision: row[7],
-            changedFields: row[8],
-            source: row[9],
-            clientRequestId: row[10],
-            conflict: row[11],
-            createdByUserId: row[12],
-            createdAt: row[13]
-        };
-    });
-}
-exports.insertAgentDefinitionVersionQuery = `-- name: InsertAgentDefinitionVersion :one
-INSERT INTO weave.agent_definition_versions (
+ON CONFLICT (organization_id, slug) DO UPDATE
+SET name = EXCLUDED.name,
+    description = EXCLUDED.description,
+    instructions = EXCLUDED.instructions,
+    default_model_id = EXCLUDED.default_model_id,
+    metadata = EXCLUDED.metadata,
+    updated_at = now()
+RETURNING
     id,
-    definition_id,
     organization_id,
-    version,
-    source_draft_revision,
+    slug,
     name,
     description,
     instructions,
-    model_id,
-    provider_configuration_id,
-    tool_descriptors,
+    default_model_id,
+    default_generate_config,
+    include_contents,
+    output_key,
     input_schema,
     output_schema,
     metadata,
-    published_by_user_id
-) VALUES (
-    $1,
-    $2,
-    $3,
-    $4,
-    $5,
-    $6,
-    $7,
-    $8,
-    $9,
-    $10::uuid,
-    $11,
-    $12,
-    $13,
-    $14,
-    $15
-)
-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) {
+    created_at,
+    updated_at,
+    (xmax = 0)::bool AS created`;
+async function upsertDefaultChatAgent(client, args) {
     const result = await client.query({
-        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) {
-        return null;
-    }
-    const row = result.rows[0];
-    return {
-        id: row[0],
-        definitionId: row[1],
-        organizationId: row[2],
-        version: row[3],
-        sourceDraftRevision: row[4],
-        name: row[5],
-        description: row[6],
-        instructions: row[7],
-        modelId: row[8],
-        providerConfigurationId: row[9],
-        toolDescriptors: row[10],
-        inputSchema: row[11],
-        outputSchema: row[12],
-        metadata: row[13],
-        publishedByUserId: row[14],
-        publishedAt: row[15]
-    };
-}
-exports.setAgentDefinitionLatestVersionQuery = `-- name: SetAgentDefinitionLatestVersion :one
-UPDATE weave.agent_definitions
-SET
-    latest_version_id = $1,
-    latest_version = $2,
-    updated_at = now()
-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 setAgentDefinitionLatestVersion(client, args) {
-    const result = await client.query({
-        text: exports.setAgentDefinitionLatestVersionQuery,
-        values: [args.versionId, args.version, args.organizationId, args.definitionId],
+        text: exports.upsertDefaultChatAgentQuery,
+        values: [args.organizationId, args.slug, args.name, args.description, args.instructions, args.defaultModelId, args.metadata],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -599,144 +242,48 @@ async function setAgentDefinitionLatestVersion(client, args) {
         slug: row[2],
         name: row[3],
         description: row[4],
-        status: row[5],
-        createdByUserId: row[6],
-        draftRevision: row[7],
-        latestVersionId: row[8],
-        latestVersion: row[9],
-        createdAt: row[10],
-        updatedAt: row[11]
-    };
-}
-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 definition_id = $2
-  AND version = $3`;
-async function getAgentDefinitionVersionByNumber(client, args) {
-    const result = await client.query({
-        text: exports.getAgentDefinitionVersionByNumberQuery,
-        values: [args.organizationId, args.definitionId, args.version],
-        rowMode: "array"
-    });
-    if (result.rows.length !== 1) {
-        return null;
-    }
-    const row = result.rows[0];
-    return {
-        id: row[0],
-        definitionId: row[1],
-        organizationId: row[2],
-        version: row[3],
-        sourceDraftRevision: row[4],
-        name: row[5],
-        description: row[6],
-        instructions: row[7],
-        modelId: row[8],
-        providerConfigurationId: row[9],
-        toolDescriptors: row[10],
-        inputSchema: row[11],
-        outputSchema: row[12],
-        metadata: row[13],
-        publishedByUserId: row[14],
-        publishedAt: row[15]
-    };
-}
-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 getAgentDefinitionVersionByID(client, args) {
-    const result = await client.query({
-        text: exports.getAgentDefinitionVersionByIDQuery,
-        values: [args.organizationId, args.versionId],
-        rowMode: "array"
-    });
-    if (result.rows.length !== 1) {
-        return null;
-    }
-    const row = result.rows[0];
-    return {
-        id: row[0],
-        definitionId: row[1],
-        organizationId: row[2],
-        version: row[3],
-        sourceDraftRevision: row[4],
-        name: row[5],
-        description: row[6],
-        instructions: row[7],
-        modelId: row[8],
-        providerConfigurationId: row[9],
-        toolDescriptors: row[10],
-        inputSchema: row[11],
-        outputSchema: row[12],
-        metadata: row[13],
-        publishedByUserId: row[14],
-        publishedAt: row[15]
+        instructions: row[5],
+        defaultModelId: row[6],
+        defaultGenerateConfig: row[7],
+        includeContents: row[8],
+        outputKey: row[9],
+        inputSchema: row[10],
+        outputSchema: row[11],
+        metadata: row[12],
+        createdAt: row[13],
+        updatedAt: row[14],
+        created: row[15]
     };
 }
-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 definition_id = $2
-ORDER BY version DESC
-LIMIT $4 OFFSET $3`;
-async function listAgentDefinitionVersions(client, args) {
-    const result = await client.query({
-        text: exports.listAgentDefinitionVersionsQuery,
-        values: [args.organizationId, args.definitionId, args.pageOffset, args.pageSize],
-        rowMode: "array"
-    });
-    return result.rows.map(row => {
-        return {
-            id: row[0],
-            definitionId: row[1],
-            organizationId: row[2],
-            version: row[3],
-            sourceDraftRevision: row[4],
-            name: row[5],
-            description: row[6],
-            instructions: row[7],
-            modelId: row[8],
-            providerConfigurationId: row[9],
-            toolDescriptors: row[10],
-            inputSchema: row[11],
-            outputSchema: row[12],
-            metadata: row[13],
-            publishedByUserId: row[14],
-            publishedAt: row[15]
-        };
-    });
-}
 exports.createAgentRunQuery = `-- name: CreateAgentRun :one
-INSERT INTO weave.agent_runs (
-    id,
+INSERT INTO weave.agent_run (
     organization_id,
-    agent_definition_id,
-    agent_version_id,
-    status,
-    created_by_user_id,
+    root_agent_id,
+    runtime_invocation_id,
+    started_by_user_id,
     chat_session_id,
-    workflow_run_id,
-    workflow_step_run_id,
-    input
+    status,
+    input,
+    model_id,
+    inference_model_route_id,
+    generate_config
 ) VALUES (
     $1,
     $2,
-    $3,
+    COALESCE($3::text, ''),
     $4,
-    $5,
-    $6,
-    $7::uuid,
-    $8::uuid,
+    $5::uuid,
+    COALESCE($6::text, 'pending'),
+    COALESCE($7::jsonb, '{}'::jsonb),
+    COALESCE($8::text, ''),
     $9::uuid,
-    $10
+    COALESCE($10::jsonb, '{}'::jsonb)
 )
-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`;
+RETURNING id, organization_id, root_agent_id, runtime_invocation_id, started_by_user_id, chat_session_id, status, input, output, model_id, inference_model_route_id, generate_config, generation_details, error_code, error_message, started_at, completed_at, created_at, updated_at`;
 async function createAgentRun(client, args) {
     const result = await client.query({
         text: exports.createAgentRunQuery,
-        values: [args.id, args.organizationId, args.agentDefinitionId, args.agentVersionId, args.status, args.createdByUserId, args.chatSessionId, args.workflowRunId, args.workflowStepRunId, args.input],
+        values: [args.organizationId, args.rootAgentId, args.runtimeInvocationId, args.startedByUserId, args.chatSessionId, args.status, args.input, args.modelId, args.inferenceModelRouteId, args.generateConfig],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -746,24 +293,28 @@ async function createAgentRun(client, args) {
     return {
         id: row[0],
         organizationId: row[1],
-        agentDefinitionId: row[2],
-        agentVersionId: row[3],
-        status: row[4],
-        createdByUserId: row[5],
-        chatSessionId: row[6],
-        workflowRunId: row[7],
-        workflowStepRunId: row[8],
-        input: row[9],
-        output: row[10],
-        errorCode: row[11],
-        safeErrorMessage: row[12],
-        createdAt: row[13],
-        startedAt: row[14],
-        finishedAt: row[15]
+        rootAgentId: row[2],
+        runtimeInvocationId: row[3],
+        startedByUserId: row[4],
+        chatSessionId: row[5],
+        status: row[6],
+        input: row[7],
+        output: row[8],
+        modelId: row[9],
+        inferenceModelRouteId: row[10],
+        generateConfig: row[11],
+        generationDetails: row[12],
+        errorCode: row[13],
+        errorMessage: row[14],
+        startedAt: row[15],
+        completedAt: row[16],
+        createdAt: row[17],
+        updatedAt: row[18]
     };
 }
 exports.getAgentRunQuery = `-- name: GetAgentRun :one
-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
+SELECT id, organization_id, root_agent_id, runtime_invocation_id, started_by_user_id, chat_session_id, status, input, output, model_id, inference_model_route_id, generate_config, generation_details, error_code, error_message, started_at, completed_at, created_at, updated_at
+FROM weave.agent_run
 WHERE organization_id = $1
   AND id = $2`;
 async function getAgentRun(client, args) {
@@ -779,119 +330,85 @@ async function getAgentRun(client, args) {
     return {
         id: row[0],
         organizationId: row[1],
-        agentDefinitionId: row[2],
-        agentVersionId: row[3],
-        status: row[4],
-        createdByUserId: row[5],
-        chatSessionId: row[6],
-        workflowRunId: row[7],
-        workflowStepRunId: row[8],
-        input: row[9],
-        output: row[10],
-        errorCode: row[11],
-        safeErrorMessage: row[12],
-        createdAt: row[13],
-        startedAt: row[14],
-        finishedAt: row[15]
-    };
-}
-exports.claimAgentRunQuery = `-- name: ClaimAgentRun :one
-UPDATE weave.agent_runs
-SET
-    status = $1,
-    error_code = '',
-    safe_error_message = '',
-    started_at = COALESCE(started_at, $2::timestamptz),
-    finished_at = NULL
-WHERE organization_id = $3
-  AND id = $4
-  AND status = $5
-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 claimAgentRun(client, args) {
-    const result = await client.query({
-        text: exports.claimAgentRunQuery,
-        values: [args.status, args.startedAt, args.organizationId, args.agentRunId, args.expectedStatus],
-        rowMode: "array"
-    });
-    if (result.rows.length !== 1) {
-        return null;
-    }
-    const row = result.rows[0];
-    return {
-        id: row[0],
-        organizationId: row[1],
-        agentDefinitionId: row[2],
-        agentVersionId: row[3],
-        status: row[4],
-        createdByUserId: row[5],
-        chatSessionId: row[6],
-        workflowRunId: row[7],
-        workflowStepRunId: row[8],
-        input: row[9],
-        output: row[10],
-        errorCode: row[11],
-        safeErrorMessage: row[12],
-        createdAt: row[13],
-        startedAt: row[14],
-        finishedAt: row[15]
+        rootAgentId: row[2],
+        runtimeInvocationId: row[3],
+        startedByUserId: row[4],
+        chatSessionId: row[5],
+        status: row[6],
+        input: row[7],
+        output: row[8],
+        modelId: row[9],
+        inferenceModelRouteId: row[10],
+        generateConfig: row[11],
+        generationDetails: row[12],
+        errorCode: row[13],
+        errorMessage: row[14],
+        startedAt: row[15],
+        completedAt: row[16],
+        createdAt: row[17],
+        updatedAt: row[18]
     };
 }
 exports.listAgentRunsQuery = `-- name: ListAgentRuns :many
-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
+SELECT id, organization_id, root_agent_id, runtime_invocation_id, started_by_user_id, chat_session_id, status, input, output, model_id, inference_model_route_id, generate_config, generation_details, error_code, error_message, started_at, completed_at, created_at, updated_at
+FROM weave.agent_run
 WHERE organization_id = $1
-  AND (
-      $2::uuid IS NULL
-      OR agent_definition_id = $2::uuid
-  )
-  AND (
-      $3::text IS NULL
-      OR status = $3::text
-  )
-ORDER BY created_at DESC
-LIMIT $5 OFFSET $4`;
+  AND ($2::uuid IS NULL OR root_agent_id = $2::uuid)
+  AND ($3::uuid IS NULL OR chat_session_id = $3::uuid)
+  AND ($4::text IS NULL OR status = $4::text)
+ORDER BY created_at DESC, id DESC
+LIMIT COALESCE($6::integer, 100)
+OFFSET COALESCE($5::integer, 0)`;
 async function listAgentRuns(client, args) {
     const result = await client.query({
         text: exports.listAgentRunsQuery,
-        values: [args.organizationId, args.agentDefinitionId, args.status, args.pageOffset, args.pageSize],
+        values: [args.organizationId, args.rootAgentId, args.chatSessionId, args.status, args.pageOffset, args.pageSize],
         rowMode: "array"
     });
     return result.rows.map(row => {
         return {
             id: row[0],
             organizationId: row[1],
-            agentDefinitionId: row[2],
-            agentVersionId: row[3],
-            status: row[4],
-            createdByUserId: row[5],
-            chatSessionId: row[6],
-            workflowRunId: row[7],
-            workflowStepRunId: row[8],
-            input: row[9],
-            output: row[10],
-            errorCode: row[11],
-            safeErrorMessage: row[12],
-            createdAt: row[13],
-            startedAt: row[14],
-            finishedAt: row[15]
+            rootAgentId: row[2],
+            runtimeInvocationId: row[3],
+            startedByUserId: row[4],
+            chatSessionId: row[5],
+            status: row[6],
+            input: row[7],
+            output: row[8],
+            modelId: row[9],
+            inferenceModelRouteId: row[10],
+            generateConfig: row[11],
+            generationDetails: row[12],
+            errorCode: row[13],
+            errorMessage: row[14],
+            startedAt: row[15],
+            completedAt: row[16],
+            createdAt: row[17],
+            updatedAt: row[18]
         };
     });
 }
 exports.updateAgentRunStatusQuery = `-- name: UpdateAgentRunStatus :one
-UPDATE weave.agent_runs
-SET
-    status = $1,
-    output = $2,
-    error_code = $3,
-    safe_error_message = $4,
-    started_at = COALESCE(started_at, $5::timestamptz),
-    finished_at = $6::timestamptz
-WHERE organization_id = $7
-  AND id = $8
-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`;
+UPDATE weave.agent_run
+SET status = $1,
+    runtime_invocation_id = COALESCE($2::text, runtime_invocation_id),
+    output = $3::jsonb,
+    model_id = COALESCE($4::text, model_id),
+    inference_model_route_id = COALESCE($5::uuid, inference_model_route_id),
+    generate_config = COALESCE($6::jsonb, generate_config),
+    generation_details = $7::jsonb,
+    error_code = COALESCE($8::text, ''),
+    error_message = COALESCE($9::text, ''),
+    started_at = COALESCE($10::timestamptz, started_at),
+    completed_at = $11::timestamptz
+WHERE organization_id = $12
+  AND id = $13
+RETURNING id, organization_id, root_agent_id, runtime_invocation_id, started_by_user_id, chat_session_id, status, input, output, model_id, inference_model_route_id, generate_config, generation_details, error_code, error_message, started_at, completed_at, created_at, updated_at`;
 async function updateAgentRunStatus(client, args) {
     const result = await client.query({
         text: exports.updateAgentRunStatusQuery,
-        values: [args.status, args.output, args.errorCode, args.safeErrorMessage, args.startedAt, args.finishedAt, args.organizationId, args.agentRunId],
+        values: [args.status, args.runtimeInvocationId, args.output, args.modelId, args.inferenceModelRouteId, args.generateConfig, args.generationDetails, args.errorCode, args.errorMessage, args.startedAt, args.completedAt, args.organizationId, args.agentRunId],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -901,45 +418,48 @@ async function updateAgentRunStatus(client, args) {
     return {
         id: row[0],
         organizationId: row[1],
-        agentDefinitionId: row[2],
-        agentVersionId: row[3],
-        status: row[4],
-        createdByUserId: row[5],
-        chatSessionId: row[6],
-        workflowRunId: row[7],
-        workflowStepRunId: row[8],
-        input: row[9],
-        output: row[10],
-        errorCode: row[11],
-        safeErrorMessage: row[12],
-        createdAt: row[13],
-        startedAt: row[14],
-        finishedAt: row[15]
+        rootAgentId: row[2],
+        runtimeInvocationId: row[3],
+        startedByUserId: row[4],
+        chatSessionId: row[5],
+        status: row[6],
+        input: row[7],
+        output: row[8],
+        modelId: row[9],
+        inferenceModelRouteId: row[10],
+        generateConfig: row[11],
+        generationDetails: row[12],
+        errorCode: row[13],
+        errorMessage: row[14],
+        startedAt: row[15],
+        completedAt: row[16],
+        createdAt: row[17],
+        updatedAt: row[18]
     };
 }
-exports.insertAgentRunEventQuery = `-- name: InsertAgentRunEvent :one
-INSERT INTO weave.agent_run_events (
-    id,
+exports.createAgentRunEventQuery = `-- name: CreateAgentRunEvent :one
+INSERT INTO weave.agent_run_event (
     organization_id,
     agent_run_id,
     sequence,
     kind,
-    message,
-    payload
+    agent_id,
+    payload,
+    generation_details
 ) VALUES (
     $1,
     $2,
     $3,
     $4,
-    $5,
-    $6,
-    $7
+    $5::uuid,
+    COALESCE($6::jsonb, '{}'::jsonb),
+    $7::jsonb
 )
-RETURNING id, organization_id, agent_run_id, sequence, kind, message, payload, created_at`;
-async function insertAgentRunEvent(client, args) {
+RETURNING id, organization_id, agent_run_id, sequence, kind, agent_id, payload, generation_details, created_at`;
+async function createAgentRunEvent(client, args) {
     const result = await client.query({
-        text: exports.insertAgentRunEventQuery,
-        values: [args.id, args.organizationId, args.agentRunId, args.sequence, args.kind, args.message, args.payload],
+        text: exports.createAgentRunEventQuery,
+        values: [args.organizationId, args.agentRunId, args.sequence, args.kind, args.agentId, args.payload, args.generationDetails],
         rowMode: "array"
     });
     if (result.rows.length !== 1) {
@@ -952,18 +472,20 @@ async function insertAgentRunEvent(client, args) {
         agentRunId: row[2],
         sequence: row[3],
         kind: row[4],
-        message: row[5],
+        agentId: row[5],
         payload: row[6],
-        createdAt: row[7]
+        generationDetails: row[7],
+        createdAt: row[8]
     };
 }
 exports.listAgentRunEventsQuery = `-- name: ListAgentRunEvents :many
-SELECT id, organization_id, agent_run_id, sequence, kind, message, payload, created_at FROM weave.agent_run_events
+SELECT id, organization_id, agent_run_id, sequence, kind, agent_id, payload, generation_details, created_at
+FROM weave.agent_run_event
 WHERE organization_id = $1
   AND agent_run_id = $2
-  AND sequence > $3
-ORDER BY sequence
-LIMIT $4`;
+  AND sequence > COALESCE($3::bigint, 0)
+ORDER BY sequence ASC
+LIMIT COALESCE($4::integer, 100)`;
 async function listAgentRunEvents(client, args) {
     const result = await client.query({
         text: exports.listAgentRunEventsQuery,
@@ -977,9 +499,10 @@ async function listAgentRunEvents(client, args) {
             agentRunId: row[2],
             sequence: row[3],
             kind: row[4],
-            message: row[5],
+            agentId: row[5],
             payload: row[6],
-            createdAt: row[7]
+            generationDetails: row[7],
+            createdAt: row[8]
         };
     });
 }