holycodex 0.6.1-dev.29547206710.2 → 0.7.0-dev.29548804255.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.6.1-dev.29547206710.2";
+var VERSION = "0.7.0-dev.29548804255.1";
 var SKILLS = [
 	"ast-grep",
 	"caveman",
@@ -463,6 +463,11 @@ var START = "# >>> holycodex managed >>>";
 var END = "# <<< holycodex managed <<<";
 var ORIGINAL_ROOT = "# holycodex original root: ";
 var ORIGINAL_TABLE_KEY = "# holycodex original table key: ";
+var ROOT_PREFERENCES = [
+	["model", `model = "${ROOT_MODEL.model}"`],
+	["model_reasoning_effort", `model_reasoning_effort = "${ROOT_MODEL.reasoningEffort}"`],
+	["model_verbosity", "model_verbosity = \"low\""]
+];
 var OLD_NAMESPACES = [
 	"marketplaces.sisyphuslabs",
 	"plugins.\"omo@sisyphuslabs\"",
@@ -533,14 +538,35 @@ function rootValue(input, key) {
 function removeRootValue(input, value) {
 	return value === void 0 ? input : input.replace(value, "");
 }
+function preserveManagedRootPreferences(input, base) {
+	const managedRoot = new RegExp(`^${START}\\r?\\n([\\s\\S]*?)^${END}\\r?$`, "m").exec(input)?.[1];
+	if (managedRoot === void 0) return base;
+	const firstTable = base.search(/^\s*\[/m);
+	const root = firstTable < 0 ? base : base.slice(0, firstTable);
+	const tables = firstTable < 0 ? "" : base.slice(firstTable);
+	let updatedRoot = root.trim();
+	for (const [key, fallback] of ROOT_PREFERENCES) {
+		const live = rootValue(managedRoot, key)?.trim();
+		if (live === void 0 || live === (rootValue(root, key)?.trim() ?? fallback)) continue;
+		updatedRoot = removeRootValue(updatedRoot, rootValue(updatedRoot, key)).trim();
+		updatedRoot = `${updatedRoot}${updatedRoot ? "\n" : ""}${live}`;
+	}
+	if (updatedRoot === root.trim()) return base;
+	return `${updatedRoot}${tables ? `\n${tables.trimStart()}` : ""}`;
+}
 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) => JSON.parse(`"${match[1]}"`));
+	const items = [...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;
+	});
 	if (!items.includes("context-remaining")) items.push("context-remaining");
 	return `[${items.map((item) => JSON.stringify(item)).join(", ")}]`;
 }
 function installConfig(input, mode, _platform) {
-	const base = removeLegacyOmo(removeManaged(input));
+	const base = preserveManagedRootPreferences(input, removeLegacyOmo(removeManaged(input)));
 	const firstTable = base.search(/^\s*\[/m);
 	const root = firstTable < 0 ? base : base.slice(0, firstTable);
 	const tables = firstTable < 0 ? "" : base.slice(firstTable);
@@ -554,11 +580,13 @@ function installConfig(input, mode, _platform) {
 	const preservedRoot = controlled.reduce(removeRootValue, root).trim();
 	const hasModel = /^\s*model\s*=/m.test(preservedRoot);
 	const hasEffort = /^\s*model_reasoning_effort\s*=/m.test(preservedRoot);
+	const hasVerbosity = /^\s*model_verbosity\s*=/m.test(preservedRoot);
 	const model = hasModel ? "" : `model = "${ROOT_MODEL.model}"\n`;
 	const effort = hasEffort ? "" : `model_reasoning_effort = "${ROOT_MODEL.reasoningEffort}"\n`;
+	const verbosity = hasVerbosity ? "" : "model_verbosity = \"low\"\n";
 	const approval = mode === "default" ? "on-request" : "never";
 	const sandbox = mode === "dangerous" ? "danger-full-access" : "workspace-write";
-	let configured = `${`${START}\n${originalRoot ? `${ORIGINAL_ROOT}${Buffer.from(originalRoot).toString("base64")}\n` : ""}${model}${effort}${preservedRoot ? `${preservedRoot}\n` : ""}approval_policy = "${approval}"\nsandbox_mode = "${sandbox}"\nstatus_line = ${mergedStatusLine(controlled[3])}\n${END}`}${tables ? `\n\n${tables}` : ""}`;
+	let configured = `${`${START}\n${originalRoot ? `${ORIGINAL_ROOT}${Buffer.from(originalRoot).toString("base64")}\n` : ""}${model}${effort}${verbosity}${preservedRoot ? `${preservedRoot}\n` : ""}approval_policy = "${approval}"\nsandbox_mode = "${sandbox}"\nstatus_line = ${mergedStatusLine(controlled[3])}\n${END}`}${tables ? `\n\n${tables}` : ""}`;
 	configured = injectTableKey(configured, "features", "default_mode_request_user_input", "true");
 	configured = injectTableKey(configured, "features", "multi_agent", "true");
 	configured = injectTableKey(configured, "agents", "max_threads", "2");
@@ -778,7 +806,10 @@ function renderHelp(version, color) {
 	const title = paint(color, `${BOLD}${CYAN}`, `HOLYCODEX ${version}`);
 	const section = (text) => paint(color, BOLD, text);
 	const muted = (text) => paint(color, DIM, text);
-	return `${title}\n${muted("Lean Codex toolkit installer and doctor")}\n\n${section("USAGE")}\n  holycodex <command> [options]\n\n${section("COMMANDS")}\n  install                         Install or update HolyCodex\n  cleanup                         Remove HolyCodex-owned state\n  doctor                          Diagnose installation and runtime\n\n${section("OPTIONS")}\n  --help                          Show help\n  --version                       Show version\n  --no-tui                        Accepted; commands remain noninteractive\n  --codex-autonomous              Never ask; keep workspace sandbox\n  --no-codex-autonomous           Safe interactive defaults\n  --dangerous-codex-autonomous    Never ask; disable filesystem sandbox\n  --json                          Print machine-readable output\n`;
+	return `${title}\n${muted("Lean Codex toolkit installer and doctor")}\n\n${section("USAGE")}\n  holycodex <command> [options]\n\n${section("COMMANDS")}\n  install                         Install or update HolyCodex\n  cleanup                         Remove HolyCodex-owned state\n  doctor                          Diagnose installation and runtime\n\n${section("OPTIONS")}\n  -h, --help                      Show help\n  -v, --version                   Show version\n  --no-tui                        Accepted; commands remain noninteractive\n  --codex-autonomous              Never ask; keep workspace sandbox\n  --no-codex-autonomous           Safe interactive defaults\n  --dangerous-codex-autonomous    Never ask; disable filesystem sandbox\n  --json                          Print machine-readable output\n`;
+}
+function renderError(message, color) {
+	return `${paint(color, `${BOLD}${RED}`, "✗ ERROR")}  ${message}\n  ${paint(color, DIM, "Run holycodex --help for usage.")}\n`;
 }
 function renderDoctor(result, color) {
 	return `${result.healthy ? paint(color, GREEN, "✓ HolyCodex doctor: healthy") : paint(color, RED, "✗ HolyCodex doctor: issues found")}\n${result.checks.map((item) => {
@@ -799,11 +830,11 @@ async function main() {
 	const args = process$1.argv.slice(2);
 	const stdoutColor = supportsColor(process$1.stdout.isTTY, process$1.env.NO_COLOR);
 	const stderrColor = supportsColor(process$1.stderr.isTTY, process$1.env.NO_COLOR);
-	if (args.includes("--help") || args.length === 0) {
+	if (args.includes("--help") || args.includes("-h") || args.length === 0) {
 		process$1.stdout.write(renderHelp(VERSION, stdoutColor));
 		return;
 	}
-	if (args.includes("--version")) {
+	if (args.includes("--version") || args.includes("-v")) {
 		process$1.stdout.write(`${VERSION}\n`);
 		return;
 	}
@@ -813,7 +844,11 @@ async function main() {
 		"--no-codex-autonomous",
 		"--dangerous-codex-autonomous"
 	].includes(arg));
-	if (autonomyFlags.length > 1) throw new Error(`Conflicting autonomy flags: ${autonomyFlags.join(", ")}`);
+	if (autonomyFlags.length > 1) {
+		process$1.stderr.write(renderError(`Conflicting autonomy flags: ${autonomyFlags.join(", ")}`, stderrColor));
+		process$1.exitCode = 1;
+		return;
+	}
 	const options = {
 		autonomy: args.includes("--dangerous-codex-autonomous") ? "dangerous" : args.includes("--codex-autonomous") ? "autonomous" : "default",
 		json: args.includes("--json")
@@ -827,7 +862,11 @@ async function main() {
 	if (options.autonomy === "dangerous") process$1.stderr.write(renderNotice("warning", "Dangerous autonomy disables approvals and filesystem sandboxing.", stderrColor));
 	else if (options.autonomy === "autonomous") process$1.stderr.write(renderNotice("notice", "--codex-autonomous is now workspace-contained. Use --dangerous-codex-autonomous only for unrestricted behavior.", stderrColor));
 	const result = command === "install" ? await install(options) : command === "cleanup" ? await cleanup(options) : void 0;
-	if (result === void 0) throw new Error(`Unknown command: ${command ?? ""}`);
+	if (result === void 0) {
+		process$1.stderr.write(renderError(`Unknown command: ${command ?? args[0] ?? ""}`, stderrColor));
+		process$1.exitCode = 1;
+		return;
+	}
 	process$1.stdout.write(options.json ? `${JSON.stringify(result)}\n` : renderRunResult(result, stdoutColor));
 }
 await main();

package/package.json

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