@nocobase/app-plugin-agents 0.1.0-beta.4 → 0.1.0-beta.6
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/CHANGELOG.md +93 -0
- package/README.md +41 -24
- package/dist/client/chat.d.ts +2 -0
- package/dist/client/chat.d.ts.map +1 -1
- package/dist/client/chat.js +2 -0
- package/dist/client/chat.js.map +1 -1
- package/dist/client/lib/install.js +1 -1
- package/dist/client/lib/tool-policy.d.ts +0 -2
- package/dist/client/lib/tool-policy.d.ts.map +1 -1
- package/dist/client/lib/tool-policy.js +1 -6
- package/dist/client/lib/tool-policy.js.map +1 -1
- package/dist/client/locales/en-US.d.ts +3 -9
- package/dist/client/locales/en-US.d.ts.map +1 -1
- package/dist/client/locales/en-US.js +3 -9
- package/dist/client/locales/en-US.js.map +1 -1
- package/dist/client/locales/runtimes.en-US.d.ts +38 -0
- package/dist/client/locales/runtimes.en-US.d.ts.map +1 -1
- package/dist/client/locales/runtimes.en-US.js +40 -2
- package/dist/client/locales/runtimes.en-US.js.map +1 -1
- package/dist/client/locales/runtimes.zh-CN.d.ts.map +1 -1
- package/dist/client/locales/runtimes.zh-CN.js +40 -2
- package/dist/client/locales/runtimes.zh-CN.js.map +1 -1
- package/dist/client/locales/zh-CN.d.ts.map +1 -1
- package/dist/client/locales/zh-CN.js +3 -9
- package/dist/client/locales/zh-CN.js.map +1 -1
- package/dist/client/pages/agents/agent-model.d.ts +0 -4
- package/dist/client/pages/agents/agent-model.d.ts.map +1 -1
- package/dist/client/pages/agents/agent-model.js +0 -19
- package/dist/client/pages/agents/agent-model.js.map +1 -1
- package/dist/client/pages/agents/detail/index.d.ts.map +1 -1
- package/dist/client/pages/agents/detail/index.js +2 -2
- package/dist/client/pages/agents/detail/index.js.map +1 -1
- package/dist/client/pages/agents/detail/sections.d.ts +0 -1
- package/dist/client/pages/agents/detail/sections.d.ts.map +1 -1
- package/dist/client/pages/agents/detail/sections.js +2 -33
- package/dist/client/pages/agents/detail/sections.js.map +1 -1
- package/dist/client/pages/runtimes/connect.js +1 -1
- package/dist/client/pages/runtimes/connect.js.map +1 -1
- package/dist/client/pages/runtimes/index.d.ts.map +1 -1
- package/dist/client/pages/runtimes/index.js +2 -1
- package/dist/client/pages/runtimes/index.js.map +1 -1
- package/dist/client/pages/runtimes/runner-sheet.d.ts.map +1 -1
- package/dist/client/pages/runtimes/runner-sheet.js +2 -1
- package/dist/client/pages/runtimes/runner-sheet.js.map +1 -1
- package/dist/client/pages/runtimes/workspace-diagnostics.d.ts +9 -0
- package/dist/client/pages/runtimes/workspace-diagnostics.d.ts.map +1 -0
- package/dist/client/pages/runtimes/workspace-diagnostics.js +58 -0
- package/dist/client/pages/runtimes/workspace-diagnostics.js.map +1 -0
- package/dist/client/runs/subject-runs.d.ts.map +1 -1
- package/dist/client/runs/subject-runs.js +2 -3
- package/dist/client/runs/subject-runs.js.map +1 -1
- package/dist/database/migrations/.manifest.json +8 -0
- package/dist/database/migrations/202610100002_ag_add_run_git_credentials.d.ts +9 -0
- package/dist/database/migrations/202610100002_ag_add_run_git_credentials.d.ts.map +1 -0
- package/dist/database/migrations/202610100002_ag_add_run_git_credentials.js +30 -0
- package/dist/database/migrations/202610100002_ag_add_run_git_credentials.js.map +1 -0
- package/dist/database/migrations/202610110001_ag_add_fresh_sessions.d.ts +4 -0
- package/dist/database/migrations/202610110001_ag_add_fresh_sessions.d.ts.map +1 -0
- package/dist/database/migrations/202610110001_ag_add_fresh_sessions.js +23 -0
- package/dist/database/migrations/202610110001_ag_add_fresh_sessions.js.map +1 -0
- package/dist/package.json +1 -1
- package/dist/server/composition.d.ts +3 -1
- package/dist/server/composition.d.ts.map +1 -1
- package/dist/server/composition.js +18 -2
- package/dist/server/composition.js.map +1 -1
- package/dist/server/core/runs/claim.d.ts +2 -0
- package/dist/server/core/runs/claim.d.ts.map +1 -1
- package/dist/server/core/runs/claim.js +53 -7
- package/dist/server/core/runs/claim.js.map +1 -1
- package/dist/server/core/runs/extensions.d.ts +57 -4
- package/dist/server/core/runs/extensions.d.ts.map +1 -1
- package/dist/server/core/runs/extensions.js +45 -9
- package/dist/server/core/runs/extensions.js.map +1 -1
- package/dist/server/core/runs/git-credentials.d.ts +43 -0
- package/dist/server/core/runs/git-credentials.d.ts.map +1 -0
- package/dist/server/core/runs/git-credentials.js +129 -0
- package/dist/server/core/runs/git-credentials.js.map +1 -0
- package/dist/server/core/runs/index.d.ts +2 -1
- package/dist/server/core/runs/index.d.ts.map +1 -1
- package/dist/server/core/runs/index.js +2 -1
- package/dist/server/core/runs/index.js.map +1 -1
- package/dist/server/core/runs/input-gate.d.ts +34 -0
- package/dist/server/core/runs/input-gate.d.ts.map +1 -0
- package/dist/server/core/runs/input-gate.js +56 -0
- package/dist/server/core/runs/input-gate.js.map +1 -0
- package/dist/server/core/runs/lifecycle.d.ts +2 -1
- package/dist/server/core/runs/lifecycle.d.ts.map +1 -1
- package/dist/server/core/runs/lifecycle.js +27 -8
- package/dist/server/core/runs/lifecycle.js.map +1 -1
- package/dist/server/core/runs/policy.d.ts +8 -0
- package/dist/server/core/runs/policy.d.ts.map +1 -1
- package/dist/server/core/runs/policy.js +10 -0
- package/dist/server/core/runs/policy.js.map +1 -1
- package/dist/server/core/runs/ports.d.ts +30 -3
- package/dist/server/core/runs/ports.d.ts.map +1 -1
- package/dist/server/core/runs/ports.js.map +1 -1
- package/dist/server/core/runs/run-requests.d.ts +3 -0
- package/dist/server/core/runs/run-requests.d.ts.map +1 -1
- package/dist/server/core/runs/run-requests.js +5 -0
- package/dist/server/core/runs/run-requests.js.map +1 -1
- package/dist/server/core/runs/run.service.d.ts +5 -1
- package/dist/server/core/runs/run.service.d.ts.map +1 -1
- package/dist/server/core/runs/run.service.js +51 -3
- package/dist/server/core/runs/run.service.js.map +1 -1
- package/dist/server/core/runs/run.store.d.ts +5 -0
- package/dist/server/core/runs/run.store.d.ts.map +1 -1
- package/dist/server/core/runs/run.store.js +7 -0
- package/dist/server/core/runs/run.store.js.map +1 -1
- package/dist/server/core/runs/runner-view.d.ts +1 -0
- package/dist/server/core/runs/runner-view.d.ts.map +1 -1
- package/dist/server/core/runs/runner-view.js +2 -1
- package/dist/server/core/runs/runner-view.js.map +1 -1
- package/dist/server/core/runs/transitions.d.ts +1 -1
- package/dist/server/core/runs/transitions.d.ts.map +1 -1
- package/dist/server/core/runs/transitions.js +39 -5
- package/dist/server/core/runs/transitions.js.map +1 -1
- package/dist/server/distribution/dist.service.d.ts +27 -5
- package/dist/server/distribution/dist.service.d.ts.map +1 -1
- package/dist/server/distribution/dist.service.js +41 -5
- package/dist/server/distribution/dist.service.js.map +1 -1
- package/dist/server/distribution/download-tokens.d.ts +1 -1
- package/dist/server/distribution/download-tokens.d.ts.map +1 -1
- package/dist/server/distribution/download-tokens.js +7 -4
- package/dist/server/distribution/download-tokens.js.map +1 -1
- package/dist/server/distribution/index.d.ts +11 -3
- package/dist/server/distribution/index.d.ts.map +1 -1
- package/dist/server/distribution/index.js +31 -8
- package/dist/server/distribution/index.js.map +1 -1
- package/dist/server/kernel/redaction.d.ts +2 -0
- package/dist/server/kernel/redaction.d.ts.map +1 -1
- package/dist/server/kernel/redaction.js +17 -0
- package/dist/server/kernel/redaction.js.map +1 -1
- package/dist/server/routes/runners/dist.d.ts +5 -1
- package/dist/server/routes/runners/dist.d.ts.map +1 -1
- package/dist/server/routes/runners/dist.js +36 -9
- package/dist/server/routes/runners/dist.js.map +1 -1
- package/dist/server/routes/runners/install.d.ts.map +1 -1
- package/dist/server/routes/runners/install.js +98 -15
- package/dist/server/routes/runners/install.js.map +1 -1
- package/dist/server/routes/runners/runner.js +4 -4
- package/dist/server/routes/runners/runner.js.map +1 -1
- package/dist/server/routes/runners/runs.d.ts +1 -1
- package/dist/server/routes/runners/runs.d.ts.map +1 -1
- package/dist/server/routes/runners/runs.js +23 -3
- package/dist/server/routes/runners/runs.js.map +1 -1
- package/dist/server/routes/schemas.d.ts +1 -0
- package/dist/server/routes/schemas.d.ts.map +1 -1
- package/dist/server/routes/schemas.js +23 -3
- package/dist/server/routes/schemas.js.map +1 -1
- package/dist/server/runners/runner.store.d.ts.map +1 -1
- package/dist/server/runners/runner.store.js +13 -3
- package/dist/server/runners/runner.store.js.map +1 -1
- package/dist/server/runners/workspaces.d.ts +7 -4
- package/dist/server/runners/workspaces.d.ts.map +1 -1
- package/dist/server/runners/workspaces.js +123 -26
- package/dist/server/runners/workspaces.js.map +1 -1
- package/dist/server/tokens.d.ts +3 -2
- package/dist/server/tokens.d.ts.map +1 -1
- package/dist/server/tokens.js +1 -0
- package/dist/server/tokens.js.map +1 -1
- package/dist/shared/models.js +1 -1
- package/dist/shared/models.js.map +1 -1
- package/dist/shared/runners.d.ts +6 -2
- package/dist/shared/runners.d.ts.map +1 -1
- package/dist/shared/runners.js.map +1 -1
- package/dist/shared/runs.d.ts +20 -0
- package/dist/shared/runs.d.ts.map +1 -1
- package/dist/shared/runs.js.map +1 -1
- package/package.json +5 -5
- package/skills/nocobase-app-plugin-agents/SKILL.md +1 -1
- package/skills/nocobase-app-plugin-agents/references/distribution.md +21 -4
- package/skills/nocobase-app-plugin-agents/references/extension-points.md +7 -1
- package/skills/nocobase-app-plugin-agents/references/runners.md +6 -0
- package/skills/nocobase-app-plugin-agents/references/setup-and-config.md +2 -0
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { defineMigration, } from '@nocobase/db';
|
|
2
|
+
/**
|
|
3
|
+
* The repositories whose credential the runner holding a run may ask for on demand (`agRuns.gitCredentialUrls`, a JSON
|
|
4
|
+
* array of URLs exactly as the claim handed them out, null when there are none), and why the runner could not push a
|
|
5
|
+
* repository at the end of a run (`agRunRepos.failureReason` and `failureDetail`, null when it pushed or did not try).
|
|
6
|
+
*/
|
|
7
|
+
const migration = defineMigration({
|
|
8
|
+
name: '202610100002_ag_add_run_git_credentials',
|
|
9
|
+
async up({ builder }) {
|
|
10
|
+
await builder.alterCollection('agRuns', (collection) => {
|
|
11
|
+
collection.json('gitCredentialUrls').nullable();
|
|
12
|
+
});
|
|
13
|
+
await builder.alterCollection('agRunRepos', (collection) => {
|
|
14
|
+
collection.string('failureReason', { length: 64 }).nullable();
|
|
15
|
+
collection.text('failureDetail').nullable();
|
|
16
|
+
});
|
|
17
|
+
},
|
|
18
|
+
async down({ builder }) {
|
|
19
|
+
await builder.alterCollection('agRunRepos', (collection) => {
|
|
20
|
+
collection.dropField('failureDetail');
|
|
21
|
+
collection.dropField('failureReason');
|
|
22
|
+
});
|
|
23
|
+
await builder.alterCollection('agRuns', (collection) => {
|
|
24
|
+
collection.dropField('gitCredentialUrls');
|
|
25
|
+
});
|
|
26
|
+
},
|
|
27
|
+
});
|
|
28
|
+
export default migration;
|
|
29
|
+
//# sourceMappingURL=202610100002_ag_add_run_git_credentials.js.map
|
|
30
|
+
// @nocobase/task-manifest v1
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"202610100002_ag_add_run_git_credentials.js","sourceRoot":"","sources":["../../../database/migrations/202610100002_ag_add_run_git_credentials.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,GAGhB,MAAM,cAAc,CAAC;AAEtB;;;;GAIG;AACH,MAAM,SAAS,GAAwB,eAAe,CAAC;IACrD,IAAI,EAAE,yCAAyC;IAE/C,KAAK,CAAC,EAAE,CAAC,EAAE,OAAO,EAAoB;QACpC,MAAM,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE;YACrD,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,EAAE;YACzD,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC9D,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAoB;QACtC,MAAM,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,EAAE;YACzD,UAAU,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;YACtC,UAAU,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE;YACrD,UAAU,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"202610110001_ag_add_fresh_sessions.d.ts","sourceRoot":"","sources":["../../../database/migrations/202610110001_ag_add_fresh_sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,cAAc,CAAC;AAEtB,QAAA,MAAM,SAAS,EAAE,mBAoBf,CAAC;AAEH,eAAe,SAAS,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { defineMigration, } from '@nocobase/db';
|
|
2
|
+
const migration = defineMigration({
|
|
3
|
+
name: '202610110001_ag_add_fresh_sessions',
|
|
4
|
+
async up({ builder }) {
|
|
5
|
+
await builder.alterCollection('agRuns', (collection) => {
|
|
6
|
+
collection.boolean('freshSession').notNull().defaultTo(false);
|
|
7
|
+
});
|
|
8
|
+
await builder.alterCollection('agRunRequests', (collection) => {
|
|
9
|
+
collection.boolean('freshSession').notNull().defaultTo(false);
|
|
10
|
+
});
|
|
11
|
+
},
|
|
12
|
+
async down({ builder }) {
|
|
13
|
+
await builder.alterCollection('agRunRequests', (collection) => {
|
|
14
|
+
collection.dropField('freshSession');
|
|
15
|
+
});
|
|
16
|
+
await builder.alterCollection('agRuns', (collection) => {
|
|
17
|
+
collection.dropField('freshSession');
|
|
18
|
+
});
|
|
19
|
+
},
|
|
20
|
+
});
|
|
21
|
+
export default migration;
|
|
22
|
+
//# sourceMappingURL=202610110001_ag_add_fresh_sessions.js.map
|
|
23
|
+
// @nocobase/task-manifest v1
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"202610110001_ag_add_fresh_sessions.js","sourceRoot":"","sources":["../../../database/migrations/202610110001_ag_add_fresh_sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,GAGhB,MAAM,cAAc,CAAC;AAEtB,MAAM,SAAS,GAAwB,eAAe,CAAC;IACrD,IAAI,EAAE,oCAAoC;IAE1C,KAAK,CAAC,EAAE,CAAC,EAAE,OAAO,EAAoB;QACpC,MAAM,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE;YACrD,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC,UAAU,EAAE,EAAE;YAC5D,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAoB;QACtC,MAAM,OAAO,CAAC,eAAe,CAAC,eAAe,EAAE,CAAC,UAAU,EAAE,EAAE;YAC5D,UAAU,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE;YACrD,UAAU,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,eAAe,SAAS,CAAC"}
|
package/dist/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@nocobase/app-plugin-agents",
|
|
3
3
|
"displayName": "Agents",
|
|
4
4
|
"description": "Agents for NocoBase applications: agents, the model services online agents call, their runs and conversations, and the runners people connect to run them (registration, the long-poll claim, slots, the sweeper, build jobs, and the runner and CLI tarballs the application serves).",
|
|
5
|
-
"version": "0.1.0-beta.
|
|
5
|
+
"version": "0.1.0-beta.6",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"prettier": "@nocobase/dev-config/prettier",
|
|
8
8
|
"engines": {
|
|
@@ -32,7 +32,7 @@ import { type SkillDisk, type SkillService } from './core/skills/index.js';
|
|
|
32
32
|
import { type VariableService } from './core/variables/index.js';
|
|
33
33
|
import { type ModelGateway, type ModelServices, type ServerExecutor, type CommandSurface, type OnlineSkill, type ServerExecutorOptions } from './online/index.js';
|
|
34
34
|
import { type Vectors, type VectorsConfig } from './vectors/index.js';
|
|
35
|
-
import { type AgentCli, type Availability, type BriefPreviewer, type ClaimEligibility, type ClaimService, type RunnerReports, type RepoAccessRegistry, type RunMountRegistry, type RunnerView, type RunService, type SubjectRegistry } from './core/runs/index.js';
|
|
35
|
+
import { type AgentCli, type Availability, type BriefPreviewer, type ClaimEligibility, type ClaimService, type GitCredentialService, type RunnerReports, type RepoAccessRegistry, type RunMountRegistry, type RunnerView, type RunService, type SubjectRegistry } from './core/runs/index.js';
|
|
36
36
|
export interface AgentsDeps {
|
|
37
37
|
readonly database: Pick<DatabaseManager, 'transaction' | 'connection'>;
|
|
38
38
|
readonly idGenerator: {
|
|
@@ -128,6 +128,8 @@ export interface Agents {
|
|
|
128
128
|
readonly runs: RunService;
|
|
129
129
|
readonly claims: ClaimService;
|
|
130
130
|
readonly reports: RunnerReports;
|
|
131
|
+
/** Repository credentials a runner asks for while it holds a run (`RepoAccessProvider.issue`). */
|
|
132
|
+
readonly gitCredentials: GitCredentialService;
|
|
131
133
|
/** Marks silent runners offline, then takes back and ends the runs and jobs nobody will finish. */
|
|
132
134
|
readonly sweeper: RunnerSweeper;
|
|
133
135
|
/** Variables of agents, working directories and the scopes the application registers. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composition.d.ts","sourceRoot":"","sources":["../../server/composition.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,EAGL,KAAK,oBAAoB,EAEzB,KAAK,UAAU,EACf,KAAK,WAAW,EACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,KAAK,UAAU,EAChB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAe,KAAK,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAIL,KAAK,aAAa,EACnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzE,OAAO,EAAgB,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAoB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,gBAAgB,EACrB,KAAK,KAAK,EACV,KAAK,UAAU,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAML,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EAEzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,cAAc,EACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,aAAa,EACnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAIL,KAAK,SAAS,EACd,KAAK,YAAY,EAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,cAAc,EACnB,KAAK,WAAW,EAChB,KAAK,qBAAqB,EAC3B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,aAAa,EACnB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,
|
|
1
|
+
{"version":3,"file":"composition.d.ts","sourceRoot":"","sources":["../../server/composition.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ import { createSkillBlobs, createSkillService, memoryDisk, } from './core/skills
|
|
|
19
19
|
import { createVariableService, } from './core/variables/index.js';
|
|
20
20
|
import { createModelGateway, createModelServices, createServerExecutor, } from './online/index.js';
|
|
21
21
|
import { createVectors, } from './vectors/index.js';
|
|
22
|
-
import { createBriefPreviewer, createBriefSectionRegistry, createClaimEligibility, createClaimService, createRepoAccessRegistry, createRunMountRegistry, createRunnerReports, createRunService, createAvailability, createSubjectRegistry, createRunnerView, createSweeper, resolveAgentCli, runsHeldBy, runsHeldByTool, openCounts, } from './core/runs/index.js';
|
|
22
|
+
import { createBriefPreviewer, createBriefSectionRegistry, createClaimEligibility, createClaimService, createGitCredentialService, createRepoAccessRegistry, createRunMountRegistry, createRunnerReports, createRunService, createAvailability, createSubjectRegistry, createRunnerView, createSweeper, resolveAgentCli, runsHeldBy, runsHeldByTool, openCounts, } from './core/runs/index.js';
|
|
23
23
|
/** The application work comes from when nothing names it: the CLI's name, else a neutral one. */
|
|
24
24
|
export function defaultRunApp(cli) {
|
|
25
25
|
const id = cli?.name ?? 'app';
|
|
@@ -195,7 +195,22 @@ export function createAgents(deps) {
|
|
|
195
195
|
onClaimFailure: (runId, error) => onError(`Agents could not assemble run ${runId}.`, error),
|
|
196
196
|
defaultModel: async (conn) => (await modelServices.defaults(conn)).effectiveChat,
|
|
197
197
|
});
|
|
198
|
-
const reports = createRunnerReports({
|
|
198
|
+
const reports = createRunnerReports({
|
|
199
|
+
...transitions,
|
|
200
|
+
tx,
|
|
201
|
+
ids,
|
|
202
|
+
secrets,
|
|
203
|
+
cliName: cli.name,
|
|
204
|
+
appName: app.name,
|
|
205
|
+
});
|
|
206
|
+
const gitCredentials = createGitCredentialService({
|
|
207
|
+
tx,
|
|
208
|
+
clock,
|
|
209
|
+
reports,
|
|
210
|
+
repoAccess,
|
|
211
|
+
secrets,
|
|
212
|
+
onError,
|
|
213
|
+
});
|
|
199
214
|
const sweeper = createRunnerSweeper({
|
|
200
215
|
clock,
|
|
201
216
|
runners,
|
|
@@ -313,6 +328,7 @@ export function createAgents(deps) {
|
|
|
313
328
|
runs,
|
|
314
329
|
claims,
|
|
315
330
|
reports,
|
|
331
|
+
gitCredentials,
|
|
316
332
|
sweeper,
|
|
317
333
|
variables,
|
|
318
334
|
skills,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composition.js","sourceRoot":"","sources":["../../server/composition.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"composition.js","sourceRoot":"","sources":["../../server/composition.ts"],"names":[],"mappings":"AAgBA,OAAO,EACL,iBAAiB,EACjB,0BAA0B,EAE1B,UAAU,GAGX,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,qBAAqB,EACrB,gBAAgB,GAEjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,WAAW,EAAc,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EACL,YAAY,EACZ,gCAAgC,EAChC,wBAAwB,GAEzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAuB,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAA0B,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAiB,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,sBAAsB,EACtB,WAAW,EACX,gBAAgB,GAMjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,wBAAwB,EACxB,kBAAkB,GAGnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,yBAAyB,EACzB,yBAAyB,EACzB,sBAAsB,GAMvB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,yBAAyB,GAE1B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,oBAAoB,GAErB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,gBAAgB,GAGjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,mBAAmB,GAGpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,UAAU,GAGX,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,qBAAqB,GAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,GAOrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,aAAa,GAGd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,0BAA0B,EAC1B,wBAAwB,EACxB,sBAAsB,EACtB,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,EAClB,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,UAAU,EACV,cAAc,EACd,UAAU,GAaX,MAAM,sBAAsB,CAAC;AAyK9B,iGAAiG;AACjG,MAAM,UAAU,aAAa,CAAC,GAAuB;IACnD,MAAM,EAAE,GAAG,GAAG,EAAE,IAAI,IAAI,KAAK,CAAC;IAC9B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,IAAgB;IAC3C,MAAM,OAAO,GACX,IAAI,CAAC,OAAO;QACZ,CAAC,CAAC,OAAe,EAAE,KAAc,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,KAAK,EAAE,EAAE,CACtC,OAAO,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAChD,CAAC;IACF,MAAM,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACjD,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,WAAW,CAAC;IACxC,MAAM,QAAQ,GAAG,qBAAqB,EAAE,CAAC;IACzC,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAClC,MAAM,WAAW,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IACxC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAE3C,MAAM,MAAM,GAAG,YAAY,EAAE,CAAC;IAC9B,MAAM,IAAI,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,KAAK,GAAG,WAAW,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;IACtD,MAAM,OAAO,GAAG,mBAAmB,CAAC;QAClC,EAAE;QACF,GAAG;QACH,KAAK;QACL,GAAG;QACH,MAAM;QACN,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,CAC7B,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,EAAE,aAAa,IAAI,IAAI;KAC1D,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,gBAAgB,CAAC;QAC5B,EAAE;QACF,GAAG;QACH,KAAK;QACL,MAAM;QACN,KAAK,EAAE,qBAAqB,EAAE;QAC9B,GAAG;QACH,SAAS,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;QACzD,OAAO;KACR,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,mBAAmB,CAAC;QACxC,EAAE;QACF,KAAK;QACL,GAAG,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,gCAAgC,CAAC;KAClE,CAAC,CAAC;IACH,kHAAkH;IAClH,MAAM,OAAO,GAAG,kBAAkB,CAAC,aAAa,EAAE;QAChD,KAAK,EAAE,wBAAwB,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;QACnD,OAAO;KACR,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,aAAa,CAAC;QAC5B,EAAE;QACF,GAAG;QACH,KAAK;QACL,KAAK,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;QAC1C,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC1B,IAAI,CAAC;gBACH,OAAO,CAAC,MAAM,aAAa,CAAC,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC;YACxE,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,OAAO;KACR,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,wBAAwB,EAAE,CAAC;IAC3C,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAClC,MAAM,SAAS,GAAG,qBAAqB,CAAC;QACtC,EAAE;QACF,GAAG;QACH,KAAK;QACL,GAAG,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,wBAAwB,CAAC;QACzD,MAAM;QACN,GAAG,EAAE,GAAG,CAAC,IAAI;QACb,yGAAyG;QACzG,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CACjC,MAAM,CAAC,KAAK,KAAK,OAAO;YACtB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;YACnD,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE;KACxB,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;IAC/D,MAAM,MAAM,GAAG,kBAAkB,CAAC;QAChC,EAAE;QACF,GAAG;QACH,KAAK;QACL,MAAM;QACN,KAAK,EAAE,gBAAgB,CAAC;YACtB,EAAE;YACF,KAAK;YACL,IAAI,EAAE,IAAI,CAAC,SAAS,IAAI,CAAC,GAAG,EAAE,CAAC,YAAa,CAAC;SAC9C,CAAC;KACH,CAAC,CAAC;IACH,MAAM,MAAM,GAAiB,kBAAkB,CAAC;QAC9C,EAAE;QACF,GAAG;QACH,KAAK;QACL,MAAM;QACN,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE;QAC/B,WAAW,EAAE,CAAC,GAAG,EAAE,EAAE,CACnB,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,KAAK,GAAG,CAAC,EAAE,KAAK;QAC5D,KAAK,EAAE;YACL,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAChC,CAAC,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;YACvD,cAAc,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,CAChC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;YAC7D,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;gBAChD,MAAM,IAAI,CAAC,cAAc,CACvB,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,yBAAyB,EAAE,EACxD,IAAI,CACL,CAAC;YACJ,CAAC;SACF;KACF,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,sBAAsB,CAAC;QACzC,OAAO;QACP,SAAS;KACV,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,kBAAkB,CAAC;QACtC,OAAO;QACP,WAAW;QACX,QAAQ,EAAE,UAAU;QACpB,MAAM,EAAE,OAAO;KAChB,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,gBAAgB,CAAC;QAC5B,GAAG,WAAW;QACd,EAAE;QACF,GAAG;QACH,MAAM;QACN,OAAO,EAAE,GAAG,CAAC,IAAI;QACjB,OAAO,EAAE,GAAG,CAAC,IAAI;QACjB,OAAO,EAAE;YACP,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;YAChC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YAC1C,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC;SACjD;QACD,WAAW;QACX,MAAM;KACP,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,0BAA0B,EAAE,CAAC;IAC9C,MAAM,MAAM,GAAG,sBAAsB,EAAE,CAAC;IACxC,MAAM,UAAU,GAAG,wBAAwB,EAAE,CAAC;IAC9C,+FAA+F;IAC/F,MAAM,OAAO,GAAG,kBAAkB,EAAE,CAAC;IACrC,MAAM,aAAa,GAAG,yBAAyB,CAAC;QAC9C,EAAE;QACF,IAAI;QACJ,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;QAC7D,MAAM;KACP,CAAC,CAAC;IACH,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACzC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAuB,CAAC;IACrD,MAAM,YAAY,GAAG;QACnB,QAAQ,CAAC,KAAkB;YACzB,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACrC,OAAO,GAAG,EAAE;gBACV,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK;oBACzC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrC,CAAC,CAAC;QACJ,CAAC;QACD,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC;KACxC,CAAC;IACF,MAAM,MAAM,GAAG,kBAAkB,CAAC;QAChC,MAAM;QACN,QAAQ;QACR,MAAM;QACN,UAAU;QACV,IAAI;QACJ,SAAS,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;QACzD,GAAG,WAAW;QACd,EAAE;QACF,GAAG;QACH,SAAS;QACT,MAAM;QACN,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,mBAAmB;QACpD,GAAG;QACH,GAAG;QACH,OAAO;QACP,YAAY,EAAE,YAAY,CAAC,IAAI;QAC/B,aAAa;QACb,cAAc,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAC/B,OAAO,CAAC,iCAAiC,KAAK,GAAG,EAAE,KAAK,CAAC;QAC3D,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAC3B,CAAC,MAAM,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa;KACrD,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,mBAAmB,CAAC;QAClC,GAAG,WAAW;QACd,EAAE;QACF,GAAG;QACH,OAAO;QACP,OAAO,EAAE,GAAG,CAAC,IAAI;QACjB,OAAO,EAAE,GAAG,CAAC,IAAI;KAClB,CAAC,CAAC;IACH,MAAM,cAAc,GAAG,0BAA0B,CAAC;QAChD,EAAE;QACF,KAAK;QACL,OAAO;QACP,UAAU;QACV,OAAO;QACP,OAAO;KACR,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,mBAAmB,CAAC;QAClC,KAAK;QACL,OAAO;QACP,IAAI,EAAE,aAAa,CAAC,EAAE,GAAG,WAAW,EAAE,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;QACzD,IAAI;QACJ,QAAQ,EAAE,IAAI,CAAC,QAAQ;KACxB,CAAC,CAAC;IACH,iDAAiD;IACjD,IAAI,CAAC,cAAc,CAAC;QAClB,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC;KACvE,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,yBAAyB,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,eAAe,GAAG,qBAAqB,CAAC;QAC5C,EAAE;QACF,QAAQ;QACR,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;QACtB,OAAO,EACL,IAAI,CAAC,SAAS;YACd,qBAAqB,CAAC;gBACpB,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI;gBACpB,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI;gBACjB,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO;aACpB,CAAC;KACL,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,yBAAyB,CAAC;QAC9C,EAAE;QACF,GAAG;QACH,KAAK;QACL,MAAM;QACN,OAAO;QACP,WAAW;QACX,IAAI;QACJ,MAAM;QACN,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,sBAAsB,EAAE;QACtC,MAAM,EAAE,OAAO;QACf,WAAW,EAAE,eAAe,CAAC,KAAK;QAClC,QAAQ;KACT,CAAC,CAAC;IACH,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACzC,wBAAwB,CAAC,aAAa,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,gBAAgB,EAAE,CAAC;IAEhC,MAAM,QAAQ,GAAG,oBAAoB,CACnC;QACE,KAAK;QACL,MAAM;QACN,OAAO;QACP,IAAI;QACJ,aAAa;QACb,aAAa;QACb,MAAM,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,CACxC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,GAAG,EAAE,QAAQ,CAAC;QAC/D,QAAQ,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,CAC5B,IAAI,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;QAClE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACrB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/D,OAAO;gBACL,GAAG,QAAQ;gBACX,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;aAC/B,CAAC;QACJ,CAAC;QACD,aAAa,EAAE,YAAY,CAAC,IAAI;QAChC,OAAO;QACP,MAAM;QACN,OAAO;KACR,EACD,IAAI,CAAC,MAAM,CACZ,CAAC;IAEF,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACjD,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/C,MAAM,CAAC,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACnD,8GAA8G;IAC9G,6CAA6C;IAC7C,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;QAChC,aAAa;aACV,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;aACpB,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE,CACxB,OAAO,CACL,8CAA8C,KAAK,CAAC,KAAK,GAAG,EAC5D,KAAK,CACN,CACF,CAAC;IACN,CAAC,CAAC,CAAC;IACH,kGAAkG;IAClG,MAAM,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;QACjC,IAAI;aACD,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;aAChB,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAClB,+EAA+E;YAC/E,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;YAChE,IAAI,YAAY;gBACd,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,sBAAsB;oBAC5B,cAAc,EAAE,YAAY,CAAC,EAAE;oBAC/B,MAAM,EAAE,YAAY,CAAC,MAAM;iBAC5B,CAAC,CAAC;QACP,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,MAAM;QACN,EAAE;QACF,KAAK;QACL,MAAM;QACN,YAAY;QACZ,WAAW;QACX,GAAG;QACH,GAAG;QACH,OAAO;QACP,UAAU,EAAE,gBAAgB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QACtD,UAAU,EAAE,sBAAsB,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;QAC3D,IAAI;QACJ,KAAK;QACL,MAAM;QACN,IAAI;QACJ,cAAc,EAAE,0BAA0B,CAAC;YACzC,EAAE;YACF,GAAG;YACH,KAAK;YACL,OAAO,EAAE,GAAG,CAAC,IAAI;SAClB,CAAC;QACF,IAAI;QACJ,MAAM;QACN,OAAO;QACP,cAAc;QACd,OAAO;QACP,SAAS;QACT,MAAM;QACN,MAAM,EAAE,oBAAoB,CAAC;YAC3B,EAAE;YACF,KAAK;YACL,QAAQ;YACR,MAAM;YACN,OAAO,EAAE,GAAG,CAAC,IAAI;YACjB,OAAO,EAAE,GAAG,CAAC,IAAI;YACjB,QAAQ;SACT,CAAC;QACF,MAAM;QACN,UAAU;QACV,MAAM;QACN,MAAM;QACN,QAAQ;QACR,IAAI;QACJ,OAAO;QACP,SAAS,EAAE,mBAAmB,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QAC/D,MAAM,EAAE,kBAAkB,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;QAC9C,aAAa;QACb,eAAe,EAAE,eAAe,CAAC,OAAO;QACxC,aAAa;QACb,IAAI;QACJ,OAAO,EAAE,oBAAoB,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACnD,MAAM,EAAE;YACN,QAAQ,EAAE,aAAa;YACvB,OAAO;YACP,QAAQ;YACR,MAAM,EAAE,YAAY;SACrB;QACD,OAAO;KACR,CAAC;AACJ,CAAC;AAED,0GAA0G;AAC1G,SAAS,wBAAwB,CAC/B,aAAkC,EAClC,MAAoB,EACpB,IAAgB;IAEhB,aAAa,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QACvE,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;QAC7C,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC1C,IAAI,KAAK,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC;gBAC1C,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;QACrE,MAAM,KAAK,GAAG,IAAI,GAAG,EAAuB,CAAC;QAC7C,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;YACrB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,IAAI,GAAG,CAAC,WAAW,KAAK,MAAM,CAAC,EAAE,CAAC;gBACtE,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;gBACnD,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE;oBACZ,KAAK,EAAE,GAAG,KAAK,EAAE,IAAI,IAAI,GAAG,CAAC,OAAO,OAAO,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE;oBAC/E,GAAG,EAAE,IAAI;oBACT,GAAG,EAAE,IAAI;iBACV,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -182,5 +182,7 @@ export declare function briefOf(agent: Agent, assembly: SubjectAssembly, skills:
|
|
|
182
182
|
readonly name: string;
|
|
183
183
|
readonly description: string;
|
|
184
184
|
}[], cli: string, appName: string): RenderedBrief;
|
|
185
|
+
/** Whether `runner` asks for repository credentials on demand rather than taking them with the claim. */
|
|
186
|
+
export declare function asksCredentialsOnDemand(runner: Pick<Runner, 'features'>): boolean;
|
|
185
187
|
export declare function createClaimService(deps: ClaimDeps): ClaimService;
|
|
186
188
|
//# sourceMappingURL=claim.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claim.d.ts","sourceRoot":"","sources":["../../../../server/core/runs/claim.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,OAAO,EAEL,KAAK,SAAS,EAKd,KAAK,MAAM,EACX,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,YAAY,EAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAuB,KAAK,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAC9E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGvD,OAAO,EAIL,KAAK,KAAK,EACV,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAS,KAAK,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAiB,KAAK,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC7E,OAAO,KAAK,EAAM,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGvD,OAAO,EAEL,KAAK,mBAAmB,EACxB,KAAK,aAAa,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAIL,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAIL,KAAK,kBAAkB,EAGvB,KAAK,oBAAoB,EAEzB,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAGL,KAAK,eAAe,EACpB,KAAK,UAAU,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAqC,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAG/E,OAAO,
|
|
1
|
+
{"version":3,"file":"claim.d.ts","sourceRoot":"","sources":["../../../../server/core/runs/claim.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,7 @@ import { MAX_CLAIM_FAILURES, toolPolicyFor } from './policy.js';
|
|
|
56
56
|
import { mintRunToken } from './run-tokens.js';
|
|
57
57
|
import { runsHeldByTool } from './runner-view.js';
|
|
58
58
|
import { ACTIVE, countActive, eventsRepo, findRunRecord, markDelivered, pendingInputs, runsOfKey, runsRepo, sessionsRepo, toInput, toRun, } from './run.store.js';
|
|
59
|
+
import { dropInputs } from './input-gate.js';
|
|
59
60
|
import { finishRun } from './transitions.js';
|
|
60
61
|
import { consumeReset, saveBrief } from './workspace.store.js';
|
|
61
62
|
/** Queued runs looked at per claim, oldest first by priority. */
|
|
@@ -217,6 +218,10 @@ export function briefOf(agent, assembly, skills, cli, appName) {
|
|
|
217
218
|
: assembly.turn.prompt;
|
|
218
219
|
return { layers, turn, prompt: joinBrief(layers) };
|
|
219
220
|
}
|
|
221
|
+
/** Whether `runner` asks for repository credentials on demand rather than taking them with the claim. */
|
|
222
|
+
export function asksCredentialsOnDemand(runner) {
|
|
223
|
+
return runner.features.includes('gitCredentials');
|
|
224
|
+
}
|
|
220
225
|
const DIRECTORY_KEY_SEPARATOR = '\n';
|
|
221
226
|
/** The directories a run holds on its runner, as stored in `agRuns.directoryKey`. */
|
|
222
227
|
function directoryKeyOf(runnerId, dirs) {
|
|
@@ -239,6 +244,12 @@ async function directoryBusy(conn, runnerId, runId, key) {
|
|
|
239
244
|
.split(DIRECTORY_KEY_SEPARATOR)
|
|
240
245
|
.some((part) => part !== '' && wanted.has(part)));
|
|
241
246
|
}
|
|
247
|
+
/** Resolve omitted subject input in the claim transaction, keeping it in the audit history. */
|
|
248
|
+
async function settleClaimInputs(conn, pending, effective, now) {
|
|
249
|
+
const ids = new Set(effective.map((input) => input.id));
|
|
250
|
+
await dropInputs(conn, pending.filter((input) => !ids.has(input.id)).map((input) => input.id), now);
|
|
251
|
+
await markDelivered(conn, pending.filter((input) => ids.has(input.id)), now);
|
|
252
|
+
}
|
|
242
253
|
export function createClaimService(deps) {
|
|
243
254
|
const { tx, clock } = deps;
|
|
244
255
|
async function assemble({ conn }, run, agent, runner, inputs, leaseExpiresAt, prepared, entry) {
|
|
@@ -256,6 +267,8 @@ export function createClaimService(deps) {
|
|
|
256
267
|
dialect: 'cli',
|
|
257
268
|
};
|
|
258
269
|
const assembly = await binding.context.assemble(conn, claim);
|
|
270
|
+
inputs = assembly.inputs ?? inputs;
|
|
271
|
+
const effectiveClaim = { ...claim, inputs };
|
|
259
272
|
// Its owner's local policy keeps this runner off the subject, or off one of the repositories: another runner takes
|
|
260
273
|
// the run.
|
|
261
274
|
if (!policyAllowsSubject(runner.policy, assembly.subject.key) ||
|
|
@@ -308,6 +321,7 @@ export function createClaimService(deps) {
|
|
|
308
321
|
const git = await repoAccessFor(conn, deps.repoAccess, {
|
|
309
322
|
claim,
|
|
310
323
|
repos: dirs.filter((dir) => dir.kind === 'repo'),
|
|
324
|
+
onDemand: asksCredentialsOnDemand(runner),
|
|
311
325
|
}, prepared);
|
|
312
326
|
deps.secrets?.remember(runSecretsKey(run.id), [
|
|
313
327
|
...env.map((variable) => variable.value),
|
|
@@ -318,9 +332,10 @@ export function createClaimService(deps) {
|
|
|
318
332
|
filter: { runId: run.id },
|
|
319
333
|
sort: (sort) => sort.field('seq').desc(),
|
|
320
334
|
});
|
|
321
|
-
const brief = briefOf(agent, await withSections(conn, deps.sections,
|
|
335
|
+
const brief = briefOf(agent, await withSections(conn, deps.sections, effectiveClaim, assembly, prepared), skills, deps.cli.name, deps.app.name);
|
|
322
336
|
const briefFingerprint = fingerprint(agent, entry, brief.layers, skills);
|
|
323
|
-
const resume = !
|
|
337
|
+
const resume = !run.freshSession &&
|
|
338
|
+
!clean &&
|
|
324
339
|
session &&
|
|
325
340
|
!session.poisoned &&
|
|
326
341
|
session.fingerprint === briefFingerprint;
|
|
@@ -328,7 +343,7 @@ export function createClaimService(deps) {
|
|
|
328
343
|
// hears what changed in them in its turn instead.
|
|
329
344
|
const { mounts, resumeNotes } = runner.features.includes('mounts')
|
|
330
345
|
? await mountsFor(conn, deps.mounts, {
|
|
331
|
-
claim,
|
|
346
|
+
claim: effectiveClaim,
|
|
332
347
|
assembly,
|
|
333
348
|
session: resume ? 'resume' : 'fresh',
|
|
334
349
|
sessionKey: sessionKeyOf(view),
|
|
@@ -404,6 +419,7 @@ export function createClaimService(deps) {
|
|
|
404
419
|
requires,
|
|
405
420
|
directoryKey,
|
|
406
421
|
entry,
|
|
422
|
+
gitOnDemand: git?.onDemand ?? [],
|
|
407
423
|
};
|
|
408
424
|
}
|
|
409
425
|
/**
|
|
@@ -444,6 +460,27 @@ export function createClaimService(deps) {
|
|
|
444
460
|
});
|
|
445
461
|
});
|
|
446
462
|
}
|
|
463
|
+
async function admit(unit, run, agent, runner, inputs) {
|
|
464
|
+
const rejection = await deps.subjects
|
|
465
|
+
.get(run.subjectKind)
|
|
466
|
+
?.context.admit?.(unit.conn, {
|
|
467
|
+
run: toRun(run),
|
|
468
|
+
agent,
|
|
469
|
+
runner,
|
|
470
|
+
inputs,
|
|
471
|
+
cli: deps.cli.name,
|
|
472
|
+
appName: deps.app.name,
|
|
473
|
+
dialect: dialectOf(agent),
|
|
474
|
+
});
|
|
475
|
+
if (!rejection)
|
|
476
|
+
return true;
|
|
477
|
+
await finishRun(unit, deps, run, {
|
|
478
|
+
status: 'cancelled',
|
|
479
|
+
reason: null,
|
|
480
|
+
detail: `${rejection.reason}${rejection.detail ? `: ${rejection.detail}` : ''}`,
|
|
481
|
+
});
|
|
482
|
+
return false;
|
|
483
|
+
}
|
|
447
484
|
async function attempt(runner, agent, candidate, reported) {
|
|
448
485
|
// Avoid assembling or asking authorization when a cheap claim rule already rules this work out.
|
|
449
486
|
const conn = tx.read();
|
|
@@ -454,7 +491,7 @@ export function createClaimService(deps) {
|
|
|
454
491
|
(await runsOfKey(conn, candidate, ACTIVE)).length > 0)
|
|
455
492
|
return { kind: 'skipped' };
|
|
456
493
|
// Before the transaction: on SQLite it holds the only connection, so the providers read what else they need now.
|
|
457
|
-
const prepared = await prepareExtensions(toRun(candidate), deps.sections, deps.mounts, (error) => deps.onClaimFailure?.(candidate.id, error), deps.repoAccess);
|
|
494
|
+
const prepared = await prepareExtensions(toRun(candidate), deps.sections, deps.mounts, (error) => deps.onClaimFailure?.(candidate.id, error), deps.repoAccess, { onDemand: asksCredentialsOnDemand(runner) });
|
|
458
495
|
let taken;
|
|
459
496
|
try {
|
|
460
497
|
taken = await tx.run(async (unit) => {
|
|
@@ -498,6 +535,8 @@ export function createClaimService(deps) {
|
|
|
498
535
|
const pending = await pendingInputs(conn, run.id);
|
|
499
536
|
let assembled;
|
|
500
537
|
try {
|
|
538
|
+
if (!(await admit(unit, run, agent, runner, pending.map(toInput))))
|
|
539
|
+
return null;
|
|
501
540
|
assembled = await assemble(unit, run, agent, runner, pending.map(toInput), leaseExpiresAt, prepared, entry);
|
|
502
541
|
}
|
|
503
542
|
catch (error) {
|
|
@@ -505,7 +544,7 @@ export function createClaimService(deps) {
|
|
|
505
544
|
throw error;
|
|
506
545
|
throw new AssemblyError(error instanceof Error ? error.message : String(error), error);
|
|
507
546
|
}
|
|
508
|
-
await
|
|
547
|
+
await settleClaimInputs(conn, pending, assembled.payload.inputs, nowText);
|
|
509
548
|
await runsRepo(conn).updateMany({
|
|
510
549
|
filter: { id: run.id },
|
|
511
550
|
values: {
|
|
@@ -537,6 +576,9 @@ export function createClaimService(deps) {
|
|
|
537
576
|
model: assembled.entry.model,
|
|
538
577
|
effort: assembled.entry.effort ?? null,
|
|
539
578
|
teamOnlyVariables: null,
|
|
579
|
+
gitCredentialUrls: assembled.gitOnDemand.length > 0
|
|
580
|
+
? [...assembled.gitOnDemand]
|
|
581
|
+
: null,
|
|
540
582
|
},
|
|
541
583
|
});
|
|
542
584
|
unit.emit({ type: 'run.changed', runId: run.id, status: 'dispatched' });
|
|
@@ -656,12 +698,14 @@ export function createClaimService(deps) {
|
|
|
656
698
|
const inputs = pending.map(toInput);
|
|
657
699
|
let claimed;
|
|
658
700
|
try {
|
|
701
|
+
if (!(await admit(unit, run, agent, null, inputs)))
|
|
702
|
+
return null;
|
|
659
703
|
claimed = await assembleServer(unit, run, agent, holder, inputs, leaseExpiresAt, prepared);
|
|
660
704
|
}
|
|
661
705
|
catch (error) {
|
|
662
706
|
throw new AssemblyError(error instanceof Error ? error.message : String(error), error);
|
|
663
707
|
}
|
|
664
|
-
await
|
|
708
|
+
await settleClaimInputs(conn, pending, claimed.inputs, nowText);
|
|
665
709
|
await runsRepo(conn).updateMany({
|
|
666
710
|
filter: { id: run.id },
|
|
667
711
|
values: {
|
|
@@ -716,11 +760,13 @@ export function createClaimService(deps) {
|
|
|
716
760
|
dialect: 'tools',
|
|
717
761
|
};
|
|
718
762
|
const assembly = await binding.context.assemble(conn, claim);
|
|
763
|
+
inputs = assembly.inputs ?? inputs;
|
|
764
|
+
const effectiveClaim = { ...claim, inputs };
|
|
719
765
|
if (assembly.dirs.length > 0)
|
|
720
766
|
throw new Error('An online agent has no working directory, and this work needs one.');
|
|
721
767
|
const skills = await deps.skills.forRun(conn, skillTargets(agent, assembly), run.id);
|
|
722
768
|
const own = new Set(skills.map((skill) => skill.slug));
|
|
723
|
-
const rendered = briefOf(agent, await withSections(conn, deps.sections,
|
|
769
|
+
const rendered = briefOf(agent, await withSections(conn, deps.sections, effectiveClaim, assembly, prepared), [], deps.cli.name, deps.app.name);
|
|
724
770
|
// The skills an online run reads through its tools, and the agents it may consult, whatever system layer its
|
|
725
771
|
// subject gives it.
|
|
726
772
|
const consultable = (await deps.consultations?.targets(conn, run, agent)) ?? [];
|