holycodex 0.7.0-dev.29548214169.1 → 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.7.0-dev.29548214169.1";
+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);
@@ -818,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")

package/package.json

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