holycodex 0.7.0-dev.29548804255.1 → 0.7.0-dev.29549907491.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.29548804255.1";
+var VERSION = "0.7.0-dev.29549907491.1";
 var SKILLS = [
 	"ast-grep",
 	"caveman",
@@ -181,7 +181,11 @@ function missing(checkedPaths) {
 //#endregion
 //#region packages/mcp-stdio-core/src/process.ts
 var TRUNCATED_MARKER = "\n... diagnostic output truncated ...\n";
-async function runManagedProcess(input) {
+var defaultManagedProcessRuntime = {
+	terminationGraceMs: 2e3,
+	kill: killProcessTree
+};
+async function runManagedProcess(input, runtime = defaultManagedProcessRuntime) {
 	return await new Promise((resolve) => {
 		const child = spawn(input.command, [...input.args], {
 			...input.cwd === void 0 ? {} : { cwd: input.cwd },
@@ -207,12 +211,12 @@ async function runManagedProcess(input) {
 		let timedOut = false;
 		let matched = false;
 		let settled = false;
-		let terminationFallback;
+		let forceKillTimeout;
 		const finish = (exitCode, error) => {
 			if (settled) return;
 			settled = true;
 			clearTimeout(timeout);
-			if (terminationFallback !== void 0) clearTimeout(terminationFallback);
+			if (forceKillTimeout !== void 0) clearTimeout(forceKillTimeout);
 			resolve({
 				exitCode,
 				stdout: outputText(stdout),
@@ -224,9 +228,12 @@ async function runManagedProcess(input) {
 			});
 		};
 		const terminate = () => {
-			killProcessTree(child, input.platform);
-			terminationFallback ??= setTimeout(() => finish(child.exitCode), 2e3);
-			terminationFallback.unref();
+			if (forceKillTimeout !== void 0) return;
+			runtime.kill(child, input.platform, "SIGTERM");
+			forceKillTimeout = setTimeout(() => {
+				runtime.kill(child, input.platform, "SIGKILL");
+			}, runtime.terminationGraceMs);
+			forceKillTimeout.unref();
 		};
 		const inspectMatch = () => {
 			if (matched || input.matchOutput === void 0) return;
@@ -294,6 +301,25 @@ 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 escapeRegExp(value) {
+	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+//#endregion
 //#region packages/cli/src/doctor.ts
 async function runCommand(name, args, platform) {
 	const result = await runManagedProcess({
@@ -361,17 +387,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";
@@ -381,6 +404,7 @@ function autonomy(config) {
 async function doctor(home = process.env.CODEX_HOME ?? join(homedir(), ".codex"), runtime = defaultRuntime$1) {
 	const checks = [];
 	const pluginRoot = join(home, "plugins", "cache", "holycodex", "holycodex", VERSION);
+	const agentRoot = join(home, "holycodex", "agents");
 	const configPath = join(home, "config.toml");
 	const missing = await missingFiles(pluginRoot, [
 		".codex-plugin/plugin.json",
@@ -444,9 +468,9 @@ async function doctor(home = process.env.CODEX_HOME ?? join(homedir(), ".codex")
 	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(pluginRoot, "agents", `${agent}.toml`), "utf8");
+		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);
 	}
@@ -556,7 +580,7 @@ function preserveManagedRootPreferences(input, base) {
 }
 function mergedStatusLine(original) {
 	if (original === void 0) return "[\"model-with-reasoning\", \"context-remaining\", \"current-dir\"]";
-	const items = [...original.slice(original.indexOf("=") + 1).matchAll(/"((?:\\.|[^"\\])*)"|'([^']*)'/g)].map((match) => {
+	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");
@@ -565,6 +589,28 @@ function mergedStatusLine(original) {
 	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);
@@ -714,8 +760,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 },
@@ -735,9 +781,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)}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "holycodex",
-  "version": "0.7.0-dev.29548804255.1",
+  "version": "0.7.0-dev.29549907491.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.29548804255.1"
+    "@holycodex/plugin": "0.7.0-dev.29549907491.1"
   },
   "engines": {
     "node": ">=20"