@rungs/cli 0.3.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rungs/cli",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Installs and maintains a repository's agentic development system, composed from modules.",
   "author": "Antoine Dancre",
   "repository": {

package/src/engines.ts

@@ -1,9 +1,11 @@
 import { existsSync, readFileSync, statSync } from 'node:fs';
 import { join, dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { matchAny, walk } from './glob.ts';
 import { parse as parseToml } from 'smol-toml';
 import { runSelfTests } from './selftest.ts';
 import { loadAllModules } from './manifest.ts';
+
 import { resolveParams, substitute } from './substitute.ts';
 import {
   computedClaim,
@@ -17,6 +19,23 @@ import {
 } from './engines2.ts';
 import { boardReconcile, changelogFreshness, gitState, mergeDriverCheck, rulePropagation, termOwnership } from './engines3.ts';
 
+/**
+ * Where the CLI's own `modules/` lives.
+ *
+ * This was `new URL(import.meta.url).pathname.slice(1)` in three places. The
+ * `.slice(1)` strips a leading `/`, which is right on Windows — `/C:/…` becomes
+ * `C:/…` — and **wrong everywhere else**, where `/home/runner/…` becomes the
+ * relative `home/runner/…`. On Linux and macOS the directory did not resolve,
+ * `loadAllModules` found nothing, and three gates silently lost the data they
+ * read from the module set: `skills-spec-pure` and `skills-description-routes`
+ * reported every opted-in extension as a non-spec key, and
+ * `gates-self-tests-both-directions` reported gates that have fixtures as
+ * having none. All three passed here and failed on the first Linux run (F-036).
+ *
+ * `fileURLToPath` is what the rest of the codebase already used.
+ */
+const CLI_MODULES = join(dirname(fileURLToPath(import.meta.url)), '..', 'modules');
+
 export interface Finding {
   file?: string;
   message: string;
@@ -362,7 +381,7 @@ export const gateMeta: Engine = (_t, root) => {
     if (!id || kind !== 'declared' || !table) continue;
     examined++;
     // Tables live in the CLI, not the repo, so read them from the module set.
-    const tablePath = join(dirname(new URL(import.meta.url).pathname.slice(1)), '..', 'modules', dirname(table), 'gates', table.split('/').pop()!);
+    const tablePath = join(CLI_MODULES, dirname(table), 'gates', table.split('/').pop()!);
     const src = existsSync(tablePath) ? readFileSync(tablePath, 'utf8') : '';
     const forGate = [...src.matchAll(/\[\[self_test\]\][\s\S]*?(?=\n\[\[|\n\[|$)/g)]
       .map((m) => m[0])
@@ -426,7 +445,7 @@ function optedInExtensions(rel: string, spec: any): Set<string> {
   const name = rel.split('/').slice(-2)[0];
   if (!name) return new Set();
   try {
-    const mods = loadAllModules(join(dirname(new URL(import.meta.url).pathname.slice(1)), '..', 'modules'));
+    const mods = loadAllModules(CLI_MODULES);
     const owner = mods.find((m) => m.skills?.[name]?.extensions);
     return new Set(Object.keys(owner?.skills?.[name]?.extensions ?? {}));
   } catch {
@@ -450,7 +469,7 @@ function parseTable(path: string, module: string): any | null {
     // and the runner reported the gate broken — a mismatch entirely of the
     // harness's making. A fixture and the table it tests must resolve against
     // the same parameters or neither means anything.
-    const mods = loadAllModules(join(dirname(new URL(import.meta.url).pathname.slice(1)), '..', 'modules'));
+    const mods = loadAllModules(CLI_MODULES);
     const params = resolveParams(mods, {}, '.');
     return parseToml(substitute(readFileSync(path, 'utf8'), module, params));
   } catch {

package/src/engines2.ts

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync } from 'node:fs';
-import { execSync } from 'node:child_process';
+import { execFileSync } from 'node:child_process';
 import { join } from 'node:path';
 import { matchAny } from './glob.ts';
 import type { Engine, Finding } from './engines.ts';
@@ -344,12 +344,28 @@ export const crossReference: Engine = (t, root, files) => {
  * this repo does not use — it deletes branches on merge — and it is the
  * direction to be wrong in, because the alternative is the daily false positive.
  */
+/**
+ * `git` as an argv array, never a shell string.
+ *
+ * `--format=%(refname:short)` is a **bash syntax error** — unquoted parentheses —
+ * so `backlog-merged-status` threw on every Linux and macOS repo, hit its catch,
+ * and reported "cannot read git branches; status not reconciled" as a finding.
+ * The gate ships in four of five profiles and had never once worked off Windows,
+ * where `execSync` goes through cmd.exe and parentheses are ordinary characters.
+ * Found by the CI matrix on its first run (F-033).
+ *
+ * Branch names come out of work-item frontmatter, so this is also the difference
+ * between reading a field and passing it to a shell.
+ */
+const gitArgs = (root: string, args: string[]) =>
+  execFileSync('git', args, { cwd: root, stdio: 'pipe' }).toString().trim();
+
 function landedWork(root: string, branch: string, base: string): boolean {
-  const git = (cmd: string) => execSync(`git ${cmd}`, { cwd: root, stdio: 'pipe' }).toString().trim();
+  const git = (...args: string[]) => gitArgs(root, args);
   try {
-    const tip = git(`rev-parse ${branch}`);
-    if (tip === git(`rev-parse ${base}`)) return false;
-    return git(`log ${base} --merges --format=%P`)
+    const tip = git('rev-parse', branch);
+    if (tip === git('rev-parse', base)) return false;
+    return git('log', base, '--merges', '--format=%P')
       .split('\n')
       .some((line) => line.trim().split(/\s+/).slice(1).includes(tip));
   } catch {
@@ -364,11 +380,7 @@ export const gitStatusReconcile: Engine = (t, root, files) => {
   let merged: Set<string>;
   try {
     merged = new Set(
-      execSync(`git branch --merged ${t.integration_branch ?? 'main'} --format=%(refname:short)`, {
-        cwd: root,
-        stdio: 'pipe',
-      })
-        .toString()
+      gitArgs(root, ['branch', '--merged', t.integration_branch ?? 'main', '--format=%(refname:short)'])
         .split('\n')
         .map((s) => s.trim())
         .filter(Boolean),

package/src/engines3.ts

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync } from 'node:fs';
-import { execSync } from 'node:child_process';
+import { execFileSync } from 'node:child_process';
 import { join } from 'node:path';
 import { matchAny } from './glob.ts';
 import type { Engine, Finding } from './engines.ts';
@@ -213,7 +213,7 @@ export const rulePropagation: Engine = (t, root, files) => {
 export const gitState: Engine = (t, root) => {
   let out: string;
   try {
-    out = execSync('git worktree list --porcelain', { cwd: root, stdio: 'pipe' }).toString();
+    out = execFileSync('git', ['worktree', 'list', '--porcelain'], { cwd: root, stdio: 'pipe' }).toString();
   } catch {
     // Not a git repo, or git unavailable. An unattributable result blocks:
     // we do not land on an unknown.
@@ -248,7 +248,8 @@ export const mergeDriverCheck: Engine = (t, root) => {
   for (const driver of required) {
     let configured = '';
     try {
-      configured = execSync(`git config --get merge.${driver}.driver`, { cwd: root, stdio: 'pipe' }).toString().trim();
+      // Driver names come from `.gitattributes`, so they reach this as data.
+      configured = execFileSync('git', ['config', '--get', `merge.${driver}.driver`], { cwd: root, stdio: 'pipe' }).toString().trim();
     } catch {
       /* absent config exits non-zero, which is the finding */
     }

package/src/lifecycle.ts

@@ -1,7 +1,7 @@
 import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { execSync } from 'node:child_process';
+import { execFileSync } from 'node:child_process';
 import { parse } from 'smol-toml';
 import type { Manifest } from './types.ts';
 import { contentHash, emittedFiles, registerGates } from './add.ts';
@@ -334,8 +334,13 @@ export function setupGit(repoRoot: string, dryRun = false) {
         : 'git merge-file -L ours -L base -L theirs %A %O %B';
     if (!dryRun) {
       try {
-        execSync(`git config merge.${d}.name "rungs ${d.replace('rungs-', '')} driver"`, { cwd: repoRoot, stdio: 'pipe' });
-        execSync(`git config merge.${d}.driver ${JSON.stringify(cmd)}`, { cwd: repoRoot, stdio: 'pipe' });
+        // argv, not a shell string. The `rungs-generated` driver command carries
+        // single quotes, a literal `\n` and `%A %O %B`, and it was being handed
+        // to a shell through `JSON.stringify` — quoting that happens to survive
+        // cmd.exe and does not survive bash the same way. The same class of bug
+        // as F-033, found in the same sweep.
+        execFileSync('git', ['config', `merge.${d}.name`, `rungs ${d.replace('rungs-', '')} driver`], { cwd: repoRoot, stdio: 'pipe' });
+        execFileSync('git', ['config', `merge.${d}.driver`, cmd], { cwd: repoRoot, stdio: 'pipe' });
       } catch {
         continue;
       }
@@ -345,7 +350,7 @@ export function setupGit(repoRoot: string, dryRun = false) {
   let rerere = false;
   if (!dryRun) {
     try {
-      execSync('git config rerere.enabled true', { cwd: repoRoot, stdio: 'pipe' });
+      execFileSync('git', ['config', 'rerere.enabled', 'true'], { cwd: repoRoot, stdio: 'pipe' });
       rerere = true;
     } catch {
       /* not a git repo */