mthds 0.6.4 → 0.7.0

package/dist/agent/binaries.js

@@ -22,7 +22,7 @@ const VERSION_RE = /^[\w-]+\s+(\d+\.\d+\.\d+)/;
 const PIPELEX_PKG = {
     package: "pipelex",
     uv_package: "pipelex",
-    version_constraint: ">=0.27.0",
+    version_constraint: ">=0.28.0",
     version_extract: VERSION_RE,
     install_url: "https://pypi.org/project/pipelex/",
     auto_installable: true,
@@ -31,7 +31,7 @@ const PIPELEX_PKG = {
 const PIPELEX_TOOLS_PKG = {
     package: "pipelex-tools",
     uv_package: "pipelex-tools",
-    version_constraint: ">=0.3.3",
+    version_constraint: ">=0.4.0",
     version_extract: VERSION_RE,
     install_url: "https://pypi.org/project/pipelex-tools/",
     auto_installable: true,

package/dist/agent/commands/bootstrap.js

@@ -12,13 +12,11 @@
  *   - BOOTSTRAP_PARTIAL <json>      -- some targets installed, some failed
  *   - BOOTSTRAP_FAILED <json>       -- all targets failed
  */
-import { writeFileSync } from "node:fs";
-import { join } from "node:path";
 import { isUvInstalled, installUv, uvToolInstallSync } from "../../installer/runtime/installer.js";
 import { checkBinaryVersion } from "../../installer/runtime/version-check.js";
 import { BINARY_RECOVERY } from "../binaries.js";
 import { agentError, AGENT_ERROR_DOMAINS } from "../output.js";
-import { clearCache, ensureStateDir, STATE_DIR } from "../update-cache.js";
+import { clearCache, writeUpgradeMarker } from "../update-cache.js";
 import { clearSnooze } from "../snooze.js";
 import { loadConfig } from "../../config/config.js";
 import { Runners } from "../../runners/types.js";
@@ -136,13 +134,7 @@ export async function agentBootstrap(options = {}) {
     const allSucceeded = failed.size === 0;
     const allFailed = succeeded.size === 0;
     if (allSucceeded) {
-        try {
-            ensureStateDir();
-            writeFileSync(join(STATE_DIR, "just-upgraded-from"), JSON.stringify(markerData), "utf-8");
-        }
-        catch (err) {
-            process.stderr.write(`Warning: could not write upgrade marker: ${errorMsg(err)}.\n`);
-        }
+        writeUpgradeMarker(markerData);
         clearCache();
         clearSnooze();
         process.stdout.write("BOOTSTRAP_COMPLETE " + JSON.stringify({ installed: installedEntries }) + "\n");

package/dist/agent/commands/bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/agent/commands/bootstrap.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,sBAAsB,CAAC;AAU9B,SAAS,QAAQ,CAAC,GAAY;IAC5B,OAAO,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC1D,CAAC;AAYD,yEAAyE;AACzE,MAAM,eAAe,GAA2B;IAC9C,OAAO,EAAE,qBAAqB;CAC/B,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,UAA4B,EAAE;IACjE,sDAAsD;IACtD,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,SAAS,EAAE,CAAC;QACd,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,UAAU,CACR,8BAA8B,QAAQ,CAAC,GAAG,CAAC,6EAA6E,EACxH,cAAc,EACd,EAAE,YAAY,EAAE,mBAAmB,CAAC,OAAO,EAAE,CAC9C,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACrB,UAAU,CACR,wGAAwG,EACxG,cAAc,EACd,EAAE,YAAY,EAAE,mBAAmB,CAAC,OAAO,EAAE,CAC9C,CAAC;YACF,OAAO;QACT,CAAC;IACH,CAAC;IAED,yCAAyC;IACzC,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,MAAM,UAAU,GAAa,CAAC,MAAM,CAAC,CAAC;IACtC,IAAI,GAAG,CAAC,MAAM,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC;QACnC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACnC,CAAC;IAED,sCAAsC;IACtC,MAAM,OAAO,GAAsB,EAAE,CAAC;IACtC,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,yCAAyC,GAAG,gCAAgC,CAC7E,CAAC;YACF,SAAS;QACX,CAAC;QAED,MAAM,KAAK,GAAuB,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC/D,IAAI,KAAK,CAAC,MAAM,KAAK,UAAU,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC9D,OAAO,CAAC,IAAI,CAAC;gBACX,SAAS,EAAE,GAAG;gBACd,QAAQ;gBACR,UAAU,EAAE,KAAK,CAAC,iBAAiB;aACpC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC/C,eAAe,EAAE,CAAC;QAClB,OAAO;IACT,CAAC;IAED,gCAAgC;IAChC,MAAM,IAAI,GAAG,IAAI,GAAG,EAA2B,CAAC;IAChD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACrC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IACD,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAEhD,0BAA0B;IAC1B,MAAM,SAAS,GAAiC,IAAI,GAAG,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAwB,IAAI,GAAG,EAAE,CAAC;IAE9C,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACxF,IAAI,SAAS,EAAE,CAAC;gBACd,kEAAkE;gBAClE,iBAAiB,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;YACpF,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACpD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,kCAAkC;IAClC,MAAM,gBAAgB,GAA2B,EAAE,CAAC;IACpD,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,SAAS,EAAE,CAAC;QACxC,IAAI,UAAU,GAAkB,IAAI,CAAC;QACrC,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACtD,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;gBACpE,UAAU,GAAG,SAAS,CAAC,iBAAiB,CAAC;YAC3C,CAAC;iBAAM,IAAI,SAAS,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC1C,UAAU,GAAG,IAAI,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,YAAY,KAAK,8BAA8B,SAAS,CAAC,iBAAiB,wBAAwB,SAAS,CAAC,kBAAkB,KAAK,CACpI,CAAC;gBACF,UAAU,GAAG,SAAS,CAAC,iBAAiB,CAAC;YAC3C,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,kDAAkD,KAAK,KAAK,QAAQ,CAAC,GAAG,CAAC,KAAK,CAC/E,CAAC;YACF,UAAU,GAAG,IAAI,CAAC;QACpB,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,IAAI,SAAS,CAAC;QAC5C,MAAM,IAAI,GAAG,UAAU,IAAI,SAAS,CAAC;QACrC,gBAAgB,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,KAAK,IAAI,EAAE,CAAC;IAC/C,CAAC;IAED,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAEjD,yDAAyD;IACzD,MAAM,UAAU,GAA4B,EAAE,CAAC;IAC/C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACtD,UAAU,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,UAAU,IAAI,SAAS,CAAC;IACzD,CAAC;IAED,iBAAiB;IACjB,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,KAAK,CAAC,CAAC;IAEvC,IAAI,YAAY,EAAE,CAAC;QACjB,IAAI,CAAC;YACH,cAAc,EAAE,CAAC;YACjB,aAAa,CACX,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,EACrC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAC1B,OAAO,CACR,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,4CAA4C,QAAQ,CAAC,GAAG,CAAC,KAAK,CAC/D,CAAC;QACJ,CAAC;QACD,UAAU,EAAE,CAAC;QACb,WAAW,EAAE,CAAC;QACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,qBAAqB,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC,GAAG,IAAI,CAC/E,CAAC;IACJ,CAAC;SAAM,IAAI,SAAS,EAAE,CAAC;QACrB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,GAAG,IAAI,CACvE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,UAAU,EAAE,CAAC;QACb,WAAW,EAAE,CAAC;QACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,oBAAoB;YAClB,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;YACtE,IAAI,CACP,CAAC;IACJ,CAAC;IAED,qFAAqF;IACrF,eAAe,EAAE,CAAC;AACpB,CAAC;AAED,sFAAsF;AACtF,SAAS,eAAe;IACtB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;QAC1B,IAAI,CAAC,IAAI;YAAE,OAAO;QAClB,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,UAAU,IAAI,WAAW,CAAC,CAAC,KAAK,SAAS,CAAC,EAAE,CAAC;YACjF,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,0BAA0B;gBACxB,IAAI,CAAC,SAAS,CAAC;oBACb,SAAS,EAAE,WAAW,CAAC,CAAC;oBACxB,QAAQ,EAAE,kBAAkB;oBAC5B,GAAG,EAAE,mBAAmB,CAAC,IAAI,CAAC;oBAC9B,IAAI;iBACL,CAAC;gBACF,IAAI,CACP,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,yCAAyC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAkB,CAC5G,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/agent/commands/bootstrap.ts"],"names":[],"mappings":"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"}

package/dist/agent/commands/codex-config.d.ts

@@ -1,31 +1,44 @@
 /**
- * mthds-agent codex apply-config — additively merge required Codex sandbox
- * settings into ~/.codex/config.toml so the mthds PostToolUse hook can run
- * without being blocked by Codex's default workspace-write sandbox.
+ * mthds-agent codex apply-config — make ~/.codex/ correct for the mthds plugin.
  *
- * Currently the only required key is `[sandbox_workspace_write] network_access = true`.
- * Without it, any hook that fetches remote pipelex config (or any other
- * outbound request) hangs/fails inside the sandbox.
+ * Two jobs:
+ *  1. Additively merge required keys into ~/.codex/config.toml:
+ *       [sandbox_workspace_write] network_access = true
+ *         — Codex's default workspace-write sandbox blocks outbound network for
+ *           hook commands; without it any remote fetch hangs/fails.
+ *       [features] plugin_hooks = true
+ *         — plugin-bundled hooks are opt-in; without it Codex never loads the
+ *           mthds validation hook shipped inside the plugin.
+ *  2. Remove any obsolete mthds entry left in ~/.codex/hooks.json by the retired
+ *     `install-hook` command (see codex.ts) — it would double-fire alongside the
+ *     plugin-bundled hook.
  *
- * Warning-only checks (we never modify these — too high-risk):
- *   - `[features] codex_hooks = false` — explicitly disables hooks
- *     (default is on as of Codex 0.124.0; codex-rs/features/src/lib.rs:768).
- *   - `sandbox_mode = "read-only"` — hook can't run apply_patch validation.
+ * Warning-only checks (never modified — too high-risk):
+ *   - `[features] hooks = false` (or its alias `codex_hooks = false`) disables
+ *     hooks entirely; we check both keys defensively.
+ *   - `sandbox_mode = "read-only"` — apply_patch can't run, so the hook can't
+ *     either.
  *
  * Output statuses (via agentSuccess):
- *   - { status: "ALREADY_OK", config_file, warnings? }     — no changes needed
- *   - { status: "APPLIED", config_file, applied, warnings? } — diff merged + written
- *   - { status: "WOULD_APPLY", config_file, applied, warnings? } — --dry-run only
+ *   - { status: "ALREADY_OK", ... }   — nothing needed changing
+ *   - { status: "APPLIED", ... }      — config.toml merged and/or stale hook removed
+ *   - { status: "WOULD_APPLY", ... }  — --dry-run only
  *
  * Flags:
  *   --check    exits non-zero if anything would change (no writes, no warnings demoted)
- *   --dry-run  prints proposed diff and exits 0 without touching the file
+ *   --dry-run  prints proposed diff and exits 0 without touching any file
  */
 export interface AppliedChange {
     table: string;
     key: string;
     value: string;
 }
+export interface SettingConflict {
+    table: string;
+    key: string;
+    current: string;
+    required: string;
+}
 export interface CodexConfigWarning {
     code: string;
     message: string;
@@ -33,7 +46,8 @@ export interface CodexConfigWarning {
 export interface CodexConfigInspection {
     config_file: string;
     exists: boolean;
-    needs_change: AppliedChange | null;
+    needs_changes: AppliedChange[];
+    conflicts: SettingConflict[];
     warnings: CodexConfigWarning[];
     parse_error?: string;
 }

package/dist/agent/commands/codex-config.js

@@ -1,41 +1,43 @@
 /**
- * mthds-agent codex apply-config — additively merge required Codex sandbox
- * settings into ~/.codex/config.toml so the mthds PostToolUse hook can run
- * without being blocked by Codex's default workspace-write sandbox.
+ * mthds-agent codex apply-config — make ~/.codex/ correct for the mthds plugin.
  *
- * Currently the only required key is `[sandbox_workspace_write] network_access = true`.
- * Without it, any hook that fetches remote pipelex config (or any other
- * outbound request) hangs/fails inside the sandbox.
+ * Two jobs:
+ *  1. Additively merge required keys into ~/.codex/config.toml:
+ *       [sandbox_workspace_write] network_access = true
+ *         — Codex's default workspace-write sandbox blocks outbound network for
+ *           hook commands; without it any remote fetch hangs/fails.
+ *       [features] plugin_hooks = true
+ *         — plugin-bundled hooks are opt-in; without it Codex never loads the
+ *           mthds validation hook shipped inside the plugin.
+ *  2. Remove any obsolete mthds entry left in ~/.codex/hooks.json by the retired
+ *     `install-hook` command (see codex.ts) — it would double-fire alongside the
+ *     plugin-bundled hook.
  *
- * Warning-only checks (we never modify these — too high-risk):
- *   - `[features] codex_hooks = false` — explicitly disables hooks
- *     (default is on as of Codex 0.124.0; codex-rs/features/src/lib.rs:768).
- *   - `sandbox_mode = "read-only"` — hook can't run apply_patch validation.
+ * Warning-only checks (never modified — too high-risk):
+ *   - `[features] hooks = false` (or its alias `codex_hooks = false`) disables
+ *     hooks entirely; we check both keys defensively.
+ *   - `sandbox_mode = "read-only"` — apply_patch can't run, so the hook can't
+ *     either.
  *
  * Output statuses (via agentSuccess):
- *   - { status: "ALREADY_OK", config_file, warnings? }     — no changes needed
- *   - { status: "APPLIED", config_file, applied, warnings? } — diff merged + written
- *   - { status: "WOULD_APPLY", config_file, applied, warnings? } — --dry-run only
+ *   - { status: "ALREADY_OK", ... }   — nothing needed changing
+ *   - { status: "APPLIED", ... }      — config.toml merged and/or stale hook removed
+ *   - { status: "WOULD_APPLY", ... }  — --dry-run only
  *
  * Flags:
  *   --check    exits non-zero if anything would change (no writes, no warnings demoted)
- *   --dry-run  prints proposed diff and exits 0 without touching the file
+ *   --dry-run  prints proposed diff and exits 0 without touching any file
  */
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { homedir } from "node:os";
 import { parse as parseToml } from "smol-toml";
 import { agentError, agentSuccess, AGENT_ERROR_DOMAINS } from "../output.js";
-// ── Constants ──────────────────────────────────────────────────────
-//
-// Single-key invariant: this command currently enforces exactly one
-// (table, key, value) tuple. `diffRequired` and `collectWarnings` are
-// structured around that assumption — if a future requirement adds a
-// second required key (e.g. a sandbox_mode default), both will need to
-// fan out to a list rather than the singleton structure used here.
-const REQUIRED_TABLE = "sandbox_workspace_write";
-const REQUIRED_KEY = "network_access";
-const REQUIRED_VALUE = true;
+import { inspectLegacyCodexHook, removeLegacyCodexHook } from "./codex.js";
+const REQUIRED_SETTINGS = [
+    { table: "sandbox_workspace_write", key: "network_access", value: true },
+    { table: "features", key: "plugin_hooks", value: true },
+];
 // ── Helpers ────────────────────────────────────────────────────────
 function configFilePath() {
     return join(homedir(), ".codex", "config.toml");
@@ -46,9 +48,13 @@ function writeAtomic(path, contents) {
     writeFileSync(tmp, contents, { encoding: "utf8", mode: 0o644 });
     renameSync(tmp, path);
 }
+/** Parse TOML text, treating empty/whitespace-only input as an empty table. */
+function parseTomlOrEmpty(text) {
+    return text.trim().length === 0 ? {} : parseToml(text);
+}
 /**
- * Append a [table] section with key=value to existing TOML text. Used when
- * the table is missing entirely. We append rather than re-serialize so user
+ * Append a [table] section with key=value to existing TOML text. Used when the
+ * table is missing entirely. We append rather than re-serialize so user
  * formatting/comments elsewhere in the file are preserved verbatim.
  */
 function appendTomlTable(existing, table, key, value) {
@@ -57,22 +63,22 @@ function appendTomlTable(existing, table, key, value) {
     return `${trimmed}${sep}[${table}]\n${key} = ${value}\n`;
 }
 /**
- * Insert key=value into an existing [table] section without re-serializing
- * the document. Locates the table header line, finds the end of its body
- * (next [section] header or EOF), and inserts the line just before that
- * boundary. This preserves comments and ordering of every other table.
+ * Insert key=value into an existing [table] section without re-serializing the
+ * document. Locates the table header line, finds the end of its body (next
+ * [section] header or EOF), and inserts the line just before that boundary.
+ * This preserves comments and ordering of every other table.
  */
 function insertIntoExistingTable(existing, table, key, value) {
     const lines = existing.split("\n");
-    const headerRegex = new RegExp(`^\\s*\\[\\s*${table.replace(/[.*+?^${}()|[\\]\\\\]/g, "\\$&")}\\s*\\]\\s*(#.*)?$`);
-    // Treat both `[table]` and `[[array_of_tables]]` as section boundaries —
-    // the inner `\[\[?...\]\]?` lets the boundary scan stop at array-of-tables
+    const headerRegex = new RegExp(`^\\s*\\[\\s*${table.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\s*\\]\\s*(#.*)?$`);
+    // Treat both `[table]` and `[[array_of_tables]]` as section boundaries — the
+    // inner `\[\[?...\]\]?` lets the boundary scan stop at array-of-tables
     // headers too, so we don't accidentally insert into one.
     const anyHeaderRegex = /^\s*\[\[?[^\]]+\]\]?\s*(#.*)?$/;
     let tableStart = -1;
-    for (let i = 0; i < lines.length; i++) {
-        if (headerRegex.test(lines[i])) {
-            tableStart = i;
+    for (let index = 0; index < lines.length; index++) {
+        if (headerRegex.test(lines[index])) {
+            tableStart = index;
             break;
         }
     }
@@ -81,9 +87,9 @@ function insertIntoExistingTable(existing, table, key, value) {
         return appendTomlTable(existing, table, key, value);
     }
     let insertAt = lines.length;
-    for (let i = tableStart + 1; i < lines.length; i++) {
-        if (anyHeaderRegex.test(lines[i])) {
-            insertAt = i;
+    for (let index = tableStart + 1; index < lines.length; index++) {
+        if (anyHeaderRegex.test(lines[index])) {
+            insertAt = index;
             break;
         }
     }
@@ -93,40 +99,61 @@ function insertIntoExistingTable(existing, table, key, value) {
     }
     const before = lines.slice(0, insertAt);
     const after = lines.slice(insertAt);
-    const newLine = `${key} = ${value}`;
-    return [...before, newLine, ...after].join("\n");
+    return [...before, `${key} = ${value}`, ...after].join("\n");
+}
+function readSettingValue(parsed, setting) {
+    const table = parsed[setting.table];
+    if (table && typeof table === "object" && !Array.isArray(table)) {
+        return table[setting.key];
+    }
+    return undefined;
 }
 /**
- * Decide whether the parsed config already satisfies the required key.
- * Returns null if satisfied, otherwise an AppliedChange describing what
- * needs to be added.
+ * Compare the parsed config against REQUIRED_SETTINGS:
+ *   - missing key  → an AppliedChange to add it
+ *   - wrong value  → a SettingConflict (the user must hand-fix; we never flip
+ *                    a key that is explicitly set)
+ *   - right value  → satisfied, ignored
  */
-function diffRequired(parsed) {
-    const table = parsed[REQUIRED_TABLE];
-    if (table &&
-        typeof table === "object" &&
-        !Array.isArray(table) &&
-        table[REQUIRED_KEY] === REQUIRED_VALUE) {
-        return null;
+function evaluateSettings(parsed) {
+    const changes = [];
+    const conflicts = [];
+    for (const setting of REQUIRED_SETTINGS) {
+        const current = readSettingValue(parsed, setting);
+        if (current === setting.value)
+            continue;
+        if (current === undefined) {
+            changes.push({ table: setting.table, key: setting.key, value: String(setting.value) });
+        }
+        else {
+            conflicts.push({
+                table: setting.table,
+                key: setting.key,
+                current: JSON.stringify(current),
+                required: String(setting.value),
+            });
+        }
     }
-    return {
-        table: REQUIRED_TABLE,
-        key: REQUIRED_KEY,
-        value: String(REQUIRED_VALUE),
-    };
+    return { changes, conflicts };
 }
 /** Collect non-fatal warnings about the user's config without modifying it. */
 function collectWarnings(parsed) {
     const warnings = [];
     const features = parsed.features;
-    if (features &&
-        typeof features === "object" &&
-        !Array.isArray(features) &&
-        features.codex_hooks === false) {
-        warnings.push({
-            code: "CODEX_HOOKS_DISABLED",
-            message: "[features] codex_hooks is explicitly set to false; the mthds hook will not load. Remove this key (Codex 0.124+ enables hooks by default).",
-        });
+    if (features && typeof features === "object" && !Array.isArray(features)) {
+        const featuresTable = features;
+        // Check both `hooks` and its alias `codex_hooks` defensively. Either being
+        // explicitly false disables hooks entirely and breaks the mthds hook. When
+        // both are false, name both so neither is silently omitted.
+        const disabledKeys = ["hooks", "codex_hooks"].filter((key) => featuresTable[key] === false);
+        if (disabledKeys.length > 0) {
+            const keyList = disabledKeys.map((key) => `[features] ${key}`).join(" and ");
+            const plural = disabledKeys.length > 1;
+            warnings.push({
+                code: "CODEX_HOOKS_DISABLED",
+                message: `${keyList} ${plural ? "are" : "is"} explicitly set to false; the mthds hook will not load. Remove ${plural ? "these keys" : "this key"} — hooks are enabled by default.`,
+            });
+        }
     }
     if (parsed.sandbox_mode === "read-only") {
         warnings.push({
@@ -136,6 +163,27 @@ function collectWarnings(parsed) {
     }
     return warnings;
 }
+function legacyHookWarning(parseError) {
+    return {
+        code: "LEGACY_HOOK_UNREADABLE",
+        message: `Could not read ~/.codex/hooks.json to remove any obsolete mthds hook entry (${parseError}). If you previously ran \`mthds-agent codex install-hook\`, delete that entry by hand so the validation hook does not run twice.`,
+    };
+}
+/** Apply each change to the TOML text in sequence, re-parsing between changes
+ *  so the table-exists decision reflects edits already made. */
+function applyChanges(raw, changes) {
+    let next = raw;
+    for (const change of changes) {
+        const parsed = parseTomlOrEmpty(next);
+        const table = parsed[change.table];
+        const tableExists = table !== undefined && typeof table === "object" && !Array.isArray(table);
+        next = tableExists
+            ? insertIntoExistingTable(next, change.table, change.key, change.value)
+            : appendTomlTable(next, change.table, change.key, change.value);
+    }
+    return next;
+}
+// ── Read-only inspection ───────────────────────────────────────────
 /**
  * Read-only inspection of ~/.codex/config.toml. Used by doctor to surface
  * issues without writing anything. Never throws — parse errors are reported
@@ -145,15 +193,16 @@ export function inspectCodexConfig() {
     const file = configFilePath();
     const exists = existsSync(file);
     if (!exists) {
-        // No config file ⇒ definitely needs a change (the required key is missing).
+        // No config file ⇒ every required key is missing.
         return {
             config_file: file,
             exists: false,
-            needs_change: {
-                table: REQUIRED_TABLE,
-                key: REQUIRED_KEY,
-                value: String(REQUIRED_VALUE),
-            },
+            needs_changes: REQUIRED_SETTINGS.map((setting) => ({
+                table: setting.table,
+                key: setting.key,
+                value: String(setting.value),
+            })),
+            conflicts: [],
             warnings: [],
         };
     }
@@ -165,20 +214,22 @@ export function inspectCodexConfig() {
         return {
             config_file: file,
             exists: true,
-            needs_change: null,
+            needs_changes: [],
+            conflicts: [],
             warnings: [],
             parse_error: `Failed to read ${file}: ${err.message}`,
         };
     }
     let parsed;
     try {
-        parsed = raw.trim().length === 0 ? {} : parseToml(raw);
+        parsed = parseTomlOrEmpty(raw);
     }
     catch (err) {
         return {
             config_file: file,
             exists: true,
-            needs_change: null,
+            needs_changes: [],
+            conflicts: [],
             warnings: [],
             parse_error: err.message,
         };
@@ -187,15 +238,18 @@ export function inspectCodexConfig() {
         return {
             config_file: file,
             exists: true,
-            needs_change: null,
+            needs_changes: [],
+            conflicts: [],
             warnings: [],
             parse_error: "Top-level value is not a TOML table",
         };
     }
+    const { changes, conflicts } = evaluateSettings(parsed);
     return {
         config_file: file,
         exists: true,
-        needs_change: diffRequired(parsed),
+        needs_changes: changes,
+        conflicts,
         warnings: collectWarnings(parsed),
     };
 }
@@ -210,92 +264,117 @@ export async function agentCodexApplyConfig(options = {}) {
             raw = readFileSync(file, "utf8");
         }
         catch (err) {
-            agentError(`Failed to read ${file}: ${err.message}`, "IOError", { error_domain: AGENT_ERROR_DOMAINS.IO });
+            agentError(`Failed to read ${file}: ${err.message}`, "IOError", {
+                error_domain: AGENT_ERROR_DOMAINS.IO,
+            });
             return;
         }
     }
     let parsed;
     try {
-        parsed = raw.trim().length === 0 ? {} : parseToml(raw);
+        parsed = parseTomlOrEmpty(raw);
     }
     catch (err) {
         agentError(`Invalid TOML in ${file}: ${err.message}. Fix the file by hand or delete it and re-run.`, "ConfigError", { error_domain: AGENT_ERROR_DOMAINS.CONFIG });
         return;
     }
     if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-        agentError(`${file} does not contain a TOML table at the top level.`, "ConfigError", { error_domain: AGENT_ERROR_DOMAINS.CONFIG });
+        agentError(`${file} does not contain a TOML table at the top level.`, "ConfigError", {
+            error_domain: AGENT_ERROR_DOMAINS.CONFIG,
+        });
         return;
     }
-    const change = diffRequired(parsed);
+    const { changes, conflicts } = evaluateSettings(parsed);
     const warnings = collectWarnings(parsed);
-    // --check mode: exit non-zero if anything would change. Warnings count
-    // because they signal explicit user state that breaks the hook.
+    // A key explicitly set to a conflicting value is a hard error in every mode:
+    // apply-config never overrides an explicit user choice.
+    if (conflicts.length > 0) {
+        const lines = conflicts.map((conflict) => `  [${conflict.table}] ${conflict.key} = ${conflict.current} (the mthds plugin needs ${conflict.required})`);
+        agentError(`~/.codex/config.toml has settings that conflict with the mthds plugin:\n${lines.join("\n")}\nChange them by hand, then re-run \`mthds-agent codex apply-config\`.`, "ConfigError", { error_domain: AGENT_ERROR_DOMAINS.CONFIG });
+        return;
+    }
+    // ── --check mode: report only, exit non-zero if anything needs attention ──
     if (checkMode) {
-        if (change || warnings.length > 0) {
+        const legacy = inspectLegacyCodexHook();
+        const needsAttention = changes.length > 0 ||
+            warnings.length > 0 ||
+            legacy.has_legacy_entry ||
+            legacy.parse_error !== undefined;
+        if (needsAttention) {
             agentError(`Codex config needs attention. Run 'mthds-agent codex apply-config' (and review warnings).`, "ConfigError", { error_domain: AGENT_ERROR_DOMAINS.CONFIG });
             return;
         }
-        agentSuccess({ status: "ALREADY_OK", config_file: file });
-        return;
-    }
-    if (!change) {
         agentSuccess({
             status: "ALREADY_OK",
             config_file: file,
-            warnings,
+            applied: [],
+            legacy_hook: { hooks_file: legacy.hooks_file, status: "absent" },
+            warnings: [],
         });
         return;
     }
-    // Build the new file contents additively.
-    //
-    // Edge case: `parsed[REQUIRED_TABLE]` may be a TOML-implicit table
-    // created by a dotted-key header like `[sandbox_workspace_write.sub]`
-    // even when no literal `[sandbox_workspace_write]` header exists in the
-    // source text. In that case `insertIntoExistingTable` falls back to
-    // appending a fresh header, which would cause smol-toml to reject the
-    // result on the sanity-parse below (table redefinition). The sanity
-    // parse catches it and we surface a ConfigError — not pretty, but safe.
-    // If this becomes a real problem, switch to writing the dotted form
-    // `sandbox_workspace_write.network_access = true` at top-of-file.
-    let nextRaw;
-    const tableExists = parsed[REQUIRED_TABLE] !== undefined &&
-        typeof parsed[REQUIRED_TABLE] === "object" &&
-        !Array.isArray(parsed[REQUIRED_TABLE]);
-    if (tableExists) {
-        nextRaw = insertIntoExistingTable(raw, change.table, change.key, change.value);
-    }
-    else {
-        nextRaw = appendTomlTable(raw, change.table, change.key, change.value);
-    }
-    // Sanity-parse the new contents before committing.
-    try {
-        parseToml(nextRaw);
-    }
-    catch (err) {
-        agentError(`Generated config would not re-parse: ${err.message}`, "ConfigError", { error_domain: AGENT_ERROR_DOMAINS.CONFIG });
-        return;
+    // Validate the prospective config.toml contents before any write.
+    let nextRaw = raw;
+    if (changes.length > 0) {
+        try {
+            nextRaw = applyChanges(raw, changes);
+            // Sanity-parse: an implicit table created by a dotted-key header can make
+            // appendTomlTable emit a duplicate header that smol-toml rejects.
+            // applyChanges itself re-parses between changes, so a malformed
+            // intermediate state throws here too — caught the same way.
+            parseToml(nextRaw);
+        }
+        catch (err) {
+            agentError(`Generated config would not re-parse: ${err.message}`, "ConfigError", { error_domain: AGENT_ERROR_DOMAINS.CONFIG });
+            return;
+        }
     }
+    // ── --dry-run mode: report the proposed diff, write nothing ──
     if (dryRunMode) {
+        const legacy = inspectLegacyCodexHook();
+        const allWarnings = legacy.parse_error !== undefined
+            ? [...warnings, legacyHookWarning(legacy.parse_error)]
+            : warnings;
+        const wouldChange = changes.length > 0 || legacy.has_legacy_entry;
         agentSuccess({
-            status: "WOULD_APPLY",
+            status: wouldChange ? "WOULD_APPLY" : "ALREADY_OK",
             config_file: file,
-            applied: [change],
-            warnings,
+            applied: changes,
+            legacy_hook: {
+                hooks_file: legacy.hooks_file,
+                status: legacy.has_legacy_entry
+                    ? "would-remove"
+                    : legacy.parse_error !== undefined
+                        ? "error"
+                        : "absent",
+            },
+            warnings: allWarnings,
         });
         return;
     }
-    try {
-        writeAtomic(file, nextRaw);
-    }
-    catch (err) {
-        agentError(`Failed to write ${file}: ${err.message}`, "IOError", { error_domain: AGENT_ERROR_DOMAINS.IO });
-        return;
+    // ── Apply ──
+    if (changes.length > 0) {
+        try {
+            writeAtomic(file, nextRaw);
+        }
+        catch (err) {
+            agentError(`Failed to write ${file}: ${err.message}`, "IOError", {
+                error_domain: AGENT_ERROR_DOMAINS.IO,
+            });
+            return;
+        }
     }
+    const removal = removeLegacyCodexHook();
+    const allWarnings = removal.status === "error" && removal.error !== undefined
+        ? [...warnings, legacyHookWarning(removal.error)]
+        : warnings;
+    const didChange = changes.length > 0 || removal.status === "removed";
     agentSuccess({
-        status: "APPLIED",
+        status: didChange ? "APPLIED" : "ALREADY_OK",
         config_file: file,
-        applied: [change],
-        warnings,
+        applied: changes,
+        legacy_hook: { hooks_file: removal.hooks_file, status: removal.status },
+        warnings: allWarnings,
     });
 }
 //# sourceMappingURL=codex-config.js.map