@bjesuiter/codex-switcher 1.8.4 → 1.8.5

package/README.md

@@ -6,11 +6,11 @@ Switch the coding-agents [pi](https://pi.dev/), [codex](https://developers.opena
 
 ## Latest Changes
 
-### 1.8.4
+### 1.8.5
 
 #### Fixes
 
-- Linux `cdx doctor` guided checks now detect `gnome-keyring-daemon` with a full-command `pgrep -f` match, fixing false negatives/errors on systems where `pgrep -x` cannot match process names longer than 15 characters.
+- Linux `cdx doctor` guided checks now avoid false-positive `gnome-keyring-daemon` running detection by preferring `ps` command-line matching (with a `pgrep` fallback), and provide clearer guidance when basic checks pass but the secure-store probe still fails (for example locked keyring/default collection/session bus issues).
 
 see full changelog here: https://github.com/bjesuiter/codex-switcher/blob/main/CHANGELOG.md
 

package/cdx.mjs

@@ -15,7 +15,7 @@ import { generatePKCE } from "@openauthjs/openauth/pkce";
 import http from "node:http";
 
 //#region package.json
-var version = "1.8.4";
+var version = "1.8.5";
 
 //#endregion
 //#region lib/platform/path-resolver.ts
@@ -2823,20 +2823,33 @@ const extractCommandFailureDetails = (result) => result.error || result.stderr |
 const isCommandAvailable = async (commandName) => {
 	return (await runCommandCapture("sh", ["-lc", `command -v ${commandName} >/dev/null 2>&1`])).ok;
 };
+const GNOME_KEYRING_CMDLINE_PATTERN = /(^|\/)gnome-keyring-daemon(\s|$)/;
 const checkGnomeKeyringRunning = async () => {
+	if (await isCommandAvailable("ps")) {
+		const psResult = await runCommandCapture("ps", [
+			"-A",
+			"-o",
+			"args="
+		]);
+		if (psResult.ok) {
+			if (psResult.stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).some((line) => GNOME_KEYRING_CMDLINE_PATTERN.test(line))) return { ok: true };
+			return {
+				ok: false,
+				details: "No gnome-keyring-daemon process found."
+			};
+		}
+	}
 	if (await isCommandAvailable("pgrep")) {
-		const pgrepResult = await runCommandCapture("pgrep", ["-f", "(^|/)gnome-keyring-daemon( |$)"]);
+		const pgrepResult = await runCommandCapture("pgrep", ["-f", "gnome-keyring-daemon"]);
 		if (pgrepResult.ok) return { ok: true };
 		return {
 			ok: false,
 			details: extractCommandFailureDetails(pgrepResult) ?? "No gnome-keyring-daemon process found."
 		};
 	}
-	const psFallback = await runCommandCapture("sh", ["-lc", "ps -A -o comm= | grep -q '^gnome-keyring-daemon$'"]);
-	if (psFallback.ok) return { ok: true };
 	return {
 		ok: false,
-		details: extractCommandFailureDetails(psFallback) ?? "No gnome-keyring-daemon process found."
+		details: "Neither ps nor pgrep is available to check gnome-keyring-daemon."
 	};
 };
 const parseSystemctlEnabledState = (output) => {
@@ -3078,6 +3091,7 @@ const maybeRunLinuxSecretStoreChecklist = async () => {
 		}
 	}
 	process.stdout.write(`  Guided checklist summary: ${passed}/${checklist.length} checks passed.\n`);
+	if (passed === checklist.length) process.stdout.write("  Note: basic checks passed, but secure-store probe still failed. This can happen when the keyring is locked, has no default collection, or your D-Bus/session setup prevents Secret Service writes.\n");
 };
 const registerDoctorCommand = (program) => {
 	program.command("doctor").description("Show auth file paths and runtime capabilities").option("--check-keychain-acl", "Run keychain trusted-app/ACL checks on macOS (can be slow)").action(async (options) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bjesuiter/codex-switcher",
-  "version": "1.8.4",
+  "version": "1.8.5",
   "type": "module",
   "description": "CLI tool to switch between multiple OpenAI accounts for OpenCode",
   "bin": {