@gjsify/cli 0.39.0 → 0.40.0

package/lib/cli-app.js

@@ -15,12 +15,10 @@
 // This module MUST NOT execute anything at load time (no top-level
 // `parseAsync`) — `run.ts` imports it, and a top-level run would re-dispatch
 // the original argv on import.
-import { readFileSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
 import yargs from 'yargs';
 import { classifyCliFailure } from './cli-fail.js';
-import { buildCommand as build, clearCommand as clear, copyCommand as copy, testCommand as test, runCommand as run, infoCommand as info, systemCheckCommand as systemCheck, checkCommand as check, showcaseCommand as showcase, createCommand as create, gresourceCommand as gresource, gettextCommand as gettext, gsettingsCommand as gsettings, flatpakCommand as flatpak, dlxCommand as dlx, installCommand as install, foreachCommand as foreach, workspaceCommand as workspace, packCommand as pack, publishCommand as publish, whoamiCommand as whoami, loginCommand as login, logoutCommand as logout, trustCommand as trust, onboardCommand as onboard, selfUpdateCommand as selfUpdate, generateInstallerCommand as generateInstaller, uninstallCommand as uninstall, formatCommand as format, lintCommand as lint, fixCommand as fix, upgradeCommand as upgrade, barrelsCommand as barrels, tscCommand as tsc, affectedCommand as affected, storybookCommand as storybook, debugCommand as debug, browseCommand as browse, } from './commands/index.js';
+import { cliVersion } from './utils/publish-headers.js';
+import { buildCommand as build, clearCommand as clear, copyCommand as copy, testCommand as test, runCommand as run, infoCommand as info, systemCheckCommand as systemCheck, checkCommand as check, showcaseCommand as showcase, createCommand as create, gresourceCommand as gresource, gettextCommand as gettext, gsettingsCommand as gsettings, flatpakCommand as flatpak, shipCommand as ship, dlxCommand as dlx, installCommand as install, foreachCommand as foreach, workspaceCommand as workspace, packCommand as pack, publishCommand as publish, whoamiCommand as whoami, loginCommand as login, logoutCommand as logout, trustCommand as trust, onboardCommand as onboard, selfUpdateCommand as selfUpdate, generateInstallerCommand as generateInstaller, uninstallCommand as uninstall, formatCommand as format, lintCommand as lint, fixCommand as fix, upgradeCommand as upgrade, barrelsCommand as barrels, tscCommand as tsc, affectedCommand as affected, storybookCommand as storybook, debugCommand as debug, browseCommand as browse, } from './commands/index.js';
 import { APP_NAME } from './constants.js';
 import { isBun, isDeno, isNode, gjsSystemVersion } from '@gjsify/rolldown-plugin-gjsify/runtime';
 import { ensureGjsifyShimOnPath } from './utils/gjsify-shim.js';
@@ -49,22 +47,6 @@ function runtimeLabel() {
     }
     return 'unknown runtime';
 }
-// Read the version from package.json adjacent to the bundle. yargs's
-// auto-version-discovery (its `pkg-up`-driven default) doesn't reach
-// through the bundled `dist/cli.gjs.mjs` path on GJS — falls back to
-// "unknown". Both layouts are covered:
-//   - dev (tsx, `yarn workspace`):  src/index.ts → ../package.json
-//   - bundled (install -g):         dist/cli.gjs.mjs → ../package.json
-function readBundleVersion() {
-    try {
-        const here = dirname(fileURLToPath(import.meta.url));
-        const pkg = JSON.parse(readFileSync(join(here, '..', 'package.json'), 'utf8'));
-        return typeof pkg.version === 'string' ? pkg.version : 'unknown';
-    }
-    catch {
-        return 'unknown';
-    }
-}
 /**
  * Build + run the gjsify yargs command surface for the given argv (already
  * stripped of the `node`/`gjs` + script prefix — i.e. what `hideBin` returns).
@@ -75,15 +57,18 @@ function readBundleVersion() {
  * exit before any async work runs.
  */
 export async function runCli(argv) {
-    // Under GJS, make a GJS-runnable `gjsify` available on PATH for child
-    // processes (workspace/foreach orchestration + compound `gjsify run`
-    // scripts) so node-free builds don't fall back to the Node bin. No-op on
-    // Node.
+    // Make a runnable `gjsify` available on PATH for child processes
+    // (workspace/foreach orchestration + compound `gjsify run` scripts). TWO
+    // cases, not one — the "No-op on Node" this comment used to claim stopped
+    // being true when the bootstrap case landed: under GJS, so node-free builds
+    // don't fall back to the Node bin; and a BOOTSTRAP CLI under Node, where the
+    // tree's own `node_modules/.bin/gjsify` dangles until `build:infra` — which
+    // is what a cold macOS/Windows leg runs — has produced what it dispatches to.
     ensureGjsifyShimOnPath();
     const cli = yargs(argv);
     await cli
         .scriptName(APP_NAME)
-        .version(readBundleVersion())
+        .version(cliVersion())
         .strict()
         // Sits beside `.strict()` because that is what produces most of what it
         // classifies. See `cli-fail.ts` for the four yargs measurements this
@@ -122,6 +107,7 @@ export async function runCli(argv) {
         .command(gettext.command, gettext.description, gettext.builder, gettext.handler)
         .command(gsettings.command, gsettings.description, gsettings.builder, gsettings.handler)
         .command(flatpak.command, flatpak.description, flatpak.builder, flatpak.handler)
+        .command(ship.command, ship.description, ship.builder, ship.handler)
         .command(foreach.command, foreach.description, foreach.builder, foreach.handler)
         .command(workspace.command, workspace.description, workspace.builder, workspace.handler)
         .command(pack.command, pack.description, pack.builder, pack.handler)

package/lib/commands/flatpak/check.js

@@ -52,7 +52,7 @@ export const flatpakCheckCommand = {
     },
     handler: async (args) => {
         const cfg = new Config();
-        const configData = await cfg.forBuild({}).catch(() => ({}));
+        const configData = await cfg.forCommand().catch(() => ({}));
         const flatpak = configData.flatpak ?? {};
         const cwd = process.cwd();
         const appId = resolveAppId(args.manifest, flatpak, cwd);

package/lib/commands/flatpak/ci.js

@@ -58,7 +58,7 @@ export const flatpakCiCommand = {
     handler: async (args) => {
         const cwd = process.cwd();
         const cfg = new Config();
-        const configData = await cfg.forBuild({}).catch(() => ({}));
+        const configData = await cfg.forCommand().catch(() => ({}));
         const flatpak = configData.flatpak ?? {};
         const pkg = readPackageJson(cwd);
         const appId = flatpak.appId ?? (looksLikeAppId(pkg.name) ? pkg.name : undefined);

package/lib/commands/flatpak/diff.js

@@ -60,7 +60,7 @@ export const flatpakDiffCommand = {
     handler: async (args) => {
         const cwd = process.cwd();
         const cfg = new Config();
-        const configData = await cfg.forBuild({}).catch(() => ({}));
+        const configData = await cfg.forCommand().catch(() => ({}));
         const flatpak = configData.flatpak ?? {};
         const appId = args.appId ?? flatpak.appId ?? readPackageJson(cwd).name;
         if (!appId) {

package/lib/commands/flatpak/init.js

@@ -97,7 +97,7 @@ export const flatpakInitCommand = {
     },
     handler: async (args) => {
         const cfg = new Config();
-        const configData = await cfg.forBuild({}).catch(() => ({}));
+        const configData = await cfg.forCommand().catch(() => ({}));
         const flatpak = configData.flatpak ?? {};
         const cwd = process.cwd();
         const pkg = readPackageJson(cwd);

package/lib/commands/flatpak/scaffold.d.ts

@@ -1,4 +1,6 @@
 import type { ConfigDataFlatpak } from '../../types/config-data.js';
+import { type MissingFieldError } from '../../utils/app-metadata.js';
+export type { MissingFieldError };
 export interface ScaffoldInputs {
     appId: string;
     name: string;
@@ -6,10 +8,6 @@ export interface ScaffoldInputs {
     kind: 'app' | 'cli';
     flatpak: ConfigDataFlatpak;
 }
-export interface MissingFieldError {
-    field: string;
-    hint: string;
-}
 /**
  * Validate that the config has the minimum set of fields required for
  * MetaInfo XML rendering. Returns the list of missing fields with

package/lib/commands/flatpak/scaffold.js

@@ -1,328 +1,55 @@
-// MetaInfo XML / .desktop / flathub.json scaffolding for
-// `gjsify flatpak init`. Phase F.9.6 onwards builds the MetaInfo XML
-// directly in TypeScript instead of substituting into a static template —
-// the AppStream surface (description blocks, per-release rich notes,
-// translator hints, kudos, supports/requires/recommends, content_rating
-// attributes, provides) has too many optional nested sections for a
-// template+placeholder approach to stay legible.
+// Flathub-specific scaffolding for `gjsify flatpak init`, plus the thin adapter
+// that hands `gjsify.flatpak`'s metadata half to the shared renderers.
 //
-// `.desktop` and `flathub.json` keep their static templates (they're
-// flat key=value or empty-object files where substitution is fine).
+// The MetaInfo XML and the `.desktop` entry moved to `utils/app-metadata.ts`
+// (ADR 0024 § 8): they describe the APP, not the Flatpak, and `gjsify ship`
+// stages the same two files into `share/metainfo/` and `share/applications/`.
+// What stays here is genuinely Flathub's — `flathub.json`, a policy file no
+// other format has.
 import { readFileSync } from 'node:fs';
+import { renderDesktopEntry, renderMetainfoApp as renderMetainfoAppShared, renderMetainfoCli as renderMetainfoCliShared, validateAppMetadata, } from '../../utils/app-metadata.js';
 /**
- * Lazy template loaders for the two artefacts that stay template-based.
- * `static-read-inliner` matches this shape and inlines the templates
- * into the GJS bundle at build time.
+ * Lazy template loaders. `static-read-inliner` matches this shape and inlines
+ * the templates into the GJS bundle at build time.
  */
-function loadDesktopTemplate() {
-    return readFileSync(new URL('../../templates/flatpak/desktop.tmpl', import.meta.url), 'utf-8');
-}
 function loadFlathubAppTemplate() {
     return readFileSync(new URL('../../templates/flatpak/flathub-app.json.tmpl', import.meta.url), 'utf-8');
 }
 function loadFlathubCliTemplate() {
     return readFileSync(new URL('../../templates/flatpak/flathub-cli.json.tmpl', import.meta.url), 'utf-8');
 }
+/** `gjsify.flatpak` IS an `AppMetadata` plus Flatpak's own keys. */
+function toMetadataInputs(inputs) {
+    return {
+        appId: inputs.appId,
+        name: inputs.name,
+        command: inputs.command,
+        kind: inputs.kind,
+        metadata: inputs.flatpak,
+        configKey: 'gjsify.flatpak',
+    };
+}
 /**
  * Validate that the config has the minimum set of fields required for
  * MetaInfo XML rendering. Returns the list of missing fields with
  * actionable hints; empty list means OK.
  */
 export function validateScaffoldInputs(inputs) {
-    const f = inputs.flatpak;
-    const missing = [];
-    if (!f.developer?.id || !f.developer?.name) {
-        missing.push({
-            field: 'gjsify.flatpak.developer',
-            hint: 'Set `gjsify.flatpak.developer = { "id": "io.github.you", "name": "Your Name" }` in package.json. The id is reverse-DNS.',
-        });
-    }
-    if (!f.summary) {
-        missing.push({
-            field: 'gjsify.flatpak.summary',
-            hint: 'One-line app summary, ≤80 chars, no trailing period. Example: "Learn 6502 assembly language".',
-        });
-    }
-    if (!f.description) {
-        missing.push({
-            field: 'gjsify.flatpak.description',
-            hint: 'Plain text (split on blank lines) or DescriptionBlock[] for rich content with bullet lists + translator hints.',
-        });
-    }
-    if (!f.license?.project) {
-        missing.push({
-            field: 'gjsify.flatpak.license.project',
-            hint: 'SPDX identifier of the project license, e.g. "MIT", "GPL-3.0-or-later".',
-        });
-    }
-    if (!f.homepageUrl) {
-        missing.push({
-            field: 'gjsify.flatpak.homepageUrl',
-            hint: 'Required by Flathub. Example: "https://github.com/you/your-repo".',
-        });
-    }
-    return missing;
+    return validateAppMetadata(toMetadataInputs(inputs));
 }
 /** Render the MetaInfo XML for a desktop application. */
 export function renderMetainfoApp(inputs) {
-    return renderMetainfo(inputs, 'desktop-application');
+    return renderMetainfoAppShared(toMetadataInputs(inputs));
 }
 /** Render the MetaInfo XML for a console application. */
 export function renderMetainfoCli(inputs) {
-    return renderMetainfo(inputs, 'console-application');
+    return renderMetainfoCliShared(toMetadataInputs(inputs));
 }
 /** Render the .desktop entry (app kind only). */
 export function renderDesktop(inputs) {
-    const f = inputs.flatpak;
-    const categoriesLine = (f.categories ?? ['Utility']).join(';') + ';';
-    const keywordsLine = f.keywords?.length ? `Keywords=${f.keywords.join(';')};\n` : '';
-    // `MimeType=` is sourced from `gjsify.flatpak.provides.mimetypes` —
-    // the same field already populates `<mediatype>` entries in the
-    // MetaInfo XML, so callers configure both with one knob. Typical
-    // entries: `x-scheme-handler/<scheme>` for URL-scheme handlers
-    // (Flatpak portal: chats / browsers can launch the app via a
-    // custom URL), or `application/<mime>` for file-type handlers.
-    const mimetypes = f.provides?.mimetypes ?? [];
-    const mimetypesLine = mimetypes.length ? `MimeType=${mimetypes.join(';')};\n` : '';
-    return substitute(loadDesktopTemplate(), {
-        NAME: inputs.name,
-        SUMMARY: f.summary ?? inputs.name,
-        COMMAND: inputs.command,
-        APP_ID: inputs.appId,
-        CATEGORIES_LINE: categoriesLine,
-        KEYWORDS_LINE: keywordsLine,
-        MIMETYPES_LINE: mimetypesLine,
-    });
+    return renderDesktopEntry(toMetadataInputs(inputs));
 }
 /** Render the flathub.json policy file. */
 export function renderFlathubJson(kind) {
     return kind === 'cli' ? loadFlathubCliTemplate() : loadFlathubAppTemplate();
 }
-// ─── MetaInfo XML builder ────────────────────────────────────────────────
-function renderMetainfo(inputs, kind) {
-    const f = inputs.flatpak;
-    const year = new Date().getFullYear();
-    const developerName = f.developer?.name ?? '';
-    const lines = [];
-    lines.push('<?xml version="1.0" encoding="UTF-8"?>');
-    lines.push(`<!-- Copyright ${year} ${escapeXml(developerName)} -->`);
-    lines.push(`<component type="${kind}">`);
-    lines.push(`  <id>${escapeXml(inputs.appId)}</id>`);
-    lines.push(`  <metadata_license>${escapeXml(f.license?.metadata ?? 'CC0-1.0')}</metadata_license>`);
-    lines.push(`  <project_license>${escapeXml(f.license?.project ?? '')}</project_license>`);
-    lines.push(`  <name>${escapeXml(inputs.name)}</name>`);
-    pushTranslatorHint(lines, f.summaryTranslatorHint, '  ');
-    lines.push(`  <summary>${escapeXml(f.summary ?? inputs.name)}</summary>`);
-    if (f.iconRemote) {
-        lines.push(`  <icon type="remote">${escapeXml(f.iconRemote)}</icon>`);
-    }
-    // <description>
-    lines.push('  <description>');
-    for (const blockLine of renderDescriptionBlocks(f.description ?? '', '    ')) {
-        lines.push(blockLine);
-    }
-    lines.push('  </description>');
-    // <developer>
-    if (f.developer?.id && f.developer?.name) {
-        lines.push(`  <developer id="${escapeXml(f.developer.id)}">`);
-        const translateAttr = f.developer.nameTranslatable === true ? '' : ' translate="no"';
-        lines.push(`    <name${translateAttr}>${escapeXml(f.developer.name)}</name>`);
-        if (f.developer.email) {
-            lines.push(`    <email>${escapeXml(f.developer.email)}</email>`);
-        }
-        lines.push('  </developer>');
-    }
-    if (kind === 'desktop-application') {
-        lines.push(`  <launchable type="desktop-id">${escapeXml(inputs.appId)}.desktop</launchable>`);
-    }
-    // <screenshots>
-    if (f.screenshots?.length) {
-        lines.push('  <screenshots>');
-        f.screenshots.forEach((s, i) => {
-            const type = s.type ?? (i === 0 ? 'default' : undefined);
-            const typeAttr = type ? ` type="${escapeXml(type)}"` : '';
-            const envAttr = s.environment ? ` environment="${escapeXml(s.environment)}"` : '';
-            lines.push(`    <screenshot${typeAttr}${envAttr}>`);
-            lines.push(`      <image>${escapeXml(s.url)}</image>`);
-            if (s.caption) {
-                pushTranslatorHint(lines, s.captionTranslatorHint, '      ');
-                lines.push(`      <caption>${escapeXml(s.caption)}</caption>`);
-            }
-            lines.push('    </screenshot>');
-        });
-        lines.push('  </screenshots>');
-    }
-    // <url> entries
-    if (f.homepageUrl)
-        lines.push(`  <url type="homepage">${escapeXml(f.homepageUrl)}</url>`);
-    if (f.bugtrackerUrl)
-        lines.push(`  <url type="bugtracker">${escapeXml(f.bugtrackerUrl)}</url>`);
-    if (f.vcsBrowserUrl)
-        lines.push(`  <url type="vcs-browser">${escapeXml(f.vcsBrowserUrl)}</url>`);
-    if (f.donationUrl)
-        lines.push(`  <url type="donation">${escapeXml(f.donationUrl)}</url>`);
-    if (f.translateUrl)
-        lines.push(`  <url type="translate">${escapeXml(f.translateUrl)}</url>`);
-    // <content_rating>
-    const cr = normaliseContentRating(f.contentRating);
-    if (cr.attributes && Object.keys(cr.attributes).length > 0) {
-        lines.push(`  <content_rating type="${escapeXml(cr.type)}">`);
-        for (const [key, value] of Object.entries(cr.attributes)) {
-            lines.push(`    <content_attribute id="${escapeXml(key)}">${escapeXml(value)}</content_attribute>`);
-        }
-        lines.push('  </content_rating>');
-    }
-    else {
-        lines.push(`  <content_rating type="${escapeXml(cr.type)}" />`);
-    }
-    // <releases>
-    if (f.releases?.length) {
-        lines.push('  <releases>');
-        for (const r of f.releases) {
-            if (r.description === undefined) {
-                lines.push(`    <release version="${escapeXml(r.version)}" date="${escapeXml(r.date)}" />`);
-            }
-            else {
-                lines.push(`    <release version="${escapeXml(r.version)}" date="${escapeXml(r.date)}">`);
-                lines.push('      <description>');
-                for (const blockLine of renderDescriptionBlocks(r.description, '        ')) {
-                    lines.push(blockLine);
-                }
-                lines.push('      </description>');
-                lines.push('    </release>');
-            }
-        }
-        lines.push('  </releases>');
-    }
-    // <categories>
-    if (f.categories?.length) {
-        lines.push('  <categories>');
-        for (const c of f.categories)
-            lines.push(`    <category>${escapeXml(c)}</category>`);
-        lines.push('  </categories>');
-    }
-    // <keywords>
-    if (f.keywords?.length) {
-        lines.push('  <keywords>');
-        for (const k of f.keywords)
-            lines.push(`    <keyword>${escapeXml(k)}</keyword>`);
-        lines.push('  </keywords>');
-    }
-    // <branding> (apps only — Flathub ignores it on CLI)
-    if (kind === 'desktop-application' && f.branding) {
-        lines.push('  <branding>');
-        lines.push(`    <color type="primary" scheme_preference="light">${escapeXml(f.branding.accentLight)}</color>`);
-        lines.push(`    <color type="primary" scheme_preference="dark">${escapeXml(f.branding.accentDark)}</color>`);
-        lines.push('  </branding>');
-    }
-    // <kudos>
-    if (f.kudos?.length) {
-        lines.push('  <kudos>');
-        for (const k of f.kudos)
-            lines.push(`    <kudo>${escapeXml(k)}</kudo>`);
-        lines.push('  </kudos>');
-    }
-    // <provides> — always emit <binary> for both kinds; <mediatype>/<dbus> only when configured
-    const binaries = f.provides?.binaries ?? [inputs.command];
-    const mimetypes = f.provides?.mimetypes ?? [];
-    const dbus = f.provides?.dbus ?? [];
-    if (binaries.length || mimetypes.length || dbus.length) {
-        lines.push('  <provides>');
-        for (const b of binaries)
-            lines.push(`    <binary>${escapeXml(b)}</binary>`);
-        for (const m of mimetypes)
-            lines.push(`    <mediatype>${escapeXml(m)}</mediatype>`);
-        for (const d of dbus)
-            lines.push(`    <dbus type="${escapeXml(d.type)}">${escapeXml(d.id)}</dbus>`);
-        lines.push('  </provides>');
-    }
-    // <supports>
-    if (f.supports?.controls?.length || f.supports?.internet) {
-        lines.push('  <supports>');
-        for (const c of f.supports.controls ?? [])
-            lines.push(`    <control>${escapeXml(c)}</control>`);
-        if (f.supports.internet)
-            lines.push(`    <internet>${escapeXml(f.supports.internet)}</internet>`);
-        lines.push('  </supports>');
-    }
-    // <requires>
-    if (f.requires?.displayLengthMin || f.requires?.controls?.length || f.requires?.internet) {
-        lines.push('  <requires>');
-        if (f.requires.displayLengthMin) {
-            lines.push(`    <display_length compare="ge">${f.requires.displayLengthMin}</display_length>`);
-        }
-        for (const c of f.requires.controls ?? [])
-            lines.push(`    <control>${escapeXml(c)}</control>`);
-        if (f.requires.internet)
-            lines.push(`    <internet>${escapeXml(f.requires.internet)}</internet>`);
-        lines.push('  </requires>');
-    }
-    // <recommends>
-    if (f.recommends?.displayLengthMin || f.recommends?.controls?.length) {
-        lines.push('  <recommends>');
-        if (f.recommends.displayLengthMin) {
-            lines.push(`    <display_length compare="ge">${f.recommends.displayLengthMin}</display_length>`);
-        }
-        for (const c of f.recommends.controls ?? [])
-            lines.push(`    <control>${escapeXml(c)}</control>`);
-        lines.push('  </recommends>');
-    }
-    lines.push('</component>');
-    return lines.join('\n') + '\n';
-}
-// ─── Description block renderer ──────────────────────────────────────────
-function renderDescriptionBlocks(description, indent) {
-    const blocks = typeof description === 'string' ? stringToBlocks(description) : description;
-    const out = [];
-    for (const block of blocks) {
-        if ('p' in block) {
-            pushTranslatorHint(out, block.translatorHint, indent);
-            out.push(`${indent}<p>${escapeXml(block.p.trim().replace(/\s+/g, ' '))}</p>`);
-        }
-        else {
-            pushTranslatorHint(out, block.translatorHint, indent);
-            out.push(`${indent}<ul>`);
-            for (const item of block.ul) {
-                if (typeof item === 'string') {
-                    out.push(`${indent}  <li>${escapeXml(item)}</li>`);
-                }
-                else {
-                    pushTranslatorHint(out, item.translatorHint, `${indent}  `);
-                    out.push(`${indent}  <li>${escapeXml(item.item)}</li>`);
-                }
-            }
-            out.push(`${indent}</ul>`);
-        }
-    }
-    return out;
-}
-/** Auto-convert blank-line-split string into paragraph blocks. */
-function stringToBlocks(s) {
-    return s
-        .trim()
-        .split(/\n\n+/)
-        .map((para) => ({ p: para.trim().replace(/\s+/g, ' ') }));
-}
-function pushTranslatorHint(out, hint, indent) {
-    if (!hint)
-        return;
-    out.push(`${indent}<!-- TRANSLATORS: ${hint} -->`);
-}
-// ─── Helpers ─────────────────────────────────────────────────────────────
-function normaliseContentRating(cr) {
-    if (cr === undefined)
-        return { type: 'oars-1.1' };
-    if (typeof cr === 'string')
-        return { type: cr };
-    return { type: cr.type ?? 'oars-1.1', attributes: cr.attributes };
-}
-function substitute(template, tokens) {
-    let out = template;
-    for (const [key, value] of Object.entries(tokens)) {
-        out = out.split(`{{${key}}}`).join(value);
-    }
-    return out;
-}
-function escapeXml(value) {
-    return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-}

package/lib/commands/flatpak/sync-flathub.js

@@ -75,7 +75,7 @@ export const flatpakSyncFlathubCommand = {
     handler: async (args) => {
         const cwd = process.cwd();
         const cfg = new Config();
-        const configData = await cfg.forBuild({}).catch(() => ({}));
+        const configData = await cfg.forCommand().catch(() => ({}));
         const flatpak = configData.flatpak ?? {};
         const appId = args.appId ?? flatpak.appId ?? readPackageJson(cwd).name;
         if (!appId) {

package/lib/commands/foreach.js

@@ -13,9 +13,15 @@ import { readFileSync, readdirSync } from 'node:fs';
 import { cpus } from 'node:os';
 import { affectedClosure, buildDependencyGraph, discoverWorkspaces, filterWorkspaces, topologicalSort, } from '@gjsify/workspace';
 import { findWorkspaceRoot } from '../utils/workspace-root.js';
+import { cliRuntimeClosure } from '../utils/cli-runtime-closure.js';
 import { prefixLines } from '../utils/prefixed-output.js';
 import { BuildCacheRunner, buildCacheEnabledByEnv } from '../utils/build-cache.js';
-import { isGjs } from '@gjsify/rolldown-plugin-gjsify/runtime';
+// The ONE runner-selection rule, shared rather than re-derived. This file used to
+// carry its own copy; `workspace.ts` grew the bootstrap-CLI branch and the copy
+// here did not, so a `gjsify foreach` reached from a cold-tree bootstrap would
+// have delegated to npm and lost the shim one level down — silently, and only on
+// the OS legs that bootstrap cold. `onboard.ts` already imports it from here.
+import { detectPackageManager } from './workspace.js';
 // Every child spawned by spawnPrefixed registers here so fail-fast can
 // terminate the whole in-flight set instead of waiting on it. On CI a
 // single failed package used to leave foreach awaiting its still-running
@@ -425,20 +431,44 @@ export const foreachCommand = {
                 targets: selected.map((w) => w.name),
             })
             : undefined;
+        // The serial prefix: every child of this command BOOTS the CLI, so a
+        // package the CLI imports must not be written while siblings are starting
+        // (the torn `lib/esm` in `utils/cli-runtime-closure.ts`'s header). Building
+        // that closure first — alone, in the order the caller already sorted — is a
+        // REORDERING, not extra work: the prefix is removed from the parallel set,
+        // so the cost is only the parallelism given up over those few packages.
+        //
+        // Applied to every PARALLEL invocation, not only to `build`. Which scripts
+        // rewrite an output tree is not knowable from a script NAME — `build`,
+        // `build:types`, a package's own `dist` step and `clear` all do — and
+        // gating on the literal string "build" would be the hand-written list this
+        // closure exists to replace. A serial run needs no prefix at all: nothing
+        // else is in flight to read what it writes.
+        const prefixNames = args.parallel === true ? cliRuntimeClosure(allWorkspaces) : new Set();
+        const prefix = prefixNames.size > 0 ? selected.filter((ws) => prefixNames.has(ws.name)) : [];
+        const sweep = prefix.length > 0 ? selected.filter((ws) => !prefixNames.has(ws.name)) : selected;
         try {
+            if (prefix.length > 0) {
+                console.error(`[gjsify foreach] serial prefix: ${prefix.length} package(s) the running CLI imports — ` +
+                    `${prefix.map((ws) => ws.name).join(', ')}`);
+                for (const ws of prefix) {
+                    console.error(`[gjsify foreach] start ${ws.name} (serial prefix)`);
+                    await runOne(ws, finalCmd, cmdArgs, /* prefixOutput */ true, verbose, exec, cache);
+                }
+            }
             if (args.parallel && !args.topological && !args['topological-dev']) {
                 const jobs = args.jobs && args.jobs > 0 ? args.jobs : cpus().length;
-                await runParallel(selected, finalCmd, cmdArgs, jobs, verbose, exec, cache);
+                await runParallel(sweep, finalCmd, cmdArgs, jobs, verbose, exec, cache);
             }
             else if (args.parallel) {
                 // Topological + parallel: each workspace starts as soon as its
                 // deps (in the selected set) have finished. Yarn calls this
                 // "topological order with concurrency"; we cap at --jobs.
                 const jobs = args.jobs && args.jobs > 0 ? args.jobs : cpus().length;
-                await runTopologicalParallel(selected, finalCmd, cmdArgs, jobs, verbose, args['topological-dev'] === true, exec, cache);
+                await runTopologicalParallel(sweep, finalCmd, cmdArgs, jobs, verbose, args['topological-dev'] === true, exec, cache);
             }
             else {
-                await runSequential(selected, finalCmd, cmdArgs, verbose, exec, cache);
+                await runSequential(sweep, finalCmd, cmdArgs, verbose, exec, cache);
             }
         }
         catch (err) {
@@ -703,22 +733,6 @@ async function runOne(ws, script, args, prefixOutput, verbose, exec, cache) {
     if (cache && before)
         cache.storeAfterSuccess(ws, before);
 }
-function detectPackageManager() {
-    // Under GJS there is no Node — neither `npm` nor `yarn` can run scripts, so
-    // the runner is `gjsify` itself via the GJS shim on PATH
-    // (`ensureGjsifyShimOnPath`). Makes node-free `gjsify foreach` work.
-    if (isGjs())
-        return 'gjsify';
-    // `npm_config_user_agent` is set by npm/yarn/pnpm — first token is
-    // `<name>/<version>`. Reuse it so `gjsify foreach build` invoked
-    // through `yarn run` keeps using yarn, etc.
-    const ua = process.env.npm_config_user_agent ?? '';
-    if (ua.startsWith('yarn/'))
-        return 'yarn';
-    if (ua.startsWith('gjsify/'))
-        return 'gjsify';
-    return 'npm';
-}
 async function spawnPrefixed(cmd, args, cwd, prefix) {
     // `completion: 'exit'` — every path out of this command's handler ends in
     // `process.exit(…)` (see the handler's tail), which is what quits the GLib

package/lib/commands/index.d.ts

@@ -12,6 +12,7 @@ export * from './gresource.js';
 export * from './gettext.js';
 export * from './gsettings.js';
 export { flatpakCommand } from './flatpak/index.js';
+export * from './ship.js';
 export * from './dlx.js';
 export * from './install.js';
 export * from './foreach.js';

package/lib/commands/index.js

@@ -12,6 +12,7 @@ export * from './gresource.js';
 export * from './gettext.js';
 export * from './gsettings.js';
 export { flatpakCommand } from './flatpak/index.js';
+export * from './ship.js';
 export * from './dlx.js';
 export * from './install.js';
 export * from './foreach.js';

package/lib/commands/ship.d.ts

@@ -0,0 +1,11 @@
+import type { Command } from '../types/index.js';
+interface ShipOptions {
+    target?: string[];
+    out?: string;
+    stage: boolean;
+    'skip-build': boolean;
+    arch?: string;
+    verbose: boolean;
+}
+export declare const shipCommand: Command<unknown, ShipOptions>;
+export {};