@sireai/optimus 0.1.10 → 0.1.13

package/dist/cli/optimus.js

@@ -1039,12 +1039,13 @@ async function resolveDefaultSetupAnswers() {
             enableSentry: false
         };
     }
+    const rawConfig = await readRawProjectConfig(configPath);
     const config = await loadConfig(configPath);
     const store = new SQLiteTaskStore(config.storage.rootDir);
     await store.init();
     const repositories = await store.listRepositoryRoots();
     const primaryRepository = repositories[0];
-    const provider = config.codex.provider;
+    const provider = config.codex.provider ?? resolveSetupCachedProvider(rawConfig);
     return {
         repoPath: primaryRepository?.path ?? "",
         repoAlias: primaryRepository?.alias ?? "",
@@ -1183,8 +1184,45 @@ function resolveSetupCodexApiKeyEnvName(answers) {
     }
     return undefined;
 }
-function buildSetupConfig(answers) {
+function normalizeSetupCachedProvider(input) {
+    if (!input || typeof input !== "object") {
+        return undefined;
+    }
+    const candidate = input;
+    const id = candidate.id?.trim();
+    const displayName = candidate.displayName?.trim();
+    const baseUrl = candidate.baseUrl?.trim();
+    const apiKeyEnvName = candidate.apiKeyEnvName?.trim();
+    const wireApi = candidate.wireApi;
+    if (!id || !displayName || !baseUrl || !apiKeyEnvName || (wireApi !== "responses" && wireApi !== "chat")) {
+        return undefined;
+    }
+    return {
+        id,
+        displayName,
+        baseUrl,
+        apiKeyEnvName,
+        wireApi
+    };
+}
+function resolveSetupCachedProvider(rawConfig) {
+    const activeProvider = normalizeSetupCachedProvider(rawConfig?.codex?.provider);
+    if (activeProvider) {
+        return activeProvider;
+    }
+    return normalizeSetupCachedProvider(rawConfig?.codex?.setupCache?.modelProvider);
+}
+function buildSetupConfig(answers, rawConfig) {
     const config = buildDefaultConfig();
+    const cachedProvider = answers.codexAuthMode === "model_provider"
+        ? {
+            id: answers.codexProviderId.trim(),
+            displayName: answers.codexProviderDisplayName.trim(),
+            baseUrl: answers.codexProviderBaseUrl.trim(),
+            apiKeyEnvName: answers.codexProviderApiKeyEnvName.trim(),
+            wireApi: "responses"
+        }
+        : resolveSetupCachedProvider(rawConfig);
     config.codex.auth.mode = answers.codexAuthMode;
     if (answers.codexAuthMode === "model_provider") {
         config.codex.provider = {
@@ -1198,6 +1236,14 @@ function buildSetupConfig(answers) {
     else {
         delete config.codex.provider;
     }
+    if (cachedProvider) {
+        config.codex.setupCache = {
+            modelProvider: cachedProvider
+        };
+    }
+    else {
+        delete config.codex.setupCache;
+    }
     config.delivery.channels = answers.enableFeishu ? ["console", "feishu"] : ["console"];
     config.delivery.feishu = {
         ...config.delivery.feishu,
@@ -1329,18 +1375,16 @@ async function runQuickDoctor(configPath = resolveDefaultConfigPath()) {
     if (!codexAuth.authenticated) {
         blocking.push({
             code: "codex_auth_missing",
-            message: `Codex authentication is missing. Required credential: ${codexAuth.apiKeyEnvName ?? "runtime login"}.`,
-            fix: codexAuth.apiKeyEnvName
-                ? `Provide ${codexAuth.apiKeyEnvName} in .env.local, or rerun \`optimus setup\` and enter the Codex API key.`
-                : "Rerun `optimus setup` and select a supported Codex auth mode."
+            message: `Codex authentication is missing for ${codexAuth.validationPath}. Required credential: ${codexAuth.requirement}.`,
+            fix: codexAuth.fixHint
         });
         next.add("optimus setup");
     }
-    if (codexAuth.mode === "codex_cli_login") {
+    if (codexAuth.mode === "codex_cli_login" && codexAuth.authenticated) {
         warnings.push({
-            code: "codex_cli_login_runtime_validation",
+            code: "codex_cli_login_resolved",
             message: "Codex auth mode is codex_cli_login.",
-            impact: "Quick doctor cannot statically verify local Codex CLI login; the first runtime turn will validate it."
+            impact: `Local Codex CLI login was resolved from ${codexAuth.authFilePath ?? "~/.codex/auth.json"}.`
         });
     }
     if (!config.codex.model?.trim()) {
@@ -1502,8 +1546,9 @@ async function runSetup(args) {
     const resolvedExecutionMode = existingRepository?.executionMode ?? describeRepositoryExecutionPlan({ executionMode: "copy" }, inspection).resolvedDefaultMode;
     const previewExecutionPlan = describeRepositoryExecutionPlan({ executionMode: resolvedExecutionMode }, inspection);
     const reviewSystem = await detectRepositoryReviewSystem(normalizedRepoPath, inspection);
+    const rawConfig = configExists ? await readRawProjectConfig(configPath) : undefined;
     await mkdir(dirname(configPath), { recursive: true });
-    await writeFile(configPath, `${buildSetupConfig({ ...answers, repoPath: normalizedRepoPath })}\n`, "utf8");
+    await writeFile(configPath, `${buildSetupConfig({ ...answers, repoPath: normalizedRepoPath }, rawConfig)}\n`, "utf8");
     const codexAuthEnvName = resolveSetupCodexApiKeyEnvName(answers);
     if (answers.codexApiKey && codexAuthEnvName) {
         await mkdir(dirname(envPath), { recursive: true });