javi-forge 1.38.2 → 1.38.4

package/assets/claude-hooks/javi-forge-skillguard-pre-tool-use.mjs

@@ -177,6 +177,97 @@ function lex(command, powershell = false) {
 	if (!commands.at(-1).length) commands.pop();
 	return { commands, separators };
 }
+function hasUnquotedHereDocOperator(line) {
+	let quote = "", escaped = false;
+	for (let index = 0; index < line.length; index++) {
+		const char = line[index];
+		if (escaped) { escaped = false; continue; }
+		if (quote) {
+			if (char === "\\" && quote === '"') escaped = true;
+			else if (char === quote) quote = "";
+			continue;
+		}
+		if (char === "\\") { escaped = true; continue; }
+		if (char === "'" || char === '"') { quote = char; continue; }
+		if (char === "#" && (index === 0 || /\s/.test(line[index - 1]))) break;
+		if (char === "<" && line[index + 1] === "<" && line[index + 2] !== "<") return true;
+	}
+	return false;
+}
+const SHELL_HEADER_WHITESPACE = new Set([" ", "\t"]);
+const STATIC_FILE_TARGET_CHARS = new Set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789._/-");
+const HEREDOC_DELIMITER_START_CHARS = new Set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_");
+const HEREDOC_DELIMITER_CHARS = new Set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_");
+function isShellHeaderWhitespace(char) {
+	return SHELL_HEADER_WHITESPACE.has(char);
+}
+function skipShellWhitespace(line, index) {
+	while (isShellHeaderWhitespace(line[index])) index++;
+	return index;
+}
+function parseStaticFileTarget(line, index) {
+	const start = index;
+	while (index < line.length && !isShellHeaderWhitespace(line[index])) {
+		if (!STATIC_FILE_TARGET_CHARS.has(line[index])) return null;
+		index++;
+	}
+	return index === start ? null : { target: line.slice(start, index), index };
+}
+function parseQuotedHereDocDelimiter(line, index) {
+	const quote = line[index];
+	if (quote !== "'" && quote !== '"') return null;
+	const start = ++index;
+	while (index < line.length && line[index] !== quote) {
+		const char = line[index];
+		if (!(index === start ? HEREDOC_DELIMITER_START_CHARS : HEREDOC_DELIMITER_CHARS).has(char)) return null;
+		index++;
+	}
+	return index === start || line[index] !== quote ? null : { delimiter: line.slice(start, index), index: index + 1 };
+}
+function parseInertCatHereDocHeader(line) {
+	let index = skipShellWhitespace(line, 0);
+	if (line.slice(index, index + 3) !== "cat" || !(isShellHeaderWhitespace(line[index + 3]) || line[index + 3] === ">")) return null;
+	index = skipShellWhitespace(line, index + 3);
+	let target, delimiter;
+	if (line[index] === ">") {
+		const parsedTarget = parseStaticFileTarget(line, skipShellWhitespace(line, index + 1));
+		if (!parsedTarget) return null;
+		target = parsedTarget.target;
+		index = skipShellWhitespace(line, parsedTarget.index);
+		if (line[index] !== "<" || line[index + 1] !== "<" || line[index + 2] === "-") return null;
+		const parsedDelimiter = parseQuotedHereDocDelimiter(line, skipShellWhitespace(line, index + 2));
+		if (!parsedDelimiter) return null;
+		delimiter = parsedDelimiter.delimiter;
+		index = parsedDelimiter.index;
+	} else if (line[index] === "<" && line[index + 1] === "<" && line[index + 2] !== "-") {
+		const parsedDelimiter = parseQuotedHereDocDelimiter(line, skipShellWhitespace(line, index + 2));
+		if (!parsedDelimiter) return null;
+		delimiter = parsedDelimiter.delimiter;
+		index = skipShellWhitespace(line, parsedDelimiter.index);
+		if (line[index] !== ">") return null;
+		const parsedTarget = parseStaticFileTarget(line, skipShellWhitespace(line, index + 1));
+		if (!parsedTarget) return null;
+		target = parsedTarget.target;
+		index = parsedTarget.index;
+	} else return null;
+	return skipShellWhitespace(line, index) === line.length ? { target, delimiter } : null;
+}
+function opaqueInertCatHereDoc(command, cwd, config, projectRoot) {
+	// A continuation changes the lexical boundary which identifies a heredoc
+	// header. This bounded parser cannot prove it is body-only, so fail closed.
+	if (command.includes("\\" + "\n") || command.includes("\\" + "\r\n")) return null;
+	const lines = command.split(/\r?\n/);
+	if (lines.at(-1) === "") lines.pop();
+	const parsed = parseInertCatHereDocHeader(lines[0] ?? "");
+	if (parsed && lines.length >= 2) {
+		const terminator = lines.findIndex((line, index) => index > 0 && line === parsed.delimiter);
+		if (terminator === lines.length - 1) {
+			const target = lexicalizePolicyPath(parsed.target, { base: cwd, projectRoot });
+			return evaluateFile("Write", target, config, projectRoot).allowed ? lines[0] : null;
+		}
+	}
+	return lines.some(hasUnquotedHereDocOperator) ? null : command;
+}
 // The pre-redesign boolean helpers (parseEnvSplit/hasChmodRecursive/hasBase64Decode
 // and their isLongPrefix/splitEnvString internals) were replaced by the semantic
 // state machines below; only ENV_ESCAPES survives, shared with splitEnvSemantics.
@@ -703,6 +794,9 @@ function bashSubstitutions(command) {
 }
 function evaluateBash(command, cwd, config = AGENT_CONFIGS.claude, projectRoot = PROJECT_ROOT, depth = 0) {
 	if (depth > 4) return { allowed: false, ruleId: "shell.obfuscated-interpreter" };
+	const headerOnlyCommand = opaqueInertCatHereDoc(command, cwd, config, projectRoot);
+	if (headerOnlyCommand === null) return { allowed: false, ruleId: "shell.obfuscated-interpreter" };
+	command = headerOnlyCommand;
 	try { for (const body of bashSubstitutions(command)) { const nested = evaluateBash(body, cwd, config, projectRoot, depth + 1); if (!nested.allowed) return nested; } } catch { return { allowed: false, ruleId: "shell.obfuscated-interpreter" }; }
 	if (/^\s*:\s*\(\s*\)\s*\{\s*:\s*\|\s*:\s*&\s*\}\s*;\s*:\s*$/.test(command)) return { allowed: false, ruleId: "shell.destructive-root" };
 	let parsed;

package/assets/claude-hooks/manifest.json

@@ -4,14 +4,15 @@
 		"name": "javi-forge-skillguard-pre-tool-use.mjs",
 		"version": 1,
 		"policyVersion": 2,
-		"sha256": "59fc4224975ad64cfc85bab50ec60d9bd4948070e9d41f42ab43e6d8231c19a1",
+		"sha256": "6edfbb31ce0551b27e38ae1ffd1daf9cc4bea54f2c86687c5124132af5b8c0af",
 		"historical": [
 			"78be7e6613c012280b7ad17886462ba166b63ebd031e34565d757b3a0796d7cc",
 			"5dc2a5c31131f4ac7d8657c78b950de52776aad6eaefe78ea0d764a9963c4425",
 			"0c9aa8fa26b389f4892782f83104f0792c2b71ebca39c18c02706e2185e22b40",
 			"3581862f0567cce75a58b693c9ade80d39ee7d58add11537a34a8461c47c1ed4",
 			"54a270f28b068450b79547a88ec6f2d4854514392fd5f38ed1d6174ea093d7aa",
-			"9a565cec31d9e091e3fb9420b86685f824733bc1ebe479f086b2b955aba6ef3e"
+			"9a565cec31d9e091e3fb9420b86685f824733bc1ebe479f086b2b955aba6ef3e",
+			"59fc4224975ad64cfc85bab50ec60d9bd4948070e9d41f42ab43e6d8231c19a1"
 		]
 	},
 	"settingsEntries": {

package/dist/cli/help.d.ts

@@ -19,7 +19,7 @@ export declare const CI_HELP_TEXT = "\n  Usage\n    $ javi-forge ci [subcommand]
  * Per-command help for `hooks`, shown by `javi-forge hooks --help` (or when
  * `hooks` is given an unknown subcommand). Whitespace is significant.
  */
-export declare const HOOKS_HELP_TEXT = "\n  Usage\n    $ javi-forge hooks run <pre-commit|pre-push>\n    $ javi-forge hooks <install|doctor|repair> claude [--force]\n\n    Run the sections enabled under hooks: in .javi-forge/ci.yaml, in a fixed\n    cheap\u2192expensive order, fail-fast. With no hooks: config the default is the\n    quick native CI gate (setup + lint + compile + gates \u2014 no tests, no coverage).\n\n  Subcommands\n    run pre-commit    Run the composed pre-commit sections\n    run pre-push      Run the composed pre-push sections\n    install claude    Install the managed Claude PreToolUse guard (.claude/)\n    doctor claude     Report Claude PreToolUse guard health (informational)\n    repair claude     Repair the managed guard; --force overwrites edited assets\n\n  Notes\n    A blocking section failure exits non-zero and blocks the commit/push.\n    A broken .javi-forge/ci.yaml exits 1 (fail-closed \u2014 never skips a gate).\n    To skip: git commit --no-verify   (pre-push: git push --no-verify)\n    doctor claude is informational (always exits 0); install/repair exit 0 on\n    success, non-zero on refusal/failure. Use repair claude --force to overwrite\n    a locally edited managed asset.\n    Linux: install/repair claude need the acl package (getfacl) to prove the\n    parent chain \u2014 apt install acl / apk add acl / dnf install acl. Without it\n    they refuse fail-closed; an already-installed guard keeps firing, and\n    doctor claude reports the acl capability as its own row.\n    Claude Code spawns the guard with node from ITS path, so node must resolve\n    there, not only inside javi-forge.\n\n  Examples\n    $ javi-forge hooks run pre-commit\n    $ javi-forge hooks run pre-push\n    $ javi-forge hooks install claude\n    $ javi-forge hooks doctor claude\n    $ javi-forge hooks repair claude --force\n";
+export declare const HOOKS_HELP_TEXT = "\n  Usage\n    $ javi-forge hooks run <pre-commit|pre-push>\n    $ javi-forge hooks <install|doctor|repair> <claude|codex> [--force]\n\n    Run the sections enabled under hooks: in .javi-forge/ci.yaml, in a fixed\n    cheap\u2192expensive order, fail-fast. With no hooks: config the default is the\n    quick native CI gate (setup + lint + compile + gates \u2014 no tests, no coverage).\n\n  Subcommands\n    run pre-commit    Run the composed pre-commit sections\n    run pre-push      Run the composed pre-push sections\n    install claude    Install the managed Claude PreToolUse guard (.claude/)\n    doctor claude     Report Claude PreToolUse guard health (informational)\n    repair claude     Repair the managed guard; --force overwrites edited assets\n    install codex     Install the managed Codex PreToolUse guard (~/.codex/)\n    doctor codex      Report Codex hook execution readiness and trust boundary\n    repair codex      Repair the managed Codex guard; --force overwrites edits\n\n  Notes\n    A blocking section failure exits non-zero and blocks the commit/push.\n    A broken .javi-forge/ci.yaml exits 1 (fail-closed \u2014 never skips a gate).\n    To skip: git commit --no-verify   (pre-push: git push --no-verify)\n    doctor claude is informational (always exits 0); install/repair exit 0 on\n    success, non-zero on refusal/failure. Use repair claude --force to overwrite\n    a locally edited managed asset.\n    doctor codex exits 0 when runnable, 1 when blocked, and 2 when inconclusive;\n    it does not prove provider trust or runtime execution. Use repair codex\n    --force only to overwrite an edited managed asset.\n    Linux: install/repair claude need the acl package (getfacl) to prove the\n    parent chain \u2014 apt install acl / apk add acl / dnf install acl. Without it\n    they refuse fail-closed; an already-installed guard keeps firing, and\n    doctor claude reports the acl capability as its own row.\n    Claude Code spawns the guard with node from ITS path, so node must resolve\n    there, not only inside javi-forge.\n\n  Examples\n    $ javi-forge hooks run pre-commit\n    $ javi-forge hooks run pre-push\n    $ javi-forge hooks install claude\n    $ javi-forge hooks doctor claude\n    $ javi-forge hooks repair claude --force\n    $ javi-forge hooks install codex\n    $ javi-forge hooks doctor codex\n    $ javi-forge hooks repair codex --force\n";
 export declare const FLAGS_SCHEMA: {
     readonly help: {
         readonly type: "boolean";

package/dist/cli/help.js

@@ -166,7 +166,7 @@ export const CI_HELP_TEXT = `
 export const HOOKS_HELP_TEXT = `
   Usage
     $ javi-forge hooks run <pre-commit|pre-push>
-    $ javi-forge hooks <install|doctor|repair> claude [--force]
+    $ javi-forge hooks <install|doctor|repair> <claude|codex> [--force]
 
     Run the sections enabled under hooks: in .javi-forge/ci.yaml, in a fixed
     cheap→expensive order, fail-fast. With no hooks: config the default is the
@@ -178,6 +178,9 @@ export const HOOKS_HELP_TEXT = `
     install claude    Install the managed Claude PreToolUse guard (.claude/)
     doctor claude     Report Claude PreToolUse guard health (informational)
     repair claude     Repair the managed guard; --force overwrites edited assets
+    install codex     Install the managed Codex PreToolUse guard (~/.codex/)
+    doctor codex      Report Codex hook execution readiness and trust boundary
+    repair codex      Repair the managed Codex guard; --force overwrites edits
 
   Notes
     A blocking section failure exits non-zero and blocks the commit/push.
@@ -186,6 +189,9 @@ export const HOOKS_HELP_TEXT = `
     doctor claude is informational (always exits 0); install/repair exit 0 on
     success, non-zero on refusal/failure. Use repair claude --force to overwrite
     a locally edited managed asset.
+    doctor codex exits 0 when runnable, 1 when blocked, and 2 when inconclusive;
+    it does not prove provider trust or runtime execution. Use repair codex
+    --force only to overwrite an edited managed asset.
     Linux: install/repair claude need the acl package (getfacl) to prove the
     parent chain — apt install acl / apk add acl / dnf install acl. Without it
     they refuse fail-closed; an already-installed guard keeps firing, and
@@ -199,6 +205,9 @@ export const HOOKS_HELP_TEXT = `
     $ javi-forge hooks install claude
     $ javi-forge hooks doctor claude
     $ javi-forge hooks repair claude --force
+    $ javi-forge hooks install codex
+    $ javi-forge hooks doctor codex
+    $ javi-forge hooks repair codex --force
 `;
 export const FLAGS_SCHEMA = {
     // `--help` is handled manually (autoHelp is disabled at the entrypoint so

package/dist/lib/codex-hook-manager.js

@@ -254,9 +254,10 @@ function buildCodexHooksContainer(assetPath) {
     };
 }
 /**
- * Merge our managed group into an existing container: drop any prior managed
- * groups (ours, by command regex) and append a fresh one, preserving every
- * foreign group. A fresh install (no container) yields the clean container.
+ * Merge our managed group into an existing container: remove only prior managed
+ * handlers (ours, by command regex), preserve foreign handlers in their groups,
+ * and append one fresh canonical managed group. A fresh install (no container)
+ * yields the clean container.
  */
 function mergeCodexHooks(existing, assetPath) {
     if (!isPlainObject(existing))
@@ -266,14 +267,24 @@ function mergeCodexHooks(existing, assetPath) {
         container.hooks = {};
     const hooks = container.hooks;
     const groups = Array.isArray(hooks.PreToolUse) ? hooks.PreToolUse : [];
-    const kept = groups.filter((group) => {
-        const list = isPlainObject(group) && Array.isArray(group.hooks) ? group.hooks : [];
-        const isOurs = list.some((h) => isPlainObject(h) &&
+    const kept = [];
+    for (const group of groups) {
+        if (!isPlainObject(group) || !Array.isArray(group.hooks)) {
+            kept.push(group);
+            continue;
+        }
+        const foreign = group.hooks.filter((h) => !(isPlainObject(h) &&
             h.type === "command" &&
             typeof h.command === "string" &&
-            CODEX_CMD_RE.test(h.command));
-        return !isOurs;
-    });
+            CODEX_CMD_RE.test(h.command)));
+        if (foreign.length === 0)
+            continue;
+        if (foreign.length === group.hooks.length) {
+            kept.push(group);
+            continue;
+        }
+        kept.push({ ...group, hooks: foreign });
+    }
     const fresh = buildCodexHooksContainer(assetPath).hooks;
     hooks.PreToolUse = [...kept, ...fresh.PreToolUse];
     return container;
@@ -372,7 +383,9 @@ export async function doctorCodexPreToolUse(homeDir, options = {}) {
             ? "inconclusive"
             : "runnable";
     const remediation = [];
-    if (hooksJson.state === "absent" || asset.state !== "managed-current") {
+    if (hooksJson.state === "absent" ||
+        hooksJson.state === "released-outdated" ||
+        asset.state !== "managed-current") {
         remediation.push("install the codex guard with: javi-forge hooks install codex");
     }
     if (!trusted)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "javi-forge",
-	"version": "1.38.2",
+	"version": "1.38.4",
 	"description": "Project scaffolding and AI-ready CI bootstrap",
 	"type": "module",
 	"bin": {