@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
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type DistArtifact } from '@nocobase/agent-protocol';
|
|
1
|
+
import { type DistArtifact, type DistNpmPackage, type DistResolution } from '@nocobase/agent-protocol';
|
|
2
2
|
import type { Hono, MiddlewareHandler } from 'hono';
|
|
3
3
|
import type { Agents } from '../../composition.js';
|
|
4
4
|
import type { AdminEnv } from './admin.js';
|
|
@@ -16,5 +16,9 @@ export interface DistRoutesOptions {
|
|
|
16
16
|
}
|
|
17
17
|
/** `key=value` lines a POSIX shell reads without a JSON parser. Values never contain a newline. */
|
|
18
18
|
export declare function artifactEnv(artifact: DistArtifact): string;
|
|
19
|
+
/** The same lines for an npm answer, led by `kind=npm`; only a caller that sent `accept=npm` reads them. */
|
|
20
|
+
export declare function npmPackageEnv(npm: DistNpmPackage): string;
|
|
21
|
+
/** `artifactEnv` or `npmPackageEnv`, whichever the answer is. */
|
|
22
|
+
export declare function resolutionEnv(resolution: DistResolution): string;
|
|
19
23
|
export declare function createDistRoutes(services: Pick<Agents, 'runners' | 'dist' | 'downloadTokens'>, options?: DistRoutesOptions): Hono;
|
|
20
24
|
//# sourceMappingURL=dist.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dist.d.ts","sourceRoot":"","sources":["../../../../server/routes/runners/dist.ts"],"names":[],"mappings":"AAeA,OAAO,
|
|
1
|
+
{"version":3,"file":"dist.d.ts","sourceRoot":"","sources":["../../../../server/routes/runners/dist.ts"],"names":[],"mappings":"AAeA,OAAO,EAWL,KAAK,YAAY,EAEjB,KAAK,cAAc,EACnB,KAAK,cAAc,EACpB,MAAM,0BAA0B,CAAC;AAUlC,OAAO,KAAK,EAAW,IAAI,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAI7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AASnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,QAAQ,CAAC,kBAAkB,CAAC,EAAE,iBAAiB,CAAC;IAChD;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC;CAC/C;AAED,mGAAmG;AACnG,wBAAgB,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM,CAc1D;AAED,4GAA4G;AAC5G,wBAAgB,aAAa,CAAC,GAAG,EAAE,cAAc,GAAG,MAAM,CAUzD;AAED,iEAAiE;AACjE,wBAAgB,aAAa,CAAC,UAAU,EAAE,cAAc,GAAG,MAAM,CAIhE;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,gBAAgB,CAAC,EAC7D,OAAO,GAAE,iBAAsB,GAC9B,IAAI,CA4NN"}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
* signed in yet install the CLI, after which `acme login` signs it in as that person.
|
|
13
13
|
*/
|
|
14
14
|
import { Readable } from 'node:stream';
|
|
15
|
-
import { DistArtifactSchema, DistManifestSchema, HEADERS, ProtocolError, } from '@nocobase/agent-protocol';
|
|
15
|
+
import { DIST_ACCEPT_NPM, DIST_TARGET_PATTERN, distAccepts, DistArtifactSchema, DistManifestSchema, DistNpmPackageSchema, DistResolutionSchema, HEADERS, isDistNpmPackage, ProtocolError, UNIVERSAL_TARGET, } from '@nocobase/agent-protocol';
|
|
16
16
|
import { apiErrorResponse, apiErrorResponses, apiValidator, dataResponse, cliRoute, describeRoute, resolver, } from '@nocobase/app-server/router';
|
|
17
17
|
import { z } from 'zod';
|
|
18
18
|
import { domainRouter } from '../../kernel/http.js';
|
|
@@ -29,9 +29,29 @@ export function artifactEnv(artifact) {
|
|
|
29
29
|
`sha256=${parsed.sha256}`,
|
|
30
30
|
`size=${parsed.size}`,
|
|
31
31
|
`channel=${parsed.channel}`,
|
|
32
|
+
// Only for the universal tarball, so the answer for a tarball built for the platform stays as it was.
|
|
33
|
+
...(parsed.universal === true ? ['universal=true'] : []),
|
|
32
34
|
'',
|
|
33
35
|
].join('\n');
|
|
34
36
|
}
|
|
37
|
+
/** The same lines for an npm answer, led by `kind=npm`; only a caller that sent `accept=npm` reads them. */
|
|
38
|
+
export function npmPackageEnv(npm) {
|
|
39
|
+
const parsed = DistNpmPackageSchema.parse(npm);
|
|
40
|
+
return [
|
|
41
|
+
`kind=${parsed.kind}`,
|
|
42
|
+
`product=${parsed.product}`,
|
|
43
|
+
`version=${parsed.version}`,
|
|
44
|
+
`package=${parsed.package}`,
|
|
45
|
+
`channel=${parsed.channel}`,
|
|
46
|
+
'',
|
|
47
|
+
].join('\n');
|
|
48
|
+
}
|
|
49
|
+
/** `artifactEnv` or `npmPackageEnv`, whichever the answer is. */
|
|
50
|
+
export function resolutionEnv(resolution) {
|
|
51
|
+
return isDistNpmPackage(resolution)
|
|
52
|
+
? npmPackageEnv(resolution)
|
|
53
|
+
: artifactEnv(resolution);
|
|
54
|
+
}
|
|
35
55
|
export function createDistRoutes(services, options = {}) {
|
|
36
56
|
const router = domainRouter();
|
|
37
57
|
/** What a download token is asked for on this request: the manifest, a platform, or a tarball (which counts). */
|
|
@@ -41,9 +61,10 @@ export function createDistRoutes(services, options = {}) {
|
|
|
41
61
|
// Checked before the file is looked up, so an invalid token learns nothing about which files there are.
|
|
42
62
|
await services.downloadTokens.admit(token, { product });
|
|
43
63
|
const found = await services.dist.file(product, version, file);
|
|
64
|
+
// The universal tarball serves every platform, so it downloads under whichever one the token is bound to.
|
|
44
65
|
await services.downloadTokens.admit(token, {
|
|
45
66
|
product,
|
|
46
|
-
target: found.target,
|
|
67
|
+
...(found.target === UNIVERSAL_TARGET ? {} : { target: found.target }),
|
|
47
68
|
download: true,
|
|
48
69
|
});
|
|
49
70
|
return;
|
|
@@ -117,14 +138,14 @@ export function createDistRoutes(services, options = {}) {
|
|
|
117
138
|
operationId: 'agentsResolveDistArtifact',
|
|
118
139
|
// Plumbing: the runner, its install script and `acme` itself download from here.
|
|
119
140
|
...cliRoute(false),
|
|
120
|
-
description: `The current version of \`product\` (the application's CLI, which carries the runner, or \`nocobase-runner\`) for \`target\` (such as \`darwin-arm64\` or \`linux-x64\`), with its download path and SHA-256. \`format=env\` answers the same as \`key=value\` lines a POSIX shell reads, as the install script does. Never cached. ${credentials}`,
|
|
141
|
+
description: `The current version of \`product\` (the application's CLI, which carries the runner, or \`nocobase-runner\`) for \`target\` (such as \`darwin-arm64\` or \`linux-x64\`), with its download path and SHA-256: the tarball built for that platform, else the universal one (\`universal: true\`), which carries no Node and needs Node.js 24 or newer on the machine. \`format=env\` answers the same as \`key=value\` lines a POSIX shell reads, as the install script does. With \`accept=npm\`, a product the application has no tarball of but names on npm (\`agents.dist.npm\`) is answered as \`{ kind: 'npm', product, version, package, channel }\`, the package and exact version to install with Node.js 24 or later, for every platform; without it such a product is 404 as before. A product with a tarball is answered the same either way. Never cached. ${credentials}`,
|
|
121
142
|
security: downloadSecurity,
|
|
122
143
|
responses: {
|
|
123
144
|
200: {
|
|
124
|
-
description:
|
|
145
|
+
description: "The artifact: `{ data }` in JSON, or with `format=env` the lines `product=`, `version=`, `target=`, `url=`, `sha256=`, `size=` and `channel=` as `text/plain`, and `universal=true` when the platform gets the universal tarball, which needs Node.js 24 or newer on the machine. An npm answer (only with `accept=npm`) is `{ data: { kind: 'npm', ... } }`, or the lines `kind=npm`, `product=`, `version=`, `package=` and `channel=`.",
|
|
125
146
|
content: {
|
|
126
147
|
'application/json': {
|
|
127
|
-
schema: resolver(z.object({ data:
|
|
148
|
+
schema: resolver(z.object({ data: DistResolutionSchema })),
|
|
128
149
|
},
|
|
129
150
|
'text/plain': {
|
|
130
151
|
schema: {
|
|
@@ -139,12 +160,18 @@ export function createDistRoutes(services, options = {}) {
|
|
|
139
160
|
},
|
|
140
161
|
}), apiValidator('param', DistTargetParams), apiValidator('query', DistTargetQuery), async (context) => {
|
|
141
162
|
const { product, target } = context.req.valid('param');
|
|
142
|
-
const
|
|
143
|
-
|
|
144
|
-
|
|
163
|
+
const query = context.req.valid('query');
|
|
164
|
+
// An npm answer only to a caller that asked for it: everyone else is answered exactly as before it existed.
|
|
165
|
+
const npm = distAccepts(query.accept, DIST_ACCEPT_NPM) &&
|
|
166
|
+
DIST_TARGET_PATTERN.test(target)
|
|
167
|
+
? await services.dist.npmPackage(product)
|
|
168
|
+
: null;
|
|
169
|
+
const resolution = npm ?? (await services.dist.resolve(product, target));
|
|
170
|
+
if (query.format === 'env')
|
|
171
|
+
return context.text(resolutionEnv(resolution), 200, {
|
|
145
172
|
'cache-control': 'no-store',
|
|
146
173
|
});
|
|
147
|
-
return context.json({ data:
|
|
174
|
+
return context.json({ data: resolution }, 200, {
|
|
148
175
|
'cache-control': 'no-store',
|
|
149
176
|
});
|
|
150
177
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dist.js","sourceRoot":"","sources":["../../../../server/routes/runners/dist.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEvC,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,OAAO,EACP,aAAa,
|
|
1
|
+
{"version":3,"file":"dist.js","sourceRoot":"","sources":["../../../../server/routes/runners/dist.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../../server/routes/runners/install.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../../server/routes/runners/install.ts"],"names":[],"mappings":"AA2DA,OAAO,EAAE,IAAI,EAAE,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AAO1C,8DAA8D;AAC9D,MAAM,WAAW,oBAAoB;IACnC,oGAAoG;IACpG,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,0GAA0G;IAC1G,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,2FAA2F;AAC3F,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,MAAM,CASnE;AAED,mFAAmF;AACnF,MAAM,WAAW,oBAAoB;IACnC,2EAA2E;IAC3E,QAAQ,CAAC,GAAG,EAAE,MAAM,MAAM,CAAC;IAC3B,uGAAuG;IACvG,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IACjD,8GAA8G;IAC9G,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,qGAAqG;AACrG,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,IAAI,CAAC,oBAAoB,EAAE,cAAc,GAAG,gBAAgB,CAAM,GAC1E,MAAM,CA2BR;AA+TD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAuCvE"}
|
|
@@ -14,13 +14,26 @@
|
|
|
14
14
|
* for each product it:
|
|
15
15
|
*
|
|
16
16
|
* 1. asks the application which version it serves for this platform (`DIST_ROUTES.resolve`), sending the token;
|
|
17
|
-
* 2. downloads that
|
|
18
|
-
* and unpacks it into `<prefix>/versions/<version>`, pointing `<prefix>/current` at it and `<bin-dir>/<command>`
|
|
17
|
+
* 2. downloads that tarball, checks its SHA-256, and unpacks it into `<prefix>/versions/<version>`, pointing `<prefix>/current` at it and `<bin-dir>/<command>`
|
|
19
18
|
* at `<prefix>/current/bin/<command>`, and records the installation in `<prefix>/install.json` (`mode`: `cli` for
|
|
20
|
-
* the CLI, `runner` for the runner), which `<cli> update` and the runner's self-update read.
|
|
19
|
+
* the CLI, `runner` for the runner), which `<cli> update` and the runner's self-update read. A tarball built for the
|
|
20
|
+
* platform bundles its Node. The universal one (`universal=true` in the answer) carries none: before downloading
|
|
21
|
+
* it the script checks that `node` on PATH is Node.js 24 or newer, failing with how to install it otherwise, and
|
|
22
|
+
* once it is unpacked links `<prefix>/node` to that `node`, which the package's launcher runs it with, so a user
|
|
23
|
+
* service started without the shell's PATH (launchd, systemd) still finds it.
|
|
21
24
|
*
|
|
22
|
-
*
|
|
23
|
-
*
|
|
25
|
+
* The script asks with `accept=npm`, so an application that serves no tarball of a product and names its npm package
|
|
26
|
+
* instead (`DistNpmPackage`, `kind=npm` in the answer) is followed too: after the same Node.js 24 check, and a check
|
|
27
|
+
* that `npm` is on PATH (or `NOCOBASE_NPM`), it runs `npm install --prefix <prefix>/versions/<version>.partial
|
|
28
|
+
* --no-save --no-audit --no-fund --omit=optional <package>@<version>` with the npm configuration of the person running
|
|
29
|
+
* it, writes `bin/<command>` beside `node_modules` (the launcher of `npmLauncherScript`, which starts
|
|
30
|
+
* `node_modules/.bin/<command>` with the Node it finds as the universal launcher does), renames the directory to
|
|
31
|
+
* `<prefix>/versions/<version>`, and links `<prefix>/node` as for a universal tarball. Everything after that, from
|
|
32
|
+
* `current` to the service, is the same for both.
|
|
33
|
+
*
|
|
34
|
+
* With `--runner` it warns when `pnpm` is not on PATH, suggesting `corepack enable`, and carries on. It then registers
|
|
35
|
+
* the runner with the token (`nocobase-runner register`), installs and starts the user service
|
|
36
|
+
* (`nocobase-runner service install`: a launchd agent or a systemd user unit), and waits until it runs.
|
|
24
37
|
* An application that serves no CLI still gets its runtime: the CLI is skipped with a note.
|
|
25
38
|
*
|
|
26
39
|
* The script is served with the server's address it was requested from as its default `--server`, so the CLI-only
|
|
@@ -32,6 +45,7 @@
|
|
|
32
45
|
* runner's state as it does for the runner itself. `nocobase-runner uninstall` undoes the runner's part.
|
|
33
46
|
*/
|
|
34
47
|
import { CREDENTIAL_PREFIXES, DIST_PRODUCT_PATTERN, DIST_ROUTES, HEADERS, RUNNER_PRODUCT, } from '@nocobase/agent-protocol';
|
|
48
|
+
import { npmLauncherScript } from '@nocobase/app-cli-client/install';
|
|
35
49
|
import { apiErrorResponse, cliRoute, describeRoute, } from '@nocobase/app-server/router';
|
|
36
50
|
import { Hono } from 'hono';
|
|
37
51
|
import { tags } from '../openapi.js';
|
|
@@ -185,6 +199,10 @@ else
|
|
|
185
199
|
fail "sha256sum or shasum is required to check the download."
|
|
186
200
|
fi
|
|
187
201
|
|
|
202
|
+
if [ "$runner" = 1 ] && ! command -v pnpm >/dev/null 2>&1; then
|
|
203
|
+
printf '%s\\n' "Note: pnpm is not on PATH. Runs that install a project's dependencies use it; run \\"corepack enable\\" (it comes with Node.js) to get it. Continuing." >&2
|
|
204
|
+
fi
|
|
205
|
+
|
|
188
206
|
tmp="$(mktemp -d)"
|
|
189
207
|
trap 'rm -rf "$tmp"' EXIT INT TERM
|
|
190
208
|
runner_bin="$runner_prefix/current/bin/$runner_cmd"
|
|
@@ -196,6 +214,35 @@ registered() {
|
|
|
196
214
|
|
|
197
215
|
field() { sed -n "s/^$1=//p" "$tmp/resolve" | head -n 1; }
|
|
198
216
|
|
|
217
|
+
# A universal package carries no Node: sets node_bin to the node on PATH when it is Node.js 24 or newer, and fails
|
|
218
|
+
# saying how to install one otherwise. require_node <command>.
|
|
219
|
+
require_node() {
|
|
220
|
+
node_hint="Install Node.js 24 or newer (https://nodejs.org/en/download, or with a version manager: nvm install 24), open a new shell so that node is on PATH, and run this command again."
|
|
221
|
+
node_bin="$(command -v node 2>/dev/null || true)"
|
|
222
|
+
[ -n "$node_bin" ] || fail "$1 needs Node.js 24 or newer, and node is not on PATH. $node_hint"
|
|
223
|
+
node_version="$("$node_bin" -p 'process.versions.node' 2>/dev/null || true)"
|
|
224
|
+
case "$node_version" in
|
|
225
|
+
''|*[!0-9.]*) fail "$1 needs Node.js 24 or newer, and $node_bin does not say its version. $node_hint" ;;
|
|
226
|
+
esac
|
|
227
|
+
[ "\${node_version%%.*}" -ge 24 ] || fail "$1 needs Node.js 24 or newer; $node_bin is $node_version. $node_hint"
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
# A package the application names on npm is installed with npm: sets npm_bin to NOCOBASE_NPM or the npm on PATH, and
|
|
231
|
+
# fails saying how to get one otherwise. require_npm <command>.
|
|
232
|
+
require_npm() {
|
|
233
|
+
npm_bin="\${NOCOBASE_NPM:-$(command -v npm 2>/dev/null || true)}"
|
|
234
|
+
if [ -z "$npm_bin" ] || [ ! -x "$npm_bin" ]; then
|
|
235
|
+
fail "$1 is installed from npm, and npm is not on PATH. npm comes with Node.js: install Node.js 24 or newer from https://nodejs.org/en/download (a version manager such as nvm installs npm too), or set NOCOBASE_NPM to its path, and run this command again."
|
|
236
|
+
fi
|
|
237
|
+
}
|
|
238
|
+
|
|
239
|
+
# The launcher of a version installed from npm: <version>/bin/<command> starts node_modules/.bin/<command> with the
|
|
240
|
+
# first Node.js 24 or newer it finds, as the universal tarball's launcher does.
|
|
241
|
+
write_npm_launcher() {
|
|
242
|
+
cat <<'LAUNCHER'
|
|
243
|
+
${npmLauncherScript()}LAUNCHER
|
|
244
|
+
}
|
|
245
|
+
|
|
199
246
|
# Installs one product: install_product <command> <prefix> <mode>. Sets "installed" to what happened: "new", "kept"
|
|
200
247
|
# (the token was not accepted, but the CLI is installed), "used" (the token was used, by the runner registered here)
|
|
201
248
|
# or "missing" (the application serves no CLI; with --runner the runtime is installed without it).
|
|
@@ -206,7 +253,7 @@ install_product() {
|
|
|
206
253
|
installed=new
|
|
207
254
|
status="$(curl -sS -o "$tmp/resolve" -w '%{http_code}' \\
|
|
208
255
|
-H "$header: $token" \\
|
|
209
|
-
"$server/api/agents/dist/products/$product/targets/$target?format=env")" ||
|
|
256
|
+
"$server/api/agents/dist/products/$product/targets/$target?format=env&accept=npm")" ||
|
|
210
257
|
fail "Could not reach $server."
|
|
211
258
|
if [ "$status" = 401 ] && [ "$runner" = 1 ] && registered; then
|
|
212
259
|
installed=used
|
|
@@ -223,23 +270,54 @@ install_product() {
|
|
|
223
270
|
message="$(sed -n 's/.*"message":"\\([^"]*\\)".*/\\1/p' "$tmp/resolve")"
|
|
224
271
|
fail "$server answered $status: \${message:-$(cat "$tmp/resolve")}"
|
|
225
272
|
fi
|
|
273
|
+
kind="$(field kind)"
|
|
226
274
|
version="$(field version)"
|
|
227
|
-
url="$(field url)"
|
|
228
|
-
checksum="$(field sha256)"
|
|
229
275
|
case "$version" in
|
|
230
276
|
''|*[!0-9A-Za-z.+-]*) fail "The server named an unexpected version: $version" ;;
|
|
231
277
|
esac
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
278
|
+
universal=""
|
|
279
|
+
if [ "$kind" = npm ]; then
|
|
280
|
+
package="$(field package)"
|
|
281
|
+
case "$package" in
|
|
282
|
+
''|*[!0-9a-z@/._~-]*) fail "The server named an unexpected npm package: $package" ;;
|
|
283
|
+
esac
|
|
284
|
+
require_node "$product"
|
|
285
|
+
require_npm "$product"
|
|
286
|
+
say "$product $version comes from npm ($package@$version) and runs on this machine's Node.js $node_version ($node_bin)."
|
|
287
|
+
else
|
|
288
|
+
url="$(field url)"
|
|
289
|
+
checksum="$(field sha256)"
|
|
290
|
+
case "$url" in
|
|
291
|
+
/*) ;;
|
|
292
|
+
*) fail "The server named an unexpected download: $url" ;;
|
|
293
|
+
esac
|
|
294
|
+
case "$checksum" in
|
|
295
|
+
*[!0-9a-f]*|'') fail "The server named an unexpected checksum: $checksum" ;;
|
|
296
|
+
esac
|
|
297
|
+
universal="$(field universal)"
|
|
298
|
+
if [ "$universal" = true ]; then
|
|
299
|
+
require_node "$product"
|
|
300
|
+
say "$product $version runs on this machine's Node.js $node_version ($node_bin)."
|
|
301
|
+
fi
|
|
302
|
+
fi
|
|
239
303
|
|
|
240
304
|
dest="$dir/versions/$version"
|
|
241
305
|
if [ -x "$dest/bin/$product" ]; then
|
|
242
306
|
say "$product $version for $target is already installed in $dest."
|
|
307
|
+
elif [ "$kind" = npm ]; then
|
|
308
|
+
say "Installing $package@$version with npm ..."
|
|
309
|
+
run rm -rf "$dest.partial"
|
|
310
|
+
run mkdir -p "$dest.partial"
|
|
311
|
+
# No optional dependencies: the coding tools' SDKs list one package per platform, each carrying a binary the
|
|
312
|
+
# runner never starts.
|
|
313
|
+
run "$npm_bin" install --prefix "$dest.partial" --no-save --no-audit --no-fund --omit=optional "$package@$version"
|
|
314
|
+
if [ "$dry_run" = 0 ]; then
|
|
315
|
+
[ -e "$dest.partial/node_modules/.bin/$product" ] || fail "$package@$version provides no $product command."
|
|
316
|
+
mkdir -p "$dest.partial/bin"
|
|
317
|
+
write_npm_launcher >"$dest.partial/bin/$product"
|
|
318
|
+
chmod 755 "$dest.partial/bin/$product"
|
|
319
|
+
fi
|
|
320
|
+
run mv "$dest.partial" "$dest"
|
|
243
321
|
else
|
|
244
322
|
say "Downloading $product $version for $target from $server ..."
|
|
245
323
|
run curl -fSL --progress-bar -H "$header: $token" -o "$tmp/$product.tar.gz" "$server$url"
|
|
@@ -254,6 +332,10 @@ install_product() {
|
|
|
254
332
|
run mv "$dest.partial" "$dest"
|
|
255
333
|
fi
|
|
256
334
|
run ln -sfn "versions/$version" "$dir/current"
|
|
335
|
+
if [ "$universal" = true ] || [ "$kind" = npm ]; then
|
|
336
|
+
# The launcher's first choice, so a service that does not have this shell's PATH runs the same Node.
|
|
337
|
+
run ln -sfn "$node_bin" "$dir/node"
|
|
338
|
+
fi
|
|
257
339
|
run mkdir -p "$bin_dir"
|
|
258
340
|
run ln -sfn "$dir/current/bin/$product" "$bin_dir/$product"
|
|
259
341
|
if [ "$dry_run" = 0 ]; then
|
|
@@ -308,6 +390,7 @@ if [ "$runner" = 1 ]; then
|
|
|
308
390
|
else
|
|
309
391
|
say "Registered. Start the runner with: $runner_bin start"
|
|
310
392
|
fi
|
|
393
|
+
say "Note: agents run with full access as $(id -un), with this user's home and credentials. The runner is not a security boundary: run it as a dedicated user, in a container or in a VM."
|
|
311
394
|
else
|
|
312
395
|
say "$cli is installed: $bin_dir/$cli"
|
|
313
396
|
fi
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../server/routes/runners/install.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../server/routes/runners/install.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { ClaimRequestSchema, ClaimResponseSchema, EventsResponseSchema, HEADERS, HeartbeatRequestSchema, HeartbeatResponseSchema, JobFinishResponseSchema, JobLeaseResponseSchema, JobStatusResponseSchema, JobCancelAckRequestSchema, JobCompleteRequestSchema, JobEventsRequestSchema, JobFailRequestSchema, JobStartRequestSchema, ActiveJobSchema, ActiveRunSchema, isProtocolSupported, LeaseRequestSchema, MIN_PROTOCOL_VERSION, PROTOCOL_VERSION, ProtocolError, RegisterRequestSchema, RegisterResponseSchema, RunnerFeatureSchema, RunnerPolicySchema, TIMINGS, ReportedToolInfoSchema, WorkspacesRequestSchema, WorkspacesResponseSchema, } from '@nocobase/agent-protocol';
|
|
18
18
|
import { apiErrorResponse, apiValidator, dataResponse, cliRoute, describeRoute, parseApiInput, } from '@nocobase/app-server/router';
|
|
19
19
|
import { z } from 'zod';
|
|
20
|
-
import { upgradeFor } from '../../distribution/index.js';
|
|
20
|
+
import { upgradeFields, upgradeFor } from '../../distribution/index.js';
|
|
21
21
|
import { domainRouter } from '../../kernel/http.js';
|
|
22
22
|
import { upgradeRequiredOf } from '../../runners/index.js';
|
|
23
23
|
import { ClaimQuery, JobParams } from '../schemas.js';
|
|
@@ -142,7 +142,7 @@ export function createRunnerRoutes(services, options = {}) {
|
|
|
142
142
|
operationId: 'agentsRunnerHeartbeat',
|
|
143
143
|
// Runner protocol: only a runner calls it.
|
|
144
144
|
...cliRoute(false),
|
|
145
|
-
description: "Reports what the runner holds and its load, every `heartbeatIntervalMs`, and answers which runs and jobs to cancel or release, and whether an upgrade is available
|
|
145
|
+
description: "Reports what the runner holds and its load, every `heartbeatIntervalMs`, and answers which runs and jobs to cancel or release, and whether an upgrade is available: a tarball in `upgrade`, or, only to a runner with the `npm` feature when the application has no tarball of its product, a package to install from npm in `npmUpgrade`. A runner of a protocol this application does not serve is answered with `compatibility` and told to release everything it holds. The body is validated in the handler, against what the runner's protocol allows.",
|
|
146
146
|
security: runnerKeySecurity,
|
|
147
147
|
parameters: [protocolHeader],
|
|
148
148
|
requestBody: jsonRequestBody(HeartbeatRequestSchema),
|
|
@@ -161,7 +161,7 @@ export function createRunnerRoutes(services, options = {}) {
|
|
|
161
161
|
const response = {
|
|
162
162
|
ok: true,
|
|
163
163
|
serverTime: services.clock.now().toISOString(),
|
|
164
|
-
...(upgrade
|
|
164
|
+
...upgradeFields(upgrade),
|
|
165
165
|
compatibility: upgradeRequiredOf(runner.protocolVersion),
|
|
166
166
|
cancelRequested: [],
|
|
167
167
|
release: request.active.map((run) => run.runId),
|
|
@@ -186,7 +186,7 @@ export function createRunnerRoutes(services, options = {}) {
|
|
|
186
186
|
const response = {
|
|
187
187
|
ok: true,
|
|
188
188
|
serverTime: services.clock.now().toISOString(),
|
|
189
|
-
...(upgrade
|
|
189
|
+
...upgradeFields(upgrade),
|
|
190
190
|
cancelRequested,
|
|
191
191
|
release,
|
|
192
192
|
...(jobs ? { jobs } : {}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../server/routes/runners/runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../server/routes/runners/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Hono } from 'hono';
|
|
2
2
|
import type { Agents } from '../../composition.js';
|
|
3
3
|
import type { RunnerEnv } from '../../runners/index.js';
|
|
4
|
-
export declare function mountRunnerRunRoutes(router: Hono<RunnerEnv>, services: Pick<Agents, 'reports' | 'claims' | 'skills' | 'mounts' | 'tx'>): void;
|
|
4
|
+
export declare function mountRunnerRunRoutes(router: Hono<RunnerEnv>, services: Pick<Agents, 'reports' | 'claims' | 'skills' | 'mounts' | 'tx' | 'gitCredentials'>): void;
|
|
5
5
|
//# sourceMappingURL=runs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runs.d.ts","sourceRoot":"","sources":["../../../../server/routes/runners/runs.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runs.d.ts","sourceRoot":"","sources":["../../../../server/routes/runners/runs.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAGjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AA6BxD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,EACvB,QAAQ,EAAE,IAAI,CACZ,MAAM,EACN,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,GAAG,gBAAgB,CACrE,GACA,IAAI,CA2MN"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* A run's endpoints on the runner protocol (`RUNNER_ROUTES` `runs/:runId/*`): its lease, start, events, status,
|
|
3
|
-
* ending reports, cancellation acknowledgement,
|
|
3
|
+
* ending reports, cancellation acknowledgement, the skills and mounts it gets and its repositories' credentials, mounted under
|
|
4
4
|
* `/api/agents/runners/runs` behind the runner's key (`routes/runners/runner.ts`). Every answer is `{ data }`.
|
|
5
5
|
*/
|
|
6
|
-
import { CancelAckRequestSchema, CompleteRequestSchema, EventsRequestSchema, EventsResponseSchema, FailRequestSchema, FinishResponseSchema, LeaseRequestSchema, LeaseResponseSchema, MountBundleSchema, SkillBundleSchema, StartRequestSchema, StartResponseSchema, StatusResponseSchema, } from '@nocobase/agent-protocol';
|
|
7
|
-
import { apiValidator, dataResponse, cliRoute, describeRoute, } from '@nocobase/app-server/router';
|
|
6
|
+
import { CancelAckRequestSchema, CompleteRequestSchema, EventsRequestSchema, EventsResponseSchema, FailRequestSchema, FinishResponseSchema, GitCredentialRequestSchema, GitCredentialSchema, LeaseRequestSchema, LeaseResponseSchema, MountBundleSchema, SkillBundleSchema, StartRequestSchema, StartResponseSchema, StatusResponseSchema, } from '@nocobase/agent-protocol';
|
|
7
|
+
import { apiErrorResponse, apiValidator, dataResponse, cliRoute, describeRoute, } from '@nocobase/app-server/router';
|
|
8
8
|
import { notFound } from '../../kernel/errors.js';
|
|
9
9
|
import { heldWorkErrors, protocolHeader, runnerKeySecurity, tags, } from '../openapi.js';
|
|
10
10
|
import { RunMountParams, RunParams, RunSkillParams } from '../schemas.js';
|
|
@@ -67,6 +67,26 @@ export function mountRunnerRunRoutes(router, services) {
|
|
|
67
67
|
throw notFound('Mount');
|
|
68
68
|
return context.json({ data: bundle });
|
|
69
69
|
});
|
|
70
|
+
// A credential for one of the run's on-demand repositories, while the runner holds this attempt of the run.
|
|
71
|
+
router.post('/:runId/gitCredentials', describeRoute({
|
|
72
|
+
tags,
|
|
73
|
+
summary: "Get a credential for one of a run's repositories",
|
|
74
|
+
operationId: 'agentsRunnerGetRunGitCredential',
|
|
75
|
+
description: 'A short-lived credential the application issues for one of the repositories the claim listed in `RunGit.onDemand`, compared exactly, while the runner holds the named attempt of the run under a live lease (the `gitCredentials` feature). `refresh` asks for a new credential after the remote refused the last one. The credential is never stored.',
|
|
76
|
+
// Runner protocol: only a runner calls it.
|
|
77
|
+
...cliRoute(false),
|
|
78
|
+
security: runnerKeySecurity,
|
|
79
|
+
parameters: [protocolHeader],
|
|
80
|
+
responses: {
|
|
81
|
+
200: dataResponse(GitCredentialSchema),
|
|
82
|
+
...heldWorkErrors,
|
|
83
|
+
403: apiErrorResponse(403, 'Another runner holds the run (`RUN_NOT_OWNED`), or the application will not issue a credential for the repository (`REPO_ACCESS_DENIED`).'),
|
|
84
|
+
409: apiErrorResponse(409, 'The run is no longer this runner’s: the lease was lost or ran out, or another attempt took it (`LEASE_LOST`).'),
|
|
85
|
+
503: apiErrorResponse(503, 'The application cannot issue a credential just now, such as when its code host is unavailable or slow (`REPO_ACCESS_UNAVAILABLE`); ask again later.'),
|
|
86
|
+
},
|
|
87
|
+
}), runParam, apiValidator('json', GitCredentialRequestSchema), async (context) => context.json({
|
|
88
|
+
data: await services.gitCredentials.issue(context.get('runner'), context.req.valid('param').runId, context.req.valid('json')),
|
|
89
|
+
}));
|
|
70
90
|
router.post('/:runId/cancelAck', report('agentsRunnerAcknowledgeRunCancel', "Acknowledge a run's cancellation", FinishResponseSchema), runParam, apiValidator('json', CancelAckRequestSchema), async (context) => context.json({
|
|
71
91
|
data: await services.reports.cancelAck(context.get('runner'), context.req.valid('param').runId, context.req.valid('json')),
|
|
72
92
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../../../server/routes/runners/runs.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,iBAAiB,EACjB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,QAAQ,EACR,aAAa,GACd,MAAM,6BAA6B,CAAC;AAKrC,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAElD,OAAO,EACL,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,IAAI,GACL,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE1E,uFAAuF;AACvF,SAAS,MAAM,CACb,WAAmB,EACnB,OAAe,EACf,QAAmB,EACnB,WAAoB;IAEpB,OAAO,aAAa,CAAC;QACnB,IAAI;QACJ,OAAO;QACP,WAAW;QACX,2CAA2C;QAC3C,GAAG,QAAQ,CAAC,KAAK,CAAC;QAClB,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,QAAQ,EAAE,iBAAiB;QAC3B,UAAU,EAAE,CAAC,cAAc,CAAC;QAC5B,SAAS,EAAE,EAAE,GAAG,EAAE,YAAY,CAAC,QAAQ,CAAC,EAAE,GAAG,cAAc,EAAE;KAC9D,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,MAAuB,EACvB,
|
|
1
|
+
{"version":3,"file":"runs.js","sourceRoot":"","sources":["../../../../server/routes/runners/runs.ts"],"names":[],"mappings":"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"}
|
|
@@ -133,6 +133,7 @@ export declare const ClaimQuery: z.ZodType<{
|
|
|
133
133
|
}>;
|
|
134
134
|
export declare const DistTargetQuery: z.ZodType<{
|
|
135
135
|
format?: 'json' | 'env' | undefined;
|
|
136
|
+
accept?: string | undefined;
|
|
136
137
|
}>;
|
|
137
138
|
export declare const VariableValueInput: z.ZodType<{
|
|
138
139
|
value?: string;
|