@minniexcode/codex-switch 0.0.3 → 0.0.4

package/dist/cli/add-interactive.js

@@ -1,29 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.COMMON_TAG_CHOICES = void 0;
 exports.collectAddInput = collectAddInput;
 exports.createNonInteractiveAddError = createNonInteractiveAddError;
-const config_repo_1 = require("../infra/config-repo");
+exports.promptTags = promptTags;
+exports.parseTags = parseTags;
 const errors_1 = require("../domain/errors");
+exports.COMMON_TAG_CHOICES = ["free", "paid", "daily", "backup"];
 /**
  * Collects add command inputs interactively when required values are missing.
  */
-async function collectAddInput(runtime, defaults, providerExists, configPath) {
+async function collectAddInput(runtime, defaults, providerExists) {
     runtime.writeLine("Interactive add mode");
     runtime.writeLine("Provide the missing required fields. Press Enter to skip optional fields.");
     const providerName = defaults.providerName
         ? normalizeRequiredValue(defaults.providerName)
         : await promptProviderName(runtime, providerExists);
-    const profile = defaults.profile
-        ? normalizeRequiredValue(defaults.profile)
-        : await promptProfile(runtime, configPath);
+    const profile = defaults.profile ? normalizeRequiredValue(defaults.profile) : await promptRequiredValue(runtime, "Profile");
     const apiKey = defaults.apiKey
         ? normalizeRequiredValue(defaults.apiKey)
         : await promptConfirmedSecret(runtime, "API key", "Confirm API key");
     const baseUrl = defaults.baseUrl ?? normalizeOptionalValue(await runtime.inputText("Base URL (optional)"));
     const note = defaults.note ?? normalizeOptionalValue(await runtime.inputText("Note (optional)"));
-    const tags = defaults.tags.length > 0
-        ? defaults.tags
-        : parseTags(await runtime.inputText("Tags (optional, comma-separated)"));
+    const tags = defaults.tags.length > 0 ? defaults.tags : await promptTags(runtime);
     return {
         providerName,
         profile,
@@ -37,7 +36,7 @@ async function collectAddInput(runtime, defaults, providerExists, configPath) {
  * Throws a consistent error when interactive add is unavailable.
  */
 function createNonInteractiveAddError() {
-    return (0, errors_1.cliError)("INVALID_IMPORT_FILE", "add requires <provider>, --profile, and --api-key when running without an interactive TTY.", {
+    return (0, errors_1.cliError)("INVALID_ARGUMENT", "add requires <provider>, --profile, and --api-key when running without an interactive TTY.", {
         suggestion: "Run in a terminal TTY or pass all required values explicitly.",
     });
 }
@@ -51,26 +50,6 @@ async function promptProviderName(runtime, providerExists) {
         return providerName;
     }
 }
-async function promptProfile(runtime, configPath) {
-    const profileChoices = loadProfileChoices(configPath);
-    if (profileChoices.length > 0) {
-        return runtime.selectOne("Profile", profileChoices);
-    }
-    return promptRequiredValue(runtime, "Profile");
-}
-function loadProfileChoices(configPath) {
-    try {
-        return Array.from((0, config_repo_1.listConfigProfiles)(configPath))
-            .sort()
-            .map((profileName) => ({
-            value: profileName,
-            label: profileName,
-        }));
-    }
-    catch {
-        return [];
-    }
-}
 async function promptRequiredValue(runtime, label) {
     while (true) {
         const value = normalizeRequiredValue(await runtime.inputText(label));
@@ -106,9 +85,24 @@ function normalizeOptionalValue(value) {
     const normalized = value.trim();
     return normalized === "" ? null : normalized;
 }
+async function promptTags(runtime, defaults = []) {
+    const defaultPresetTags = defaults.filter(isCommonTag);
+    const defaultCustomTags = defaults.filter((tag) => !isCommonTag(tag));
+    const presetTags = await runtime.selectMany("Select tags (optional)", exports.COMMON_TAG_CHOICES.map((tag) => ({ value: tag, label: tag })), { defaultValues: defaultPresetTags });
+    const customTags = parseTags(await runtime.inputText("Custom tags (optional, comma-separated)", {
+        defaultValue: defaultCustomTags.join(", "),
+    }));
+    return dedupeTags([...presetTags, ...customTags]);
+}
 function parseTags(value) {
-    return value
+    return dedupeTags(value
         .split(",")
         .map((tag) => tag.trim())
-        .filter((tag) => tag.length > 0);
+        .filter((tag) => tag.length > 0));
+}
+function isCommonTag(tag) {
+    return exports.COMMON_TAG_CHOICES.includes(tag);
+}
+function dedupeTags(tags) {
+    return Array.from(new Set(tags));
 }

package/dist/cli/args.js

@@ -21,7 +21,7 @@ function parseArgs(argv) {
         if (value === "--codex-dir") {
             const next = argv[index + 1];
             if (!next) {
-                throw (0, errors_1.cliError)("INVALID_IMPORT_FILE", "--codex-dir requires a path value.");
+                throw (0, errors_1.cliError)("INVALID_ARGUMENT", "--codex-dir requires a path value.");
             }
             codexDir = (0, codex_paths_1.resolveCodexDir)(next);
             index += 1;
@@ -30,6 +30,7 @@ function parseArgs(argv) {
         remaining.push(value);
     }
     if (remaining[0] === "help") {
+        const helpTarget = remaining[1] === "backups" && remaining[2] === "list" ? "backups" : remaining[1] ?? null;
         return {
             command: null,
             positionals: [],
@@ -39,7 +40,7 @@ function parseArgs(argv) {
             },
             commandOptions: new Map(),
             helpRequested: true,
-            helpTarget: remaining[1] ?? null,
+            helpTarget,
             versionRequested: false,
         };
     }
@@ -51,11 +52,13 @@ function parseArgs(argv) {
             versionRequested: true,
         });
     }
-    const command = remaining[0] ?? null;
+    const commandToken = remaining[0] ?? null;
+    const command = commandToken === "backups" && remaining[1] === "list" ? "backups-list" : commandToken;
     const positionals = [];
     const commandOptions = new Map();
     let helpRequested = false;
-    for (let index = 1; index < remaining.length; index += 1) {
+    const startIndex = command === "backups-list" ? 2 : 1;
+    for (let index = startIndex; index < remaining.length; index += 1) {
         const value = remaining[index];
         if (value === "--help" || value === "-h") {
             helpRequested = true;
@@ -86,7 +89,7 @@ function parseArgs(argv) {
         },
         commandOptions,
         helpRequested,
-        helpTarget: helpRequested ? command : null,
+        helpTarget: helpRequested ? (command === "backups-list" ? "backups" : command) : null,
         versionRequested: false,
     };
 }

package/dist/cli/help.js

@@ -9,6 +9,18 @@ const GROUP_TITLES = {
     recovery: "Diagnostics And Recovery",
 };
 const COMMANDS = [
+    {
+        name: "setup",
+        group: "write",
+        summary: "Initialize providers.json from an existing Codex directory.",
+        usage: ["codexs setup [--json] [--codex-dir <path>] [--merge|--overwrite]"],
+        details: [
+            "Reads config.toml profiles, collects complete provider records, then writes providers.json under managed backup flow.",
+            "TTY mode can collect missing provider details and choose merge or overwrite when providers.json already exists.",
+            "Non-TTY and --json runs stay non-interactive and require explicit strategy when providers.json already exists.",
+        ],
+        examples: ["codexs setup", "codexs setup --overwrite --json --codex-dir ~/.codex"],
+    },
     {
         name: "list",
         group: "read",
@@ -20,6 +32,18 @@ const COMMANDS = [
         ],
         examples: ["codexs list", "codexs list --json"],
     },
+    {
+        name: "show",
+        group: "read",
+        summary: "Show one provider record from providers.json.",
+        usage: ["codexs show <provider> [--json] [--codex-dir <path>]"],
+        details: [
+            "Human-readable output masks apiKey by default.",
+            "TTY mode can select a missing provider interactively before showing its record.",
+            "JSON mode returns the full provider payload for local automation.",
+        ],
+        examples: ["codexs show packycode", "codexs show packycode --json"],
+    },
     {
         name: "current",
         group: "read",
@@ -42,6 +66,21 @@ const COMMANDS = [
         ],
         examples: ["codexs status", "codexs status --json --codex-dir ./.tmp-codex"],
     },
+    {
+        name: "edit",
+        group: "write",
+        summary: "Update fields on a single provider record.",
+        usage: [
+            "codexs edit <provider> [--profile <name>] [--api-key <key>] [--base-url <url>] [--note <text>] [--tag <tag> ...] [--json] [--codex-dir <path>]",
+        ],
+        details: [
+            "Passed flags replace only the selected fields and keep the rest unchanged.",
+            "TTY mode can first select a provider, then prompt for fields when no editable options were provided.",
+            "Interactive tags use preset multi-select plus optional custom comma-separated input.",
+            "Backs up providers.json before writing.",
+        ],
+        examples: ["codexs edit packycode --note primary", "codexs edit packycode --tag daily --tag paid --json"],
+    },
     {
         name: "add",
         group: "write",
@@ -52,8 +91,9 @@ const COMMANDS = [
         ],
         details: [
             "Prompts only for missing required values when stdin/stdout are TTYs and --json is not set.",
-            "Profile selection prefers existing config.toml profiles, then falls back to free-text input.",
+            "Interactive add collects provider name, profile, and apiKey progressively as plain text inputs.",
             "Confirm API key when prompted interactively because the hidden prompt asks twice before writing.",
+            "Interactive tags use preset multi-select plus optional custom comma-separated input.",
             "Automation and non-TTY environments must pass all required values explicitly.",
         ],
         examples: [
@@ -95,10 +135,10 @@ const COMMANDS = [
         usage: ["codexs import <file> [--json] [--codex-dir <path>]"],
         details: [
             "The file path is always explicit; there is no path wizard in this release.",
-            "TTY mode asks for confirmation before replacing the current providers registry.",
+            "TTY mode asks for confirmation before replacing or merging into the current providers registry.",
             "Non-TTY and --json runs stay non-interactive and validate the file before writing.",
         ],
-        examples: ["codexs import ./providers.json", "codexs import ./providers.json --json"],
+        examples: ["codexs import ./providers.json", "codexs import ./providers.json --merge --json"],
     },
     {
         name: "export",
@@ -112,6 +152,17 @@ const COMMANDS = [
         ],
         examples: ["codexs export ./providers-backup.json", "codexs export ./providers-backup.json --force"],
     },
+    {
+        name: "backups",
+        group: "recovery",
+        summary: "List historical backup entries.",
+        usage: ["codexs backups list [--json] [--codex-dir <path>]"],
+        details: [
+            "Enumerates backups/ manifests and returns them newest first.",
+            "Corrupt backup manifests are skipped with warnings instead of failing the whole command.",
+        ],
+        examples: ["codexs backups list", "codexs backups list --json"],
+    },
     {
         name: "doctor",
         group: "recovery",
@@ -126,14 +177,14 @@ const COMMANDS = [
     {
         name: "rollback",
         group: "recovery",
-        summary: "Restore the latest managed backup.",
-        usage: ["codexs rollback [--json] [--codex-dir <path>]"],
+        summary: "Restore the latest managed backup or a specific backup id.",
+        usage: ["codexs rollback [<backup-id>] [--json] [--codex-dir <path>]"],
         details: [
-            "TTY mode previews the latest backup path and affected files, then asks for confirmation.",
+            "TTY mode previews the target backup path and affected files, then asks for confirmation.",
             "Non-TTY and --json runs stay non-interactive and execute immediately.",
             "Use after a failed or undesired managed mutation.",
         ],
-        examples: ["codexs rollback", "codexs rollback --json"],
+        examples: ["codexs rollback", "codexs rollback 20260511-221457-switch --json"],
     },
 ];
 const COMMAND_NAME_SET = new Set(COMMANDS.map((command) => command.name));
@@ -141,9 +192,10 @@ function getKnownCommandNames() {
     return COMMANDS.map((command) => command.name);
 }
 function isKnownCommandName(commandName) {
-    return COMMAND_NAME_SET.has(commandName);
+    return COMMAND_NAME_SET.has(commandName) || commandName === "backups-list";
 }
 function buildHelpText(commandName) {
+    const normalizedCommandName = commandName === "backups-list" ? "backups" : commandName;
     if (!commandName) {
         return [
             "codex-switch",
@@ -162,6 +214,10 @@ function buildHelpText(commandName) {
             "  --help             Show top-level or command-specific help.",
             "  --version          Print the current CLI version.",
             "",
+            "Environment:",
+            "  CODEXS_CODEX_DIR   Default Codex directory when --codex-dir is not passed.",
+            "  NODE_ENV=development defaults to ./test-fixtures/sample-codex when no override is set.",
+            "",
             "Interactive rules:",
             "  Progressive prompts only run in a real TTY and never run under --json.",
             "  Human write commands may guide missing inputs or ask for dangerous-action confirmation.",
@@ -169,23 +225,25 @@ function buildHelpText(commandName) {
             "",
             "Dangerous commands:",
             "  remove deletes provider records.",
-            "  import replaces providers.json.",
+            "  import replaces or merges providers.json.",
             "  export may overwrite a target file.",
-            "  rollback restores files from the latest backup.",
+            "  rollback restores files from a managed backup.",
             "",
             "Examples:",
+            "  codexs setup",
             "  codexs list",
             "  codexs switch",
             "  codexs add packycode --profile packycode --api-key sk-xxx",
             "  codexs remove freemodel",
+            "  codexs backups list",
             "  codexs rollback",
             "  codexs help add",
         ].join("\n");
     }
-    const command = COMMANDS.find((candidate) => candidate.name === commandName);
+    const command = COMMANDS.find((candidate) => candidate.name === normalizedCommandName);
     if (!command) {
         return [
-            `Unknown help topic: ${commandName}`,
+            `Unknown help topic: ${normalizedCommandName}`,
             "",
             "Available commands:",
             ...getKnownCommandNames().map((name) => `  ${name}`),

package/dist/cli/interactive.js

@@ -40,12 +40,18 @@ exports.confirmImport = confirmImport;
 exports.confirmExportOverwrite = confirmExportOverwrite;
 exports.exportTargetExists = exportTargetExists;
 exports.getRollbackSummary = getRollbackSummary;
+exports.getRollbackSummaryById = getRollbackSummaryById;
 exports.confirmRollback = confirmRollback;
+exports.chooseSetupStrategy = chooseSetupStrategy;
+exports.collectSetupProviderDetails = collectSetupProviderDetails;
+exports.collectEditInput = collectEditInput;
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const errors_1 = require("../domain/errors");
+const backups_1 = require("../domain/backups");
 const providers_repo_1 = require("../infra/providers-repo");
 const backup_repo_1 = require("../infra/backup-repo");
+const add_interactive_1 = require("./add-interactive");
 /**
  * Keeps CLI-side interactivity rules in one place so automation paths remain explicit.
  */
@@ -71,13 +77,15 @@ async function confirmProviderRemoval(runtime, providerName) {
         defaultValue: false,
     });
     if (!confirmed) {
-        throw (0, errors_1.cliError)("INVALID_IMPORT_FILE", `Removal cancelled for provider "${providerName}".`);
+        throw (0, errors_1.cliError)("PROMPT_CANCELLED", `Removal cancelled for provider "${providerName}".`);
     }
 }
-async function confirmImport(runtime, sourceFile) {
-    const confirmed = await runtime.confirmAction(`Import providers from ${path.resolve(sourceFile)} and replace the current registry?`, { defaultValue: false });
+async function confirmImport(runtime, sourceFile, merge = false) {
+    const confirmed = await runtime.confirmAction(merge
+        ? `Import providers from ${path.resolve(sourceFile)} and merge into the current registry?`
+        : `Import providers from ${path.resolve(sourceFile)} and replace the current registry?`, { defaultValue: false });
     if (!confirmed) {
-        throw (0, errors_1.cliError)("INVALID_IMPORT_FILE", "Import cancelled.");
+        throw (0, errors_1.cliError)("PROMPT_CANCELLED", "Import cancelled.");
     }
 }
 async function confirmExportOverwrite(runtime, targetFile) {
@@ -90,8 +98,16 @@ function exportTargetExists(targetFile) {
 }
 function getRollbackSummary(latestBackupPath) {
     const manifest = (0, backup_repo_1.loadLatestManifest)(latestBackupPath);
+    return buildRollbackSummary(manifest);
+}
+function getRollbackSummaryById(backupsDir, backupId) {
+    const manifest = (0, backup_repo_1.loadManifestById)(backupsDir, backupId);
+    return buildRollbackSummary(manifest);
+}
+function buildRollbackSummary(manifest) {
     const previewLines = [
         "Rollback preview",
+        `Backup ID: ${(0, backups_1.getBackupId)(manifest.backupDir)}`,
         `Backup: ${manifest.backupDir}`,
         ...manifest.files.map((file) => {
             const suffix = file.existed ? "restore" : "remove";
@@ -100,15 +116,58 @@ function getRollbackSummary(latestBackupPath) {
     ];
     return { manifest, previewLines };
 }
-async function confirmRollback(runtime, latestBackupPath) {
-    const { previewLines } = getRollbackSummary(latestBackupPath);
+async function confirmRollback(runtime, latestBackupPath, backupsDir, backupId) {
+    const { previewLines } = backupId && backupsDir
+        ? getRollbackSummaryById(backupsDir, backupId)
+        : getRollbackSummary(latestBackupPath);
     for (const line of previewLines) {
         runtime.writeLine(line);
     }
-    const confirmed = await runtime.confirmAction("Restore files from the latest backup?", {
+    const confirmed = await runtime.confirmAction(backupId ? `Restore files from backup "${backupId}"?` : "Restore files from the latest backup?", {
         defaultValue: false,
     });
     if (!confirmed) {
-        throw (0, errors_1.cliError)("INVALID_IMPORT_FILE", "Rollback cancelled.");
+        throw (0, errors_1.cliError)("PROMPT_CANCELLED", "Rollback cancelled.");
+    }
+}
+async function chooseSetupStrategy(runtime) {
+    return runtime.selectOne("providers.json already exists. Choose a setup strategy.", [
+        { value: "merge", label: "merge", hint: "keep existing providers and override by imported names" },
+        { value: "overwrite", label: "overwrite", hint: "replace the existing registry" },
+        { value: "cancel", label: "cancel", hint: "abort setup without writing" },
+    ]);
+}
+async function collectSetupProviderDetails(runtime, profiles) {
+    const result = {};
+    for (const profile of profiles) {
+        const providerName = (await runtime.inputText(`Provider name for profile "${profile}"`, {
+            defaultValue: profile,
+        })).trim();
+        const apiKey = (await runtime.inputSecret(`API key for profile "${profile}"`)).trim();
+        const baseUrl = (await runtime.inputText(`Base URL for profile "${profile}" (optional)`)).trim();
+        const note = (await runtime.inputText(`Note for profile "${profile}" (optional)`)).trim();
+        const tags = await (0, add_interactive_1.promptTags)(runtime);
+        result[profile] = {
+            providerName: providerName || profile,
+            apiKey,
+            baseUrl: baseUrl || undefined,
+            note: note || undefined,
+            tags: tags.length > 0 ? tags : undefined,
+        };
     }
+    return result;
+}
+async function collectEditInput(runtime, current) {
+    const profile = (await runtime.inputText("Profile", { defaultValue: current.profile })).trim();
+    const apiKey = (await runtime.inputSecret("API key")).trim() || current.apiKey;
+    const baseUrl = (await runtime.inputText("Base URL (optional)", { defaultValue: current.baseUrl ?? "" })).trim();
+    const note = (await runtime.inputText("Note (optional)", { defaultValue: current.note ?? "" })).trim();
+    const tags = await (0, add_interactive_1.promptTags)(runtime, current.tags ?? []);
+    return {
+        profile,
+        apiKey,
+        baseUrl: baseUrl || undefined,
+        note: note || undefined,
+        tags,
+    };
 }

package/dist/cli/output.js

@@ -95,6 +95,22 @@ function renderHumanSuccess(command, data, warnings) {
             }
             break;
         }
+        case "show": {
+            const provider = data?.provider ?? {};
+            lines.push(`Provider: ${String(data?.providerName ?? "")}`);
+            lines.push(`profile: ${String(provider.profile ?? "")}`);
+            lines.push(`apiKey: ${String(provider.apiKey ?? "")}`);
+            if (provider.baseUrl) {
+                lines.push(`baseUrl: ${String(provider.baseUrl)}`);
+            }
+            if (provider.note) {
+                lines.push(`note: ${String(provider.note)}`);
+            }
+            if (Array.isArray(provider.tags) && provider.tags.length > 0) {
+                lines.push(`tags: ${provider.tags.join(", ")}`);
+            }
+            break;
+        }
         case "current":
             lines.push(`Current profile: ${String(data?.profile ?? "")}`);
             break;
@@ -111,11 +127,21 @@ function renderHumanSuccess(command, data, warnings) {
             lines.push(`Login performed: ${String(data?.loginPerformed ?? false)}`);
             break;
         case "import":
-            lines.push(`Imported providers from file. Backup: ${String(data?.backupPath ?? "")}`);
+            lines.push(`Imported providers from file using mode ${String(data?.mode ?? "replace")}. Backup: ${String(data?.backupPath ?? "")}`);
             break;
         case "export":
             lines.push(`Exported providers to ${String(data?.exportedTo ?? "")}.`);
             break;
+        case "setup":
+            lines.push(`Initialized providers in ${String(data?.codexDir ?? "")} using ${String(data?.strategy ?? "")}.`);
+            lines.push(`Providers initialized: ${String(data?.providersInitialized ?? 0)}`);
+            lines.push(`Doctor healthy: ${String(data?.doctor?.healthy ?? false)}`);
+            lines.push(`Backup: ${String(data?.backupPath ?? "")}`);
+            break;
+        case "edit":
+            lines.push(`Updated provider ${String(data?.provider ?? "")}. Backup: ${String(data?.backupPath ?? "")}`);
+            lines.push(`Updated fields: ${Array.isArray(data?.updatedFields) ? (data?.updatedFields).join(", ") : ""}`);
+            break;
         case "add":
             lines.push(`Added provider ${String(data?.provider ?? "")}. Backup: ${String(data?.backupPath ?? "")}`);
             break;
@@ -131,6 +157,13 @@ function renderHumanSuccess(command, data, warnings) {
             }
             break;
         }
+        case "backups-list": {
+            const backups = data?.backups ?? [];
+            for (const backup of backups) {
+                lines.push(`${backup.backupId} ${backup.reason} ${backup.createdAt}`);
+            }
+            break;
+        }
         case "rollback":
             lines.push(`Rollback restored files from ${String(data?.backupPath ?? "")}.`);
             break;

package/dist/cli/prompt.js

@@ -54,6 +54,23 @@ function createPromptRuntime() {
                 return answer.value;
             });
         },
+        selectMany: async (message, choices, options) => {
+            return handlePromptCancellation(async () => {
+                const answer = await inquirer_1.default.prompt([
+                    {
+                        type: "checkbox",
+                        name: "value",
+                        message,
+                        choices: choices.map((choice) => ({
+                            value: choice.value,
+                            name: choice.hint ? `${choice.label} (${choice.hint})` : choice.label,
+                            checked: Boolean(options?.defaultValues?.includes(choice.value)),
+                        })),
+                    },
+                ]);
+                return (Array.isArray(answer.value) ? answer.value : []);
+            });
+        },
         confirmAction: async (message, options) => {
             return handlePromptCancellation(async () => {
                 const answer = await inquirer_1.default.prompt([
@@ -78,9 +95,9 @@ async function handlePromptCancellation(run) {
     }
     catch (error) {
         if (isPromptCancellation(error)) {
-            throw (0, errors_1.cliError)("INVALID_IMPORT_FILE", "Interactive prompt was cancelled.");
+            throw (0, errors_1.cliError)("PROMPT_CANCELLED", "Interactive prompt was cancelled.");
         }
-        throw (0, errors_1.cliError)("INVALID_IMPORT_FILE", "Interactive prompt failed.", {
+        throw (0, errors_1.cliError)("INVALID_ARGUMENT", "Interactive prompt failed.", {
             cause: error instanceof Error ? error.message : String(error),
         });
     }