@inkeep/agents-core 0.62.2 → 0.63.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/auth/auth-config-utils.js +1 -1
- package/dist/auth/auth.js +1 -1
- package/dist/client-exports.d.ts +2 -2
- package/dist/client-exports.js +2 -2
- package/dist/data-access/index.d.ts +4 -7
- package/dist/data-access/index.js +4 -7
- package/dist/data-access/manage/agentFull.js +0 -116
- package/dist/data-access/manage/agents.d.ts +27 -27
- package/dist/data-access/manage/agents.js +0 -30
- package/dist/data-access/manage/audit-queries.d.ts +1 -14
- package/dist/data-access/manage/audit-queries.js +2 -16
- package/dist/data-access/manage/contextConfigs.d.ts +4 -4
- package/dist/data-access/manage/functionTools.d.ts +2 -2
- package/dist/data-access/manage/skills.d.ts +3 -3
- package/dist/data-access/manage/subAgentRelations.d.ts +2 -2
- package/dist/data-access/manage/subAgents.d.ts +9 -9
- package/dist/data-access/manage/tools.d.ts +6 -6
- package/dist/data-access/manage/triggerCleanup.js +18 -7
- package/dist/data-access/runtime/cascade-delete.d.ts +2 -0
- package/dist/data-access/runtime/cascade-delete.js +13 -6
- package/dist/data-access/runtime/conversations.d.ts +4 -4
- package/dist/data-access/runtime/messages.d.ts +12 -12
- package/dist/data-access/runtime/scheduledTriggerInvocations.d.ts +5 -4
- package/dist/data-access/runtime/scheduledTriggers.d.ts +89 -0
- package/dist/data-access/runtime/scheduledTriggers.js +91 -0
- package/dist/data-access/runtime/schedulerState.d.ts +11 -0
- package/dist/data-access/runtime/schedulerState.js +30 -0
- package/dist/data-reconciliation/index.d.ts +2 -2
- package/dist/data-reconciliation/types.d.ts +1 -28
- package/dist/db/manage/manage-schema.d.ts +429 -783
- package/dist/db/manage/manage-schema.js +2 -4
- package/dist/db/runtime/runtime-schema.d.ts +811 -350
- package/dist/db/runtime/runtime-schema.js +38 -5
- package/dist/index.d.ts +11 -12
- package/dist/index.js +8 -10
- package/dist/types/entities.d.ts +12 -2
- package/dist/types/index.d.ts +2 -2
- package/dist/utils/compute-next-run-at.d.ts +9 -0
- package/dist/utils/compute-next-run-at.js +18 -0
- package/dist/utils/index.d.ts +2 -1
- package/dist/utils/index.js +2 -1
- package/dist/validation/index.d.ts +2 -2
- package/dist/validation/index.js +2 -2
- package/dist/validation/schemas.d.ts +2216 -3196
- package/dist/validation/schemas.js +16 -32
- package/drizzle/runtime/0028_thick_squirrel_girl.sql +36 -0
- package/drizzle/runtime/meta/0028_snapshot.json +4661 -0
- package/drizzle/runtime/meta/_journal.json +7 -0
- package/package.json +2 -1
- package/dist/data-access/manage/scheduledTriggers.d.ts +0 -91
- package/dist/data-access/manage/scheduledTriggers.js +0 -87
- package/dist/data-access/manage/scheduledWorkflows.d.ts +0 -29
- package/dist/data-access/manage/scheduledWorkflows.js +0 -33
|
@@ -15,8 +15,6 @@ declare const getSubAgentById: (db: AgentsManageDatabaseClient) => (params: {
|
|
|
15
15
|
updatedAt: string;
|
|
16
16
|
description: string | null;
|
|
17
17
|
tenantId: string;
|
|
18
|
-
projectId: string;
|
|
19
|
-
agentId: string;
|
|
20
18
|
models: {
|
|
21
19
|
base?: {
|
|
22
20
|
model?: string | undefined;
|
|
@@ -31,10 +29,12 @@ declare const getSubAgentById: (db: AgentsManageDatabaseClient) => (params: {
|
|
|
31
29
|
providerOptions?: Record<string, unknown> | undefined;
|
|
32
30
|
} | undefined;
|
|
33
31
|
} | null;
|
|
34
|
-
prompt: string | null;
|
|
35
32
|
stopWhen: {
|
|
36
33
|
stepCountIs?: number | undefined;
|
|
37
34
|
} | null;
|
|
35
|
+
projectId: string;
|
|
36
|
+
agentId: string;
|
|
37
|
+
prompt: string | null;
|
|
38
38
|
conversationHistoryConfig: ConversationHistoryConfig | null;
|
|
39
39
|
} | undefined>;
|
|
40
40
|
declare const listSubAgents: (db: AgentsManageDatabaseClient) => (params: {
|
|
@@ -46,8 +46,6 @@ declare const listSubAgents: (db: AgentsManageDatabaseClient) => (params: {
|
|
|
46
46
|
updatedAt: string;
|
|
47
47
|
description: string | null;
|
|
48
48
|
tenantId: string;
|
|
49
|
-
projectId: string;
|
|
50
|
-
agentId: string;
|
|
51
49
|
models: {
|
|
52
50
|
base?: {
|
|
53
51
|
model?: string | undefined;
|
|
@@ -62,10 +60,12 @@ declare const listSubAgents: (db: AgentsManageDatabaseClient) => (params: {
|
|
|
62
60
|
providerOptions?: Record<string, unknown> | undefined;
|
|
63
61
|
} | undefined;
|
|
64
62
|
} | null;
|
|
65
|
-
prompt: string | null;
|
|
66
63
|
stopWhen: {
|
|
67
64
|
stepCountIs?: number | undefined;
|
|
68
65
|
} | null;
|
|
66
|
+
projectId: string;
|
|
67
|
+
agentId: string;
|
|
68
|
+
prompt: string | null;
|
|
69
69
|
conversationHistoryConfig: ConversationHistoryConfig | null;
|
|
70
70
|
}[]>;
|
|
71
71
|
declare const listSubAgentsPaginated: (db: AgentsManageDatabaseClient) => (params: {
|
|
@@ -115,8 +115,6 @@ declare const createSubAgent: (db: AgentsManageDatabaseClient) => (params: SubAg
|
|
|
115
115
|
updatedAt: string;
|
|
116
116
|
description: string | null;
|
|
117
117
|
tenantId: string;
|
|
118
|
-
projectId: string;
|
|
119
|
-
agentId: string;
|
|
120
118
|
models: {
|
|
121
119
|
base?: {
|
|
122
120
|
model?: string | undefined;
|
|
@@ -131,10 +129,12 @@ declare const createSubAgent: (db: AgentsManageDatabaseClient) => (params: SubAg
|
|
|
131
129
|
providerOptions?: Record<string, unknown> | undefined;
|
|
132
130
|
} | undefined;
|
|
133
131
|
} | null;
|
|
134
|
-
prompt: string | null;
|
|
135
132
|
stopWhen: {
|
|
136
133
|
stepCountIs?: number | undefined;
|
|
137
134
|
} | null;
|
|
135
|
+
projectId: string;
|
|
136
|
+
agentId: string;
|
|
137
|
+
prompt: string | null;
|
|
138
138
|
conversationHistoryConfig: ConversationHistoryConfig | null;
|
|
139
139
|
}>;
|
|
140
140
|
declare const updateSubAgent: (db: AgentsManageDatabaseClient) => (params: {
|
|
@@ -28,11 +28,11 @@ declare const getToolById: (db: AgentsManageDatabaseClient) => (params: {
|
|
|
28
28
|
headers: Record<string, string> | null;
|
|
29
29
|
tenantId: string;
|
|
30
30
|
projectId: string;
|
|
31
|
+
credentialReferenceId: string | null;
|
|
31
32
|
config: {
|
|
32
33
|
type: "mcp";
|
|
33
34
|
mcp: ToolMcpConfig;
|
|
34
35
|
};
|
|
35
|
-
credentialReferenceId: string | null;
|
|
36
36
|
credentialScope: string;
|
|
37
37
|
imageUrl: string | null;
|
|
38
38
|
capabilities: ToolServerCapabilities | null;
|
|
@@ -86,11 +86,11 @@ declare const createTool: (db: AgentsManageDatabaseClient) => (params: ToolInser
|
|
|
86
86
|
headers: Record<string, string> | null;
|
|
87
87
|
tenantId: string;
|
|
88
88
|
projectId: string;
|
|
89
|
+
credentialReferenceId: string | null;
|
|
89
90
|
config: {
|
|
90
91
|
type: "mcp";
|
|
91
92
|
mcp: ToolMcpConfig;
|
|
92
93
|
};
|
|
93
|
-
credentialReferenceId: string | null;
|
|
94
94
|
credentialScope: string;
|
|
95
95
|
imageUrl: string | null;
|
|
96
96
|
capabilities: ToolServerCapabilities | null;
|
|
@@ -144,10 +144,10 @@ declare const addToolToAgent: (db: AgentsManageDatabaseClient) => (params: {
|
|
|
144
144
|
agentId: string;
|
|
145
145
|
subAgentId: string;
|
|
146
146
|
toolId: string;
|
|
147
|
+
selectedTools: string[] | null;
|
|
147
148
|
toolPolicies: Record<string, {
|
|
148
149
|
needsApproval?: boolean;
|
|
149
150
|
}> | null;
|
|
150
|
-
selectedTools: string[] | null;
|
|
151
151
|
}>;
|
|
152
152
|
declare const removeToolFromAgent: (db: AgentsManageDatabaseClient) => (params: {
|
|
153
153
|
scopes: AgentScopeConfig;
|
|
@@ -163,10 +163,10 @@ declare const removeToolFromAgent: (db: AgentsManageDatabaseClient) => (params:
|
|
|
163
163
|
agentId: string;
|
|
164
164
|
subAgentId: string;
|
|
165
165
|
toolId: string;
|
|
166
|
+
selectedTools: string[] | null;
|
|
166
167
|
toolPolicies: Record<string, {
|
|
167
168
|
needsApproval?: boolean;
|
|
168
169
|
}> | null;
|
|
169
|
-
selectedTools: string[] | null;
|
|
170
170
|
}>;
|
|
171
171
|
/**
|
|
172
172
|
* Upsert agent-tool relation (create if it doesn't exist, update if it does)
|
|
@@ -191,10 +191,10 @@ declare const upsertSubAgentToolRelation: (db: AgentsManageDatabaseClient) => (p
|
|
|
191
191
|
agentId: string;
|
|
192
192
|
subAgentId: string;
|
|
193
193
|
toolId: string;
|
|
194
|
+
selectedTools: string[] | null;
|
|
194
195
|
toolPolicies: Record<string, {
|
|
195
196
|
needsApproval?: boolean;
|
|
196
197
|
}> | null;
|
|
197
|
-
selectedTools: string[] | null;
|
|
198
198
|
}>;
|
|
199
199
|
/**
|
|
200
200
|
* Upsert a tool (create if it doesn't exist, update if it does)
|
|
@@ -210,11 +210,11 @@ declare const upsertTool: (db: AgentsManageDatabaseClient) => (params: {
|
|
|
210
210
|
headers: Record<string, string> | null;
|
|
211
211
|
tenantId: string;
|
|
212
212
|
projectId: string;
|
|
213
|
+
credentialReferenceId: string | null;
|
|
213
214
|
config: {
|
|
214
215
|
type: "mcp";
|
|
215
216
|
mcp: ToolMcpConfig;
|
|
216
217
|
};
|
|
217
|
-
credentialReferenceId: string | null;
|
|
218
218
|
credentialScope: string;
|
|
219
219
|
imageUrl: string | null;
|
|
220
220
|
capabilities: ToolServerCapabilities | null;
|
|
@@ -2,8 +2,8 @@ import { manage_schema_exports } from "../../db/manage/manage-schema.js";
|
|
|
2
2
|
import { getLogger } from "../../utils/logger.js";
|
|
3
3
|
import { resolveProjectMainRefs } from "../../dolt/ref-helpers.js";
|
|
4
4
|
import { listProjectsMetadata } from "../runtime/projects.js";
|
|
5
|
-
import { deleteScheduledTriggersByRunAsUserId } from "./scheduledTriggers.js";
|
|
6
5
|
import { deleteTriggersByRunAsUserId } from "./triggers.js";
|
|
6
|
+
import { deleteScheduledTriggersByRunAsUserId } from "../runtime/scheduledTriggers.js";
|
|
7
7
|
import { withRef } from "../../dolt/ref-scope.js";
|
|
8
8
|
import { drizzle } from "drizzle-orm/node-postgres";
|
|
9
9
|
|
|
@@ -13,6 +13,22 @@ async function cleanupUserTriggers(params) {
|
|
|
13
13
|
const { tenantId, userId, runDb, manageDbPool } = params;
|
|
14
14
|
const projects = await listProjectsMetadata(runDb)({ tenantId });
|
|
15
15
|
if (projects.length === 0) return;
|
|
16
|
+
await Promise.allSettled(projects.map(async (project) => {
|
|
17
|
+
try {
|
|
18
|
+
await deleteScheduledTriggersByRunAsUserId(runDb)({
|
|
19
|
+
tenantId,
|
|
20
|
+
projectId: project.id,
|
|
21
|
+
runAsUserId: userId
|
|
22
|
+
});
|
|
23
|
+
} catch (err) {
|
|
24
|
+
logger.error({
|
|
25
|
+
tenantId,
|
|
26
|
+
projectId: project.id,
|
|
27
|
+
userId,
|
|
28
|
+
error: err
|
|
29
|
+
}, "Failed to clean up scheduled triggers for project");
|
|
30
|
+
}
|
|
31
|
+
}));
|
|
16
32
|
const connection = await manageDbPool.connect();
|
|
17
33
|
let resolvedRefs;
|
|
18
34
|
try {
|
|
@@ -21,11 +37,6 @@ async function cleanupUserTriggers(params) {
|
|
|
21
37
|
connection.release();
|
|
22
38
|
}
|
|
23
39
|
const results = await Promise.allSettled(resolvedRefs.map(({ projectId, ref }) => withRef(manageDbPool, ref, async (db) => {
|
|
24
|
-
await deleteScheduledTriggersByRunAsUserId(db)({
|
|
25
|
-
tenantId,
|
|
26
|
-
projectId,
|
|
27
|
-
runAsUserId: userId
|
|
28
|
-
});
|
|
29
40
|
await deleteTriggersByRunAsUserId(db)({
|
|
30
41
|
tenantId,
|
|
31
42
|
projectId,
|
|
@@ -43,7 +54,7 @@ async function cleanupUserTriggers(params) {
|
|
|
43
54
|
projectId,
|
|
44
55
|
userId,
|
|
45
56
|
error: result.reason
|
|
46
|
-
}, "Failed to clean up
|
|
57
|
+
}, "Failed to clean up webhook triggers for project");
|
|
47
58
|
}
|
|
48
59
|
}
|
|
49
60
|
|
|
@@ -19,6 +19,7 @@ type CascadeDeleteResult = {
|
|
|
19
19
|
slackWorkspaceDefaultsCleared: number;
|
|
20
20
|
appsDeleted: number;
|
|
21
21
|
appDefaultsCleared: number;
|
|
22
|
+
scheduledTriggersDeleted: number;
|
|
22
23
|
};
|
|
23
24
|
/**
|
|
24
25
|
* Delete all runtime entities for a specific branch.
|
|
@@ -30,6 +31,7 @@ type CascadeDeleteResult = {
|
|
|
30
31
|
declare const cascadeDeleteByBranch: (db: AgentsRunDatabaseClient) => (params: {
|
|
31
32
|
scopes: ProjectScopeConfig;
|
|
32
33
|
fullBranchName: string;
|
|
34
|
+
ref: string;
|
|
33
35
|
}) => Promise<CascadeDeleteResult>;
|
|
34
36
|
/**
|
|
35
37
|
* Delete all runtime entities for a project on a specific branch.
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { apiKeys, contextCache, conversations, datasetRun, evaluationRun, scheduledTriggerInvocations, tasks, triggerInvocations, workAppGitHubMcpToolAccessMode, workAppGitHubMcpToolRepositoryAccess, workAppGitHubProjectAccessMode, workAppGitHubProjectRepositoryAccess } from "../../db/runtime/runtime-schema.js";
|
|
1
|
+
import { apiKeys, contextCache, conversations, datasetRun, evaluationRun, scheduledTriggerInvocations, scheduledTriggers, tasks, triggerInvocations, workAppGitHubMcpToolAccessMode, workAppGitHubMcpToolRepositoryAccess, workAppGitHubProjectAccessMode, workAppGitHubProjectRepositoryAccess } from "../../db/runtime/runtime-schema.js";
|
|
2
2
|
import { projectScopedWhere } from "../manage/scope-helpers.js";
|
|
3
3
|
import { clearAppDefaultsByAgent, clearAppDefaultsByProject, deleteAppsByProject } from "./apps.js";
|
|
4
4
|
import { deleteSlackMcpToolAccessConfig } from "./slack-work-app-mcp.js";
|
|
@@ -14,7 +14,7 @@ import { and, eq, inArray, sql } from "drizzle-orm";
|
|
|
14
14
|
* @returns Function that performs the cascade delete
|
|
15
15
|
*/
|
|
16
16
|
const cascadeDeleteByBranch = (db) => async (params) => {
|
|
17
|
-
const { scopes, fullBranchName } = params;
|
|
17
|
+
const { scopes, fullBranchName, ref } = params;
|
|
18
18
|
const contextCacheResult = await db.delete(contextCache).where(and(projectScopedWhere(contextCache, scopes), sql`${contextCache.ref}->>'name' = ${fullBranchName}`)).returning();
|
|
19
19
|
const conversationsResult = await db.delete(conversations).where(and(projectScopedWhere(conversations, scopes), sql`${conversations.ref}->>'name' = ${fullBranchName}`)).returning();
|
|
20
20
|
const tasksResult = await db.delete(tasks).where(and(projectScopedWhere(tasks, scopes), sql`${tasks.ref}->>'name' = ${fullBranchName}`)).returning();
|
|
@@ -22,6 +22,7 @@ const cascadeDeleteByBranch = (db) => async (params) => {
|
|
|
22
22
|
const scheduledTriggerInvocationsResult = await db.delete(scheduledTriggerInvocations).where(and(eq(scheduledTriggerInvocations.tenantId, scopes.tenantId), eq(scheduledTriggerInvocations.projectId, scopes.projectId), sql`${scheduledTriggerInvocations.ref}->>'name' = ${fullBranchName}`)).returning();
|
|
23
23
|
const datasetRunsResult = await db.delete(datasetRun).where(and(eq(datasetRun.tenantId, scopes.tenantId), eq(datasetRun.projectId, scopes.projectId), sql`${datasetRun.ref}->>'name' = ${fullBranchName}`)).returning();
|
|
24
24
|
const evaluationRunsResult = await db.delete(evaluationRun).where(and(eq(evaluationRun.tenantId, scopes.tenantId), eq(evaluationRun.projectId, scopes.projectId), sql`${evaluationRun.ref}->>'name' = ${fullBranchName}`)).returning();
|
|
25
|
+
const scheduledTriggersResult = await db.delete(scheduledTriggers).where(and(eq(scheduledTriggers.tenantId, scopes.tenantId), eq(scheduledTriggers.projectId, scopes.projectId), eq(scheduledTriggers.ref, ref))).returning();
|
|
25
26
|
return {
|
|
26
27
|
conversationsDeleted: conversationsResult.length,
|
|
27
28
|
tasksDeleted: tasksResult.length,
|
|
@@ -34,7 +35,8 @@ const cascadeDeleteByBranch = (db) => async (params) => {
|
|
|
34
35
|
slackChannelConfigsDeleted: 0,
|
|
35
36
|
slackWorkspaceDefaultsCleared: 0,
|
|
36
37
|
appsDeleted: 0,
|
|
37
|
-
appDefaultsCleared: 0
|
|
38
|
+
appDefaultsCleared: 0,
|
|
39
|
+
scheduledTriggersDeleted: scheduledTriggersResult.length
|
|
38
40
|
};
|
|
39
41
|
};
|
|
40
42
|
/**
|
|
@@ -64,6 +66,7 @@ const cascadeDeleteByProject = (db) => async (params) => {
|
|
|
64
66
|
const slackChannelConfigsDeleted = await deleteWorkAppSlackChannelAgentConfigsByProject(db)(scopes.tenantId, scopes.projectId);
|
|
65
67
|
const slackWorkspaceDefaultsCleared = await clearWorkspaceDefaultsByProject(db)(scopes.tenantId, scopes.projectId);
|
|
66
68
|
clearDevConfigWorkspaceDefaultsByProject(scopes.projectId);
|
|
69
|
+
const scheduledTriggersResult = await db.delete(scheduledTriggers).where(and(eq(scheduledTriggers.tenantId, scopes.tenantId), eq(scheduledTriggers.projectId, scopes.projectId))).returning();
|
|
67
70
|
return {
|
|
68
71
|
conversationsDeleted: conversationsResult.length,
|
|
69
72
|
tasksDeleted: tasksResult.length,
|
|
@@ -76,7 +79,8 @@ const cascadeDeleteByProject = (db) => async (params) => {
|
|
|
76
79
|
slackChannelConfigsDeleted,
|
|
77
80
|
slackWorkspaceDefaultsCleared,
|
|
78
81
|
appsDeleted,
|
|
79
|
-
appDefaultsCleared
|
|
82
|
+
appDefaultsCleared,
|
|
83
|
+
scheduledTriggersDeleted: scheduledTriggersResult.length
|
|
80
84
|
};
|
|
81
85
|
};
|
|
82
86
|
/**
|
|
@@ -108,6 +112,7 @@ const cascadeDeleteByAgent = (db) => async (params) => {
|
|
|
108
112
|
const slackChannelConfigsDeleted = await deleteWorkAppSlackChannelAgentConfigsByAgent(db)(scopes.tenantId, scopes.projectId, scopes.agentId);
|
|
109
113
|
const slackWorkspaceDefaultsCleared = await clearWorkspaceDefaultsByAgent(db)(scopes.tenantId, scopes.projectId, scopes.agentId);
|
|
110
114
|
clearDevConfigWorkspaceDefaultsByAgent(scopes.projectId, scopes.agentId);
|
|
115
|
+
const scheduledTriggersResult = await db.delete(scheduledTriggers).where(and(eq(scheduledTriggers.tenantId, scopes.tenantId), eq(scheduledTriggers.projectId, scopes.projectId), eq(scheduledTriggers.agentId, scopes.agentId))).returning();
|
|
111
116
|
return {
|
|
112
117
|
conversationsDeleted,
|
|
113
118
|
tasksDeleted,
|
|
@@ -120,7 +125,8 @@ const cascadeDeleteByAgent = (db) => async (params) => {
|
|
|
120
125
|
slackChannelConfigsDeleted,
|
|
121
126
|
slackWorkspaceDefaultsCleared,
|
|
122
127
|
appsDeleted: 0,
|
|
123
|
-
appDefaultsCleared
|
|
128
|
+
appDefaultsCleared,
|
|
129
|
+
scheduledTriggersDeleted: scheduledTriggersResult.length
|
|
124
130
|
};
|
|
125
131
|
};
|
|
126
132
|
/**
|
|
@@ -151,7 +157,8 @@ const cascadeDeleteBySubAgent = (db) => async (params) => {
|
|
|
151
157
|
slackChannelConfigsDeleted: 0,
|
|
152
158
|
slackWorkspaceDefaultsCleared: 0,
|
|
153
159
|
appsDeleted: 0,
|
|
154
|
-
appDefaultsCleared: 0
|
|
160
|
+
appDefaultsCleared: 0,
|
|
161
|
+
scheduledTriggersDeleted: 0
|
|
155
162
|
};
|
|
156
163
|
};
|
|
157
164
|
/**
|
|
@@ -25,8 +25,8 @@ declare const createConversation: (db: AgentsRunDatabaseClient) => (params: Conv
|
|
|
25
25
|
} | null;
|
|
26
26
|
userId: string | null;
|
|
27
27
|
metadata: ConversationMetadata | null;
|
|
28
|
-
title: string | null;
|
|
29
28
|
tenantId: string;
|
|
29
|
+
title: string | null;
|
|
30
30
|
projectId: string;
|
|
31
31
|
agentId: string | null;
|
|
32
32
|
activeSubAgentId: string;
|
|
@@ -94,8 +94,8 @@ declare const getConversation: (db: AgentsRunDatabaseClient) => (params: {
|
|
|
94
94
|
} | null;
|
|
95
95
|
userId: string | null;
|
|
96
96
|
metadata: ConversationMetadata | null;
|
|
97
|
-
title: string | null;
|
|
98
97
|
tenantId: string;
|
|
98
|
+
title: string | null;
|
|
99
99
|
projectId: string;
|
|
100
100
|
agentId: string | null;
|
|
101
101
|
activeSubAgentId: string;
|
|
@@ -130,8 +130,8 @@ declare const createOrGetConversation: (db: AgentsRunDatabaseClient) => (input:
|
|
|
130
130
|
} | null;
|
|
131
131
|
userId: string | null;
|
|
132
132
|
metadata: ConversationMetadata | null;
|
|
133
|
-
title: string | null;
|
|
134
133
|
tenantId: string;
|
|
134
|
+
title: string | null;
|
|
135
135
|
projectId: string;
|
|
136
136
|
agentId: string | null;
|
|
137
137
|
activeSubAgentId: string;
|
|
@@ -162,8 +162,8 @@ declare const getActiveAgentForConversation: (db: AgentsRunDatabaseClient) => (p
|
|
|
162
162
|
} | null;
|
|
163
163
|
userId: string | null;
|
|
164
164
|
metadata: ConversationMetadata | null;
|
|
165
|
-
title: string | null;
|
|
166
165
|
tenantId: string;
|
|
166
|
+
title: string | null;
|
|
167
167
|
projectId: string;
|
|
168
168
|
agentId: string | null;
|
|
169
169
|
activeSubAgentId: string;
|
|
@@ -15,21 +15,21 @@ declare const getMessageById: (db: AgentsRunDatabaseClient) => (params: {
|
|
|
15
15
|
updatedAt: string;
|
|
16
16
|
metadata: MessageMetadata | null;
|
|
17
17
|
role: string;
|
|
18
|
-
content: MessageContent;
|
|
19
18
|
tenantId: string;
|
|
19
|
+
content: MessageContent;
|
|
20
20
|
projectId: string;
|
|
21
|
+
conversationId: string;
|
|
21
22
|
fromSubAgentId: string | null;
|
|
22
23
|
toSubAgentId: string | null;
|
|
23
24
|
fromExternalAgentId: string | null;
|
|
24
25
|
toExternalAgentId: string | null;
|
|
25
|
-
taskId: string | null;
|
|
26
|
-
a2aTaskId: string | null;
|
|
27
|
-
conversationId: string;
|
|
28
26
|
fromTeamAgentId: string | null;
|
|
29
27
|
toTeamAgentId: string | null;
|
|
30
28
|
visibility: string;
|
|
31
29
|
messageType: string;
|
|
30
|
+
taskId: string | null;
|
|
32
31
|
parentMessageId: string | null;
|
|
32
|
+
a2aTaskId: string | null;
|
|
33
33
|
a2aSessionId: string | null;
|
|
34
34
|
} | undefined>;
|
|
35
35
|
declare const listMessages: (db: AgentsRunDatabaseClient) => (params: {
|
|
@@ -149,21 +149,21 @@ declare const createMessage: (db: AgentsRunDatabaseClient) => (params: {
|
|
|
149
149
|
updatedAt: string;
|
|
150
150
|
metadata: MessageMetadata | null;
|
|
151
151
|
role: string;
|
|
152
|
-
content: MessageContent;
|
|
153
152
|
tenantId: string;
|
|
153
|
+
content: MessageContent;
|
|
154
154
|
projectId: string;
|
|
155
|
+
conversationId: string;
|
|
155
156
|
fromSubAgentId: string | null;
|
|
156
157
|
toSubAgentId: string | null;
|
|
157
158
|
fromExternalAgentId: string | null;
|
|
158
159
|
toExternalAgentId: string | null;
|
|
159
|
-
taskId: string | null;
|
|
160
|
-
a2aTaskId: string | null;
|
|
161
|
-
conversationId: string;
|
|
162
160
|
fromTeamAgentId: string | null;
|
|
163
161
|
toTeamAgentId: string | null;
|
|
164
162
|
visibility: string;
|
|
165
163
|
messageType: string;
|
|
164
|
+
taskId: string | null;
|
|
166
165
|
parentMessageId: string | null;
|
|
166
|
+
a2aTaskId: string | null;
|
|
167
167
|
a2aSessionId: string | null;
|
|
168
168
|
}>;
|
|
169
169
|
declare const updateMessage: (db: AgentsRunDatabaseClient) => (params: {
|
|
@@ -202,21 +202,21 @@ declare const deleteMessage: (db: AgentsRunDatabaseClient) => (params: {
|
|
|
202
202
|
updatedAt: string;
|
|
203
203
|
metadata: MessageMetadata | null;
|
|
204
204
|
role: string;
|
|
205
|
-
content: MessageContent;
|
|
206
205
|
tenantId: string;
|
|
206
|
+
content: MessageContent;
|
|
207
207
|
projectId: string;
|
|
208
|
+
conversationId: string;
|
|
208
209
|
fromSubAgentId: string | null;
|
|
209
210
|
toSubAgentId: string | null;
|
|
210
211
|
fromExternalAgentId: string | null;
|
|
211
212
|
toExternalAgentId: string | null;
|
|
212
|
-
taskId: string | null;
|
|
213
|
-
a2aTaskId: string | null;
|
|
214
|
-
conversationId: string;
|
|
215
213
|
fromTeamAgentId: string | null;
|
|
216
214
|
toTeamAgentId: string | null;
|
|
217
215
|
visibility: string;
|
|
218
216
|
messageType: string;
|
|
217
|
+
taskId: string | null;
|
|
219
218
|
parentMessageId: string | null;
|
|
219
|
+
a2aTaskId: string | null;
|
|
220
220
|
a2aSessionId: string | null;
|
|
221
221
|
}>;
|
|
222
222
|
declare const countMessagesByConversation: (db: AgentsRunDatabaseClient) => (params: {
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { AgentScopeConfig } from "../../db/manage/scope-definitions.js";
|
|
2
2
|
import { PaginationConfig } from "../../types/utility.js";
|
|
3
3
|
import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
|
|
4
|
-
import {
|
|
4
|
+
import { ScheduledTriggerInvocationStatus } from "../../validation/schemas.js";
|
|
5
|
+
import { ScheduledTriggerInvocation, ScheduledTriggerInvocationInsert, ScheduledTriggerInvocationUpdate } from "../../types/entities.js";
|
|
5
6
|
|
|
6
7
|
//#region src/data-access/runtime/scheduledTriggerInvocations.d.ts
|
|
7
8
|
/**
|
|
@@ -39,7 +40,7 @@ declare const listScheduledTriggerInvocationsPaginated: (db: AgentsRunDatabaseCl
|
|
|
39
40
|
name: string;
|
|
40
41
|
hash: string;
|
|
41
42
|
} | null;
|
|
42
|
-
status: "pending" | "
|
|
43
|
+
status: "pending" | "running" | "completed" | "failed" | "cancelled";
|
|
43
44
|
scheduledFor: string;
|
|
44
45
|
startedAt: string | null;
|
|
45
46
|
completedAt: string | null;
|
|
@@ -193,7 +194,7 @@ declare const listUpcomingInvocationsForAgentPaginated: (db: AgentsRunDatabaseCl
|
|
|
193
194
|
name: string;
|
|
194
195
|
hash: string;
|
|
195
196
|
} | null;
|
|
196
|
-
status: "pending" | "
|
|
197
|
+
status: "pending" | "running" | "completed" | "failed" | "cancelled";
|
|
197
198
|
scheduledFor: string;
|
|
198
199
|
startedAt: string | null;
|
|
199
200
|
completedAt: string | null;
|
|
@@ -232,7 +233,7 @@ declare const listProjectScheduledTriggerInvocationsPaginated: (db: AgentsRunDat
|
|
|
232
233
|
name: string;
|
|
233
234
|
hash: string;
|
|
234
235
|
} | null;
|
|
235
|
-
status: "pending" | "
|
|
236
|
+
status: "pending" | "running" | "completed" | "failed" | "cancelled";
|
|
236
237
|
scheduledFor: string;
|
|
237
238
|
startedAt: string | null;
|
|
238
239
|
completedAt: string | null;
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import { AgentScopeConfig } from "../../db/manage/scope-definitions.js";
|
|
2
|
+
import { PaginationConfig } from "../../types/utility.js";
|
|
3
|
+
import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
|
|
4
|
+
import { ScheduledTrigger, ScheduledTriggerInsert } from "../../types/entities.js";
|
|
5
|
+
|
|
6
|
+
//#region src/data-access/runtime/scheduledTriggers.d.ts
|
|
7
|
+
declare const getScheduledTriggerById: (db: AgentsRunDatabaseClient) => (params: {
|
|
8
|
+
scopes: AgentScopeConfig;
|
|
9
|
+
scheduledTriggerId: string;
|
|
10
|
+
}) => Promise<ScheduledTrigger | undefined>;
|
|
11
|
+
declare const listScheduledTriggersPaginated: (db: AgentsRunDatabaseClient) => (params: {
|
|
12
|
+
scopes: AgentScopeConfig;
|
|
13
|
+
pagination?: PaginationConfig;
|
|
14
|
+
}) => Promise<{
|
|
15
|
+
data: {
|
|
16
|
+
createdAt: string;
|
|
17
|
+
updatedAt: string;
|
|
18
|
+
name: string;
|
|
19
|
+
description: string | null;
|
|
20
|
+
enabled: boolean;
|
|
21
|
+
cronExpression: string | null;
|
|
22
|
+
cronTimezone: string | null;
|
|
23
|
+
runAt: string | null;
|
|
24
|
+
payload: Record<string, unknown> | null;
|
|
25
|
+
messageTemplate: string | null;
|
|
26
|
+
maxRetries: number;
|
|
27
|
+
retryDelaySeconds: number;
|
|
28
|
+
timeoutSeconds: number;
|
|
29
|
+
runAsUserId: string | null;
|
|
30
|
+
createdBy: string | null;
|
|
31
|
+
nextRunAt: string | null;
|
|
32
|
+
ref: string;
|
|
33
|
+
agentId: string;
|
|
34
|
+
projectId: string;
|
|
35
|
+
tenantId: string;
|
|
36
|
+
id: string;
|
|
37
|
+
}[];
|
|
38
|
+
pagination: {
|
|
39
|
+
page: number;
|
|
40
|
+
limit: number;
|
|
41
|
+
total: number;
|
|
42
|
+
pages: number;
|
|
43
|
+
};
|
|
44
|
+
}>;
|
|
45
|
+
declare const createScheduledTrigger: (db: AgentsRunDatabaseClient) => (params: ScheduledTriggerInsert & {
|
|
46
|
+
nextRunAt?: string | null;
|
|
47
|
+
}) => Promise<ScheduledTrigger>;
|
|
48
|
+
declare const updateScheduledTrigger: (db: AgentsRunDatabaseClient) => (params: {
|
|
49
|
+
scopes: AgentScopeConfig;
|
|
50
|
+
scheduledTriggerId: string;
|
|
51
|
+
data: Partial<ScheduledTriggerInsert> & {
|
|
52
|
+
nextRunAt?: string | null;
|
|
53
|
+
};
|
|
54
|
+
}) => Promise<ScheduledTrigger>;
|
|
55
|
+
declare const deleteScheduledTrigger: (db: AgentsRunDatabaseClient) => (params: {
|
|
56
|
+
scopes: AgentScopeConfig;
|
|
57
|
+
scheduledTriggerId: string;
|
|
58
|
+
}) => Promise<void>;
|
|
59
|
+
declare const upsertScheduledTrigger: (db: AgentsRunDatabaseClient) => (params: {
|
|
60
|
+
scopes: AgentScopeConfig;
|
|
61
|
+
data: ScheduledTriggerInsert;
|
|
62
|
+
}) => Promise<ScheduledTrigger>;
|
|
63
|
+
declare const deleteScheduledTriggersByRunAsUserId: (db: AgentsRunDatabaseClient) => (params: {
|
|
64
|
+
tenantId: string;
|
|
65
|
+
projectId: string;
|
|
66
|
+
runAsUserId: string;
|
|
67
|
+
}) => Promise<void>;
|
|
68
|
+
declare const listScheduledTriggers: (db: AgentsRunDatabaseClient) => (params: {
|
|
69
|
+
scopes: AgentScopeConfig;
|
|
70
|
+
}) => Promise<ScheduledTrigger[]>;
|
|
71
|
+
/**
|
|
72
|
+
* Query due scheduled triggers across all projects directly from the runtime DB.
|
|
73
|
+
* No AS OF queries needed - simple WHERE clause on enabled + nextRunAt.
|
|
74
|
+
*/
|
|
75
|
+
declare const findDueScheduledTriggersAcrossProjects: (db: AgentsRunDatabaseClient) => (params: {
|
|
76
|
+
asOf: string;
|
|
77
|
+
}) => Promise<ScheduledTrigger[]>;
|
|
78
|
+
/**
|
|
79
|
+
* Advance the next_run_at timestamp for a scheduled trigger in the runtime DB.
|
|
80
|
+
* No withRef scope needed - direct update.
|
|
81
|
+
*/
|
|
82
|
+
declare const advanceScheduledTriggerNextRunAt: (db: AgentsRunDatabaseClient) => (params: {
|
|
83
|
+
scopes: AgentScopeConfig;
|
|
84
|
+
scheduledTriggerId: string;
|
|
85
|
+
nextRunAt: string | null;
|
|
86
|
+
enabled?: boolean;
|
|
87
|
+
}) => Promise<void>;
|
|
88
|
+
//#endregion
|
|
89
|
+
export { advanceScheduledTriggerNextRunAt, createScheduledTrigger, deleteScheduledTrigger, deleteScheduledTriggersByRunAsUserId, findDueScheduledTriggersAcrossProjects, getScheduledTriggerById, listScheduledTriggers, listScheduledTriggersPaginated, updateScheduledTrigger, upsertScheduledTrigger };
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import { scheduledTriggers } from "../../db/runtime/runtime-schema.js";
|
|
2
|
+
import { computeNextRunAt } from "../../utils/compute-next-run-at.js";
|
|
3
|
+
import { and, count, desc, eq, isNotNull, lte } from "drizzle-orm";
|
|
4
|
+
|
|
5
|
+
//#region src/data-access/runtime/scheduledTriggers.ts
|
|
6
|
+
const getScheduledTriggerById = (db) => async (params) => {
|
|
7
|
+
return await db.query.scheduledTriggers.findFirst({ where: and(eq(scheduledTriggers.tenantId, params.scopes.tenantId), eq(scheduledTriggers.projectId, params.scopes.projectId), eq(scheduledTriggers.agentId, params.scopes.agentId), eq(scheduledTriggers.id, params.scheduledTriggerId)) });
|
|
8
|
+
};
|
|
9
|
+
const listScheduledTriggersPaginated = (db) => async (params) => {
|
|
10
|
+
const page = params.pagination?.page || 1;
|
|
11
|
+
const limit = Math.min(params.pagination?.limit || 10, 100);
|
|
12
|
+
const offset = (page - 1) * limit;
|
|
13
|
+
const whereClause = and(eq(scheduledTriggers.tenantId, params.scopes.tenantId), eq(scheduledTriggers.projectId, params.scopes.projectId), eq(scheduledTriggers.agentId, params.scopes.agentId));
|
|
14
|
+
const [data, totalResult] = await Promise.all([db.select().from(scheduledTriggers).where(whereClause).limit(limit).offset(offset).orderBy(desc(scheduledTriggers.createdAt)), db.select({ count: count() }).from(scheduledTriggers).where(whereClause)]);
|
|
15
|
+
const total = totalResult[0]?.count || 0;
|
|
16
|
+
return {
|
|
17
|
+
data,
|
|
18
|
+
pagination: {
|
|
19
|
+
page,
|
|
20
|
+
limit,
|
|
21
|
+
total,
|
|
22
|
+
pages: Math.ceil(total / limit)
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
};
|
|
26
|
+
const createScheduledTrigger = (db) => async (params) => {
|
|
27
|
+
const created = (await db.insert(scheduledTriggers).values(params).returning())[0];
|
|
28
|
+
if (!created) throw new Error("Failed to create scheduled trigger");
|
|
29
|
+
return created;
|
|
30
|
+
};
|
|
31
|
+
const updateScheduledTrigger = (db) => async (params) => {
|
|
32
|
+
const updateData = {
|
|
33
|
+
...params.data,
|
|
34
|
+
updatedAt: (/* @__PURE__ */ new Date()).toISOString()
|
|
35
|
+
};
|
|
36
|
+
const updated = (await db.update(scheduledTriggers).set(updateData).where(and(eq(scheduledTriggers.tenantId, params.scopes.tenantId), eq(scheduledTriggers.projectId, params.scopes.projectId), eq(scheduledTriggers.agentId, params.scopes.agentId), eq(scheduledTriggers.id, params.scheduledTriggerId))).returning())[0];
|
|
37
|
+
if (!updated) throw new Error(`Scheduled trigger ${params.scheduledTriggerId} not found for update`);
|
|
38
|
+
return updated;
|
|
39
|
+
};
|
|
40
|
+
const deleteScheduledTrigger = (db) => async (params) => {
|
|
41
|
+
await db.delete(scheduledTriggers).where(and(eq(scheduledTriggers.tenantId, params.scopes.tenantId), eq(scheduledTriggers.projectId, params.scopes.projectId), eq(scheduledTriggers.agentId, params.scopes.agentId), eq(scheduledTriggers.id, params.scheduledTriggerId)));
|
|
42
|
+
};
|
|
43
|
+
const upsertScheduledTrigger = (db) => async (params) => {
|
|
44
|
+
const nextRunAt = params.data.enabled ?? true ? computeNextRunAt({
|
|
45
|
+
cronExpression: params.data.cronExpression,
|
|
46
|
+
cronTimezone: params.data.cronTimezone,
|
|
47
|
+
runAt: params.data.runAt
|
|
48
|
+
}) : null;
|
|
49
|
+
const now = (/* @__PURE__ */ new Date()).toISOString();
|
|
50
|
+
const values = {
|
|
51
|
+
...params.data,
|
|
52
|
+
nextRunAt
|
|
53
|
+
};
|
|
54
|
+
const upserted = (await db.insert(scheduledTriggers).values(values).onConflictDoUpdate({
|
|
55
|
+
target: [scheduledTriggers.tenantId, scheduledTriggers.id],
|
|
56
|
+
set: {
|
|
57
|
+
...values,
|
|
58
|
+
updatedAt: now
|
|
59
|
+
}
|
|
60
|
+
}).returning())[0];
|
|
61
|
+
if (!upserted) throw new Error(`Failed to upsert scheduled trigger ${params.data.id}`);
|
|
62
|
+
return upserted;
|
|
63
|
+
};
|
|
64
|
+
const deleteScheduledTriggersByRunAsUserId = (db) => async (params) => {
|
|
65
|
+
await db.delete(scheduledTriggers).where(and(eq(scheduledTriggers.tenantId, params.tenantId), eq(scheduledTriggers.projectId, params.projectId), eq(scheduledTriggers.runAsUserId, params.runAsUserId)));
|
|
66
|
+
};
|
|
67
|
+
const listScheduledTriggers = (db) => async (params) => {
|
|
68
|
+
return await db.select().from(scheduledTriggers).where(and(eq(scheduledTriggers.tenantId, params.scopes.tenantId), eq(scheduledTriggers.projectId, params.scopes.projectId), eq(scheduledTriggers.agentId, params.scopes.agentId)));
|
|
69
|
+
};
|
|
70
|
+
/**
|
|
71
|
+
* Query due scheduled triggers across all projects directly from the runtime DB.
|
|
72
|
+
* No AS OF queries needed - simple WHERE clause on enabled + nextRunAt.
|
|
73
|
+
*/
|
|
74
|
+
const findDueScheduledTriggersAcrossProjects = (db) => async (params) => {
|
|
75
|
+
return await db.select().from(scheduledTriggers).where(and(eq(scheduledTriggers.enabled, true), isNotNull(scheduledTriggers.nextRunAt), lte(scheduledTriggers.nextRunAt, params.asOf)));
|
|
76
|
+
};
|
|
77
|
+
/**
|
|
78
|
+
* Advance the next_run_at timestamp for a scheduled trigger in the runtime DB.
|
|
79
|
+
* No withRef scope needed - direct update.
|
|
80
|
+
*/
|
|
81
|
+
const advanceScheduledTriggerNextRunAt = (db) => async (params) => {
|
|
82
|
+
const set = {
|
|
83
|
+
nextRunAt: params.nextRunAt,
|
|
84
|
+
updatedAt: (/* @__PURE__ */ new Date()).toISOString()
|
|
85
|
+
};
|
|
86
|
+
if (params.enabled !== void 0) set.enabled = params.enabled;
|
|
87
|
+
await db.update(scheduledTriggers).set(set).where(and(eq(scheduledTriggers.tenantId, params.scopes.tenantId), eq(scheduledTriggers.projectId, params.scopes.projectId), eq(scheduledTriggers.agentId, params.scopes.agentId), eq(scheduledTriggers.id, params.scheduledTriggerId)));
|
|
88
|
+
};
|
|
89
|
+
|
|
90
|
+
//#endregion
|
|
91
|
+
export { advanceScheduledTriggerNextRunAt, createScheduledTrigger, deleteScheduledTrigger, deleteScheduledTriggersByRunAsUserId, findDueScheduledTriggersAcrossProjects, getScheduledTriggerById, listScheduledTriggers, listScheduledTriggersPaginated, updateScheduledTrigger, upsertScheduledTrigger };
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { AgentsRunDatabaseClient } from "../../db/runtime/runtime-client.js";
|
|
2
|
+
import { SchedulerState } from "../../types/entities.js";
|
|
3
|
+
|
|
4
|
+
//#region src/data-access/runtime/schedulerState.d.ts
|
|
5
|
+
declare const getSchedulerState: (db: AgentsRunDatabaseClient) => () => Promise<SchedulerState | undefined>;
|
|
6
|
+
declare const upsertSchedulerState: (db: AgentsRunDatabaseClient) => (params: {
|
|
7
|
+
currentRunId: string;
|
|
8
|
+
}) => Promise<SchedulerState>;
|
|
9
|
+
declare const clearSchedulerState: (db: AgentsRunDatabaseClient) => () => Promise<void>;
|
|
10
|
+
//#endregion
|
|
11
|
+
export { clearSchedulerState, getSchedulerState, upsertSchedulerState };
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { schedulerState } from "../../db/runtime/runtime-schema.js";
|
|
2
|
+
import { eq, sql } from "drizzle-orm";
|
|
3
|
+
|
|
4
|
+
//#region src/data-access/runtime/schedulerState.ts
|
|
5
|
+
const SINGLETON_ID = "singleton";
|
|
6
|
+
const getSchedulerState = (db) => async () => {
|
|
7
|
+
return await db.query.schedulerState.findFirst({ where: eq(schedulerState.id, SINGLETON_ID) });
|
|
8
|
+
};
|
|
9
|
+
const upsertSchedulerState = (db) => async (params) => {
|
|
10
|
+
const [row] = await db.insert(schedulerState).values({
|
|
11
|
+
id: SINGLETON_ID,
|
|
12
|
+
currentRunId: params.currentRunId
|
|
13
|
+
}).onConflictDoUpdate({
|
|
14
|
+
target: schedulerState.id,
|
|
15
|
+
set: {
|
|
16
|
+
currentRunId: params.currentRunId,
|
|
17
|
+
updatedAt: sql`now()`.mapWith(String)
|
|
18
|
+
}
|
|
19
|
+
}).returning();
|
|
20
|
+
return row;
|
|
21
|
+
};
|
|
22
|
+
const clearSchedulerState = (db) => async () => {
|
|
23
|
+
await db.update(schedulerState).set({
|
|
24
|
+
currentRunId: null,
|
|
25
|
+
updatedAt: sql`now()`.mapWith(String)
|
|
26
|
+
}).where(eq(schedulerState.id, SINGLETON_ID));
|
|
27
|
+
};
|
|
28
|
+
|
|
29
|
+
//#endregion
|
|
30
|
+
export { clearSchedulerState, getSchedulerState, upsertSchedulerState };
|