oh-my-opencode 4.18.2 → 4.19.1

package/packages/omo-codex/plugin/hooks/session-start-checking-auto-update.json

@@ -6,8 +6,8 @@
 					{
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/scripts/auto-update.mjs\" hook session-start",
-						"timeout": 5,
-						"statusMessage": "(OmO 4.18.2) Checking Auto Update",
+						"timeout": 15,
+						"statusMessage": "(OmO 4.19.1) Checking Auto Update",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\scripts\\auto-update.mjs\" hook session-start"
 					}
 				],

package/packages/omo-codex/plugin/hooks/session-start-checking-bootstrap-provisioning.json

@@ -8,7 +8,7 @@
 						"command": "node \"${PLUGIN_ROOT}/components/bootstrap/dist/cli.js\" hook session-start",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\bootstrap.ps1\"",
 						"timeout": 30,
-						"statusMessage": "(OmO 4.18.2) Checking Bootstrap Provisioning"
+						"statusMessage": "(OmO 4.19.1) Checking Bootstrap Provisioning"
 					}
 				]
 			}

package/packages/omo-codex/plugin/hooks/session-start-checking-codegraph-bootstrap.json

@@ -6,8 +6,8 @@
 					{
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/codegraph/dist/cli.js\" hook session-start",
-						"timeout": 5,
-						"statusMessage": "(OmO 4.18.2) Checking CodeGraph Bootstrap",
+						"timeout": 15,
+						"statusMessage": "(OmO 4.19.1) Checking CodeGraph Bootstrap",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\codegraph\\dist\\cli.js\" hook session-start"
 					}
 				]

package/packages/omo-codex/plugin/hooks/session-start-loading-project-rules.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/rules/dist/cli.js\" hook session-start",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.18.2) Loading Project Rules",
+						"statusMessage": "(OmO 4.19.1) Loading Project Rules",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\rules\\dist\\cli.js\" hook session-start"
 					}
 				]

package/packages/omo-codex/plugin/hooks/session-start-recording-session-telemetry.json

@@ -6,8 +6,8 @@
 					{
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/telemetry/dist/cli.js\" hook session-start",
-						"timeout": 5,
-						"statusMessage": "(OmO 4.18.2) Recording Session Telemetry",
+						"timeout": 15,
+						"statusMessage": "(OmO 4.19.1) Recording Session Telemetry",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\telemetry\\dist\\cli.js\" hook session-start"
 					}
 				]

package/packages/omo-codex/plugin/hooks/stop-checking-start-work-continuation.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/start-work-continuation/dist/cli.js\" hook stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.18.2) Checking Start-Work Continuation",
+						"statusMessage": "(OmO 4.19.1) Checking Start-Work Continuation",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\start-work-continuation\\dist\\cli.js\" hook stop"
 					}
 				]

package/packages/omo-codex/plugin/hooks/stop-checking-ulw-loop-resume.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/ulw-loop/dist/cli.js\" hook stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.18.2) Checking Ulw-Loop Resume",
+						"statusMessage": "(OmO 4.19.1) Checking Ulw-Loop Resume",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\ulw-loop\\dist\\cli.js\" hook stop"
 					}
 				]

package/packages/omo-codex/plugin/hooks/subagent-stop-checking-start-work-continuation.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/start-work-continuation/dist/cli.js\" hook subagent-stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.18.2) Checking Start-Work Continuation",
+						"statusMessage": "(OmO 4.19.1) Checking Start-Work Continuation",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\start-work-continuation\\dist\\cli.js\" hook subagent-stop"
 					}
 				]

package/packages/omo-codex/plugin/hooks/subagent-stop-verifying-lazycodex-executor-evidence.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/lazycodex-executor-verify/dist/cli.js\" hook subagent-stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.18.2) Verifying LazyCodex Executor Evidence",
+						"statusMessage": "(OmO 4.19.1) Verifying LazyCodex Executor Evidence",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\lazycodex-executor-verify\\dist\\cli.js\" hook subagent-stop"
 					}
 				],

package/packages/omo-codex/plugin/hooks/user-prompt-submit-checking-ultrawork-trigger.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/ultrawork/dist/cli.js\" hook user-prompt-submit",
 						"timeout": 5,
-						"statusMessage": "(OmO 4.18.2) Checking Ultrawork Trigger",
+						"statusMessage": "(OmO 4.19.1) Checking Ultrawork Trigger",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\ultrawork\\dist\\cli.js\" hook user-prompt-submit"
 					}
 				]

package/packages/omo-codex/plugin/hooks/user-prompt-submit-checking-ulw-loop-steering.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/ulw-loop/dist/cli.js\" hook user-prompt-submit",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.18.2) Checking Ulw-Loop Steering",
+						"statusMessage": "(OmO 4.19.1) Checking Ulw-Loop Steering",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\ulw-loop\\dist\\cli.js\" hook user-prompt-submit"
 					}
 				]

package/packages/omo-codex/plugin/hooks/user-prompt-submit-loading-project-rules.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/rules/dist/cli.js\" hook user-prompt-submit",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.18.2) Loading Project Rules",
+						"statusMessage": "(OmO 4.19.1) Loading Project Rules",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\node-dispatch.ps1\" \"${PLUGIN_ROOT}\\components\\rules\\dist\\cli.js\" hook user-prompt-submit"
 					}
 				]

package/packages/omo-codex/plugin/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "@sisyphuslabs/omo-codex-plugin",
-	"version": "4.18.2",
+	"version": "4.19.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@sisyphuslabs/omo-codex-plugin",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"workspaces": [
 				"components/codegraph",
 				"components/comment-checker",
@@ -100,7 +100,7 @@
 		},
 		"components/codegraph": {
 			"name": "@sisyphuslabs/codex-codegraph",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"bin": {
 				"omo-codegraph": "dist/cli.js"
 			},
@@ -114,12 +114,12 @@
 				"node": ">=20.0.0"
 			},
 			"optionalDependencies": {
-				"@colbymchenry/codegraph": "1.0.1"
+				"@colbymchenry/codegraph": "1.4.1"
 			}
 		},
 		"components/comment-checker": {
 			"name": "@code-yeongyu/codex-comment-checker",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"license": "MIT",
 			"bin": {
 				"omo-comment-checker": "dist/cli.js"
@@ -140,7 +140,7 @@
 		},
 		"components/git-bash": {
 			"name": "@sisyphuslabs/codex-git-bash-hook",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"bin": {
 				"omo-git-bash-hook": "dist/cli.js"
 			},
@@ -155,7 +155,7 @@
 		},
 		"components/lazycodex-executor-verify": {
 			"name": "@code-yeongyu/codex-lazycodex-executor-verify",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"license": "MIT",
 			"bin": {
 				"lazycodex-executor-verify": "dist/cli.js"
@@ -172,7 +172,7 @@
 		},
 		"components/lsp": {
 			"name": "@code-yeongyu/codex-lsp",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"license": "MIT",
 			"dependencies": {
 				"@code-yeongyu/lsp-daemon": "file:../../../../lsp-daemon",
@@ -193,7 +193,7 @@
 		},
 		"components/rules": {
 			"name": "@code-yeongyu/codex-rules",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"license": "MIT",
 			"dependencies": {
 				"picomatch": "^4.0.3"
@@ -215,7 +215,7 @@
 		},
 		"components/start-work-continuation": {
 			"name": "@code-yeongyu/codex-start-work-continuation",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"license": "MIT",
 			"bin": {
 				"omo-start-work-continuation": "dist/cli.js"
@@ -232,7 +232,7 @@
 		},
 		"components/teammode": {
 			"name": "@sisyphuslabs/codex-teammode",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"devDependencies": {
 				"@types/node": "^25.9.3",
 				"bun-types": "^1.3.1",
@@ -245,7 +245,7 @@
 		},
 		"components/telemetry": {
 			"name": "@code-yeongyu/codex-telemetry",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"license": "MIT",
 			"bin": {
 				"omo-telemetry": "dist/cli.js"
@@ -263,7 +263,7 @@
 		},
 		"components/ultrawork": {
 			"name": "@code-yeongyu/codex-ultrawork",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"license": "MIT",
 			"bin": {
 				"omo-ultrawork": "dist/cli.js"
@@ -281,7 +281,7 @@
 		},
 		"components/ulw-loop": {
 			"name": "@code-yeongyu/codex-ulw-loop",
-			"version": "4.18.2",
+			"version": "4.19.1",
 			"license": "MIT",
 			"bin": {
 				"omo-ulw-loop": "dist/cli.js",
@@ -512,27 +512,27 @@
 			"link": true
 		},
 		"node_modules/@colbymchenry/codegraph": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph/-/codegraph-1.0.1.tgz",
-			"integrity": "sha512-Y4ZMk7wxSRI9g2wQTcW21TfLr+fw7td1Dadkll6Udl9Ll8wX3H6qtov7K/VGtHG2AFX2j1e5Lm48PTHi74mImg==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph/-/codegraph-1.4.1.tgz",
+			"integrity": "sha512-xZayboJt6T3QBzBsBsI0eJ3J/tN4vYs6LMuvrxJVdM71yQFjrFKFeV3KsbicAgkj6AHnTXxUNk26g9BYwkNMgg==",
 			"license": "MIT",
 			"optional": true,
 			"bin": {
 				"codegraph": "npm-shim.js"
 			},
 			"optionalDependencies": {
-				"@colbymchenry/codegraph-darwin-arm64": "1.0.1",
-				"@colbymchenry/codegraph-darwin-x64": "1.0.1",
-				"@colbymchenry/codegraph-linux-arm64": "1.0.1",
-				"@colbymchenry/codegraph-linux-x64": "1.0.1",
-				"@colbymchenry/codegraph-win32-arm64": "1.0.1",
-				"@colbymchenry/codegraph-win32-x64": "1.0.1"
+				"@colbymchenry/codegraph-darwin-arm64": "1.4.1",
+				"@colbymchenry/codegraph-darwin-x64": "1.4.1",
+				"@colbymchenry/codegraph-linux-arm64": "1.4.1",
+				"@colbymchenry/codegraph-linux-x64": "1.4.1",
+				"@colbymchenry/codegraph-win32-arm64": "1.4.1",
+				"@colbymchenry/codegraph-win32-x64": "1.4.1"
 			}
 		},
 		"node_modules/@colbymchenry/codegraph-darwin-arm64": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-darwin-arm64/-/codegraph-darwin-arm64-1.0.1.tgz",
-			"integrity": "sha512-4z3aNzR3Ml31MBVzAvFQm+bk83erdHkjnaJ0PoeM6I9T7xuTIcdAGV36i3qYwgBE4tdrghRdR0mP5MNM+OrGFA==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-darwin-arm64/-/codegraph-darwin-arm64-1.4.1.tgz",
+			"integrity": "sha512-USSpExjuxZWN0OeNexZp2V5fCfOI4ZekqE79CJiBdGdPbqGTB+857ImIqzWGyF/rAyyED94Wc0Cd82t+uWD30w==",
 			"cpu": [
 				"arm64"
 			],
@@ -543,9 +543,9 @@
 			]
 		},
 		"node_modules/@colbymchenry/codegraph-darwin-x64": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-darwin-x64/-/codegraph-darwin-x64-1.0.1.tgz",
-			"integrity": "sha512-KBSKl+tLCSIgV4iyi21SqYlpXL0P8DPqAnVHvvStdyYsCmkc2Heqf4oQIko+TYyFmuo65m4VpX989JkYZVGIVQ==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-darwin-x64/-/codegraph-darwin-x64-1.4.1.tgz",
+			"integrity": "sha512-syLC7QPsNui2hPrK58El0XQrjjdSYhsoKS5i26ieD8DVrb0adzFQrBRP8qId/wfGp078xdC54rdKvqgmbIL1WQ==",
 			"cpu": [
 				"x64"
 			],
@@ -556,9 +556,9 @@
 			]
 		},
 		"node_modules/@colbymchenry/codegraph-linux-arm64": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-linux-arm64/-/codegraph-linux-arm64-1.0.1.tgz",
-			"integrity": "sha512-2TOeL/Lx3kME+dmv2Q9hbIQFBvT6uKLdZONDRaYto+1Bcl3GrJuIu6bsu3jiJuifPhnYIL2xwUV6y+TZQ8MbTw==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-linux-arm64/-/codegraph-linux-arm64-1.4.1.tgz",
+			"integrity": "sha512-XC6GJ9/fTicW9CE3k2fOcUOcbtDU8mS53t+PUfzq3Py9+JiX3PtJgtBB8bmf6e45NZUF5foaLUwFXfxTTl961g==",
 			"cpu": [
 				"arm64"
 			],
@@ -569,9 +569,9 @@
 			]
 		},
 		"node_modules/@colbymchenry/codegraph-linux-x64": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-linux-x64/-/codegraph-linux-x64-1.0.1.tgz",
-			"integrity": "sha512-UENXSURJJUhcvdKoYsB5Wj6Z6O9C2afhYfG0LnL13KFWJhGXugqYKjF4KwkaeE8Po8TFul9k3f+8eXjmJwwwaQ==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-linux-x64/-/codegraph-linux-x64-1.4.1.tgz",
+			"integrity": "sha512-bjfa+0IyjbxpZz7ghznN4qMPoYVSiZafeZu/rXGdg3VI+kEPOPZrk2vmtWIU9tBPGVJbeU2Kwa/0Z2DkUGOJ9A==",
 			"cpu": [
 				"x64"
 			],
@@ -582,9 +582,9 @@
 			]
 		},
 		"node_modules/@colbymchenry/codegraph-win32-arm64": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-win32-arm64/-/codegraph-win32-arm64-1.0.1.tgz",
-			"integrity": "sha512-ZEG+HOakHiAe1AWMa2LgD52HyIEbWsY2FyNvDmon4Ss2889OghqUyA8BOLu5hNW+EI42JwwSXijVevn2Zn0hlg==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-win32-arm64/-/codegraph-win32-arm64-1.4.1.tgz",
+			"integrity": "sha512-mb5bFDhwcP49U0P2IBRhH1O5ZmnlgE8lIXTlg2dqpfLeL+XfxzyeJ+i4I0KU0h1hlNWP/u3d2k+1EGem2swDBw==",
 			"cpu": [
 				"arm64"
 			],
@@ -595,9 +595,9 @@
 			]
 		},
 		"node_modules/@colbymchenry/codegraph-win32-x64": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-win32-x64/-/codegraph-win32-x64-1.0.1.tgz",
-			"integrity": "sha512-qU6jjyma635qKJ0aaL8XU8QtYUGkWly0Mu4Wm2cSWRcNDL1v6sVoHMElgfUY7E9tK0gnU+/LbZW3MfmtqLG1GA==",
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/@colbymchenry/codegraph-win32-x64/-/codegraph-win32-x64-1.4.1.tgz",
+			"integrity": "sha512-ipN6WvTKa0cSXIL6DTdACq57WnNYTjVq2wtC5uPT8F22o6Ucbcu3/w3OzKkkfwP4mkXv2cDMbuvExbnYNULyuw==",
 			"cpu": [
 				"x64"
 			],

package/packages/omo-codex/plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sisyphuslabs/omo-codex-plugin",
-  "version": "4.18.2",
+  "version": "4.19.1",
   "description": "Aggregate Codex plugin root for OMO components.",
   "type": "module",
   "packageManager": "npm@11.12.1",

package/packages/omo-codex/plugin/scripts/migrate-codex-config/multi-agent-v2-guard.mjs

@@ -26,7 +26,17 @@ import { readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, isAbsolute, join } from "node:path";
 
+import {
+	findTomlSection as findSection,
+	hasTomlSetting,
+	removeTomlSectionSetting,
+	removeRootTomlSetting,
+	replaceOrInsertTomlSectionSetting,
+	replaceOrInsertRootTomlSetting,
+} from "./toml-section-editor.mjs";
+
 const MANAGED_COMMENT_MARKER = "openai/codex#26753";
+const MULTI_AGENT_V2_THREAD_LIMIT_KEY = "features.multi_agent_v2.max_concurrent_threads_per_session";
 const MANAGED_DISABLE_COMMENT = [
 	"# Managed by LazyCodex: multi_agent_v2 is re-disabled on every Codex session start",
 	`# because enabling it fails every turn with HTTP 400 (${MANAGED_COMMENT_MARKER}).`,
@@ -177,7 +187,11 @@ function isGpt56Family(model) {
 
 function clearMultiAgentV2DisableForReservedSchema(config) {
 	// `config` arrives shorthand-normalized from forceDisableMultiAgentV2.
-	const result = removeManagedDisableComments(config);
+	let result = removeManagedDisableComments(config);
+	result = removeRootTomlSetting(result, "features.multi_agent_v2.enabled", "false");
+	result = removeRootTomlSetting(result, "features.multi_agent_v2.hide_spawn_agent_metadata", "false");
+	result = removeDottedMultiAgentV2Setting(result, "enabled", "false");
+	result = removeDottedMultiAgentV2Setting(result, "hide_spawn_agent_metadata", "false");
 
 	const section = findSection(result, "[features.multi_agent_v2]");
 	if (!section) return result;
@@ -203,6 +217,9 @@ function forceDisableLegacyEncryptedV2(config) {
 	const section = findSection(config, "[features.multi_agent_v2]");
 
 	if (!section) {
+		if (hasTomlSetting(config, MULTI_AGENT_V2_THREAD_LIMIT_KEY)) {
+			return setDottedMultiAgentV2Disable(config);
+		}
 		return ensureManagedComment(appendDisabledSection(config));
 	}
 
@@ -222,6 +239,20 @@ function forceDisableLegacyEncryptedV2(config) {
 	return ensureManagedComment(config.slice(0, section.start) + patched + config.slice(section.end));
 }
 
+function setDottedMultiAgentV2Disable(config) {
+	const featuresSection = findSection(config, "[features]");
+	if (!featuresSection) {
+		return replaceOrInsertRootTomlSetting(config, "features.multi_agent_v2.enabled", "false");
+	}
+	return replaceOrInsertTomlSectionSetting(config, featuresSection, "multi_agent_v2.enabled", "false");
+}
+
+function removeDottedMultiAgentV2Setting(config, key, expectedValue) {
+	const featuresSection = findSection(config, "[features]");
+	if (!featuresSection) return config;
+	return removeTomlSectionSetting(config, featuresSection, `multi_agent_v2.${key}`, expectedValue);
+}
+
 function ensureManagedComment(config) {
 	if (config.includes(MANAGED_COMMENT_MARKER)) return config;
 	const section = findSection(config, "[features.multi_agent_v2]");
@@ -269,30 +300,3 @@ function appendDisabledSection(config) {
 	const prefix = trimmed.length === 0 ? "" : `${trimmed}\n\n`;
 	return `${prefix}[features.multi_agent_v2]\nenabled = false\n`;
 }
-
-// Strips a trailing # comment from a TOML line fragment (best-effort; quoted keys containing # are out of scope).
-function stripTrailingComment(line) {
-	const idx = line.indexOf("#");
-	return idx === -1 ? line : line.slice(0, idx).trim();
-}
-
-function findSection(config, headerLine) {
-	const lines = config.match(/[^\n]*\n?|$/g) ?? [];
-	let offset = 0;
-	let start = -1;
-	for (const line of lines) {
-		if (line.length === 0) break;
-		const trimmed = line.trim();
-		if (start === -1) {
-			if (stripTrailingComment(trimmed) === headerLine) start = offset;
-		} else {
-			const bare = stripTrailingComment(trimmed);
-			if (bare.startsWith("[") && bare.endsWith("]")) {
-				return { start, end: offset, text: config.slice(start, offset) };
-			}
-		}
-		offset += line.length;
-	}
-	if (start === -1) return null;
-	return { start, end: config.length, text: config.slice(start) };
-}

package/packages/omo-codex/plugin/scripts/migrate-codex-config/subagent-limit-guard.mjs

@@ -1,8 +1,15 @@
 import { prefersMultiAgentV2, readRootModel, resolveMultiAgentVersionFromConfig } from "./multi-agent-v2-guard.mjs";
+import {
+	findTomlSection as findSection,
+	hasTomlSetting,
+	replaceOrInsertTomlSectionSetting,
+} from "./toml-section-editor.mjs";
 
 const CODEX_AGENTS_HEADER = "[agents]";
 const CODEX_MULTI_AGENT_V2_HEADER = "[features.multi_agent_v2]";
+const CODEX_MULTI_AGENT_V2_THREAD_LIMIT_KEY = "features.multi_agent_v2.max_concurrent_threads_per_session";
 const CODEX_SUBAGENT_THREAD_LIMIT = "1000";
+const CODEX_MULTI_AGENT_V2_DEFAULT_THREAD_LIMIT = "16";
 
 /**
  * Ensure subagent concurrency limits without writing settings that conflict
@@ -53,13 +60,13 @@ function raiseExistingAgentsMaxThreads(config) {
 	const section = findSection(config, CODEX_AGENTS_HEADER);
 	if (!section) return config;
 	if (!/^\s*max_threads\s*=/m.test(section.text)) return config;
-	return replaceOrInsertSetting(config, section, "max_threads", CODEX_SUBAGENT_THREAD_LIMIT);
+	return replaceOrInsertTomlSectionSetting(config, section, "max_threads", CODEX_SUBAGENT_THREAD_LIMIT);
 }
 
 function ensureAgentsMaxThreads(config) {
 	const section = findSection(config, CODEX_AGENTS_HEADER);
 	if (!section) return appendBlock(config, `${CODEX_AGENTS_HEADER}\nmax_threads = ${CODEX_SUBAGENT_THREAD_LIMIT}\n`);
-	return replaceOrInsertSetting(config, section, "max_threads", CODEX_SUBAGENT_THREAD_LIMIT);
+	return replaceOrInsertTomlSectionSetting(config, section, "max_threads", CODEX_SUBAGENT_THREAD_LIMIT);
 }
 
 function removeAgentsMaxThreads(config) {
@@ -79,29 +86,20 @@ function removeAgentsMaxThreads(config) {
 }
 
 function ensureMultiAgentV2ThreadLimit(config) {
+	if (hasTomlSetting(config, CODEX_MULTI_AGENT_V2_THREAD_LIMIT_KEY)) return config;
 	const section = findSection(config, CODEX_MULTI_AGENT_V2_HEADER);
 	if (!section) {
 		return appendBlock(
 			config,
-			`${CODEX_MULTI_AGENT_V2_HEADER}\nmax_concurrent_threads_per_session = ${CODEX_SUBAGENT_THREAD_LIMIT}\n`,
+			`${CODEX_MULTI_AGENT_V2_HEADER}\nmax_concurrent_threads_per_session = ${CODEX_MULTI_AGENT_V2_DEFAULT_THREAD_LIMIT}\n`,
 		);
 	}
-	return replaceOrInsertSetting(config, section, "max_concurrent_threads_per_session", CODEX_SUBAGENT_THREAD_LIMIT);
-}
-
-function replaceOrInsertSetting(config, section, key, value) {
-	const pattern = new RegExp(`^(\\s*)${escapeRegExp(key)}\\s*=\\s*[^\\n#]*(#[^\\n]*)?$`, "m");
-	if (pattern.test(section.text)) {
-		const patched = section.text.replace(pattern, (_match, indent, comment) =>
-			comment ? `${indent}${key} = ${value} ${comment}` : `${indent}${key} = ${value}`,
-		);
-		return config.slice(0, section.start) + patched + config.slice(section.end);
-	}
-
-	const headerEnd = section.text.indexOf("\n");
-	const insertAt = headerEnd === -1 ? section.text.length : headerEnd + 1;
-	const patched = `${section.text.slice(0, insertAt)}${headerEnd === -1 ? "\n" : ""}${key} = ${value}\n${section.text.slice(insertAt)}`;
-	return config.slice(0, section.start) + patched + config.slice(section.end);
+	return replaceOrInsertTomlSectionSetting(
+		config,
+		section,
+		"max_concurrent_threads_per_session",
+		CODEX_MULTI_AGENT_V2_DEFAULT_THREAD_LIMIT,
+	);
 }
 
 function appendBlock(config, block) {
@@ -113,29 +111,3 @@ function appendBlock(config, block) {
 function escapeRegExp(value) {
 	return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-
-function stripTrailingComment(line) {
-	const idx = line.indexOf("#");
-	return idx === -1 ? line : line.slice(0, idx).trim();
-}
-
-function findSection(config, headerLine) {
-	const lines = config.match(/[^\n]*\n?|$/g) ?? [];
-	let offset = 0;
-	let start = -1;
-	for (const line of lines) {
-		if (line.length === 0) break;
-		const trimmed = line.trim();
-		if (start === -1) {
-			if (stripTrailingComment(trimmed) === headerLine) start = offset;
-		} else {
-			const bare = stripTrailingComment(trimmed);
-			if (bare.startsWith("[") && bare.endsWith("]")) {
-				return { start, end: offset, text: config.slice(start, offset) };
-			}
-		}
-		offset += line.length;
-	}
-	if (start === -1) return null;
-	return { start, end: config.length, text: config.slice(start) };
-}