holycodex 0.7.0-dev.29549405174.1 → 0.7.0-dev.29579145024.1

package/dist/cli.js

@@ -7,7 +7,7 @@ import { existsSync } from "node:fs";
 import { pluginRoot } from "@holycodex/plugin";
 import { Buffer } from "node:buffer";
 //#region packages/cli/src/catalog.ts
-var VERSION = "0.7.0-dev.29549405174.1";
+var VERSION = "0.7.0-dev.29579145024.1";
 var SKILLS = [
 	"ast-grep",
 	"caveman",
@@ -97,7 +97,7 @@ function effectiveMcpServers(platform) {
 	};
 }
 function requiredPackageRuntimes(platform) {
-	return platform === "win32" ? GENERATED_RUNTIMES : GENERATED_RUNTIMES.filter((file) => file !== "git-bash.js" && file !== "git-bash-resolver.js");
+	return platform === "win32" ? GENERATED_RUNTIMES : GENERATED_RUNTIMES.filter((file) => file !== "git-bash.js");
 }
 //#endregion
 //#region packages/git-bash-mcp/src/git-bash-resolver.ts
@@ -301,6 +301,72 @@ function outputText(state) {
 	return state.truncated ? `${state.head}${TRUNCATED_MARKER}${state.tail}` : state.head;
 }
 //#endregion
+//#region packages/cli/src/toml.ts
+var TOML_TABLE = /^[ \t]*(?:\[[^\]\r\n]+\]|\[\[[^\]\r\n]+\]\])[ \t]*(?:#.*)?$/m;
+function rootTomlString(input, key) {
+	const table = TOML_TABLE.exec(input);
+	const root = table === null ? input : input.slice(0, table.index);
+	const match = new RegExp(String.raw`^[ \t]*${escapeRegExp(key)}[ \t]*=[ \t]*(?:"((?:\\.|[^"\\\r\n])*)"|'([^'\r\n]*)')[ \t]*(?:#.*)?$`, "m").exec(root);
+	if (match === null) return void 0;
+	if (match[2] !== void 0) return match[2];
+	try {
+		const parsed = JSON.parse(`"${match[1] ?? ""}"`);
+		return typeof parsed === "string" ? parsed : void 0;
+	} catch {
+		return;
+	}
+}
+function rootTomlStringArray(input, key) {
+	const table = TOML_TABLE.exec(input);
+	const root = table === null ? input : input.slice(0, table.index);
+	const assignment = new RegExp(String.raw`^[ \t]*${escapeRegExp(key)}[ \t]*=`, "m").exec(root);
+	if (assignment === null) return void 0;
+	const start = root.indexOf("[", assignment.index + assignment[0].length);
+	if (start < 0) return void 0;
+	const items = [];
+	let quote;
+	let raw = "";
+	let escaped = false;
+	let comment = false;
+	for (let index = start + 1; index < root.length; index += 1) {
+		const character = root[index];
+		if (comment) {
+			if (character === "\n") comment = false;
+			continue;
+		}
+		if (quote === "\"") {
+			if (escaped) {
+				raw += character;
+				escaped = false;
+			} else if (character === "\\") {
+				raw += character;
+				escaped = true;
+			} else if (character === "\"") {
+				const parsed = JSON.parse(`"${raw}"`);
+				if (typeof parsed !== "string") return void 0;
+				items.push(parsed);
+				quote = void 0;
+				raw = "";
+			} else raw += character;
+			continue;
+		}
+		if (quote === "'") {
+			if (character === "'") {
+				items.push(raw);
+				quote = void 0;
+				raw = "";
+			} else raw += character;
+			continue;
+		}
+		if (character === "#") comment = true;
+		else if (character === "\"" || character === "'") quote = character;
+		else if (character === "]") return items;
+	}
+}
+function escapeRegExp(value) {
+	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+//#endregion
 //#region packages/cli/src/doctor.ts
 async function runCommand(name, args, platform) {
 	const result = await runManagedProcess({
@@ -339,7 +405,8 @@ async function startContext7(platform) {
 	});
 	const diagnostic = `${result.stdout}\n${result.stderr}`.trim() || result.error || "";
 	return {
-		ok: result.matched,
+		ok: result.matched && !result.timedOut,
+		timedOut: result.timedOut,
 		packageFailure: /(?:404|failed to resolve|package.*not found|error: GET)/i.test(diagnostic),
 		detail: diagnostic
 	};
@@ -359,6 +426,14 @@ function check(id, status, code, detail, fix) {
 		...fix === void 0 ? {} : { fix }
 	};
 }
+function mcpConfigMatches(actual, expected) {
+	const expectedEntries = Object.entries(expected);
+	if (Object.keys(actual).length !== expectedEntries.length) return false;
+	return expectedEntries.every(([key, expectedValue]) => {
+		const actualValue = actual[key];
+		return Array.isArray(expectedValue) ? Array.isArray(actualValue) && actualValue.length === expectedValue.length && actualValue.every((value, index) => value === expectedValue[index]) : actualValue === expectedValue;
+	});
+}
 async function missingFiles(root, paths) {
 	const missing = [];
 	for (const path of paths) try {
@@ -368,17 +443,14 @@ async function missingFiles(root, paths) {
 	}
 	return missing;
 }
-function rootString(config, key) {
-	return new RegExp(`^\\s*${key}\\s*=\\s*"([^"]+)"`, "m").exec(config)?.[1];
-}
 function tableBoolean(config, table, key) {
 	const body = new RegExp(`^\\s*\\[${table.replaceAll(".", "\\.")}]\\s*$([\\s\\S]*?)(?=^\\s*\\[|(?![\\s\\S]))`, "m").exec(config)?.[1];
 	const value = body === void 0 ? void 0 : new RegExp(`^\\s*${key}\\s*=\\s*(true|false)`, "m").exec(body)?.[1];
 	return value === void 0 ? void 0 : value === "true";
 }
 function autonomy(config) {
-	const approval = rootString(config, "approval_policy");
-	const sandbox = rootString(config, "sandbox_mode");
+	const approval = rootTomlString(config, "approval_policy");
+	const sandbox = rootTomlString(config, "sandbox_mode");
 	const network = tableBoolean(config, "sandbox_workspace_write", "network_access");
 	if (approval === "on-request" && sandbox === "workspace-write" && network === true) return "safe-workspace";
 	if (approval === "never" && sandbox === "workspace-write" && network === true) return "autonomous-workspace";
@@ -408,11 +480,16 @@ async function doctor(home = process.env.CODEX_HOME ?? join(homedir(), ".codex")
 	}
 	const servers = mcp?.mcpServers;
 	const requiredMcps = runtime.platform === "win32" ? ["git_bash", "lsp"] : ["lsp"];
-	for (const name of requiredMcps) checks.push(servers?.[name] === void 0 ? check(`mcp-${name}`, "error", "missing-required-mcp", `${name} is not configured.`, "Reinstall HolyCodex.") : check(`mcp-${name}`, "ok", "required-mcp-ready", `${name} is configured locally.`));
+	const expectedMcps = effectiveMcpServers(runtime.platform);
+	for (const name of requiredMcps) {
+		const configured = servers?.[name];
+		const expected = expectedMcps[name];
+		checks.push(configured === void 0 ? check(`mcp-${name}`, "error", "missing-required-mcp", `${name} is not configured.`, "Reinstall HolyCodex.") : !mcpConfigMatches(configured, expected) ? check(`mcp-${name}`, "error", "invalid-required-mcp-config", `${name} configuration is stale or contains unsupported settings.`, "Reinstall HolyCodex.") : check(`mcp-${name}`, "ok", "required-mcp-ready", `${name} is configured locally.`));
+	}
 	const gitBashConfig = servers?.git_bash;
 	if (runtime.platform === "win32" && gitBashConfig !== void 0) {
 		const expected = effectiveMcpServers("win32").git_bash;
-		checks.push(JSON.stringify(gitBashConfig) === JSON.stringify(expected) ? check("mcp-git_bash-config", "ok", "git-bash-mcp-config-ready", "Git Bash MCP exposes only run through the supported allowlist.") : check("mcp-git_bash-config", "error", "invalid-git-bash-mcp-config", "Git Bash MCP command or enabled_tools configuration is stale.", "Reinstall HolyCodex."));
+		checks.push(mcpConfigMatches(gitBashConfig, expected) ? check("mcp-git_bash-config", "ok", "git-bash-mcp-config-ready", "Git Bash MCP exposes only run through the supported allowlist.") : check("mcp-git_bash-config", "error", "invalid-git-bash-mcp-config", "Git Bash MCP command or enabled_tools configuration is stale.", "Reinstall HolyCodex."));
 	} else if (runtime.platform !== "win32" && gitBashConfig !== void 0) checks.push(check("mcp-git_bash-config", "error", "unexpected-git-bash-mcp", "Git Bash MCP must not be installed on non-Windows platforms.", "Reinstall HolyCodex for this platform."));
 	const context7 = servers?.context7;
 	const obsoleteAuth = context7 !== void 0 && [
@@ -432,7 +509,7 @@ async function doctor(home = process.env.CODEX_HOME ?? join(homedir(), ".codex")
 	checks.push(bunx.ok ? check("bunx", "ok", "bunx-ready", `bunx ${bunx.output || "available"}.`) : check("bunx", "error", "missing-bunx", "bunx is unavailable.", "Repair the Bun installation."));
 	if (bun.ok && bunx.ok && checks.some((item) => item.code === "local-context7-config")) {
 		const started = await runtime.context7();
-		checks.push(started.ok ? check("context7-startup", "ok", "context7-healthy", "Context7 completed a bounded MCP handshake.") : started.packageFailure ? check("context7-startup", "error", "context7-package-resolution-failed", started.detail || "Context7 package resolution failed.", "Check network/package availability.") : check("context7-startup", "error", "context7-startup-failed", started.detail || "Context7 did not complete an MCP handshake within 15 seconds.", runtime.platform === "win32" ? "Run bunx @upstash/context7-mcp in Git Bash." : "Run bunx @upstash/context7-mcp in the native shell."));
+		checks.push(started.ok && !started.timedOut ? check("context7-startup", "ok", "context7-healthy", "Context7 completed a bounded MCP handshake.") : started.packageFailure ? check("context7-startup", "error", "context7-package-resolution-failed", started.detail || "Context7 package resolution failed.", "Check network/package availability.") : check("context7-startup", "error", "context7-startup-failed", started.detail || "Context7 did not complete an MCP handshake within 15 seconds.", runtime.platform === "win32" ? "Run bunx @upstash/context7-mcp in Git Bash." : "Run bunx @upstash/context7-mcp in the native shell."));
 	}
 	if (runtime.platform === "win32") {
 		const gitBash = runtime.gitBash();
@@ -447,14 +524,14 @@ async function doctor(home = process.env.CODEX_HOME ?? join(homedir(), ".codex")
 	const mode = autonomy(config);
 	checks.push(mode === "unknown" ? check("autonomy", "error", "invalid-autonomy-config", "Approval, sandbox, and network settings do not match a supported mode.", "Rerun install with the intended autonomy flag.") : mode === "dangerous" ? check("autonomy", "warning", "dangerous-autonomy", "Explicit dangerous autonomy is active; workspace containment is removed.") : check("autonomy", "ok", `${mode}-ready`, mode === "safe-workspace" ? "Safe workspace autonomy is active." : "Approval-free workspace autonomy is active."));
 	checks.push(tableBoolean(config, "features", "default_mode_request_user_input") === true ? check("user-input", "ok", "user-input-ready", "default_mode_request_user_input is enabled.") : check("user-input", "error", "user-input-disabled", "default_mode_request_user_input is not enabled.", "Rerun holycodex install."));
-	checks.push(/^\s*status_line\s*=\s*\[[\s\S]*?context-remaining[\s\S]*?]/m.test(config) ? check("context-visibility", "warning", "context-visible-support-unverified", "status_line includes context-remaining. Current official Codex config documents this item, but publishes no minimum compatible Codex version.") : check("context-visibility", "error", "context-hidden", "status_line does not include context-remaining.", "Rerun holycodex install."));
+	checks.push(rootTomlStringArray(config, "status_line")?.includes("context-remaining") === true ? check("context-visibility", "warning", "context-visible-support-unverified", "status_line includes context-remaining. Current official Codex config documents this item, but publishes no minimum compatible Codex version.") : check("context-visibility", "error", "context-hidden", "status_line does not include context-remaining.", "Rerun holycodex install."));
 	const codex = await runtime.command("codex", ["--version"]);
 	checks.push(codex.ok ? check("codex", "ok", "codex-version", codex.output || "Codex is available.") : check("codex", "warning", "codex-version-unavailable", "Codex version could not be read; status-line compatibility cannot be independently confirmed."));
 	const agentModelFailures = [];
 	for (const agent of AGENTS) try {
 		const text = await readFile(join(agentRoot, `${agent}.toml`), "utf8");
 		const expected = AGENT_MODELS[agent];
-		if (!text.includes(`model = "${expected.model}"`) || !text.includes(`model_reasoning_effort = "${expected.reasoningEffort}"`)) agentModelFailures.push(agent);
+		if (rootTomlString(text, "model") !== expected.model || rootTomlString(text, "model_reasoning_effort") !== expected.reasoningEffort) agentModelFailures.push(agent);
 	} catch {
 		agentModelFailures.push(agent);
 	}
@@ -564,37 +641,10 @@ function preserveManagedRootPreferences(input, base) {
 }
 function mergedStatusLine(original) {
 	if (original === void 0) return "[\"model-with-reasoning\", \"context-remaining\", \"current-dir\"]";
-	const items = [...tomlArrayValue(original.slice(original.indexOf("=") + 1)).matchAll(/"((?:\\.|[^"\\])*)"|'([^']*)'/g)].map((match) => {
-		if (match[1] === void 0) return match[2] ?? "";
-		const parsed = JSON.parse(`"${match[1]}"`);
-		if (typeof parsed !== "string") throw new Error("Invalid status-line string");
-		return parsed;
-	});
+	const items = rootTomlStringArray(original, "status_line") ?? [];
 	if (!items.includes("context-remaining")) items.push("context-remaining");
 	return `[${items.map((item) => JSON.stringify(item)).join(", ")}]`;
 }
-function tomlArrayValue(input) {
-	const start = input.indexOf("[");
-	if (start < 0) return input;
-	let quote;
-	let escaped = false;
-	for (let index = start + 1; index < input.length; index += 1) {
-		const character = input[index];
-		if (quote === "\"") {
-			if (escaped) escaped = false;
-			else if (character === "\\") escaped = true;
-			else if (character === "\"") quote = void 0;
-			continue;
-		}
-		if (quote === "'") {
-			if (character === "'") quote = void 0;
-			continue;
-		}
-		if (character === "\"" || character === "'") quote = character;
-		else if (character === "]") return input.slice(start, index + 1);
-	}
-	return input.slice(start);
-}
 function installConfig(input, mode, _platform) {
 	const base = preserveManagedRootPreferences(input, removeLegacyOmo(removeManaged(input)));
 	const firstTable = base.search(/^\s*\[/m);
@@ -744,8 +794,8 @@ async function readAgentPreferences(root) {
 	const preferences = {};
 	await Promise.all(AGENTS.map(async (agent) => {
 		const source = await readText(join(root, `${agent}.toml`));
-		const model = tomlString(source, "model");
-		const reasoningEffort = tomlString(source, "model_reasoning_effort");
+		const model = rootTomlString(source, "model");
+		const reasoningEffort = rootTomlString(source, "model_reasoning_effort");
 		if (model === void 0 && reasoningEffort === void 0) return;
 		if (!MANAGED_AGENT_MODEL_HISTORY[agent].some((item) => item.model === model && item.reasoningEffort === reasoningEffort)) preferences[agent] = {
 			...model === void 0 ? {} : { model },
@@ -765,9 +815,6 @@ async function preserveAgentPreferences(root, preferences) {
 		await atomicWrite(path, source);
 	}));
 }
-function tomlString(input, key) {
-	return new RegExp(`^${key}\\s*=\\s*"([^"]+)"`, "m").exec(input)?.[1];
-}
 function replaceTomlString(input, key, value) {
 	return input.replace(new RegExp(`^${key}\\s*=.*$`, "m"), `${key} = ${JSON.stringify(value)}`);
 }
@@ -779,7 +826,7 @@ async function writePlatformAgents(root, platform) {
 	if (platform === "win32") return;
 	await Promise.all(AGENTS.map(async (agent) => {
 		const path = join(root, `${agent}.toml`);
-		await atomicWrite(path, (await readText(path)).replace(`${WINDOWS_SHELL_POLICY}\n\n`, ""));
+		await atomicWrite(path, (await readText(path)).replace(`${WINDOWS_SHELL_POLICY}\r\n\r\n`, "").replace(`${WINDOWS_SHELL_POLICY}\n\n`, ""));
 	}));
 }
 async function cleanup(_options) {
@@ -899,5 +946,11 @@ async function main() {
 	}
 	process$1.stdout.write(options.json ? `${JSON.stringify(result)}\n` : renderRunResult(result, stdoutColor));
 }
-await main();
+try {
+	await main();
+} catch (error) {
+	const stderrColor = supportsColor(process$1.stderr.isTTY, process$1.env.NO_COLOR);
+	process$1.stderr.write(renderError(error instanceof Error ? error.message : String(error), stderrColor));
+	process$1.exitCode = 1;
+}
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "holycodex",
-  "version": "0.7.0-dev.29549405174.1",
+  "version": "0.7.0-dev.29579145024.1",
   "description": "Lean Codex-only agent toolkit installer and doctor",
   "keywords": [
     "agents",
@@ -39,7 +39,7 @@
     "prepack": "vp run --workspace-root build"
   },
   "dependencies": {
-    "@holycodex/plugin": "0.7.0-dev.29549405174.1"
+    "@holycodex/plugin": "0.7.0-dev.29579145024.1"
   },
   "engines": {
     "node": ">=20"