sleev 0.0.11 → 0.0.12

package/dist/apps/codex.js

@@ -1,8 +1,11 @@
 // Codex setup owns global TOML patching for the OpenAI-compatible proxy provider.
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { chmod, mkdir, readFile, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { field, success } from '../terminal.js';
+const PROVIDER = 'sleev';
+const HARNESS = 'codex cli';
+const OLD_HARNESS = 'codex';
 export async function setupCodex(auth, path = codexPath()) {
     const result = await patchCodex(auth, path);
     success(process.stdout, 'Configured Codex');
@@ -12,8 +15,7 @@ export async function setupCodex(auth, path = codexPath()) {
 export async function patchCodex(auth, path = codexPath()) {
     const existing = await readText(path);
     const config = patchCodexConfig(existing, auth);
-    await mkdir(dirname(path), { recursive: true, mode: 0o700 });
-    await writeFile(path, config, { mode: 0o600 });
+    await writeText(path, config);
     return { path };
 }
 export async function unpatchCodex(path = codexPath()) {
@@ -21,25 +23,25 @@ export async function unpatchCodex(path = codexPath()) {
     if (!existing)
         return;
     const config = unpatchCodexConfig(existing);
-    await mkdir(dirname(path), { recursive: true, mode: 0o700 });
-    await writeFile(path, config, { mode: 0o600 });
+    await writeText(path, config);
 }
 export function codexPath(env = process.env) {
     return join(env.CODEX_HOME || join(homedir(), '.codex'), 'config.toml');
 }
 export function patchCodexConfig(input, auth) {
-    const provider = rootString(input, 'model_provider') ?? 'openai';
-    const target = reserved(provider) ? 'sleev' : provider;
-    const stale = removeTable(input.trimEnd(), 'model_providers.sleev');
-    const clean = target === provider ? stale : removeRootKey(stale, 'model_provider');
-    const root = target === provider ? clean : insertRootKey(clean.trimEnd(), 'model_provider', target);
-    const base = trim(auth.proxyUrl);
-    return `${patchProvider(root, target, auth, base).trimEnd()}\n`;
+    const previous = previousProvider(input);
+    const stale = removeTable(removeTable(input.trimEnd(), table(PROVIDER)), 'sleev.codex');
+    const clean = removeRootKey(stale, 'model_provider');
+    const root = insertRootKey(clean.trimEnd(), 'model_provider', PROVIDER);
+    const meta = previous ? `\n\n[sleev.codex]\nprevious_model_provider = "${toml(previous)}"` : '';
+    return `${patchProvider(root, auth).trimEnd()}${meta}\n`;
 }
 export function unpatchCodexConfig(input) {
+    const previous = backup(input);
     const provider = rootString(input, 'model_provider') ?? 'openai';
-    const clean = removeTable(removeRootKey(input.trimEnd(), 'model_provider'), 'model_providers.sleev');
-    const config = provider === 'sleev' ? clean : removeSleevKeys(input, provider);
+    const clean = removeTable(removeTable(removeRootKey(input.trimEnd(), 'model_provider'), table(PROVIDER)), 'sleev.codex');
+    const restored = previous ? insertRootKey(clean.trimEnd(), 'model_provider', previous) : clean;
+    const config = provider === PROVIDER ? restored : removeSleevKeys(input, provider);
     return `${config.trimEnd()}\n`;
 }
 function insertRootKey(input, key, value) {
@@ -73,11 +75,11 @@ function removeRootKey(input, key) {
     }
     return next.join('\n');
 }
-function removeTable(input, table) {
+function removeTable(input, name) {
     const lines = input.split('\n');
     const next = [];
     let skip = false;
-    const header = new RegExp(`^\\s*\\[\\s*${escape(table)}(?:\\.|\\s*\\])`);
+    const header = new RegExp(`^\\s*\\[\\s*${escape(name)}(?:\\.|\\s*\\])`);
     for (const line of lines) {
         if (header.test(line)) {
             skip = true;
@@ -90,38 +92,23 @@ function removeTable(input, table) {
     }
     return next.join('\n');
 }
-function patchProvider(input, provider, auth, url) {
-    const table = `model_providers.${provider}`;
-    const clean = removeTable(input, `${table}.http_headers`);
-    const lines = clean.split('\n');
-    const header = new RegExp(`^\\s*\\[\\s*${escape(table)}\\s*\\]\\s*(#.*)?$`);
-    const index = lines.findIndex((line) => header.test(line));
-    const keys = providerKeys(auth, url);
-    if (index === -1)
-        return `${clean.trimEnd()}\n\n[${table}]\nname = "Sleev"\n${keys.join('\n')}`;
-    const next = [];
-    for (let i = 0; i < lines.length; i += 1) {
-        const line = lines[i] ?? '';
-        const inside = i > index && !/^\s*\[/.test(line);
-        if (inside && /^\s*(base_url|wire_api|http_headers)\s*=/.test(line))
-            continue;
-        next.push(line);
-        if (i === index)
-            next.push(...keys);
-    }
-    return next.join('\n');
+function patchProvider(input, auth) {
+    return `${input.trimEnd()}\n\n[${table(PROVIDER)}]\nname = "Sleev"\n${providerKeys(auth).join('\n')}`;
 }
-function providerKeys(auth, url) {
+function providerKeys(auth) {
     return [
-        `base_url = "${toml(url)}"`,
+        `base_url = "${toml(baseUrl(auth.proxyUrl))}"`,
         'wire_api = "responses"',
-        `http_headers = { "sleeve-token" = "${toml(auth.token)}", "sleeve-provider" = "openai", "sleeve-harness" = "codex" }`,
+        '',
+        `[${table(PROVIDER)}.http_headers]`,
+        `"sleeve-token" = "${toml(auth.token)}"`,
+        '"sleeve-provider" = "openai"',
+        `"sleeve-harness" = "${HARNESS}"`,
     ];
 }
 function removeSleevKeys(input, provider) {
-    const table = `model_providers.${provider}`;
     const lines = input.split('\n');
-    const header = new RegExp(`^\\s*\\[\\s*${escape(table)}\\s*\\]\\s*(#.*)?$`);
+    const header = new RegExp(`^\\s*\\[\\s*${escape(table(provider))}\\s*\\]\\s*(#.*)?$`);
     const index = lines.findIndex((line) => header.test(line));
     if (index === -1)
         return input;
@@ -132,7 +119,7 @@ function removeSleevKeys(input, provider) {
             break;
         current.push(line);
     }
-    if (!current.some((line) => line.includes('"sleeve-harness" = "codex"')))
+    if (!current.some((line) => owned(line)))
         return input;
     return lines
         .filter((line, i) => {
@@ -143,20 +130,40 @@ function removeSleevKeys(input, provider) {
     })
         .join('\n');
 }
+function previousProvider(input) {
+    const current = rootString(input, 'model_provider');
+    return backup(input) ?? (current && current !== PROVIDER ? current : null);
+}
+function backup(input) {
+    return tableString(input, 'sleev.codex', 'previous_model_provider');
+}
+function tableString(input, name, key) {
+    const lines = input.split('\n');
+    const header = new RegExp(`^\\s*\\[\\s*${escape(name)}\\s*\\]\\s*(#.*)?$`);
+    const index = lines.findIndex((line) => header.test(line));
+    if (index === -1)
+        return null;
+    for (let i = index + 1; i < lines.length; i += 1) {
+        const line = lines[i] ?? '';
+        if (/^\s*\[/.test(line))
+            return null;
+        const match = new RegExp(`^\\s*${escape(key)}\\s*=\\s*(["'])([^"']+)\\1`).exec(line);
+        if (match?.[2])
+            return match[2];
+    }
+    return null;
+}
 function rootString(input, key) {
     const lines = input.split('\n');
     for (const line of lines) {
         if (/^\s*\[/.test(line))
             return null;
-        const match = new RegExp(`^\\s*${escape(key)}\\s*=\\s*([\"'])([^\"']+)\\1`).exec(line);
+        const match = new RegExp(`^\\s*${escape(key)}\\s*=\\s*(["'])([^"']+)\\1`).exec(line);
         if (match?.[2])
             return match[2];
     }
     return null;
 }
-function reserved(provider) {
-    return provider === 'openai' || provider === 'ollama' || provider === 'lmstudio';
-}
 async function readText(path) {
     try {
         return await readFile(path, 'utf8');
@@ -176,6 +183,23 @@ function escape(value) {
 function trim(url) {
     return url.replace(/\/+$/, '');
 }
+function baseUrl(url) {
+    const clean = trim(url);
+    if (clean.endsWith('/v1'))
+        return clean;
+    return `${clean}/v1`;
+}
+function table(provider) {
+    return `model_providers.${provider}`;
+}
+function owned(line) {
+    return line.includes(`"sleeve-harness" = "${HARNESS}"`) || line.includes(`"sleeve-harness" = "${OLD_HARNESS}"`);
+}
+async function writeText(path, config) {
+    await mkdir(dirname(path), { recursive: true, mode: 0o700 });
+    await writeFile(path, config, { mode: 0o600 });
+    await chmod(path, 0o600);
+}
 function code(err) {
     if (typeof err !== 'object' || err === null || !('code' in err))
         return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sleev",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Sleev command-line tools.",
   "type": "module",
   "bin": {