@gjsify/cli 0.64.10 → 0.64.11

package/lib/commands/devtools.js

@@ -62,7 +62,7 @@ system.exit(await runDevtoolsCli(system.programArgs));
  * `instances` — so anything a rig does by hand over `gdbus` has a scriptable spelling.
  */
 export const devtoolsCommand = {
-    command: 'devtools',
+    command: 'devtools <operation> [operands..]',
     description: 'Drive a running devtools-enabled app from a script: capture a screenshot to a file, find a widget, ' +
         'activate it, send a key. Peer of `gjsify debug`, which speaks MCP for an AI agent.',
     builder: (yargs) => yargs

package/lib/commands/dlx.d.ts

@@ -1,5 +1,6 @@
 import type { Command } from '../types/index.js';
 import { type ParsedSpec } from '../utils/parse-spec.js';
+import { type PlatformTarget } from '../utils/platform-check.js';
 interface DlxOptions {
     spec: string;
     binOrArg?: string;
@@ -31,6 +32,12 @@ export interface EnsureOpts {
      * Part of the cache key, so the gjs and node trees never share an entry.
      */
     extraSpecs?: readonly string[];
+    /**
+     * Install the tree for this platform rather than the host's: a package that is
+     * copied into another machine's artifact (`gjsify ship` fetching a darwin GTK
+     * closure on Linux). Part of the cache key.
+     */
+    platform?: PlatformTarget;
 }
 /**
  * Resolve (installing + caching when remote) the on-disk directory of a package

package/lib/commands/dlx.js

@@ -16,6 +16,7 @@ import { resolveGjsEntry } from '../utils/resolve-gjs-entry.js';
 import { doubleDashArgs } from '../utils/double-dash-args.js';
 import { cacheDirFor, createCacheKey, getValidCachedPkg, makePrepareDir, resolveInstalledPkgDir, symlinkSwap, } from '../utils/dlx-cache.js';
 import { installPackages, makeProgressReporter } from '../utils/install-backend.js';
+import { describePlatformTarget } from '../utils/platform-check.js';
 export const dlxCommand = {
     command: 'dlx <spec> [binOrArg] [extraArgs..]',
     description: 'Run the GJS bundle of an npm-published package without installing it locally.',
@@ -118,7 +119,10 @@ export async function ensurePkgDir(parsed, opts) {
         return { pkgDir: parsed.path, cachedPkgName: null };
     }
     const specs = [parsed.spec, ...(opts.extraSpecs ?? [])];
-    const cacheKey = createCacheKey({ packages: specs });
+    const cacheKey = createCacheKey({
+        packages: specs,
+        ...(opts.platform ? { platform: describePlatformTarget(opts.platform) } : {}),
+    });
     const cacheDir = cacheDirFor(cacheKey);
     const cached = opts.cacheMaxAge > 0 ? getValidCachedPkg(cacheDir, opts.cacheMaxAge) : undefined;
     if (cached) {
@@ -145,6 +149,7 @@ export async function ensurePkgDir(parsed, opts) {
         lockfile: true,
         frozen: opts.frozen,
         progress,
+        ...(opts.platform ? { platform: opts.platform } : {}),
     });
     const liveTarget = symlinkSwap(cacheDir, prepareDir);
     return {

package/lib/commands/publish.js

@@ -48,7 +48,7 @@ import { buildPublishHeaders, escapePackageName } from '../utils/publish-headers
 import { packWorkspace } from './pack.js';
 import { getNpmTrustedToken, hasGithubOidcEnv, OidcExchangeError, OidcUnavailableError } from '../utils/npm-oidc.js';
 import { diagnose404, is404DiagnosticCandidate } from '../utils/publish-diagnose.js';
-import { DEFAULT_VERIFY_BUDGET_MS, formatUnconfirmedPublish, probePackageName, verifyPublishedVersion, } from '../utils/publish-readback.js';
+import { budgetForPayload, DEFAULT_VERIFY_BUDGET_MS, formatUnconfirmedPublish, probePackageName, verifyPublishedVersion, } from '../utils/publish-readback.js';
 import { collectWorkspacePins, REQUIRED_BLOCK } from '../utils/publish-pins.js';
 import { appendLedger, DEFAULT_HOLD_WAIT_MS, findUnavailablePins, holdsPublish, markHeldPublished, pendingEntries, readLedger, recordUnserved, renderLedgerSummary, settleUnserved, summariseReasons, } from '../utils/publish-hold.js';
 import { describeClass, statusTokenFromEnv } from '../utils/publish-status.js';
@@ -584,9 +584,10 @@ export async function publishWorkspace(input) {
      * `publish-unconfirmed`. Same origin, same credential, one request later.
      */
     const readBack = async () => {
-        const budgetMs = input.verifyBudgetMs ?? DEFAULT_VERIFY_BUDGET_MS;
-        if (budgetMs <= 0)
+        const configuredMs = input.verifyBudgetMs ?? DEFAULT_VERIFY_BUDGET_MS;
+        if (configuredMs <= 0)
             return undefined;
+        const budgetMs = budgetForPayload(configuredMs, bodyStr.length);
         return verifyPublishedVersion({
             registry: registryClean,
             name: packed.name,

package/lib/commands/ship.js

@@ -786,12 +786,19 @@ async function resolveCarriedRuntime(layout, settings, projectDir) {
         return empty;
     // The closure is fetched, not installed: a project that lists it puts a second
     // GLib next to Homebrew's in its dev tree (see `gtk-runtime-acquire.ts`).
+    // Fetched FOR THE TARGET: on a Linux host the package's own `os`/`cpu` gate
+    // refused it as EBADPLATFORM, and every macOS and Windows artifact assembled
+    // on Linux shipped without GTK, starting only where Homebrew happened to have it.
     const acquired = await acquireGtkRuntime({
         target,
         version: cliVersion(),
         discovery: { cwd: projectDir },
-        ensure: async (spec) => (await ensurePkgDir(parseSpec(spec), { verbose: false, cacheMaxAge: DLX_CACHE_MAX_AGE_MIN, frozen: false }))
-            .pkgDir,
+        ensure: async (spec) => (await ensurePkgDir(parseSpec(spec), {
+            verbose: false,
+            cacheMaxAge: DLX_CACHE_MAX_AGE_MIN,
+            frozen: false,
+            platform: { os: layout.os, cpu: settings.arch },
+        })).pkgDir,
         log: (message) => console.log(`${LOG} ${message}`),
     });
     return stageAppRuntime({

package/lib/utils/dlx-cache.d.ts

@@ -1,6 +1,12 @@
 interface CacheKeyOpts {
     packages: string[];
     registries?: Record<string, string>;
+    /**
+     * The platform the tree was installed FOR (`darwin-arm64`), when not the host's.
+     * The same specs filter to a different tree per platform. Absent, the key is
+     * the one it always was, so existing cache entries stay valid.
+     */
+    platform?: string;
 }
 /** Stable, sorted JSON hash of inputs. */
 export declare function createCacheKey(opts: CacheKeyOpts): string;

package/lib/utils/dlx-cache.js

@@ -19,7 +19,7 @@ function lexCompare(a, b) {
 export function createCacheKey(opts) {
     const sortedPkgs = [...opts.packages].sort(lexCompare);
     const sortedRegs = Object.entries(opts.registries ?? {}).sort(([a], [b]) => lexCompare(a, b));
-    const payload = JSON.stringify([sortedPkgs, sortedRegs]);
+    const payload = JSON.stringify(opts.platform === undefined ? [sortedPkgs, sortedRegs] : [sortedPkgs, sortedRegs, opts.platform]);
     return createHash('sha256').update(payload).digest('hex');
 }
 /** $XDG_CACHE_HOME/gjsify/dlx — created if missing. */

package/lib/utils/install-backend-native.js

@@ -143,8 +143,9 @@ async function installPackagesNativeLocked(opts, npmrc, log) {
     // The triple this install materialises FOR. Normally the running host;
     // `--os/--cpu/--libc` (npm's config keys, read from the environment by
     // `resolveHostPlatform`) override it, which is what makes the darwin/win32/musl
-    // branches reviewable from one machine.
-    const target = resolveHostPlatform();
+    // branches reviewable from one machine. A caller that installs for another
+    // machine's artifact (`opts.platform`) wins over both.
+    const target = opts.platform ?? resolveHostPlatform();
     const force = readPlatformForce(process.env);
     log('install: platform target %s%s', describePlatformTarget(target), force ? ' (--force: checks bypassed)' : '');
     let nodes;

package/lib/utils/install-backend.d.ts

@@ -1,4 +1,5 @@
 import type { ProgressReporter } from './install-progress.js';
+import type { PlatformTarget } from './platform-check.js';
 export type { ProgressEvent, ProgressPhase, ProgressReporter } from './install-progress.js';
 export { makeProgressReporter } from './install-progress.js';
 export interface InstallOptions {
@@ -79,6 +80,15 @@ export interface InstallOptions {
      * and the warning falls back to bare ranges.
      */
     specOrigins?: Map<string, string[]>;
+    /**
+     * The `os`/`cpu`/`libc` triple to install FOR, instead of the host's (and of
+     * `npm_config_os`/`_cpu`/`_libc`). For a tree that is copied into an artifact
+     * for another machine and never run here — `gjsify ship` assembling a darwin or
+     * win32 bundle on Linux fetches that target's GTK closure, whose `os`/`cpu`
+     * gate would otherwise refuse it as EBADPLATFORM (ADR 0024 § A1). The npm
+     * backend passes it on as `--os`/`--cpu`/`--libc`.
+     */
+    platform?: PlatformTarget;
 }
 export interface InstallResult {
     /** Requested top-level packages with the version each resolved to. Empty for

package/lib/utils/install-backend.js

@@ -24,7 +24,7 @@ export async function installPackages(opts) {
     const installed = await installPackagesNative(opts);
     return { installed };
 }
-async function installViaNpm({ prefix, specs, verbose, registry }) {
+async function installViaNpm({ prefix, specs, verbose, registry, platform }) {
     if (specs.length === 0) {
         throw new Error('installPackages: empty specs list');
     }
@@ -42,6 +42,8 @@ async function installViaNpm({ prefix, specs, verbose, registry }) {
         '--prefix',
         prefix,
         ...(verbose ? ['--loglevel', 'verbose'] : ['--loglevel', 'warn']),
+        ...(platform ? ['--os', platform.os, '--cpu', platform.cpu] : []),
+        ...(platform?.libc ? ['--libc', platform.libc] : []),
         ...specs,
     ];
     // Through `spawnToCompletion` because a bare `spawn('npm', …)` is ENOENT on

package/lib/utils/publish-readback.d.ts

@@ -146,6 +146,8 @@ export declare function probeTimeoutFor(configuredMs: number, remainingMs: numbe
  * state is what the `recorded-not-served` verdict names.
  */
 export declare const DEFAULT_VERIFY_BUDGET_MS = 600000;
+/** The read-back budget for a payload: `configuredMs`, longer if it is the default and the upload is large. */
+export declare function budgetForPayload(configuredMs: number, payloadBytes: number): number;
 /**
  * Poll the registry until `name@version` resolves, or the budget runs out, then
  * say WHICH of the three states it found (see {@link ReadbackVerdict}).

package/lib/utils/publish-readback.js

@@ -138,6 +138,26 @@ export function probeTimeoutFor(configuredMs, remainingMs) {
  * state is what the `recorded-not-served` verdict names.
  */
 export const DEFAULT_VERIFY_BUDGET_MS = 600_000;
+/**
+ * Payload size above which the DEFAULT window starts to grow, and the growth per MiB.
+ *
+ * v0.64.9, run 40145205912: `@gjsify/gtk-runtime-win32-arm64` PUT 69.7 MB, got a 202,
+ * and the read-back gave up after 600 s with `not-published`; the registry's `time`
+ * map recorded the version 20 s later. The lag scales with what npm has to ingest,
+ * and the 600 s ceiling was measured on packages of a few MB. So the window grows by
+ * 10 s per MiB past 32 MiB (that package: ~945 s). Only the PATIENT default grows —
+ * an explicit short budget (the sweep's `--verify-timeout 5`) is a caller's decision.
+ * An upload npm accepted but never recorded still ends in `not-published`.
+ */
+const LARGE_PAYLOAD_BYTES = 32 * 1024 * 1024;
+const EXTRA_BUDGET_PER_MIB_MS = 10_000;
+/** The read-back budget for a payload: `configuredMs`, longer if it is the default and the upload is large. */
+export function budgetForPayload(configuredMs, payloadBytes) {
+    if (configuredMs < DEFAULT_VERIFY_BUDGET_MS || payloadBytes <= LARGE_PAYLOAD_BYTES)
+        return configuredMs;
+    const extraMiB = (payloadBytes - LARGE_PAYLOAD_BYTES) / (1024 * 1024);
+    return configuredMs + Math.ceil(extraMiB) * EXTRA_BUDGET_PER_MIB_MS;
+}
 /**
  * Make one probe's URL uncacheable, by giving it a key no cache holds.
  *

package/lib/utils/ship/gtk-runtime-acquire.js

@@ -40,6 +40,12 @@ export async function acquireGtkRuntime(input) {
         return { kind: 'present' };
     const name = gtkRuntimePackageName(input.target);
     const spec = `${name}@${input.version}`;
+    // An offline build, or a suite that must not download 100 MB per run, stages what is
+    // reachable and nothing more. The e2e suites that assert "a project without the packages
+    // stages no runtime" held only while the fetch failed on Linux for every foreign target.
+    if ((discovery.env ?? process.env)['GJSIFY_GTK_RUNTIME_FETCH'] === '0') {
+        return { kind: 'failed', reason: `GJSIFY_GTK_RUNTIME_FETCH=0 turned off the fetch of ${spec}` };
+    }
     input.log?.(`${name} is not installed here, and is not meant to be — fetching ${spec} into the cache ` +
         '(about 100 MB, once)');
     let dir;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gjsify/cli",
-    "version": "0.64.10",
+    "version": "0.64.11",
     "description": "CLI for Gjsify",
     "type": "module",
     "main": "lib/index.js",
@@ -142,22 +142,22 @@
         "cli"
     ],
     "dependencies": {
-        "@gjsify/blueprint": "^0.64.10",
-        "@gjsify/buffer": "^0.64.10",
-        "@gjsify/create-app": "^0.64.10",
-        "@gjsify/node-globals": "^0.64.10",
-        "@gjsify/node-polyfills": "^0.64.10",
-        "@gjsify/npm-registry": "^0.64.10",
-        "@gjsify/resolve-npm": "^0.64.10",
-        "@gjsify/rolldown-plugin-gjsify": "^0.64.10",
-        "@gjsify/vite-plugin-blueprint": "^0.64.10",
-        "@gjsify/rolldown-plugin-pnp": "^0.64.10",
-        "@gjsify/semver": "^0.64.10",
-        "@gjsify/tar": "^0.64.10",
-        "@gjsify/tsc": "^0.64.10",
-        "@gjsify/utils": "^0.64.10",
-        "@gjsify/web-polyfills": "^0.64.10",
-        "@gjsify/workspace": "^0.64.10",
+        "@gjsify/blueprint": "^0.64.11",
+        "@gjsify/buffer": "^0.64.11",
+        "@gjsify/create-app": "^0.64.11",
+        "@gjsify/node-globals": "^0.64.11",
+        "@gjsify/node-polyfills": "^0.64.11",
+        "@gjsify/npm-registry": "^0.64.11",
+        "@gjsify/resolve-npm": "^0.64.11",
+        "@gjsify/rolldown-plugin-gjsify": "^0.64.11",
+        "@gjsify/vite-plugin-blueprint": "^0.64.11",
+        "@gjsify/rolldown-plugin-pnp": "^0.64.11",
+        "@gjsify/semver": "^0.64.11",
+        "@gjsify/tar": "^0.64.11",
+        "@gjsify/tsc": "^0.64.11",
+        "@gjsify/utils": "^0.64.11",
+        "@gjsify/web-polyfills": "^0.64.11",
+        "@gjsify/workspace": "^0.64.11",
         "acorn": "^8.17.0",
         "cosmiconfig": "^9.0.2",
         "get-tsconfig": "^4.14.0",
@@ -166,13 +166,13 @@
         "yargs": "^18.0.0"
     },
     "devDependencies": {
-        "@gjsify/unit": "^0.64.10",
+        "@gjsify/unit": "^0.64.11",
         "@types/yargs": "^17.0.35",
         "typescript": "^6.0.3"
     },
     "peerDependencies": {
-        "@gjsify/oxfmt-native": "^0.64.10",
-        "@gjsify/rolldown-native": "^0.64.10"
+        "@gjsify/oxfmt-native": "^0.64.11",
+        "@gjsify/rolldown-native": "^0.64.11"
     },
     "peerDependenciesMeta": {
         "@gjsify/oxfmt-native": {