@4yi-dev/cli 0.1.15 → 0.1.16

package/README.md

@@ -39,7 +39,7 @@ On macOS, `4yi connect claude` also configures an installed Claude Desktop throu
 
 `--scope project` changes only the project's Claude Code settings and never changes the global Claude Desktop profile.
 
-Codex CLI and Codex App share the same Codex home on native Windows (`%USERPROFILE%\\.codex`). After `4yi connect codex`, finish active App tasks, fully quit and reopen the App, and start a new chat so its embedded Codex process loads the new provider. Microsoft Store/AppX installations may not expose a conventional executable path, but that detection does not gate the shared configuration update.
+Codex CLI and Codex App share the same Codex home on native Windows (`%USERPROFILE%\\.codex`). After `4yi connect codex`, finish active App tasks, fully quit and reopen the App, and start a new chat so its embedded Codex process loads the new provider. Microsoft Store/AppX installations may not expose a conventional executable path, but that detection does not gate the shared configuration update. While the external 4YI provider supplies authentication, Codex App may hide its `Log out` action because there is no App-managed provider credential to clear. To switch back to OpenAI, run `4yi restore codex`, fully quit and reopen the App, and start a new chat.
 
 Existing Codex tasks keep the provider they were created with. Run `4yi migrate codex`, choose a recent task by number, and 4YI creates a new task with the same history and project using your Plan's default model. The original task is not modified. Scripts can use `--thread <id>` and optionally `--model <id>`.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4yi-dev/cli",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "4YI command-line launcher for OAuth login and OpenCode runtime",
   "type": "module",
   "bin": {

package/src/connect.mjs

@@ -216,9 +216,9 @@ function reportDesktopApp(target, {
   const detected = candidates.some((candidate) => exists(candidate));
   if (target === "codex" && platform === "win32") {
     if (detected) {
-      stdout("Codex App detected. 4YI updated the shared Windows Codex home. Finish active tasks, fully quit and reopen the App, then start a new chat to load the new provider.");
+      stdout("Codex App detected. 4YI updated the shared Windows Codex home. Finish active tasks, fully quit and reopen the App, then start a new chat to load the new provider. The App may hide Log out while this external provider supplies authentication; use `4yi restore codex`, then reopen the App, to return to OpenAI.");
     } else {
-      stdout("4YI updated the shared Windows Codex home. A Microsoft Store/AppX install may not expose a standard executable path; finish active tasks, fully quit and reopen any running Codex App, then start a new chat.");
+      stdout("4YI updated the shared Windows Codex home. A Microsoft Store/AppX install may not expose a standard executable path; finish active tasks, fully quit and reopen any running Codex App, then start a new chat. The App may hide Log out while this external provider supplies authentication; use `4yi restore codex`, then reopen the App, to return to OpenAI.");
     }
     return detected;
   }
@@ -249,21 +249,37 @@ function backupFile(target, file, home, groupId = timestamp()) {
   return backup;
 }
 
-function latestBackups(target, home) {
+function backupGroups(target, home) {
   const dir = path.join(pathsForHome(home).backupsDir, target);
   if (!fs.existsSync(dir)) return [];
   const entries = fs.readdirSync(dir)
     .filter((entry) => entry.endsWith(".json"))
     .sort()
     .reverse();
-  if (!entries[0]) return [];
-  const latest = path.join(dir, entries[0]);
-  const latestRecord = JSON.parse(fs.readFileSync(latest, "utf8"));
-  const groupId = latestRecord.group_id;
-  if (!groupId) return [latest];
-  return entries
-    .map((entry) => path.join(dir, entry))
-    .filter((file) => JSON.parse(fs.readFileSync(file, "utf8")).group_id === groupId);
+  const groups = new Map();
+  for (const entry of entries) {
+    const file = path.join(dir, entry);
+    const record = JSON.parse(fs.readFileSync(file, "utf8"));
+    const groupId = record.group_id || entry;
+    if (!groups.has(groupId)) groups.set(groupId, []);
+    groups.get(groupId).push({ file, record });
+  }
+  return [...groups.values()];
+}
+
+function latestBackups(target, home) {
+  const groups = backupGroups(target, home);
+  if (target !== "codex") return groups[0] || [];
+
+  // Older CLI releases created a fresh backup every time `connect codex` ran,
+  // even when Codex was already connected. Such a group only restores the 4YI
+  // provider and credential helper. Walk back to the newest group whose config
+  // predates 4YI management so existing installations can still return to the
+  // official provider.
+  return groups.find((group) => !group.some(({ record }) => (
+    typeof record.content === "string"
+      && (record.content.includes(CODEX_ROOT_START) || record.content.includes(CODEX_PROVIDER_START))
+  ))) || [];
 }
 
 function mask(value) {
@@ -566,10 +582,15 @@ async function connectCodex({ session, home, codexHome, codexBaseUrl, stdout, sk
   const catalog = buildCodexCatalog(models, template);
   atomicWrite(paths.codexCatalog, `${JSON.stringify(catalog, null, 2)}\n`);
 
-  const backupGroup = timestamp();
-  const backup = backupFile("codex", paths.codexConfig, home, backupGroup);
-  const helperBackup = backupFile("codex", paths.codexCredentialHelper, home, backupGroup);
   let existing = fs.existsSync(paths.codexConfig) ? fs.readFileSync(paths.codexConfig, "utf8") : "";
+  const alreadyManaged = existing.includes(CODEX_ROOT_START) || existing.includes(CODEX_PROVIDER_START);
+  let backup;
+  let helperBackup;
+  if (!alreadyManaged) {
+    const backupGroup = timestamp();
+    backup = backupFile("codex", paths.codexConfig, home, backupGroup);
+    helperBackup = backupFile("codex", paths.codexCredentialHelper, home, backupGroup);
+  }
   existing = removeManagedBlock(existing, CODEX_ROOT_START, CODEX_ROOT_END);
   existing = removeManagedBlock(existing, CODEX_PROVIDER_START, CODEX_PROVIDER_END);
   existing = removeCodexRootAssignments(existing);
@@ -584,8 +605,12 @@ async function connectCodex({ session, home, codexHome, codexBaseUrl, stdout, sk
   stdout(`Connected Codex: ${paths.codexConfig}`);
   stdout(`Codex credential helper: ${paths.codexCredentialHelper}`);
   stdout(`Available Codex models: ${models.map((model) => model.id).join(", ")}`);
-  stdout(`Backup: ${backup}`);
-  stdout(`Backup: ${helperBackup}`);
+  if (backup && helperBackup) {
+    stdout(`Backup: ${backup}`);
+    stdout(`Backup: ${helperBackup}`);
+  } else {
+    stdout("Preserved the existing Codex restore point.");
+  }
 }
 
 function resolveUrls(session, options) {
@@ -684,8 +709,7 @@ function restoreOne(target, home, stdout, { required = true } = {}) {
     if (required) throw new Error(`No ${target} backup found.`);
     return false;
   }
-  for (const backup of backups) {
-    const record = JSON.parse(fs.readFileSync(backup, "utf8"));
+  for (const { file: backup, record } of backups) {
     if (record.existed) atomicWrite(record.source, record.content || "");
     else if (fs.existsSync(record.source)) fs.unlinkSync(record.source);
     stdout(`Restored ${target}: ${record.source}`);