@inkeep/agents-core 0.50.6 → 0.52.0

package/dist/data-access/manage/agents.d.ts

@@ -1,4 +1,5 @@
-import { AgentScopeConfig, ConversationHistoryConfig, PaginationConfig, ProjectScopeConfig } from "../../types/utility.js";
+import { AgentScopeConfig, ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
+import { ConversationHistoryConfig, PaginationConfig } from "../../types/utility.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import "../../index.js";
 import { AgentInsert, AgentSelect, AgentUpdate, FullAgentDefinition, FullAgentSelectWithRelationIds } from "../../types/entities.js";
@@ -8,15 +9,13 @@ import { PgTable } from "drizzle-orm/pg-core";
 declare const getAgentById: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
+  description: string | null;
   name: string;
+  tenantId: string;
+  projectId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  description: string | null;
-  defaultSubAgentId: string | null;
-  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -31,6 +30,11 @@ declare const getAgentById: (db: AgentsManageDatabaseClient) => (params: {
       providerOptions?: Record<string, any> | undefined;
     } | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
@@ -47,22 +51,17 @@ declare const getAgentById: (db: AgentsManageDatabaseClient) => (params: {
       } | undefined;
     }[] | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
 } | null>;
 declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
+  description: string | null;
   name: string;
+  tenantId: string;
+  projectId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  description: string | null;
-  defaultSubAgentId: string | null;
-  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -77,6 +76,11 @@ declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (
       providerOptions?: Record<string, any> | undefined;
     } | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
@@ -93,18 +97,14 @@ declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (
       } | undefined;
     }[] | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
   defaultSubAgent: {
+    description: string | null;
     name: string;
+    tenantId: string;
+    projectId: string;
     id: string;
     createdAt: string;
     updatedAt: string;
-    agentId: string;
-    projectId: string;
-    tenantId: string;
-    description: string | null;
     models: {
       base?: {
         model?: string | undefined;
@@ -119,25 +119,24 @@ declare const getAgentWithDefaultSubAgent: (db: AgentsManageDatabaseClient) => (
         providerOptions?: Record<string, any> | undefined;
       } | undefined;
     } | null;
-    prompt: string | null;
     stopWhen: {
       stepCountIs?: number | undefined;
     } | null;
+    prompt: string | null;
+    agentId: string;
     conversationHistoryConfig: ConversationHistoryConfig | null;
   } | null;
 } | null>;
 declare const listAgents: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
 }) => Promise<{
+  description: string | null;
   name: string;
+  tenantId: string;
+  projectId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  description: string | null;
-  defaultSubAgentId: string | null;
-  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -152,6 +151,11 @@ declare const listAgents: (db: AgentsManageDatabaseClient) => (params: {
       providerOptions?: Record<string, any> | undefined;
     } | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
@@ -168,9 +172,6 @@ declare const listAgents: (db: AgentsManageDatabaseClient) => (params: {
       } | undefined;
     }[] | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
 }[]>;
 declare const listAgentsPaginated: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
@@ -245,15 +246,13 @@ declare function listAgentsAcrossProjectMainBranches(db: AgentsManageDatabaseCli
   projectIds: string[];
 }): Promise<AvailableAgentInfo[]>;
 declare const createAgent: (db: AgentsManageDatabaseClient) => (data: AgentInsert) => Promise<{
+  description: string | null;
   name: string;
+  tenantId: string;
+  projectId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
-  projectId: string;
-  tenantId: string;
-  description: string | null;
-  defaultSubAgentId: string | null;
-  contextConfigId: string | null;
   models: {
     base?: {
       model?: string | undefined;
@@ -268,6 +267,11 @@ declare const createAgent: (db: AgentsManageDatabaseClient) => (data: AgentInser
       providerOptions?: Record<string, any> | undefined;
     } | undefined;
   } | null;
+  stopWhen: {
+    transferCountIs?: number | undefined;
+  } | null;
+  defaultSubAgentId: string | null;
+  contextConfigId: string | null;
   prompt: string | null;
   statusUpdates: {
     enabled?: boolean | undefined;
@@ -284,9 +288,6 @@ declare const createAgent: (db: AgentsManageDatabaseClient) => (data: AgentInser
       } | undefined;
     }[] | undefined;
   } | null;
-  stopWhen: {
-    transferCountIs?: number | undefined;
-  } | null;
 }>;
 declare const updateAgent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;

package/dist/data-access/manage/artifactComponents.d.ts

@@ -1,4 +1,5 @@
-import { AgentScopeConfig, PaginationConfig, ProjectScopeConfig, SubAgentScopeConfig } from "../../types/utility.js";
+import { AgentScopeConfig, ProjectScopeConfig, SubAgentScopeConfig } from "../../db/manage/scope-definitions.js";
+import { PaginationConfig } from "../../types/utility.js";
 import { JsonSchemaProperty } from "../../validation/json-schemas.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import { ArtifactComponentInsert, ArtifactComponentSelect, ArtifactComponentUpdate } from "../../types/entities.js";
@@ -8,13 +9,11 @@ declare const getArtifactComponentById: (db: AgentsManageDatabaseClient) => (par
   scopes: ProjectScopeConfig;
   id: string;
 }) => Promise<{
+  description: string | null;
   name: string;
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  projectId: string;
   tenantId: string;
-  description: string | null;
+  projectId: string;
+  id: string;
   props: {
     [x: string]: unknown;
     type: "object";
@@ -27,6 +26,8 @@ declare const getArtifactComponentById: (db: AgentsManageDatabaseClient) => (par
     component: string;
     mockData: Record<string, unknown>;
   } | null;
+  createdAt: string;
+  updatedAt: string;
 } | undefined>;
 declare const listArtifactComponents: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
@@ -64,13 +65,11 @@ declare const listArtifactComponentsPaginated: (db: AgentsManageDatabaseClient)
   };
 }>;
 declare const createArtifactComponent: (db: AgentsManageDatabaseClient) => (params: ArtifactComponentInsert) => Promise<{
+  description: string | null;
   name: string;
-  id: string;
-  createdAt: string;
-  updatedAt: string;
-  projectId: string;
   tenantId: string;
-  description: string | null;
+  projectId: string;
+  id: string;
   props: {
     [x: string]: unknown;
     type: "object";
@@ -83,6 +82,8 @@ declare const createArtifactComponent: (db: AgentsManageDatabaseClient) => (para
     component: string;
     mockData: Record<string, unknown>;
   } | null;
+  createdAt: string;
+  updatedAt: string;
 }>;
 declare const updateArtifactComponent: (db: AgentsManageDatabaseClient) => (params: {
   scopes: ProjectScopeConfig;
@@ -140,12 +141,12 @@ declare const associateArtifactComponentWithAgent: (db: AgentsManageDatabaseClie
   scopes: SubAgentScopeConfig;
   artifactComponentId: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
+  subAgentId: string;
   id: string;
   createdAt: string;
   agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   artifactComponentId: string;
 }>;
 declare const removeArtifactComponentFromAgent: (db: AgentsManageDatabaseClient) => (params: {
@@ -183,12 +184,12 @@ declare const upsertAgentArtifactComponentRelation: (db: AgentsManageDatabaseCli
   scopes: SubAgentScopeConfig;
   artifactComponentId: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
+  subAgentId: string;
   id: string;
   createdAt: string;
   agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   artifactComponentId: string;
 } | null>;
 /**

package/dist/data-access/manage/contextConfigs.d.ts

@@ -1,4 +1,5 @@
-import { AgentScopeConfig, ContextFetchDefinition, PaginationConfig } from "../../types/utility.js";
+import { AgentScopeConfig } from "../../db/manage/scope-definitions.js";
+import { ContextFetchDefinition, PaginationConfig } from "../../types/utility.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import "../../index.js";
 import { ContextConfigInsert, ContextConfigUpdate } from "../../types/entities.js";
@@ -8,26 +9,26 @@ declare const getContextConfigById: (db: AgentsManageDatabaseClient) => (params:
   scopes: AgentScopeConfig;
   id: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
-  headersSchema: unknown;
-  contextVariables: Record<string, ContextFetchDefinition> | null;
   createdAt: string;
   updatedAt: string;
+  headersSchema: unknown;
+  contextVariables: Record<string, ContextFetchDefinition> | null;
   agentId: string;
-  projectId: string;
-  tenantId: string;
 } | undefined>;
 declare const listContextConfigs: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
-  headersSchema: unknown;
-  contextVariables: Record<string, ContextFetchDefinition> | null;
   createdAt: string;
   updatedAt: string;
+  headersSchema: unknown;
+  contextVariables: Record<string, ContextFetchDefinition> | null;
   agentId: string;
-  projectId: string;
-  tenantId: string;
 }[]>;
 declare const listContextConfigsPaginated: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
@@ -42,14 +43,14 @@ declare const listContextConfigsPaginated: (db: AgentsManageDatabaseClient) => (
   };
 }>;
 declare const createContextConfig: (db: AgentsManageDatabaseClient) => (params: ContextConfigInsert) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
-  headersSchema: unknown;
-  contextVariables: Record<string, ContextFetchDefinition> | null;
   createdAt: string;
   updatedAt: string;
+  headersSchema: unknown;
+  contextVariables: Record<string, ContextFetchDefinition> | null;
   agentId: string;
-  projectId: string;
-  tenantId: string;
 }>;
 declare const updateContextConfig: (db: AgentsManageDatabaseClient) => (params: {
   scopes: AgentScopeConfig;
@@ -82,14 +83,14 @@ declare const countContextConfigs: (db: AgentsManageDatabaseClient) => (params:
 declare const upsertContextConfig: (db: AgentsManageDatabaseClient) => (params: {
   data: ContextConfigInsert;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
   id: string;
-  headersSchema: unknown;
-  contextVariables: Record<string, ContextFetchDefinition> | null;
   createdAt: string;
   updatedAt: string;
+  headersSchema: unknown;
+  contextVariables: Record<string, ContextFetchDefinition> | null;
   agentId: string;
-  projectId: string;
-  tenantId: string;
 }>;
 //#endregion
 export { countContextConfigs, createContextConfig, deleteContextConfig, getContextConfigById, hasContextConfig, listContextConfigs, listContextConfigsPaginated, updateContextConfig, upsertContextConfig };

package/dist/data-access/manage/credentialReferences.d.ts

@@ -1,4 +1,5 @@
-import { PaginationConfig, ProjectScopeConfig } from "../../types/utility.js";
+import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
+import { PaginationConfig } from "../../types/utility.js";
 import "../../types/index.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import { CredentialReferenceInsert, CredentialReferenceSelect, CredentialReferenceUpdate, ExternalAgentSelect, ToolSelect } from "../../types/entities.js";

package/dist/data-access/manage/dataComponents.d.ts

@@ -1,4 +1,5 @@
-import { PaginationConfig, ProjectScopeConfig, SubAgentScopeConfig } from "../../types/utility.js";
+import { ProjectScopeConfig, SubAgentScopeConfig } from "../../db/manage/scope-definitions.js";
+import { PaginationConfig } from "../../types/utility.js";
 import "../../types/index.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import { DataComponentInsert, DataComponentSelect, DataComponentUpdate } from "../../types/entities.js";
@@ -64,12 +65,12 @@ declare const associateDataComponentWithAgent: (db: AgentsManageDatabaseClient)
   scopes: SubAgentScopeConfig;
   dataComponentId: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
+  subAgentId: string;
   id: string;
   createdAt: string;
   agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   dataComponentId: string;
 }>;
 /**
@@ -106,12 +107,12 @@ declare const upsertAgentDataComponentRelation: (db: AgentsManageDatabaseClient)
   scopes: SubAgentScopeConfig;
   dataComponentId: string;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
+  subAgentId: string;
   id: string;
   createdAt: string;
   agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   dataComponentId: string;
 } | null>;
 /**

package/dist/data-access/manage/evalConfig.d.ts

@@ -1,4 +1,5 @@
-import { ProjectScopeConfig } from "../../types/utility.js";
+import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
+import "../../types/utility.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
 import { DatasetInsert, DatasetItemInsert, DatasetItemSelect, DatasetItemUpdate, DatasetRunConfigAgentRelationInsert, DatasetRunConfigAgentRelationSelect, DatasetRunConfigInsert, DatasetRunConfigSelect, DatasetRunConfigUpdate, DatasetSelect, DatasetUpdate, EvaluationJobConfigEvaluatorRelationInsert, EvaluationJobConfigEvaluatorRelationSelect, EvaluationJobConfigInsert, EvaluationJobConfigSelect, EvaluationRunConfigEvaluationSuiteConfigRelationInsert, EvaluationRunConfigEvaluationSuiteConfigRelationSelect, EvaluationRunConfigInsert, EvaluationRunConfigSelect, EvaluationRunConfigUpdate, EvaluationRunConfigWithSuiteConfigs, EvaluationSuiteConfigEvaluatorRelationInsert, EvaluationSuiteConfigEvaluatorRelationSelect, EvaluationSuiteConfigInsert, EvaluationSuiteConfigSelect, EvaluationSuiteConfigUpdate, EvaluatorInsert, EvaluatorSelect, EvaluatorUpdate } from "../../types/entities.js";

package/dist/data-access/manage/externalAgents.d.ts

@@ -1,4 +1,5 @@
-import { PaginationConfig, ProjectScopeConfig } from "../../types/utility.js";
+import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
+import { PaginationConfig } from "../../types/utility.js";
 import "../../types/index.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import { ExternalAgentInsert, ExternalAgentSelect, ExternalAgentUpdate } from "../../types/entities.js";

package/dist/data-access/manage/functionTools.d.ts

@@ -1,9 +1,9 @@
-import { AgentScopeConfig, PaginationConfig } from "../../types/utility.js";
+import { AgentScopeConfig } from "../../db/manage/scope-definitions.js";
+import { PaginationConfig } from "../../types/utility.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import { FunctionToolApiInsert, FunctionToolApiUpdate } from "../../types/entities.js";
 
 //#region src/data-access/manage/functionTools.d.ts
-
 /**
  * Get a function tool by ID (agent-scoped)
  */
@@ -53,14 +53,14 @@ declare const createFunctionTool: (db: AgentsManageDatabaseClient) => (params: {
   data: FunctionToolApiInsert;
   scopes: AgentScopeConfig;
 }) => Promise<{
+  description: string | null;
   name: string;
+  tenantId: string;
+  projectId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
   agentId: string;
-  projectId: string;
-  tenantId: string;
-  description: string | null;
   functionId: string;
 }>;
 /**
@@ -95,14 +95,14 @@ declare const upsertFunctionTool: (db: AgentsManageDatabaseClient) => (params: {
   data: FunctionToolApiInsert;
   scopes: AgentScopeConfig;
 }) => Promise<{
+  description: string | null;
   name: string;
+  tenantId: string;
+  projectId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
   agentId: string;
-  projectId: string;
-  tenantId: string;
-  description: string | null;
   functionId: string;
 }>;
 declare const getFunctionToolsForSubAgent: (db: AgentsManageDatabaseClient) => (params: {
@@ -161,13 +161,13 @@ declare const addFunctionToolToSubAgent: (db: AgentsManageDatabaseClient) => (pa
     needsApproval?: boolean;
   }> | null;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
+  subAgentId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
   agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;
@@ -226,13 +226,13 @@ declare const associateFunctionToolWithSubAgent: (db: AgentsManageDatabaseClient
     needsApproval?: boolean;
   }> | null;
 }) => Promise<{
+  tenantId: string;
+  projectId: string;
+  subAgentId: string;
   id: string;
   createdAt: string;
   updatedAt: string;
   agentId: string;
-  projectId: string;
-  tenantId: string;
-  subAgentId: string;
   toolPolicies: Record<string, {
     needsApproval?: boolean;
   }> | null;

package/dist/data-access/manage/functions.d.ts

@@ -1,9 +1,9 @@
-import { PaginationConfig, ProjectScopeConfig } from "../../types/utility.js";
+import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
+import { PaginationConfig } from "../../types/utility.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import { FunctionApiInsert } from "../../types/entities.js";
 
 //#region src/data-access/manage/functions.d.ts
-
 /**
  * Create or update a function (project-scoped)
  */

package/dist/data-access/manage/projectFull.d.ts

@@ -1,4 +1,5 @@
-import { ProjectScopeConfig } from "../../types/utility.js";
+import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
+import "../../types/utility.js";
 import { getLogger } from "../../utils/logger.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import { FullProjectDefinition, FullProjectSelect, FullProjectSelectWithRelationIds } from "../../types/entities.js";

package/dist/data-access/manage/projects.d.ts

@@ -1,4 +1,5 @@
-import { PaginationConfig, PaginationResult, ProjectInfo, ProjectResourceCounts, ProjectScopeConfig } from "../../types/utility.js";
+import { ProjectScopeConfig } from "../../db/manage/scope-definitions.js";
+import { PaginationConfig, PaginationResult, ProjectInfo, ProjectResourceCounts } from "../../types/utility.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import { ProjectInsert, ProjectSelect, ProjectUpdate } from "../../types/entities.js";
 

package/dist/data-access/manage/scheduledTriggers.d.ts

@@ -1,9 +1,9 @@
-import { AgentScopeConfig, PaginationConfig } from "../../types/utility.js";
+import { AgentScopeConfig } from "../../db/manage/scope-definitions.js";
+import { PaginationConfig } from "../../types/utility.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import { ScheduledTrigger, ScheduledTriggerInsert, ScheduledTriggerUpdate } from "../../validation/schemas.js";
 
 //#region src/data-access/manage/scheduledTriggers.d.ts
-
 /**
  * Get a scheduled trigger by ID (agent-scoped)
  */

package/dist/data-access/manage/scheduledWorkflows.d.ts

@@ -1,9 +1,9 @@
-import { AgentScopeConfig } from "../../types/utility.js";
+import { AgentScopeConfig } from "../../db/manage/scope-definitions.js";
+import "../../types/utility.js";
 import { AgentsManageDatabaseClient } from "../../db/manage/manage-client.js";
 import { ScheduledWorkflow, ScheduledWorkflowInsert } from "../../validation/schemas.js";
 
 //#region src/data-access/manage/scheduledWorkflows.d.ts
-
 /**
  * Get a scheduled workflow by trigger ID (agent-scoped)
  */

package/dist/data-access/manage/scope-helpers.d.ts

@@ -1,25 +1,18 @@
-import { AgentScopeConfig, ProjectScopeConfig, SubAgentScopeConfig } from "../../types/utility.js";
-import * as drizzle_orm138 from "drizzle-orm";
+import { ScopeConfig, ScopeLevel, ScopedTable } from "../../db/manage/scope-definitions.js";
+import { SQL } from "drizzle-orm";
 
 //#region src/data-access/manage/scope-helpers.d.ts
-type TenantScopeConfig = {
-  tenantId: string;
-};
-type TenantScopedColumns = {
-  tenantId: any;
-};
-type ProjectScopedColumns = TenantScopedColumns & {
-  projectId: any;
-};
-type AgentScopedColumns = ProjectScopedColumns & {
-  agentId: any;
-};
-type SubAgentScopedColumns = AgentScopedColumns & {
-  subAgentId: any;
-};
-declare function tenantScopedWhere<T extends TenantScopedColumns>(table: T, scopes: TenantScopeConfig): drizzle_orm138.SQL<unknown>;
-declare function projectScopedWhere<T extends ProjectScopedColumns>(table: T, scopes: ProjectScopeConfig): drizzle_orm138.SQL<unknown> | undefined;
-declare function agentScopedWhere<T extends AgentScopedColumns>(table: T, scopes: AgentScopeConfig): drizzle_orm138.SQL<unknown> | undefined;
-declare function subAgentScopedWhere<T extends SubAgentScopedColumns>(table: T, scopes: SubAgentScopeConfig): drizzle_orm138.SQL<unknown> | undefined;
+
+/**
+ * Build a WHERE clause that filters by all scope columns for the given level.
+ *
+ * The columns and config shape are both derived from `SCOPE_KEYS` in
+ * `scope-definitions.ts`, so they cannot drift apart.
+ */
+declare function scopedWhere<L extends ScopeLevel>(level: L, table: ScopedTable<L>, scopes: ScopeConfig<L>): SQL | undefined;
+declare const tenantScopedWhere: <T extends ScopedTable<"tenant">>(table: T, scopes: ScopeConfig<"tenant">) => SQL<unknown> | undefined;
+declare const projectScopedWhere: <T extends ScopedTable<"project">>(table: T, scopes: ScopeConfig<"project">) => SQL<unknown> | undefined;
+declare const agentScopedWhere: <T extends ScopedTable<"agent">>(table: T, scopes: ScopeConfig<"agent">) => SQL<unknown> | undefined;
+declare const subAgentScopedWhere: <T extends ScopedTable<"subAgent">>(table: T, scopes: ScopeConfig<"subAgent">) => SQL<unknown> | undefined;
 //#endregion
-export { agentScopedWhere, projectScopedWhere, subAgentScopedWhere, tenantScopedWhere };
+export { agentScopedWhere, projectScopedWhere, scopedWhere, subAgentScopedWhere, tenantScopedWhere };

package/dist/data-access/manage/scope-helpers.js

@@ -1,18 +1,21 @@
+import { SCOPE_KEYS } from "../../db/manage/scope-definitions.js";
 import { and, eq } from "drizzle-orm";
 
 //#region src/data-access/manage/scope-helpers.ts
-function tenantScopedWhere(table, scopes) {
-	return eq(table.tenantId, scopes.tenantId);
-}
-function projectScopedWhere(table, scopes) {
-	return and(eq(table.tenantId, scopes.tenantId), eq(table.projectId, scopes.projectId));
-}
-function agentScopedWhere(table, scopes) {
-	return and(eq(table.tenantId, scopes.tenantId), eq(table.projectId, scopes.projectId), eq(table.agentId, scopes.agentId));
-}
-function subAgentScopedWhere(table, scopes) {
-	return and(eq(table.tenantId, scopes.tenantId), eq(table.projectId, scopes.projectId), eq(table.agentId, scopes.agentId), eq(table.subAgentId, scopes.subAgentId));
+/**
+* Build a WHERE clause that filters by all scope columns for the given level.
+*
+* The columns and config shape are both derived from `SCOPE_KEYS` in
+* `scope-definitions.ts`, so they cannot drift apart.
+*/
+function scopedWhere(level, table, scopes) {
+	const conditions = SCOPE_KEYS[level].map((key) => eq(table[key], scopes[key]));
+	return conditions.length === 1 ? conditions[0] : and(...conditions);
 }
+const tenantScopedWhere = (table, scopes) => scopedWhere("tenant", table, scopes);
+const projectScopedWhere = (table, scopes) => scopedWhere("project", table, scopes);
+const agentScopedWhere = (table, scopes) => scopedWhere("agent", table, scopes);
+const subAgentScopedWhere = (table, scopes) => scopedWhere("subAgent", table, scopes);
 
 //#endregion
-export { agentScopedWhere, projectScopedWhere, subAgentScopedWhere, tenantScopedWhere };
+export { agentScopedWhere, projectScopedWhere, scopedWhere, subAgentScopedWhere, tenantScopedWhere };