@nocobase/app-plugin-agents 0.1.0-beta.4 → 0.1.0-beta.5

package/dist/server/distribution/download-tokens.js

@@ -57,11 +57,14 @@ export function createDownloadTokenService(deps) {
                 downloads >= DOWNLOAD_TOKEN_MAX_DOWNLOADS)
                 throw spent();
             const { target } = request;
-            if (target === undefined)
+            if (target === undefined && !request.download)
                 return;
-            if (record.target !== null && record.target !== target)
+            if (target !== undefined &&
+                record.target !== null &&
+                record.target !== target)
                 throw invalid(`This download token is for ${record.target}, not ${target}.`);
-            if (record.target === target && !request.download)
+            if ((target === undefined || record.target === target) &&
+                !request.download)
                 return;
             // Binds the platform and counts the download; a concurrent request that changed the row first wins.
             const updated = await tokens.updateMany({
@@ -70,7 +73,7 @@ export function createDownloadTokenService(deps) {
                     f.number('downloads').eq(downloads),
                 ]),
                 values: {
-                    target,
+                    target: target ?? record.target,
                     downloads: request.download ? downloads + 1 : downloads,
                 },
             });

package/dist/server/distribution/download-tokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"download-tokens.js","sourceRoot":"","sources":["../../../server/distribution/download-tokens.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"download-tokens.js","sourceRoot":"","sources":["../../../server/distribution/download-tokens.ts"],"names":[],"mappings":"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"}

package/dist/server/distribution/index.d.ts

@@ -1,14 +1,22 @@
-import { type UpgradeNotice } from '@nocobase/agent-protocol';
+import { type HeartbeatResponse, type NpmUpgradeNotice, type UpgradeNotice } from '@nocobase/agent-protocol';
 import type { Runner } from '../../shared/runners.js';
 import type { DistService } from './dist.service.js';
 export { createDownloadTokenService, DOWNLOAD_TOKEN_MAX_DOWNLOADS, DOWNLOAD_TOKEN_TTL_MS, type DownloadRequest, type DownloadTokenService, } from './download-tokens.js';
-export { createDistService, DEFAULT_CHANNEL, type DistConfig, type DistFile, type DistService, } from './dist.service.js';
+export { createDistService, DEFAULT_CHANNEL, type DistConfig, type DistFile, type DistNpmSource, type DistService, } from './dist.service.js';
 /** The platform a runner reported, as the tarballs name it. */
 export declare function runnerTarget(runner: Pick<Runner, 'os' | 'arch'>): string;
+/** An update for a runner: a tarball the application serves, or a package to install from npm. */
+export type RunnerUpgrade = UpgradeNotice | NpmUpgradeNotice;
 /**
  * A newer version of the product `runner` runs as (`nocobase-runner`, or a CLI that carries the runner) that the
  * application serves for its platform, if there is one. A runner that reported no product is offered none: it may be
  * carried by a CLI that no longer carries it.
+ *
+ * The tarball is offered whenever there is one. Only when the application has none of the product, and names it on npm
+ * (`agents.dist.npm`), is the package offered, and then only to a runner with the `npm` feature: any other runner is
+ * offered nothing, as before.
  */
-export declare function upgradeFor(dist: DistService, runner: Pick<Runner, 'os' | 'arch' | 'version' | 'product'>): Promise<UpgradeNotice | undefined>;
+export declare function upgradeFor(dist: DistService, runner: Pick<Runner, 'os' | 'arch' | 'version' | 'product' | 'features'>): Promise<RunnerUpgrade | undefined>;
+/** Where an update goes in a heartbeat answer: a tarball in `upgrade`, an npm package in `npmUpgrade`. */
+export declare function upgradeFields(upgrade: RunnerUpgrade | undefined): Pick<HeartbeatResponse, 'upgrade' | 'npmUpgrade'>;
 //# sourceMappingURL=index.d.ts.map

package/dist/server/distribution/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../server/distribution/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAE/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,WAAW,GACjB,MAAM,mBAAmB,CAAC;AAE3B,+DAA+D;AAC/D,wBAAgB,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,MAAM,CAAC,GAAG,MAAM,CAExE;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC,GAC1D,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAapC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../server/distribution/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EACnB,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,aAAa,EAClB,KAAK,WAAW,GACjB,MAAM,mBAAmB,CAAC;AAE3B,+DAA+D;AAC/D,wBAAgB,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,MAAM,CAAC,GAAG,MAAM,CAExE;AAED,kGAAkG;AAClG,MAAM,MAAM,aAAa,GAAG,aAAa,GAAG,gBAAgB,CAAC;AAE7D;;;;;;;;GAQG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,WAAW,EACjB,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,CAAC,GACvE,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAwBpC;AAED,0GAA0G;AAC1G,wBAAgB,aAAa,CAC3B,OAAO,EAAE,aAAa,GAAG,SAAS,GACjC,IAAI,CAAC,iBAAiB,EAAE,SAAS,GAAG,YAAY,CAAC,CAGnD"}

package/dist/server/distribution/index.js

@@ -1,4 +1,4 @@
-import { compareVersions } from '@nocobase/agent-protocol';
+import { compareVersions, NPM_UPGRADE_FEATURE, } from '@nocobase/agent-protocol';
 export { createDownloadTokenService, DOWNLOAD_TOKEN_MAX_DOWNLOADS, DOWNLOAD_TOKEN_TTL_MS, } from './download-tokens.js';
 export { createDistService, DEFAULT_CHANNEL, } from './dist.service.js';
 /** The platform a runner reported, as the tarballs name it. */
@@ -9,20 +9,43 @@ export function runnerTarget(runner) {
  * A newer version of the product `runner` runs as (`nocobase-runner`, or a CLI that carries the runner) that the
  * application serves for its platform, if there is one. A runner that reported no product is offered none: it may be
  * carried by a CLI that no longer carries it.
+ *
+ * The tarball is offered whenever there is one. Only when the application has none of the product, and names it on npm
+ * (`agents.dist.npm`), is the package offered, and then only to a runner with the `npm` feature: any other runner is
+ * offered nothing, as before.
  */
 export async function upgradeFor(dist, runner) {
     if (runner.product === null)
         return undefined;
     const latest = await dist.find(runner.product, runnerTarget(runner));
-    if (!latest || compareVersions(latest.version, runner.version) <= 0)
+    if (latest) {
+        if (compareVersions(latest.version, runner.version) <= 0)
+            return undefined;
+        return {
+            minVersion: '0.0.0',
+            latestVersion: latest.version,
+            downloadUrl: latest.url,
+            sha256: latest.sha256,
+            channel: latest.channel,
+            reason: `The application serves ${latest.product} ${latest.version} on the ${latest.channel} channel.`,
+        };
+    }
+    if (!runner.features.includes(NPM_UPGRADE_FEATURE))
+        return undefined;
+    const npm = await dist.npmPackage(runner.product);
+    if (!npm || compareVersions(npm.version, runner.version) <= 0)
         return undefined;
     return {
-        minVersion: '0.0.0',
-        latestVersion: latest.version,
-        downloadUrl: latest.url,
-        sha256: latest.sha256,
-        channel: latest.channel,
-        reason: `The application serves ${latest.product} ${latest.version} on the ${latest.channel} channel.`,
+        latestVersion: npm.version,
+        package: npm.package,
+        channel: npm.channel,
+        reason: `The application runs ${npm.product} ${npm.version}: install ${npm.package}@${npm.version} from npm.`,
     };
 }
+/** Where an update goes in a heartbeat answer: a tarball in `upgrade`, an npm package in `npmUpgrade`. */
+export function upgradeFields(upgrade) {
+    if (upgrade === undefined)
+        return {};
+    return 'downloadUrl' in upgrade ? { upgrade } : { npmUpgrade: upgrade };
+}
 //# sourceMappingURL=index.js.map

package/dist/server/distribution/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/distribution/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAsB,MAAM,0BAA0B,CAAC;AAI/E,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,qBAAqB,GAGtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,iBAAiB,EACjB,eAAe,GAIhB,MAAM,mBAAmB,CAAC;AAE3B,+DAA+D;AAC/D,MAAM,UAAU,YAAY,CAAC,MAAmC;IAC9D,OAAO,GAAG,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;AACvC,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAiB,EACjB,MAA2D;IAE3D,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,IAAI,CAAC,MAAM,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QACjE,OAAO,SAAS,CAAC;IACnB,OAAO;QACL,UAAU,EAAE,OAAO;QACnB,aAAa,EAAE,MAAM,CAAC,OAAO;QAC7B,WAAW,EAAE,MAAM,CAAC,GAAG;QACvB,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,MAAM,EAAE,0BAA0B,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC,OAAO,WAAW;KACvG,CAAC;AACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/distribution/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,mBAAmB,GAIpB,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,qBAAqB,GAGtB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,iBAAiB,EACjB,eAAe,GAKhB,MAAM,mBAAmB,CAAC;AAE3B,+DAA+D;AAC/D,MAAM,UAAU,YAAY,CAAC,MAAmC;IAC9D,OAAO,GAAG,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;AACvC,CAAC;AAKD;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,IAAiB,EACjB,MAAwE;IAExE,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,eAAe,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YAAE,OAAO,SAAS,CAAC;QAC3E,OAAO;YACL,UAAU,EAAE,OAAO;YACnB,aAAa,EAAE,MAAM,CAAC,OAAO;YAC7B,WAAW,EAAE,MAAM,CAAC,GAAG;YACvB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,MAAM,EAAE,0BAA0B,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC,OAAO,WAAW;SACvG,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC;QAAE,OAAO,SAAS,CAAC;IACrE,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QAC3D,OAAO,SAAS,CAAC;IACnB,OAAO;QACL,aAAa,EAAE,GAAG,CAAC,OAAO;QAC1B,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,MAAM,EAAE,wBAAwB,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,aAAa,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,YAAY;KAC9G,CAAC;AACJ,CAAC;AAED,0GAA0G;AAC1G,MAAM,UAAU,aAAa,CAC3B,OAAkC;IAElC,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACrC,OAAO,aAAa,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;AAC1E,CAAC"}

package/dist/server/routes/runners/dist.d.ts

@@ -1,4 +1,4 @@
-import { type DistArtifact } from '@nocobase/agent-protocol';
+import { type DistArtifact, type DistNpmPackage, type DistResolution } from '@nocobase/agent-protocol';
 import type { Hono, MiddlewareHandler } from 'hono';
 import type { Agents } from '../../composition.js';
 import type { AdminEnv } from './admin.js';
@@ -16,5 +16,9 @@ export interface DistRoutesOptions {
 }
 /** `key=value` lines a POSIX shell reads without a JSON parser. Values never contain a newline. */
 export declare function artifactEnv(artifact: DistArtifact): string;
+/** The same lines for an npm answer, led by `kind=npm`; only a caller that sent `accept=npm` reads them. */
+export declare function npmPackageEnv(npm: DistNpmPackage): string;
+/** `artifactEnv` or `npmPackageEnv`, whichever the answer is. */
+export declare function resolutionEnv(resolution: DistResolution): string;
 export declare function createDistRoutes(services: Pick<Agents, 'runners' | 'dist' | 'downloadTokens'>, options?: DistRoutesOptions): Hono;
 //# sourceMappingURL=dist.d.ts.map

package/dist/server/routes/runners/dist.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dist.d.ts","sourceRoot":"","sources":["../../../../server/routes/runners/dist.ts"],"names":[],"mappings":"AAeA,OAAO,EAKL,KAAK,YAAY,EAClB,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,CAY1D;AAED,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,gBAAgB,CAAC,EAC7D,OAAO,GAAE,iBAAsB,GAC9B,IAAI,CAmNN"}
+{"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"}

package/dist/server/routes/runners/dist.js

@@ -12,7 +12,7 @@
  * signed in yet install the CLI, after which `acme login` signs it in as that person.
  */
 import { Readable } from 'node:stream';
-import { DistArtifactSchema, DistManifestSchema, HEADERS, ProtocolError, } from '@nocobase/agent-protocol';
+import { DIST_ACCEPT_NPM, DIST_TARGET_PATTERN, distAccepts, DistArtifactSchema, DistManifestSchema, DistNpmPackageSchema, DistResolutionSchema, HEADERS, isDistNpmPackage, ProtocolError, UNIVERSAL_TARGET, } from '@nocobase/agent-protocol';
 import { apiErrorResponse, apiErrorResponses, apiValidator, dataResponse, cliRoute, describeRoute, resolver, } from '@nocobase/app-server/router';
 import { z } from 'zod';
 import { domainRouter } from '../../kernel/http.js';
@@ -29,9 +29,29 @@ export function artifactEnv(artifact) {
         `sha256=${parsed.sha256}`,
         `size=${parsed.size}`,
         `channel=${parsed.channel}`,
+        // Only for the universal tarball, so the answer for a tarball built for the platform stays as it was.
+        ...(parsed.universal === true ? ['universal=true'] : []),
         '',
     ].join('\n');
 }
+/** The same lines for an npm answer, led by `kind=npm`; only a caller that sent `accept=npm` reads them. */
+export function npmPackageEnv(npm) {
+    const parsed = DistNpmPackageSchema.parse(npm);
+    return [
+        `kind=${parsed.kind}`,
+        `product=${parsed.product}`,
+        `version=${parsed.version}`,
+        `package=${parsed.package}`,
+        `channel=${parsed.channel}`,
+        '',
+    ].join('\n');
+}
+/** `artifactEnv` or `npmPackageEnv`, whichever the answer is. */
+export function resolutionEnv(resolution) {
+    return isDistNpmPackage(resolution)
+        ? npmPackageEnv(resolution)
+        : artifactEnv(resolution);
+}
 export function createDistRoutes(services, options = {}) {
     const router = domainRouter();
     /** 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 = {}) {
             // Checked before the file is looked up, so an invalid token learns nothing about which files there are.
             await services.downloadTokens.admit(token, { product });
             const found = await services.dist.file(product, version, file);
+            // The universal tarball serves every platform, so it downloads under whichever one the token is bound to.
             await services.downloadTokens.admit(token, {
                 product,
-                target: found.target,
+                ...(found.target === UNIVERSAL_TARGET ? {} : { target: found.target }),
                 download: true,
             });
             return;
@@ -117,14 +138,14 @@ export function createDistRoutes(services, options = {}) {
         operationId: 'agentsResolveDistArtifact',
         // Plumbing: the runner, its install script and `acme` itself download from here.
         ...cliRoute(false),
-        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}`,
+        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}`,
         security: downloadSecurity,
         responses: {
             200: {
-                description: 'The artifact: `{ data }` in JSON, or with `format=env` the lines `product=`, `version=`, `target=`, `url=`, `sha256=`, `size=` and `channel=` as `text/plain`.',
+                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=`.',
                 content: {
                     'application/json': {
-                        schema: resolver(z.object({ data: DistArtifactSchema })),
+                        schema: resolver(z.object({ data: DistResolutionSchema })),
                     },
                     'text/plain': {
                         schema: {
@@ -139,12 +160,18 @@ export function createDistRoutes(services, options = {}) {
         },
     }), apiValidator('param', DistTargetParams), apiValidator('query', DistTargetQuery), async (context) => {
         const { product, target } = context.req.valid('param');
-        const artifact = await services.dist.resolve(product, target);
-        if (context.req.valid('query').format === 'env')
-            return context.text(artifactEnv(artifact), 200, {
+        const query = context.req.valid('query');
+        // An npm answer only to a caller that asked for it: everyone else is answered exactly as before it existed.
+        const npm = distAccepts(query.accept, DIST_ACCEPT_NPM) &&
+            DIST_TARGET_PATTERN.test(target)
+            ? await services.dist.npmPackage(product)
+            : null;
+        const resolution = npm ?? (await services.dist.resolve(product, target));
+        if (query.format === 'env')
+            return context.text(resolutionEnv(resolution), 200, {
                 'cache-control': 'no-store',
             });
-        return context.json({ data: artifact }, 200, {
+        return context.json({ data: resolution }, 200, {
             'cache-control': 'no-store',
         });
     });

package/dist/server/routes/runners/dist.js.map

@@ -1 +1 @@
-{"version":3,"file":"dist.js","sourceRoot":"","sources":["../../../../server/routes/runners/dist.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dist.js","sourceRoot":"","sources":["../../../../server/routes/runners/dist.ts"],"names":[],"mappings":"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"}

package/dist/server/routes/runners/install.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"install.d.ts","sourceRoot":"","sources":["../../../../server/routes/runners/install.ts"],"names":[],"mappings":"AA6CA,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;AA0PD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAuCvE"}
+{"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"}

package/dist/server/routes/runners/install.js

@@ -14,13 +14,26 @@
  * for each product it:
  *
  * 1. asks the application which version it serves for this platform (`DIST_ROUTES.resolve`), sending the token;
- * 2. downloads that standalone tarball (it bundles Node, so nothing needs to be installed first), checks its SHA-256,
- *    and unpacks it into `<prefix>/versions/<version>`, pointing `<prefix>/current` at it and `<bin-dir>/<command>`
+ * 2. downloads that tarball, checks its SHA-256, and unpacks it into `<prefix>/versions/<version>`, pointing `<prefix>/current` at it and `<bin-dir>/<command>`
  *    at `<prefix>/current/bin/<command>`, and records the installation in `<prefix>/install.json` (`mode`: `cli` for
- *    the CLI, `runner` for the runner), which `<cli> update` and the runner's self-update read.
+ *    the CLI, `runner` for the runner), which `<cli> update` and the runner's self-update read. A tarball built for the
+ *    platform bundles its Node. The universal one (`universal=true` in the answer) carries none: before downloading
+ *    it the script checks that `node` on PATH is Node.js 24 or newer, failing with how to install it otherwise, and
+ *    once it is unpacked links `<prefix>/node` to that `node`, which the package's launcher runs it with, so a user
+ *    service started without the shell's PATH (launchd, systemd) still finds it.
  *
- * With `--runner` it then registers the runner with the token (`nocobase-runner register`), installs and starts the
- * user service (`nocobase-runner service install`: a launchd agent or a systemd user unit), and waits until it runs.
+ * The script asks with `accept=npm`, so an application that serves no tarball of a product and names its npm package
+ * instead (`DistNpmPackage`, `kind=npm` in the answer) is followed too: after the same Node.js 24 check, and a check
+ * that `npm` is on PATH (or `NOCOBASE_NPM`), it runs `npm install --prefix <prefix>/versions/<version>.partial
+ * --no-save --no-audit --no-fund --omit=optional <package>@<version>` with the npm configuration of the person running
+ * it, writes `bin/<command>` beside `node_modules` (the launcher of `npmLauncherScript`, which starts
+ * `node_modules/.bin/<command>` with the Node it finds as the universal launcher does), renames the directory to
+ * `<prefix>/versions/<version>`, and links `<prefix>/node` as for a universal tarball. Everything after that, from
+ * `current` to the service, is the same for both.
+ *
+ * With `--runner` it warns when `pnpm` is not on PATH, suggesting `corepack enable`, and carries on. It then registers
+ * the runner with the token (`nocobase-runner register`), installs and starts the user service
+ * (`nocobase-runner service install`: a launchd agent or a systemd user unit), and waits until it runs.
  * An application that serves no CLI still gets its runtime: the CLI is skipped with a note.
  *
  * 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 @@
  * runner's state as it does for the runner itself. `nocobase-runner uninstall` undoes the runner's part.
  */
 import { CREDENTIAL_PREFIXES, DIST_PRODUCT_PATTERN, DIST_ROUTES, HEADERS, RUNNER_PRODUCT, } from '@nocobase/agent-protocol';
+import { npmLauncherScript } from '@nocobase/app-cli-client/install';
 import { apiErrorResponse, cliRoute, describeRoute, } from '@nocobase/app-server/router';
 import { Hono } from 'hono';
 import { tags } from '../openapi.js';
@@ -185,6 +199,10 @@ else
   fail "sha256sum or shasum is required to check the download."
 fi
 
+if [ "$runner" = 1 ] && ! command -v pnpm >/dev/null 2>&1; then
+  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
+fi
+
 tmp="$(mktemp -d)"
 trap 'rm -rf "$tmp"' EXIT INT TERM
 runner_bin="$runner_prefix/current/bin/$runner_cmd"
@@ -196,6 +214,35 @@ registered() {
 
 field() { sed -n "s/^$1=//p" "$tmp/resolve" | head -n 1; }
 
+# A universal package carries no Node: sets node_bin to the node on PATH when it is Node.js 24 or newer, and fails
+# saying how to install one otherwise. require_node <command>.
+require_node() {
+  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."
+  node_bin="$(command -v node 2>/dev/null || true)"
+  [ -n "$node_bin" ] || fail "$1 needs Node.js 24 or newer, and node is not on PATH. $node_hint"
+  node_version="$("$node_bin" -p 'process.versions.node' 2>/dev/null || true)"
+  case "$node_version" in
+    ''|*[!0-9.]*) fail "$1 needs Node.js 24 or newer, and $node_bin does not say its version. $node_hint" ;;
+  esac
+  [ "\${node_version%%.*}" -ge 24 ] || fail "$1 needs Node.js 24 or newer; $node_bin is $node_version. $node_hint"
+}
+
+# A package the application names on npm is installed with npm: sets npm_bin to NOCOBASE_NPM or the npm on PATH, and
+# fails saying how to get one otherwise. require_npm <command>.
+require_npm() {
+  npm_bin="\${NOCOBASE_NPM:-$(command -v npm 2>/dev/null || true)}"
+  if [ -z "$npm_bin" ] || [ ! -x "$npm_bin" ]; then
+    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."
+  fi
+}
+
+# The launcher of a version installed from npm: <version>/bin/<command> starts node_modules/.bin/<command> with the
+# first Node.js 24 or newer it finds, as the universal tarball's launcher does.
+write_npm_launcher() {
+  cat <<'LAUNCHER'
+${npmLauncherScript()}LAUNCHER
+}
+
 # Installs one product: install_product <command> <prefix> <mode>. Sets "installed" to what happened: "new", "kept"
 # (the token was not accepted, but the CLI is installed), "used" (the token was used, by the runner registered here)
 # or "missing" (the application serves no CLI; with --runner the runtime is installed without it).
@@ -206,7 +253,7 @@ install_product() {
   installed=new
   status="$(curl -sS -o "$tmp/resolve" -w '%{http_code}' \\
     -H "$header: $token" \\
-    "$server/api/agents/dist/products/$product/targets/$target?format=env")" ||
+    "$server/api/agents/dist/products/$product/targets/$target?format=env&accept=npm")" ||
     fail "Could not reach $server."
   if [ "$status" = 401 ] && [ "$runner" = 1 ] && registered; then
     installed=used
@@ -223,23 +270,54 @@ install_product() {
     message="$(sed -n 's/.*"message":"\\([^"]*\\)".*/\\1/p' "$tmp/resolve")"
     fail "$server answered $status: \${message:-$(cat "$tmp/resolve")}"
   fi
+  kind="$(field kind)"
   version="$(field version)"
-  url="$(field url)"
-  checksum="$(field sha256)"
   case "$version" in
     ''|*[!0-9A-Za-z.+-]*) fail "The server named an unexpected version: $version" ;;
   esac
-  case "$url" in
-    /*) ;;
-    *) fail "The server named an unexpected download: $url" ;;
-  esac
-  case "$checksum" in
-    *[!0-9a-f]*|'') fail "The server named an unexpected checksum: $checksum" ;;
-  esac
+  universal=""
+  if [ "$kind" = npm ]; then
+    package="$(field package)"
+    case "$package" in
+      ''|*[!0-9a-z@/._~-]*) fail "The server named an unexpected npm package: $package" ;;
+    esac
+    require_node "$product"
+    require_npm "$product"
+    say "$product $version comes from npm ($package@$version) and runs on this machine's Node.js $node_version ($node_bin)."
+  else
+    url="$(field url)"
+    checksum="$(field sha256)"
+    case "$url" in
+      /*) ;;
+      *) fail "The server named an unexpected download: $url" ;;
+    esac
+    case "$checksum" in
+      *[!0-9a-f]*|'') fail "The server named an unexpected checksum: $checksum" ;;
+    esac
+    universal="$(field universal)"
+    if [ "$universal" = true ]; then
+      require_node "$product"
+      say "$product $version runs on this machine's Node.js $node_version ($node_bin)."
+    fi
+  fi
 
   dest="$dir/versions/$version"
   if [ -x "$dest/bin/$product" ]; then
     say "$product $version for $target is already installed in $dest."
+  elif [ "$kind" = npm ]; then
+    say "Installing $package@$version with npm ..."
+    run rm -rf "$dest.partial"
+    run mkdir -p "$dest.partial"
+    # No optional dependencies: the coding tools' SDKs list one package per platform, each carrying a binary the
+    # runner never starts.
+    run "$npm_bin" install --prefix "$dest.partial" --no-save --no-audit --no-fund --omit=optional "$package@$version"
+    if [ "$dry_run" = 0 ]; then
+      [ -e "$dest.partial/node_modules/.bin/$product" ] || fail "$package@$version provides no $product command."
+      mkdir -p "$dest.partial/bin"
+      write_npm_launcher >"$dest.partial/bin/$product"
+      chmod 755 "$dest.partial/bin/$product"
+    fi
+    run mv "$dest.partial" "$dest"
   else
     say "Downloading $product $version for $target from $server ..."
     run curl -fSL --progress-bar -H "$header: $token" -o "$tmp/$product.tar.gz" "$server$url"
@@ -254,6 +332,10 @@ install_product() {
     run mv "$dest.partial" "$dest"
   fi
   run ln -sfn "versions/$version" "$dir/current"
+  if [ "$universal" = true ] || [ "$kind" = npm ]; then
+    # The launcher's first choice, so a service that does not have this shell's PATH runs the same Node.
+    run ln -sfn "$node_bin" "$dir/node"
+  fi
   run mkdir -p "$bin_dir"
   run ln -sfn "$dir/current/bin/$product" "$bin_dir/$product"
   if [ "$dry_run" = 0 ]; then
@@ -308,6 +390,7 @@ if [ "$runner" = 1 ]; then
   else
     say "Registered. Start the runner with: $runner_bin start"
   fi
+  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."
 else
   say "$cli is installed: $bin_dir/$cli"
 fi

package/dist/server/routes/runners/install.js.map

@@ -1 +1 @@
-{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../server/routes/runners/install.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"install.js","sourceRoot":"","sources":["../../../../server/routes/runners/install.ts"],"names":[],"mappings":"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"}

package/dist/server/routes/runners/runner.js

@@ -17,7 +17,7 @@
 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';
 import { apiErrorResponse, apiValidator, dataResponse, cliRoute, describeRoute, parseApiInput, } from '@nocobase/app-server/router';
 import { z } from 'zod';
-import { upgradeFor } from '../../distribution/index.js';
+import { upgradeFields, upgradeFor } from '../../distribution/index.js';
 import { domainRouter } from '../../kernel/http.js';
 import { upgradeRequiredOf } from '../../runners/index.js';
 import { ClaimQuery, JobParams } from '../schemas.js';
@@ -142,7 +142,7 @@ export function createRunnerRoutes(services, options = {}) {
         operationId: 'agentsRunnerHeartbeat',
         // Runner protocol: only a runner calls it.
         ...cliRoute(false),
-        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 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.",
+        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.",
         security: runnerKeySecurity,
         parameters: [protocolHeader],
         requestBody: jsonRequestBody(HeartbeatRequestSchema),
@@ -161,7 +161,7 @@ export function createRunnerRoutes(services, options = {}) {
             const response = {
                 ok: true,
                 serverTime: services.clock.now().toISOString(),
-                ...(upgrade ? { upgrade } : {}),
+                ...upgradeFields(upgrade),
                 compatibility: upgradeRequiredOf(runner.protocolVersion),
                 cancelRequested: [],
                 release: request.active.map((run) => run.runId),
@@ -186,7 +186,7 @@ export function createRunnerRoutes(services, options = {}) {
         const response = {
             ok: true,
             serverTime: services.clock.now().toISOString(),
-            ...(upgrade ? { upgrade } : {}),
+            ...upgradeFields(upgrade),
             cancelRequested,
             release,
             ...(jobs ? { jobs } : {}),