cli-jaw 2.2.13 → 2.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cli-jaw",
-  "version": "2.2.13",
+  "version": "2.2.15",
   "description": "Personal AI assistant powered by Pi, Antigravity, AI-E, Claude, Claude E, Codex, Codex App, Cursor, Grok, Kiro, OpenCode, and Copilot — Web, Terminal, Telegram, and Discord interfaces with 107 built-in skills",
   "type": "module",
   "keywords": [

package/scripts/release-gates.mjs

@@ -82,7 +82,7 @@ const GATES = {
             ];
             const r = run('npx', args);
             if (r.status !== 0) {
-                return { ok: false, detail: `tests failed:\n${(r.stdout || r.stderr || '').slice(-2000)}` };
+                return { ok: false, detail: `tests failed:\n${[r.stdout, r.stderr].filter(Boolean).join('\n').slice(-2000)}` };
             }
             return { ok: true, detail: `passed ${targets.length} suite(s): ${targets.join(', ')}` };
         },
@@ -382,7 +382,7 @@ const GATES = {
             for (const s of steps) {
                 const r = run(s.cmd, s.args, { timeout: s.timeout });
                 if (r.status !== 0) {
-                    return { ok: false, detail: `${s.name} failed:\n${(r.stdout || r.stderr || '').slice(-1500)}` };
+                    return { ok: false, detail: `${s.name} failed:\n${[r.stdout, r.stderr].filter(Boolean).join('\n').slice(-1500)}` };
                 }
             }
             return { ok: true, detail: 'docs:check + check-doc-drift.sh clean' };
@@ -393,7 +393,7 @@ const GATES = {
         check() {
             const r = run('node', ['scripts/check-strict-baseline.mjs'], { timeout: 120_000 });
             if (r.status !== 0) {
-                return { ok: false, detail: `strict baseline regressed:\n${(r.stdout || r.stderr || '').slice(-1200)}` };
+                return { ok: false, detail: `strict baseline regressed:\n${[r.stdout, r.stderr].filter(Boolean).join('\n').slice(-1200)}` };
             }
             return { ok: true, detail: 'live any/debt/allow counts within frozen baseline' };
         },
@@ -403,7 +403,7 @@ const GATES = {
         check() {
             const r = run('node', ['scripts/check-redaction-sinks.mjs'], { timeout: 60_000 });
             if (r.status !== 0) {
-                return { ok: false, detail: `unmasked channel sink:\n${(r.stdout || r.stderr || '').slice(-1500)}` };
+                return { ok: false, detail: `unmasked channel sink:\n${[r.stdout, r.stderr].filter(Boolean).join('\n').slice(-1500)}` };
             }
             return { ok: true, detail: 'no unmasked sink in telegram/discord/slack/telegram-hub' };
         },
@@ -413,7 +413,7 @@ const GATES = {
         check() {
             const r = run('node', ['scripts/sync-electron-version.cjs', '--check'], { timeout: 60_000 });
             if (r.status !== 0) {
-                return { ok: false, detail: (r.stdout || r.stderr || '').trim().slice(-500) };
+                return { ok: false, detail: [r.stdout, r.stderr].filter(Boolean).join('\n').trim().slice(-500) };
             }
             return { ok: true, detail: 'desktop artifacts will carry the release version' };
         },
@@ -423,7 +423,7 @@ const GATES = {
         check() {
             const r = run('node', ['scripts/check-sidecar-prune-safety.mjs'], { timeout: 60_000 });
             if (r.status !== 0) {
-                return { ok: false, detail: (r.stdout || r.stderr || '').trim().slice(-800) };
+                return { ok: false, detail: [r.stdout, r.stderr].filter(Boolean).join('\n').trim().slice(-800) };
             }
             return { ok: true, detail: 'packaged sidecar keeps every runtime dependency' };
         },
@@ -439,7 +439,12 @@ const GATES = {
                 return { ok: true, detail: 'SKIPPED — electron/node_modules absent, nothing probed' };
             }
             if (r.status !== 0) {
-                return { ok: false, detail: (r.stdout || r.stderr || '').trim().slice(-800) };
+                // The probe prints its notes on stdout and its reasons on
+                // stderr. `stdout || stderr` therefore threw the reasons away
+                // whenever a single note had been printed, which is how a Linux
+                // failure reached CI showing only "prebuilds present" and
+                // "round-trip ok" with no stated cause.
+                return { ok: false, detail: [r.stdout, r.stderr].filter(Boolean).join('\n').trim().slice(-800) };
             }
             return { ok: true, detail: 'node-pty loads under this runtime' };
         },
@@ -452,7 +457,7 @@ const GATES = {
                 return { ok: true, detail: 'SKIPPED — sidecar not bundled, nothing imported' };
             }
             if (r.status !== 0) {
-                return { ok: false, detail: (r.stdout || r.stderr || '').trim().slice(-800) };
+                return { ok: false, detail: [r.stdout, r.stderr].filter(Boolean).join('\n').trim().slice(-800) };
             }
             return { ok: true, detail: 'bundled sidecar imports its critical entry surfaces' };
         },

package/scripts/run-electron-builder.mjs

@@ -0,0 +1,60 @@
+#!/usr/bin/env node
+/**
+ * Run electron-builder with a node-gyp-capable python resolved first.
+ *
+ * The scripts used to inline the lookup as
+ * `PYTHON="$(bash ../scripts/pick-gyp-python.sh)" electron-builder --win`.
+ * npm hands package scripts to cmd.exe on Windows, which does not expand
+ * `$(...)`, so the literal text arrived as a filename and the Windows job of
+ * every desktop release from v2.2.11 onward died before electron-builder even
+ * started:
+ *
+ *   PYTHON: can't open file 'D:\a\cli-jaw\cli-jaw\electron\=$(bash ..\scripts\pick-gyp-python.sh)'
+ *
+ * macOS and Linux kept building, so the release looked successful while its
+ * Windows artifacts silently went missing.
+ *
+ * Node is the one interpreter guaranteed to exist wherever npm runs a script,
+ * so the resolution happens here instead of in shell syntax. The picker itself
+ * stays in bash and stays authoritative; it is simply invoked rather than
+ * interpolated. When bash is unavailable (a plain Windows box without Git
+ * Bash), the build proceeds with the ambient python3: node-gyp then fails with
+ * its own diagnostic instead of a confusing missing-file error.
+ */
+import { spawnSync } from 'node:child_process';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const scriptsDir = dirname(fileURLToPath(import.meta.url));
+const picker = join(scriptsDir, 'pick-gyp-python.sh');
+
+/** Ask the bash picker for an interpreter that still has distutils. */
+function resolvePython() {
+    if (process.env['PYTHON']) return process.env['PYTHON'];
+    const probe = spawnSync('bash', [picker], { encoding: 'utf8' });
+    if (probe.status !== 0) {
+        const reason = probe.error ? probe.error.message : (probe.stderr || '').trim();
+        console.warn(`[gyp-python] picker unavailable (${reason || 'unknown'}); leaving python resolution to node-gyp`);
+        return null;
+    }
+    return probe.stdout.trim() || null;
+}
+
+const python = resolvePython();
+const env = { ...process.env };
+if (python) {
+    env['PYTHON'] = python;
+    // node-gyp does not read PYTHON on its own; npm_config_python is the knob
+    // it actually consults.
+    env['npm_config_python'] = python;
+}
+
+const args = process.argv.slice(2);
+const builder = process.platform === 'win32' ? 'electron-builder.cmd' : 'electron-builder';
+const result = spawnSync(builder, args, { stdio: 'inherit', env, shell: process.platform === 'win32' });
+
+if (result.error) {
+    console.error(`[electron-builder] failed to start: ${result.error.message}`);
+    process.exit(1);
+}
+process.exit(result.status ?? 1);