@opengsd/gsd-core 1.6.0-rc.2 → 1.6.0

package/gsd-core/bin/lib/audit-command-router.cjs

@@ -25,6 +25,10 @@
  */
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const io = require("./io.cjs");
+// Phase 2 (#1646): route through the Hub per ADR-959 §III(B) line 75.
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const cjsCommandRouterAdapter = require("./cjs-command-router-adapter.cjs");
+const { routeHubCommandFamily } = cjsCommandRouterAdapter;
 // ─── routeAuditUat ────────────────────────────────────────────────────────────
 function routeAuditUat({ args, cwd, raw, error, _uat }) {
     // Suppress unused-variable warnings for args/error — this command has no
@@ -33,27 +37,61 @@ function routeAuditUat({ args, cwd, raw, error, _uat }) {
     void error;
     // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-unsafe-assignment
     const u = _uat ?? require('./uat.cjs');
-    u.cmdAuditUat(cwd, raw);
+    // Phase 2 (#1646): routes through the Hub for uniform observability and
+    // HandlerFailure taxonomy. audit-uat has no subcommands — a synthetic 'run'
+    // defaultSubcommand gives the Hub a single-handler manifest. The dispatch is
+    // trivial but the observability seam (DispatchEvent, GSD_AUDIT=1 trace) is
+    // now consistent with graphify/intel/host routers.
+    routeHubCommandFamily({
+        family: 'audit-uat',
+        args,
+        subcommands: ['run'],
+        defaultSubcommand: 'run',
+        handlers: {
+            run: () => u.cmdAuditUat(cwd, raw),
+        },
+        unknownMessage: (subcommand) => `Unknown audit-uat subcommand: "${subcommand}". audit-uat takes no subcommands.`,
+        error,
+        cwd,
+        raw,
+    });
 }
 // ─── routeAuditOpen ──────────────────────────────────────────────────────────
 function routeAuditOpen({ args, cwd, raw, error, _audit, _core }) {
-    // Suppress unused-variable warning for error — audit-open has no subcommand
-    // dispatch that would call error(); only flag parsing occurs here.
-    void error;
     // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-unsafe-assignment
     const a = _audit ?? require('./audit.cjs');
     const c = _core ?? io;
+    // Phase 2 (#1646): routes through the Hub for uniform observability.
+    // `--json` is a flag, not a subcommand — capture it in the closure and strip
+    // it from args before Hub dispatch so it isn't mistaken for a subcommand by
+    // the manifest check. The handler then branches on wantJson for the two
+    // output shapes (JSON object vs human-readable formatted report).
     const wantJson = args.includes('--json');
-    const result = a.auditOpenArtifacts(cwd);
-    if (wantJson) {
-        // io.output JSON-stringifies its first arg; pass the object directly.
-        c.output(result, raw);
-    }
-    else {
-        // Human-readable report must bypass JSON encoding — use the rawValue
-        // form (third arg) which io.output emits verbatim.
-        c.output(null, true, a.formatAuditReport(result));
-    }
+    const hubArgs = wantJson ? args.filter((arg) => arg !== '--json') : args;
+    routeHubCommandFamily({
+        family: 'audit-open',
+        args: hubArgs,
+        subcommands: ['run'],
+        defaultSubcommand: 'run',
+        handlers: {
+            run: () => {
+                const result = a.auditOpenArtifacts(cwd);
+                if (wantJson) {
+                    // io.output JSON-stringifies its first arg; pass the object directly.
+                    c.output(result, raw);
+                }
+                else {
+                    // Human-readable report must bypass JSON encoding — use the rawValue
+                    // form (third arg) which io.output emits verbatim.
+                    c.output(null, true, a.formatAuditReport(result));
+                }
+            },
+        },
+        unknownMessage: (subcommand) => `Unknown audit-open subcommand: "${subcommand}". audit-open takes no subcommands (use --json for JSON output).`,
+        error,
+        cwd,
+        raw,
+    });
 }
 module.exports = {
     routeAuditUat,

package/gsd-core/bin/lib/capability-lifecycle.cjs

@@ -280,6 +280,20 @@ function isSafeHookScriptPath(script) {
 function shellSingleQuote(value) {
     return "'" + value.replace(/'/g, "'\\''") + "'";
 }
+/**
+ * #1634: build the emitted hook `command` for an ABSOLUTE confined script path. For `.js`-family
+ * hooks (`.js`/`.cjs`/`.mjs`) prefix with `node` so the hook runs regardless of the source's
+ * executable bit — a `git`/tarball source that lost `+x` would otherwise yield
+ * `/bin/sh: Permission denied` on every matching call (defect #2). This mirrors first-party hooks
+ * (`node "${CLAUDE_PLUGIN_ROOT}/hooks/x.js"`). The path stays POSIX single-quoted (#1460 (R) HIGH)
+ * so a space-containing install prefix cannot word-split or inject. Non-JS scripts (e.g. `.sh`)
+ * keep the bare single-quoted absolute path (unchanged) — they remain responsible for their own
+ * executability, exactly as before; per-runtime command projection is a separate concern (ADR-857 D8).
+ */
+const JS_HOOK_EXT_RE = /\.(?:js|cjs|mjs)$/;
+function runnableHookCommand(absScript) {
+    return JS_HOOK_EXT_RE.test(absScript) ? 'node ' + shellSingleQuote(absScript) : shellSingleQuote(absScript);
+}
 /**
  * #1460 CONF-1: resolve a hook `script` (declared RELATIVE to the bundle) against the capability's
  * own install dir and CONFINE it via realpath, returning the ABSOLUTE confined path or null when it
@@ -459,6 +473,11 @@ function applyCapabilitySharedEdits(args) {
                 const script = typeof rec['script'] === 'string' ? rec['script'] : '';
                 if (!event || !script || isUnsafeKey(event))
                     continue;
+                // #1634: optional tool-scoping `matcher` (a settings.json concept — entry-level sibling of
+                // `hooks`). Absent => match-all (field OMITTED so the existing shipped capabilities' wiring
+                // is byte-for-byte unchanged, Hyrum's Law). The validator gates this to a non-empty string.
+                const matcherRaw = rec['matcher'];
+                const matcher = typeof matcherRaw === 'string' && matcherRaw.length > 0 ? matcherRaw : null;
                 // #1460 CONF-1: resolve the declared (relative) script against the capability's OWN install
                 // dir and CONFINE via realpath, then write the ABSOLUTE confined path as the hook command —
                 // never the raw relative path (which would resolve against the CWD at hook-exec time and could
@@ -467,14 +486,18 @@ function applyCapabilitySharedEdits(args) {
                 const absScript = confinedBundleScript(capDir(runtimeDir, capId), script);
                 if (absScript === null)
                     continue;
-                // #1460 (R) HIGH: the hook `command` is consumed by a shell (first-party hooks emit
-                // `node "${CLAUDE_PLUGIN_ROOT}/hooks/x.js"`). The absolute path begins with the
-                // (non-manifest) install-prefix, which commonly contains spaces — emit it POSIX
-                // single-quoted so the prefix cannot word-split or inject. The script BASENAME is
-                // already restricted to a shell-safe allowlist by isSafeHookScriptPath above.
-                const command = shellSingleQuote(absScript);
+                // #1460 (R) HIGH + #1634: the hook `command` is consumed by a shell. `runnableHookCommand`
+                // emits a `node`-prefixed POSIX-single-quoted absolute path for `.js`-family hooks (runs
+                // without `+x`; mirrors first-party) and a bare single-quoted path otherwise. Single-quoting
+                // keeps a space-containing install prefix as one shell token (cannot word-split or inject).
+                const command = runnableHookCommand(absScript);
                 const arr = Array.isArray(hooksObj[event]) ? hooksObj[event] : [];
-                arr.push({ [CAP_MARKER]: capId, hooks: [{ type: 'command', command }] });
+                // #1634: stamp the marker so the entry is surgically strippable, and carry the declared
+                // `matcher` (entry-level sibling of `hooks`) only when the author declared one.
+                const entry = { [CAP_MARKER]: capId, hooks: [{ type: 'command', command }] };
+                if (matcher !== null)
+                    entry['matcher'] = matcher;
+                arr.push(entry);
                 hooksObj[event] = arr;
                 touched = true;
             }