@nocobase/app-plugin-agents 2.0.0-beta.8 → 2.0.0-beta.9
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 +23 -0
- package/dist/database/migrations/.manifest.json +4 -0
- package/dist/database/migrations/202611090001_ag_runner_preference.d.ts +9 -0
- package/dist/database/migrations/202611090001_ag_runner_preference.d.ts.map +1 -0
- package/dist/database/migrations/202611090001_ag_runner_preference.js +28 -0
- package/dist/database/migrations/202611090001_ag_runner_preference.js.map +1 -0
- package/dist/package.json +1 -1
- package/dist/server/composition.d.ts +5 -1
- package/dist/server/composition.d.ts.map +1 -1
- package/dist/server/composition.js +12 -1
- package/dist/server/composition.js.map +1 -1
- package/dist/server/core/conversations/chat-settings.d.ts +1 -1
- package/dist/server/core/conversations/chat-settings.d.ts.map +1 -1
- package/dist/server/core/conversations/chat-settings.js +6 -0
- package/dist/server/core/conversations/chat-settings.js.map +1 -1
- package/dist/server/core/conversations/conversation.store.d.ts +2 -0
- package/dist/server/core/conversations/conversation.store.d.ts.map +1 -1
- package/dist/server/core/conversations/conversation.store.js.map +1 -1
- package/dist/server/core/runs/claim.d.ts +10 -1
- package/dist/server/core/runs/claim.d.ts.map +1 -1
- package/dist/server/core/runs/claim.js +39 -6
- package/dist/server/core/runs/claim.js.map +1 -1
- package/dist/server/core/runs/extensions.d.ts +26 -1
- package/dist/server/core/runs/extensions.d.ts.map +1 -1
- package/dist/server/core/runs/extensions.js +15 -0
- package/dist/server/core/runs/extensions.js.map +1 -1
- 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/npm-credentials.d.ts +35 -0
- package/dist/server/core/runs/npm-credentials.d.ts.map +1 -0
- package/dist/server/core/runs/npm-credentials.js +83 -0
- package/dist/server/core/runs/npm-credentials.js.map +1 -0
- package/dist/server/core/runs/run.service.d.ts.map +1 -1
- package/dist/server/core/runs/run.service.js +4 -1
- package/dist/server/core/runs/run.service.js.map +1 -1
- package/dist/server/core/runs/run.store.d.ts +10 -0
- package/dist/server/core/runs/run.store.d.ts.map +1 -1
- package/dist/server/core/runs/run.store.js +11 -0
- package/dist/server/core/runs/run.store.js.map +1 -1
- package/dist/server/routes/chat.d.ts.map +1 -1
- package/dist/server/routes/chat.js +5 -2
- package/dist/server/routes/chat.js.map +1 -1
- package/dist/server/routes/run.js +1 -1
- package/dist/server/routes/run.js.map +1 -1
- package/dist/server/routes/runners/runner.js +1 -1
- 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 +20 -1
- package/dist/server/routes/runners/runs.js.map +1 -1
- package/dist/server/routes/schemas.d.ts.map +1 -1
- package/dist/server/routes/schemas.js +4 -1
- package/dist/server/routes/schemas.js.map +1 -1
- package/dist/server/tokens.d.ts +1 -1
- package/dist/server/tokens.d.ts.map +1 -1
- package/dist/server/tokens.js.map +1 -1
- package/dist/shared/conversations.d.ts +12 -1
- package/dist/shared/conversations.d.ts.map +1 -1
- package/dist/shared/conversations.js +10 -0
- package/dist/shared/conversations.js.map +1 -1
- package/package.json +7 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,28 @@
|
|
|
1
1
|
# @nocobase/app-plugin-agents
|
|
2
2
|
|
|
3
|
+
## 2.0.0-beta.9
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- ac6c1eb: A runner asks the application for the token of NocoBase's private npm registry (`https://pkg-v3.nocobase.com/`) only when an install of a run needs it: when the repository's committed `.npmrc` points a scope or the registry at it, or after an `@nocobase/*` package was not found on the default registry, which it then retries once with the private registry. The token goes into a run-private npm configuration for that one command and is redacted from what the run reports. The machine's own npm and pnpm settings stay in effect except those pointing at the private registry, so a project that needs no private package never reaches it. Protocol version 16 adds the `npmCredentials` feature and `RUNNER_ROUTES.npmCredential`; applications register where the token comes from with `npmCredentialProviders`. Update the application before the runners.
|
|
8
|
+
- d4d7b07: A person can choose which kind of runner their runs go to first: their own personal runners or the runners shared with the team (`runnerPreference` in the chat preferences, `auto` by default). A run keeps the choice its actor had when it was queued; runners of the other kind wait one more second before taking it, so they still take it when none of the preferred kind can. Claims read nothing more.
|
|
9
|
+
|
|
10
|
+
### Patch Changes
|
|
11
|
+
|
|
12
|
+
- a2dc459: Expose whether the current run starts an independent tool session so reviewers can verify their session before reviewing.
|
|
13
|
+
- Updated dependencies [a2dc459]
|
|
14
|
+
- Updated dependencies [2d18eb2]
|
|
15
|
+
- Updated dependencies [6a51d28]
|
|
16
|
+
- Updated dependencies [ac6c1eb]
|
|
17
|
+
- Updated dependencies [3642d82]
|
|
18
|
+
- @nocobase/agent-protocol@0.1.0-beta.18
|
|
19
|
+
- @nocobase/db@1.0.0-beta.27
|
|
20
|
+
- @nocobase/app-server@5.0.0-beta.3
|
|
21
|
+
- @nocobase/app-cli@1.0.0-beta.33
|
|
22
|
+
- @nocobase/app-cli-client@0.1.0-beta.20
|
|
23
|
+
- @nocobase/app-plugin-authentication@2.0.0-beta.20
|
|
24
|
+
- @nocobase/app-plugin-file@1.0.0-beta.30
|
|
25
|
+
|
|
3
26
|
## 2.0.0-beta.8
|
|
4
27
|
|
|
5
28
|
### Patch Changes
|
|
@@ -164,6 +164,10 @@
|
|
|
164
164
|
"202611080002_ag_run_failure_params.js": {
|
|
165
165
|
"sourceChecksum": "5a5d11e54a71e072f568c8a084f9edde34ade30f4150bafae31d8690b08e1086",
|
|
166
166
|
"artifactChecksum": "6fc7bc4556a7e34a709afd6d7f843fe2dba361a2c432ba35a38e7d055ff45ac5"
|
|
167
|
+
},
|
|
168
|
+
"202611090001_ag_runner_preference.js": {
|
|
169
|
+
"sourceChecksum": "612d4b3dc9bed7ffa305341872a1af925f31b588e9c99581d6e213ee9141e6d1",
|
|
170
|
+
"artifactChecksum": "1d4ba8b5dfd7c81711a7952984819ee686f12dbd656cc00767cd5a371fbd9455"
|
|
167
171
|
}
|
|
168
172
|
}
|
|
169
173
|
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { type MigrationDefinition } from '@nocobase/db';
|
|
2
|
+
/**
|
|
3
|
+
* Which kind of runner a person's runs go to first (`personal` or `team`; null: either, whoever is first). The person
|
|
4
|
+
* chooses it in `agChatPreferences`; a run keeps the choice its actor had when it was queued, so a claim reads it from
|
|
5
|
+
* the run it already holds.
|
|
6
|
+
*/
|
|
7
|
+
declare const migration: MigrationDefinition;
|
|
8
|
+
export default migration;
|
|
9
|
+
//# sourceMappingURL=202611090001_ag_runner_preference.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"202611090001_ag_runner_preference.d.ts","sourceRoot":"","sources":["../../../database/migrations/202611090001_ag_runner_preference.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,mBAAmB,EACzB,MAAM,cAAc,CAAC;AAEtB;;;;GAIG;AACH,QAAA,MAAM,SAAS,EAAE,mBAkBf,CAAC;AAEH,eAAe,SAAS,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { defineMigration, } from '@nocobase/db';
|
|
2
|
+
/**
|
|
3
|
+
* Which kind of runner a person's runs go to first (`personal` or `team`; null: either, whoever is first). The person
|
|
4
|
+
* chooses it in `agChatPreferences`; a run keeps the choice its actor had when it was queued, so a claim reads it from
|
|
5
|
+
* the run it already holds.
|
|
6
|
+
*/
|
|
7
|
+
const migration = defineMigration({
|
|
8
|
+
name: '202611090001_ag_runner_preference',
|
|
9
|
+
async up({ builder }) {
|
|
10
|
+
await builder.alterCollection('agChatPreferences', (collection) => {
|
|
11
|
+
collection.string('runnerPreference', { length: 16 }).nullable();
|
|
12
|
+
});
|
|
13
|
+
await builder.alterCollection('agRuns', (collection) => {
|
|
14
|
+
collection.string('runnerPreference', { length: 16 }).nullable();
|
|
15
|
+
});
|
|
16
|
+
},
|
|
17
|
+
async down({ builder }) {
|
|
18
|
+
await builder.alterCollection('agRuns', (collection) => {
|
|
19
|
+
collection.dropField('runnerPreference');
|
|
20
|
+
});
|
|
21
|
+
await builder.alterCollection('agChatPreferences', (collection) => {
|
|
22
|
+
collection.dropField('runnerPreference');
|
|
23
|
+
});
|
|
24
|
+
},
|
|
25
|
+
});
|
|
26
|
+
export default migration;
|
|
27
|
+
//# sourceMappingURL=202611090001_ag_runner_preference.js.map
|
|
28
|
+
// @nocobase/task-manifest v1
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"202611090001_ag_runner_preference.js","sourceRoot":"","sources":["../../../database/migrations/202611090001_ag_runner_preference.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,GAGhB,MAAM,cAAc,CAAC;AAEtB;;;;GAIG;AACH,MAAM,SAAS,GAAwB,eAAe,CAAC;IACrD,IAAI,EAAE,mCAAmC;IACzC,KAAK,CAAC,EAAE,CAAC,EAAE,OAAO,EAAoB;QACpC,MAAM,OAAO,CAAC,eAAe,CAAC,mBAAmB,EAAE,CAAC,UAAU,EAAE,EAAE;YAChE,UAAU,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QACnE,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE;YACrD,UAAU,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;QACnE,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAoB;QACtC,MAAM,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE;YACrD,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,MAAM,OAAO,CAAC,eAAe,CAAC,mBAAmB,EAAE,CAAC,UAAU,EAAE,EAAE;YAChE,UAAU,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;QAC3C,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": "2.0.0-beta.
|
|
5
|
+
"version": "2.0.0-beta.9",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"prettier": "@nocobase/dev-config/prettier",
|
|
8
8
|
"engines": {
|
|
@@ -37,7 +37,7 @@ import { type PriceService, type ReportService } from './core/reports/index.js';
|
|
|
37
37
|
import { type SkillDisk, type SkillService } from './core/skills/index.js';
|
|
38
38
|
import { type VariableService } from './core/variables/index.js';
|
|
39
39
|
import { type ModelGateway, type ModelServices } from './online/index.js';
|
|
40
|
-
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';
|
|
40
|
+
import { type AgentCli, type Availability, type BriefPreviewer, type ClaimEligibility, type ClaimService, type GitCredentialService, type NpmCredentialRegistry, type NpmCredentialService, type RunnerReports, type RepoAccessRegistry, type RunMountRegistry, type RunnerView, type RunService, type SubjectRegistry } from './core/runs/index.js';
|
|
41
41
|
import type { OnlineAgentSandboxOptions } from './online/sandbox/types.js';
|
|
42
42
|
export interface AgentsDeps {
|
|
43
43
|
readonly uiRecovery?: OnlineAgentRecoveryConfig;
|
|
@@ -139,6 +139,8 @@ export interface Agents {
|
|
|
139
139
|
readonly reports: RunnerReports;
|
|
140
140
|
/** Repository credentials a runner asks for while it holds a run (`RepoAccessProvider.issue`). */
|
|
141
141
|
readonly gitCredentials: GitCredentialService;
|
|
142
|
+
/** The private npm registry's token a runner asks for while it holds a run (`NpmCredentialProvider.issue`). */
|
|
143
|
+
readonly npmCredentials: NpmCredentialService;
|
|
142
144
|
/** Marks silent runners offline, then takes back and ends the runs and jobs nobody will finish. */
|
|
143
145
|
readonly sweeper: RunnerSweeper;
|
|
144
146
|
readonly purgeRunData: () => Promise<number>;
|
|
@@ -158,6 +160,8 @@ export interface Agents {
|
|
|
158
160
|
readonly mounts: RunMountRegistry;
|
|
159
161
|
/** Who a run's commits name and the short-lived credentials its checkouts push with, as the application gives them. */
|
|
160
162
|
readonly repoAccess: RepoAccessRegistry;
|
|
163
|
+
/** Where the token of NocoBase's private npm registry comes from, as the application gives it. */
|
|
164
|
+
readonly npmCredentialProviders: NpmCredentialRegistry;
|
|
161
165
|
/** Names of people, from the directory the application plugs in. */
|
|
162
166
|
readonly people: People;
|
|
163
167
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composition.d.ts","sourceRoot":"","sources":["../../server/composition.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAGzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE;;;;;;;;;;;;;;GAcG;AACH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,OAAO,EAEL,KAAK,sBAAsB,EAC5B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAExE,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,EAML,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAML,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EAEzB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAoB,KAAK,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC5E,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,EAGL,KAAK,YAAY,EACjB,KAAK,aAAa,EACnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,
|
|
1
|
+
{"version":3,"file":"composition.d.ts","sourceRoot":"","sources":["../../server/composition.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ import { createModelUsageRecorder, createPriceService, createReportService, } fr
|
|
|
24
24
|
import { createSkillBlobs, createSkillService, memoryDisk, } from './core/skills/index.js';
|
|
25
25
|
import { createVariableService, } from './core/variables/index.js';
|
|
26
26
|
import { createModelGateway, createModelServices, } from './online/index.js';
|
|
27
|
-
import { createBriefPreviewer, createBriefSectionRegistry, createClaimEligibility, createClaimService, createGitCredentialService, createRepoAccessRegistry, createRunMountRegistry, createRunnerReports, createRunService, createAvailability, createSubjectRegistry, createRunnerView, createSweeper, resolveAgentCli, runsHeldSnapshot, openCounts, } from './core/runs/index.js';
|
|
27
|
+
import { createBriefPreviewer, createBriefSectionRegistry, createClaimEligibility, createClaimService, createGitCredentialService, createNpmCredentialRegistry, createNpmCredentialService, createRepoAccessRegistry, createRunMountRegistry, createRunnerReports, createRunService, createAvailability, createSubjectRegistry, createRunnerView, createSweeper, resolveAgentCli, runsHeldSnapshot, openCounts, } from './core/runs/index.js';
|
|
28
28
|
import { createSandboxProvider } from './online/sandbox/provider.js';
|
|
29
29
|
/** The application work comes from when nothing names it: the CLI's name, else a neutral one. */
|
|
30
30
|
export function defaultRunApp(cli) {
|
|
@@ -151,6 +151,7 @@ export function createAgents(deps) {
|
|
|
151
151
|
const sections = createBriefSectionRegistry();
|
|
152
152
|
const mounts = createRunMountRegistry();
|
|
153
153
|
const repoAccess = createRepoAccessRegistry();
|
|
154
|
+
const npmCredentialProviders = createNpmCredentialRegistry();
|
|
154
155
|
// The secrets claims hand out, so what runners report is redacted of them before it is stored.
|
|
155
156
|
const secrets = createSecretMemory();
|
|
156
157
|
const selectionPolicies = createModelSelectionPolicies();
|
|
@@ -195,6 +196,14 @@ export function createAgents(deps) {
|
|
|
195
196
|
secrets,
|
|
196
197
|
onError,
|
|
197
198
|
});
|
|
199
|
+
const npmCredentials = createNpmCredentialService({
|
|
200
|
+
tx,
|
|
201
|
+
clock,
|
|
202
|
+
reports,
|
|
203
|
+
providers: npmCredentialProviders,
|
|
204
|
+
secrets,
|
|
205
|
+
onError,
|
|
206
|
+
});
|
|
198
207
|
const sweeper = createRunnerSweeper({
|
|
199
208
|
clock,
|
|
200
209
|
runners,
|
|
@@ -381,6 +390,7 @@ export function createAgents(deps) {
|
|
|
381
390
|
selectionPolicies,
|
|
382
391
|
reports,
|
|
383
392
|
gitCredentials,
|
|
393
|
+
npmCredentials,
|
|
384
394
|
sweeper,
|
|
385
395
|
variables,
|
|
386
396
|
skills,
|
|
@@ -395,6 +405,7 @@ export function createAgents(deps) {
|
|
|
395
405
|
}),
|
|
396
406
|
mounts,
|
|
397
407
|
repoAccess,
|
|
408
|
+
npmCredentialProviders,
|
|
398
409
|
people,
|
|
399
410
|
scopes,
|
|
400
411
|
subjects,
|
|
@@ -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":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Who new conversations go to: the team's system default chat agent (`agSettings`, key `chat`) and each person's own
|
|
3
|
-
* default (`agChatPreferences`).
|
|
3
|
+
* default (`agChatPreferences`), which also keeps the kind of runner their runs go to first (`runnerPreference`).
|
|
4
4
|
*/
|
|
5
5
|
import type { DatabaseConnection } from '@nocobase/db';
|
|
6
6
|
import { z } from 'zod';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-settings.d.ts","sourceRoot":"","sources":["../../../../server/core/conversations/chat-settings.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EACV,eAAe,EACf,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EAClB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"chat-settings.d.ts","sourceRoot":"","sources":["../../../../server/core/conversations/chat-settings.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EACV,eAAe,EACf,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EAClB,MAAM,kCAAkC,CAAC;AAK1C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAMvD,eAAO,MAAM,0BAA0B,EAAE,CAAC,CAAC,OAAO,CAAC,oBAAoB,CAc3D,CAAC;AAEb,eAAO,MAAM,uBAAuB,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB,CASrD,CAAC;AAEb,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3D,yEAAyE;IACzE,cAAc,CACZ,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,YAAY,CAAC,CAAC;IACzB,WAAW,CACT,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,kBAAkB,GACxB,OAAO,CAAC,eAAe,CAAC,CAAC;IAC5B,yDAAyD;IACzD,iBAAiB,CACf,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7B;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAC9C,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IACjD,QAAQ,CAAC,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;CAClD,GAAG,mBAAmB,CAqHtB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
+
import { RUNNER_PREFERENCES, toRunnerPreference, } from '../../../shared/conversations.js';
|
|
2
3
|
import { forbidden, invalid } from '../../kernel/errors.js';
|
|
3
4
|
import { asJson, jsonObject } from '../../kernel/values.js';
|
|
4
5
|
import { findAgent } from '../agents/index.js';
|
|
@@ -12,6 +13,9 @@ export const ChatPreferencesPatchSchema = z
|
|
|
12
13
|
.max(64)
|
|
13
14
|
.nullable()
|
|
14
15
|
.describe('The default agent identifier.'),
|
|
16
|
+
runnerPreference: z
|
|
17
|
+
.enum(RUNNER_PREFERENCES)
|
|
18
|
+
.describe('Which kind of runner runs queued from now on go to first: auto, personal or team.'),
|
|
15
19
|
})
|
|
16
20
|
.partial();
|
|
17
21
|
export const ChatSettingsPatchSchema = z
|
|
@@ -39,6 +43,7 @@ export function createChatSettingsService(deps) {
|
|
|
39
43
|
const row = await preferencesRepo(conn).findOne({ filter: { userId } });
|
|
40
44
|
return {
|
|
41
45
|
defaultAgentId: row?.defaultAgentId ?? null,
|
|
46
|
+
runnerPreference: toRunnerPreference(row?.runnerPreference),
|
|
42
47
|
};
|
|
43
48
|
}
|
|
44
49
|
async function validateOnlineDefault(patch) {
|
|
@@ -103,6 +108,7 @@ export function createChatSettingsService(deps) {
|
|
|
103
108
|
}
|
|
104
109
|
const values = {
|
|
105
110
|
defaultAgentId: next.defaultAgentId,
|
|
111
|
+
runnerPreference: next.runnerPreference === 'auto' ? null : next.runnerPreference,
|
|
106
112
|
updatedAt: clock.now().toISOString(),
|
|
107
113
|
};
|
|
108
114
|
const existing = await preferencesRepo(conn).findOne({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-settings.js","sourceRoot":"","sources":["../../../../server/core/conversations/chat-settings.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"chat-settings.js","sourceRoot":"","sources":["../../../../server/core/conversations/chat-settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,6 +73,8 @@ export interface MessageRecord {
|
|
|
73
73
|
export interface PreferencesRecord {
|
|
74
74
|
readonly userId: string;
|
|
75
75
|
readonly defaultAgentId: string | null;
|
|
76
|
+
/** `personal` or `team`; null: `auto`. */
|
|
77
|
+
readonly runnerPreference?: string | null;
|
|
76
78
|
readonly onlineAgent?: JsonColumn;
|
|
77
79
|
readonly updatedAt: string;
|
|
78
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.store.d.ts","sourceRoot":"","sources":["../../../../server/core/conversations/conversation.store.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"conversation.store.d.ts","sourceRoot":"","sources":["../../../../server/core/conversations/conversation.store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversation.store.js","sourceRoot":"","sources":["../../../../server/core/conversations/conversation.store.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,MAAM,EAAE,UAAU,EAAmB,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EACL,cAAc,EACd,iBAAiB,GAElB,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"conversation.store.js","sourceRoot":"","sources":["../../../../server/core/conversations/conversation.store.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,7 +82,16 @@ export interface ClaimDeps extends TransitionDeps {
|
|
|
82
82
|
* woken for one run take it in order of how busy each is with its tool, whichever asked first and however many runs
|
|
83
83
|
* each took before; an idle runner, and work queued longer than its share, wait nothing.
|
|
84
84
|
*/
|
|
85
|
-
export declare function claimPace(runner: Pick<Runner, 'slots' | 'toolSlots' | 'toolLoad'>, tool: AgentTool, byTool: Readonly<Partial<Record<AgentTool, number>>>, run: Pick<Run, 'queueEnteredAt' | 'createdAt' | 'availableAt'>, now: number
|
|
85
|
+
export declare function claimPace(runner: Pick<Runner, 'slots' | 'toolSlots' | 'toolLoad'>, tool: AgentTool, byTool: Readonly<Partial<Record<AgentTool, number>>>, run: Pick<Run, 'queueEnteredAt' | 'createdAt' | 'availableAt'>, now: number,
|
|
86
|
+
/** Added to the share and counted from the same moment (`preferenceDelay`). */
|
|
87
|
+
extraMs?: number): number;
|
|
88
|
+
/**
|
|
89
|
+
* What `runner` waits on top of its share (`claimPace`) for `run`, from the kind of runner its actor prefers: one
|
|
90
|
+
* second when the run prefers the other kind, nothing otherwise. Nothing either when only this runner may take it
|
|
91
|
+
* (`bound`: pinned, reserved or continuing where its session is), or when it prefers personal runners but has
|
|
92
|
+
* variables for shared runners only, which no personal runner may receive.
|
|
93
|
+
*/
|
|
94
|
+
export declare function preferenceDelay(runner: Pick<Runner, 'trust'>, run: Pick<RunRecord, 'runnerPreference' | 'runnerPinId' | 'teamOnlyVariables'>, bound: boolean): number;
|
|
86
95
|
/**
|
|
87
96
|
* The entry `runner` takes a run of `agent` with: the first whose tool it has enabled, installed and signed in, with
|
|
88
97
|
* the entry's model among those it reports (`runsEntry`). Null when it has none of them.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claim.d.ts","sourceRoot":"","sources":["../../../../server/core/runs/claim.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"claim.d.ts","sourceRoot":"","sources":["../../../../server/core/runs/claim.ts"],"names":[],"mappings":"AA0DA,OAAO,EAGL,KAAK,SAAS,EAKd,KAAK,MAAM,EAEX,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,EAOL,KAAK,MAAM,EACZ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAc,KAAK,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACzE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAGpD,OAAO,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,KAAK,EACV,GAAG,EACH,kBAAkB,EAGnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAgB,KAAK,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEjE,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,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAMvD,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAIL,KAAK,eAAe,EACpB,KAAK,cAAc,EACpB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAML,KAAK,kBAAkB,EAGvB,KAAK,oBAAoB,EAEzB,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,KAAK,eAAe,EACpB,KAAK,UAAU,EAChB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAqC,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE/E,OAAO,EAeL,KAAK,SAAS,EACf,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAa,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAqBlE,+EAA+E;AAC/E,MAAM,WAAW,SAAS;IACxB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,wBAAgB,eAAe,IAAI,SAAS,CAE3C;AAED,MAAM,WAAW,YAAY;IAC3B,uBAAuB,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,0FAA0F;IAC1F,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IACjE,uGAAuG;IACvG,QAAQ,CACN,IAAI,EAAE,kBAAkB,EACxB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,KAAK,GACX,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IACtC;;;;;OAKG;IACH,KAAK,CACH,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,KAAK,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EACpD,IAAI,CAAC,EAAE,SAAS,EAChB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACzB,+GAA+G;IAC/G,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,SAAU,SAAQ,cAAc;IAC/C,QAAQ,CAAC,iBAAiB,CAAC,EAAE,sBAAsB,CAAC;IACpD,QAAQ,CAAC,OAAO,CAAC,EAAE;QACjB,MAAM,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACpD,GAAG,CAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;KAC3E,CAAC;IACF,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,qEAAqE;IACrE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,8BAA8B;IAC9B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,mGAAmG;IACnG,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IACvB,+DAA+D;IAC/D,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC1C,qEAAqE;IACrE,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAClC,2EAA2E;IAC3E,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,oEAAoE;IACpE,QAAQ,CAAC,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IACzC,2GAA2G;IAC3G,QAAQ,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC;IACnC,iEAAiE;IACjE,QAAQ,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC;IACzC,oHAAoH;IACpH,QAAQ,CAAC,OAAO,CAAC,EAAE,YAAY,CAAC;IAChC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CACnE;AA+DD;;;;;;GAMG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,GAAG,WAAW,GAAG,UAAU,CAAC,EACxD,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC,EACpD,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,gBAAgB,GAAG,WAAW,GAAG,aAAa,CAAC,EAC9D,GAAG,EAAE,MAAM;AACX,+EAA+E;AAC/E,OAAO,SAAI,GACV,MAAM,CAOR;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,EAC7B,GAAG,EAAE,IAAI,CACP,SAAS,EACT,kBAAkB,GAAG,aAAa,GAAG,mBAAmB,CACzD,EACD,KAAK,EAAE,OAAO,GACb,MAAM,CAWR;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC,EAClC,GAAG,EAAE,MAAM,GACV,gBAAgB,GAAG,IAAI,CAIzB;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC,EAClC,IAAI,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,OAAO,EAClC,GAAG,EAAE,MAAM,GACV,gBAAgB,GAAG,IAAI,CAMzB;AAED,yGAAyG;AACzG,wBAAgB,OAAO,CACrB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,cAAc,CAAC,EAClC,GAAG,EAAE,MAAM,GACV,OAAO,CAET;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,SAAS,aAAa,EAAE,EAClC,GAAG,EAAE,MAAM,GACV,OAAO,CAYT;AAkBD,2GAA2G;AAC3G,wBAAgB,IAAI,CAClB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,SAAS,EACd,GAAG,EAAE,MAAM,GACV,OAAO,CAWT;AAED,2CAA2C;AAC3C,wBAAgB,eAAe,CAC7B,IAAI,EAAE,SAAS,YAAY,EAAE,EAC7B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,YAAY,GAAE,OAAe,GAC5B,aAAa,EAAE,CAUjB;AAED,4FAA4F;AAC5F,wBAAgB,WAAW,CAAC,IAAI,EAAE,SAAS,UAAU,EAAE,GAAG,YAAY,EAAE,CAKvE;AAED,8GAA8G;AAC9G,wBAAgB,eAAe,CAC7B,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,EACxB,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,GAAG,MAAM,CAAC,GACjD,cAAc,EAAE,CAQlB;AAED,0FAA0F;AAC1F,wBAAgB,YAAY,CAC1B,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,EACzB,QAAQ,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,GAAG,MAAM,CAAC,GACjD,WAAW,EAAE,CAUf;AAyBD,qGAAqG;AACrG,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,iEAAiE;AACjE,wBAAgB,OAAO,CACrB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,SAAS;IACf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B,EAAE,EACH,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GACd,aAAa,CA8Bf;AAaD,yGAAyG;AACzG,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,GAC/B,OAAO,CAET;AAUD,wFAAwF;AACxF,wBAAgB,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,OAAO,CAExE;AAkCD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,GAAG,YAAY,CAmmEhE"}
|
|
@@ -25,6 +25,11 @@ import { ACTIVE_JOB, jobsRepo } from '../../jobs/job.store.js';
|
|
|
25
25
|
* runners woken for the same runs, the least busy with each tool takes the next one. A request that ends while it
|
|
26
26
|
* waits takes nothing.
|
|
27
27
|
*
|
|
28
|
+
* A run whose actor prefers one kind of runner (`runnerPreference`, `personal` or `team`, noted when it was queued)
|
|
29
|
+
* makes the other kind wait one second more (`preferenceDelay`), so an idle runner of the preferred kind takes it
|
|
30
|
+
* first, and one of the other kind takes it about a second later when none can. Work that only one runner may take
|
|
31
|
+
* (pinned, reserved, continuing where its session is, or for shared runners only) adds no wait. Nothing else is read.
|
|
32
|
+
*
|
|
28
33
|
* Variables are checked and opened in the claim's own transaction, on its connection: which ones the assembled payload
|
|
29
34
|
* gets, whether any is for shared runners only, and their values, so what the runner receives is what was checked. The
|
|
30
35
|
* names taken from the runner go in `workspace.passthrough`, without values.
|
|
@@ -77,7 +82,10 @@ import { consumeReset, saveBrief } from './workspace.store.js';
|
|
|
77
82
|
const CANDIDATES = 50;
|
|
78
83
|
/** The initial page plus at most two further pages per claim request, shared by all free slots. */
|
|
79
84
|
const CANDIDATE_PAGES = 3;
|
|
80
|
-
/**
|
|
85
|
+
/**
|
|
86
|
+
* What a runner waits for a run when it already runs its tool at the limit, and what one of the kind of runner the
|
|
87
|
+
* run's actor does not prefer waits on top (`preferenceDelay`).
|
|
88
|
+
*/
|
|
81
89
|
const PACE_MS = 1000;
|
|
82
90
|
export function createClaimScan() {
|
|
83
91
|
return { remainingPages: CANDIDATE_PAGES };
|
|
@@ -124,15 +132,36 @@ function toolRoom(tools) {
|
|
|
124
132
|
* woken for one run take it in order of how busy each is with its tool, whichever asked first and however many runs
|
|
125
133
|
* each took before; an idle runner, and work queued longer than its share, wait nothing.
|
|
126
134
|
*/
|
|
127
|
-
export function claimPace(runner, tool, byTool, run, now
|
|
135
|
+
export function claimPace(runner, tool, byTool, run, now,
|
|
136
|
+
/** Added to the share and counted from the same moment (`preferenceDelay`). */
|
|
137
|
+
extraMs = 0) {
|
|
128
138
|
const limit = toolLimit(runner, tool);
|
|
129
139
|
if (limit <= 0)
|
|
130
140
|
return 0;
|
|
131
141
|
const load = runner.toolLoad?.[tool];
|
|
132
142
|
const used = Math.max(byTool[tool] ?? 0, load ? load.slots - load.free : 0);
|
|
133
|
-
const share = (Math.min(used, limit) / limit) * PACE_MS;
|
|
143
|
+
const share = (Math.min(used, limit) / limit) * PACE_MS + extraMs;
|
|
134
144
|
return Math.min(share, Math.max(0, queueStart(run) + share - now));
|
|
135
145
|
}
|
|
146
|
+
/**
|
|
147
|
+
* What `runner` waits on top of its share (`claimPace`) for `run`, from the kind of runner its actor prefers: one
|
|
148
|
+
* second when the run prefers the other kind, nothing otherwise. Nothing either when only this runner may take it
|
|
149
|
+
* (`bound`: pinned, reserved or continuing where its session is), or when it prefers personal runners but has
|
|
150
|
+
* variables for shared runners only, which no personal runner may receive.
|
|
151
|
+
*/
|
|
152
|
+
export function preferenceDelay(runner, run, bound) {
|
|
153
|
+
const preferred = run.runnerPreference;
|
|
154
|
+
if (preferred !== 'personal' && preferred !== 'team')
|
|
155
|
+
return 0;
|
|
156
|
+
if (bound || run.runnerPinId)
|
|
157
|
+
return 0;
|
|
158
|
+
if (preferred === (runner.trust === 'team' ? 'team' : 'personal'))
|
|
159
|
+
return 0;
|
|
160
|
+
if (preferred === 'personal' &&
|
|
161
|
+
variableRefs(run.teamOnlyVariables).length > 0)
|
|
162
|
+
return 0;
|
|
163
|
+
return PACE_MS;
|
|
164
|
+
}
|
|
136
165
|
/**
|
|
137
166
|
* The entry `runner` takes a run of `agent` with: the first whose tool it has enabled, installed and signed in, with
|
|
138
167
|
* the entry's model among those it reports (`runsEntry`). Null when it has none of them.
|
|
@@ -1116,7 +1145,9 @@ export function createClaimService(deps) {
|
|
|
1116
1145
|
const pinned = await pin.runnerOf(conn, toRun(run));
|
|
1117
1146
|
return pinned === null || pinned === runner.id;
|
|
1118
1147
|
}
|
|
1119
|
-
async function attempt(runner, agent, candidate, reported, pass
|
|
1148
|
+
async function attempt(runner, agent, candidate, reported, pass,
|
|
1149
|
+
/** Only this runner may take it: no preference wait (`preferenceDelay`). */
|
|
1150
|
+
bound) {
|
|
1120
1151
|
if (candidate.runnerPinId && candidate.runnerPinId !== runner.id)
|
|
1121
1152
|
return { kind: 'skipped' };
|
|
1122
1153
|
const conn = tx.read();
|
|
@@ -1152,7 +1183,7 @@ export function createClaimService(deps) {
|
|
|
1152
1183
|
reported.has(tool), clock.now().getTime());
|
|
1153
1184
|
if (!paced)
|
|
1154
1185
|
return { kind: 'skipped' };
|
|
1155
|
-
const wait = claimPace(runner, paced.tool, pass.byTool, candidate, clock.now().getTime());
|
|
1186
|
+
const wait = claimPace(runner, paced.tool, pass.byTool, candidate, clock.now().getTime(), preferenceDelay(runner, candidate, bound));
|
|
1156
1187
|
if (wait > 0)
|
|
1157
1188
|
await (deps.pause ?? pause)(wait, pass.signal);
|
|
1158
1189
|
if (pass.signal?.aborted)
|
|
@@ -1732,7 +1763,9 @@ export function createClaimService(deps) {
|
|
|
1732
1763
|
if (!pickOpenEntry(runner, agent, (tool) => reported.has(tool), clock.now().getTime()))
|
|
1733
1764
|
continue;
|
|
1734
1765
|
try {
|
|
1735
|
-
const result = await attempt(runner, agent, candidate, reported, pass
|
|
1766
|
+
const result = await attempt(runner, agent, candidate, reported, pass, reserved === runner.id ||
|
|
1767
|
+
pinned !== null ||
|
|
1768
|
+
preferred?.id === runner.id);
|
|
1736
1769
|
if (result.kind === 'claimed')
|
|
1737
1770
|
return result.payload;
|
|
1738
1771
|
if (result.kind === 'aborted')
|