@open-agent-toolkit/cli 0.3.36 → 0.3.38

package/dist/providers/codex/codec/config-merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-merge.d.ts","sourceRoot":"","sources":["../../../../src/providers/codex/codec/config-merge.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,sBAAsB,EAAE,CAAC;IACvC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,8BAA8B;IAC7C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,sBAAsB,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AA8FD,4EAA4E;AAC5E,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAIvE;AAED,0EAA0E;AAC1E,wBAAgB,gBAAgB,CAAC,EAC/B,eAAe,EACf,YAAY,EACZ,iBAAsB,EACtB,iBAAiB,GAClB,EAAE,oBAAoB,GAAG,sBAAsB,CAgD/C;AAED,6EAA6E;AAC7E,wBAAgB,uBAAuB,CAAC,EACtC,eAAe,EACf,IAAI,EACJ,iBAAsB,EACtB,iBAAiB,GAClB,EAAE,8BAA8B,GAAG,sBAAsB,CAOzD"}
+{"version":3,"file":"config-merge.d.ts","sourceRoot":"","sources":["../../../../src/providers/codex/codec/config-merge.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,sBAAsB;IACrC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,sBAAsB,EAAE,CAAC;IACvC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,8BAA8B;IAC7C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,IAAI,EAAE,sBAAsB,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;AAqFD,4EAA4E;AAC5E,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAIvE;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,eAAe,EACf,YAAY,EACZ,iBAAsB,EACtB,iBAAiB,GAClB,EAAE,oBAAoB,GAAG,sBAAsB,CAkH/C;AAED,6EAA6E;AAC7E,wBAAgB,uBAAuB,CAAC,EACtC,eAAe,EACf,IAAI,EACJ,iBAAsB,EACtB,iBAAiB,GAClB,EAAE,8BAA8B,GAAG,sBAAsB,CAOzD"}

package/dist/providers/codex/codec/config-merge.js

@@ -1,44 +1,6 @@
 import { CliError } from '../../../errors/index.js';
 import TOML from '@iarna/toml';
-import { stringifyToml } from './shared.js';
-function isEscapedBasicStringDelimiter(line, index) {
-    let backslashCount = 0;
-    for (let cursor = index - 1; cursor >= 0 && line[cursor] === '\\'; cursor--) {
-        backslashCount += 1;
-    }
-    return backslashCount % 2 === 1;
-}
-function scanMultilineStringDelimiter(line, initialDelimiter) {
-    let delimiter = initialDelimiter;
-    for (let index = 0; index < line.length - 2; index++) {
-        if (delimiter === null) {
-            const candidate = line.slice(index, index + 3);
-            if ((candidate === '"""' && !isEscapedBasicStringDelimiter(line, index)) ||
-                candidate === "'''") {
-                delimiter = candidate;
-                index += 2;
-            }
-            continue;
-        }
-        if (line.startsWith(delimiter, index) &&
-            (delimiter === "'''" || !isEscapedBasicStringDelimiter(line, index))) {
-            delimiter = null;
-            index += 2;
-        }
-    }
-    return delimiter;
-}
-function normalizeCodexConfigIndentation(content) {
-    let multilineDelimiter = null;
-    return content
-        .split('\n')
-        .map((line) => {
-        const normalizedLine = multilineDelimiter === null ? line.trimStart() : line;
-        multilineDelimiter = scanMultilineStringDelimiter(normalizedLine, multilineDelimiter);
-        return normalizedLine;
-    })
-        .join('\n');
-}
+import { removeTomlTable, renderTomlString, setTomlValue, } from './config-toml-edit.js';
 function parseConfig(content) {
     if (!content || content.trim() === '') {
         return {};
@@ -57,39 +19,85 @@ function parseConfig(content) {
         throw new CliError(`Failed to parse .codex/config.toml: ${error instanceof Error ? error.message : 'unknown parse error'}`);
     }
 }
+function isTable(value) {
+    return (!!value &&
+        typeof value === 'object' &&
+        !Array.isArray(value) &&
+        !(value instanceof Date));
+}
 function getObject(value) {
-    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return isTable(value) ? { ...value } : {};
+}
+function requireTableOrAbsent(value, label) {
+    if (value === undefined) {
         return {};
     }
-    return { ...value };
+    if (!isTable(value)) {
+        throw new CliError(`Refusing to rewrite .codex/config.toml: ${label} must be a table. Fix it by hand and rerun sync.`);
+    }
+    return value;
+}
+function requireNotTable(value, label) {
+    if (isTable(value)) {
+        throw new CliError(`Refusing to rewrite .codex/config.toml: ${label} must not be a table. Fix it by hand and rerun sync.`);
+    }
 }
 function getFiniteNumber(value) {
     return typeof value === 'number' && Number.isFinite(value) ? value : null;
 }
+function canonicalTomlValue(value) {
+    if (value instanceof Date) {
+        return { $date: value.toISOString() };
+    }
+    if (Array.isArray(value)) {
+        return value.map(canonicalTomlValue);
+    }
+    if (typeof value === 'bigint') {
+        return { $bigint: value.toString() };
+    }
+    if (typeof value === 'number' && !Number.isFinite(value)) {
+        return { $number: String(value) };
+    }
+    if (isTable(value)) {
+        return Object.fromEntries(Object.keys(value)
+            .sort()
+            .map((key) => [key, canonicalTomlValue(value[key])]));
+    }
+    return value;
+}
 /** Reads a valid numeric agents.max_depth value from Codex TOML content. */
 export function readCodexMaxDepth(content) {
     const parsed = parseConfig(content);
     const agents = getObject(parsed.agents);
     return getFiniteNumber(agents.max_depth);
 }
-/** Merges managed Codex roles and required shared agent configuration. */
+/**
+ * Merges managed Codex roles and required shared agent configuration in place:
+ * other tools keep ownership markers in this file's comments, so unmanaged
+ * content must survive byte for byte.
+ */
 export function mergeCodexConfig({ existingContent, desiredRoles, staleManagedRoles = [], inheritedMaxDepth, }) {
     const parsed = parseConfig(existingContent);
-    const features = getObject(parsed.features);
-    const agents = getObject(parsed.agents);
-    const targetMaxDepth = getFiniteNumber(agents.max_depth);
-    const validInheritedMaxDepth = getFiniteNumber(inheritedMaxDepth);
-    agents.max_depth = Math.max(2, targetMaxDepth ?? 2, validInheritedMaxDepth ?? 2);
-    const nextConfig = {
-        ...parsed,
-        features: {
-            ...features,
-            multi_agent: true,
-        },
-        agents,
-    };
-    for (const role of desiredRoles) {
-        agents[role.roleName] = {
+    const features = requireTableOrAbsent(parsed.features, 'features');
+    const agents = requireTableOrAbsent(parsed.agents, 'agents');
+    const roles = new Map(desiredRoles.map((role) => [role.roleName, role]));
+    const stale = new Set(staleManagedRoles);
+    requireNotTable(features.multi_agent, 'features.multi_agent');
+    if (!stale.has('max_depth')) {
+        requireNotTable(agents.max_depth, 'agents.max_depth');
+    }
+    for (const roleName of roles.keys()) {
+        if (stale.has(roleName)) {
+            continue;
+        }
+        const role = requireTableOrAbsent(agents[roleName], `agents.${roleName}`);
+        requireNotTable(role.description, `agents.${roleName}.description`);
+        requireNotTable(role.config_file, `agents.${roleName}.config_file`);
+    }
+    const maxDepth = Math.max(2, getFiniteNumber(agents.max_depth) ?? 2, getFiniteNumber(inheritedMaxDepth) ?? 2);
+    const expectedAgents = { ...agents, max_depth: maxDepth };
+    for (const role of roles.values()) {
+        expectedAgents[role.roleName] = {
             ...getObject(agents[role.roleName]),
             description: role.description,
             config_file: role.configFile,
@@ -97,16 +105,57 @@ export function mergeCodexConfig({ existingContent, desiredRoles, staleManagedRo
     }
     const removedRoles = [];
     for (const staleRole of staleManagedRoles) {
-        if (staleRole in agents) {
-            delete agents[staleRole];
+        if (Object.hasOwn(expectedAgents, staleRole)) {
+            delete expectedAgents[staleRole];
             removedRoles.push(staleRole);
         }
     }
-    const mergedContent = normalizeCodexConfigIndentation(stringifyToml(nextConfig));
-    const changed = (existingContent ?? '').trimEnd() !== mergedContent.trimEnd();
+    const removed = new Set(removedRoles);
+    const original = existingContent !== null && existingContent.trim() !== ''
+        ? existingContent
+        : '';
+    let mergedContent = original;
+    if (features.multi_agent !== true) {
+        mergedContent = setTomlValue(mergedContent, ['features', 'multi_agent'], 'true');
+    }
+    if (agents.max_depth !== maxDepth && !removed.has('max_depth')) {
+        mergedContent = setTomlValue(mergedContent, ['agents', 'max_depth'], String(maxDepth));
+    }
+    for (const staleRole of removedRoles) {
+        mergedContent = removeTomlTable(mergedContent, ['agents', staleRole]);
+    }
+    for (const role of roles.values()) {
+        if (removed.has(role.roleName)) {
+            continue;
+        }
+        const current = getObject(agents[role.roleName]);
+        if (current.description !== role.description) {
+            mergedContent = setTomlValue(mergedContent, ['agents', role.roleName, 'description'], renderTomlString(role.description));
+        }
+        if (current.config_file !== role.configFile) {
+            mergedContent = setTomlValue(mergedContent, ['agents', role.roleName, 'config_file'], renderTomlString(role.configFile));
+        }
+    }
+    const expected = {
+        ...parsed,
+        features: { ...features, multi_agent: true },
+        agents: expectedAgents,
+    };
+    let actual;
+    try {
+        actual = parseConfig(mergedContent);
+    }
+    catch {
+        actual = null;
+    }
+    if (actual === null ||
+        JSON.stringify(canonicalTomlValue(actual)) !==
+            JSON.stringify(canonicalTomlValue(expected))) {
+        throw new CliError('Refusing to write .codex/config.toml: the in-place edit did not produce the expected managed configuration. Edit the file by hand and rerun sync.');
+    }
     return {
         mergedContent,
-        changed,
+        changed: mergedContent !== (existingContent ?? ''),
         removedRoles,
     };
 }

package/dist/providers/codex/codec/config-toml-edit.d.ts

@@ -0,0 +1,8 @@
+type KeyPath = readonly string[];
+/** Renders a TOML basic string; JSON escaping is not TOML-safe for all input. */
+export declare function renderTomlString(value: string): string;
+/** `renderedValue` must already be a valid TOML value literal. */
+export declare function setTomlValue(text: string, path: KeyPath, renderedValue: string): string;
+export declare function removeTomlTable(text: string, path: KeyPath): string;
+export {};
+//# sourceMappingURL=config-toml-edit.d.ts.map

package/dist/providers/codex/codec/config-toml-edit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config-toml-edit.d.ts","sourceRoot":"","sources":["../../../../src/providers/codex/codec/config-toml-edit.ts"],"names":[],"mappings":"AAOA,KAAK,OAAO,GAAG,SAAS,MAAM,EAAE,CAAC;AAofjC,iFAAiF;AACjF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAyBtD;AAqTD,kEAAkE;AAClE,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,OAAO,EACb,aAAa,EAAE,MAAM,GACpB,MAAM,CAsFR;AA8BD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,CA4BnE"}