dsh-codex-share 0.5.1 → 0.6.0

package/README.md

@@ -4,7 +4,7 @@ A DeepSeek Harness LLM adapter that uses the same ChatGPT subscription login as
 
 ## Requirements
 
-- DeepSeek Harness `0.2.1-alpha.2` (earlier releases are no longer supported), with Node.js `^22.19.0 || >=24`.
+- DeepSeek Harness `0.2.1-alpha.2` or `0.2.1-rc.2` and later 0.2 releases (earlier releases are no longer supported), with Node.js `^22.19.0 || >=24`. The Harness packages and pi-ai are peer dependencies: the plugin uses the Harness's own copies rather than installing its own.
 - Codex CLI signed in with a ChatGPT account and configured for **file credential storage**. Run `codex login` and check `codex login status`. Codex must be able to read and update `$CODEX_HOME/auth.json` (default `~/.codex/auth.json`).
 - The harness process must run as the same OS user, or have read access to that same credential file. A keyring-only Codex login is not supported.
 
@@ -16,7 +16,7 @@ Install the bundle into a harness profile:
 dsh plugin --profile web add dsh-codex-share
 ```
 
-On a fresh profile, pnpm may stop with `ERR_PNPM_IGNORED_BUILDS` for the pi-ai dependency tree. In `$DSH_HOME/profiles/web/pnpm-workspace.yaml` (default `~/.dsh/profiles/web/pnpm-workspace.yaml`), set the generated `allowBuilds` entries for `@google/genai` and `protobufjs` to `false`, as the harness source workspace does. Then run `dsh plugin --profile web remove dsh-codex-share` followed by the add command again; a failed add can leave the package installed without activating its bundle layer.
+Versions up to 0.5.1 installed their own pinned copies of the Harness packages and pi-ai into the profile, which shadow the running Harness. After updating from those versions, `$DSH_HOME/profiles/web/node_modules/@deepseek-ai/` (default `~/.dsh/profiles/web/node_modules/@deepseek-ai/`) should no longer contain `dsh-llm` or `dsh-llm-pi-ai`; if it does, remove and re-add the plugin.
 
 For development from this checkout, from its directory:
 
@@ -24,7 +24,7 @@ For development from this checkout, from its directory:
 dsh plugin --profile web add .
 ```
 
-Restart the profile after installation or update. The bundle mounts one provider route, `openai-codex-local`, with the model catalog supplied by pi-ai 1.0, including GPT-6 Astra, Sol, and Luna, and GPT-6.1 Sol (`gpt-6.1-sol`). GPT-6.1 Luna is not listed in the current OpenAI or Codex catalogs; use `gpt-6-luna` for Luna. This route replaces the plugin's earlier `openai-codex` route, which collides with pi-ai's configurable provider directory; update any saved model selection to `openai-codex-local`. The plugin appears in **Settings → Plugins → Plugin list**. Open **Settings → Models** and use **Edit model IDs** in the OpenAI Codex row to add subscription model IDs (one per line). The IDs are saved as `additionalModelIds` on the `llm-codex-share` entry in the profile's `cordis.patch.yml` and take effect without a restart. The installed catalog remains available; clearing the additional IDs restores it. For example, enter a model ID that your account can use but the catalog does not list yet. An unrecognized ID can be listed, but requests to it will fail if the Codex endpoint rejects it. Select a listed model in the model picker or agent preset. For a local Codex home outside the default location, set the absolute `CODEX_HOME` path in the environment that launches the harness. Direct Cordis composition can configure `codexHome` on the `dsh-codex-share` plugin instead.
+Restart the profile after installation or update. The bundle discovers home directories whose names start with `.codex` and contain an `auth.json` file (including symlinked directories). Each gets a separate provider group labeled with its directory name, such as **OpenAI Codex (.codex)** and **OpenAI Codex (.codex-p)**, in the model picker. The primary account retains `openai-codex-local`; other accounts use stable routes such as `openai-codex-local-.codex-p`. Each route offers the same catalog and additional model IDs, and reads only that account’s current credentials for each request. Invalid logins never fall back to another account. Discovery runs when the plugin starts; restart the profile after adding or removing account directories. Directory labels distinguish homes without exposing account email addresses. The primary route comes with the model catalog supplied by the Harness's pi-ai 1.x, including GPT-6 Astra, Sol, and Luna, and GPT-6.1 Sol (`gpt-6.1-sol`). GPT-6.1 Luna is not listed in the current OpenAI or Codex catalogs; use `gpt-6-luna` for Luna. This route replaces the plugin's earlier `openai-codex` route, which collides with pi-ai's configurable provider directory; update any saved model selection to `openai-codex-local`. The plugin appears in **Settings → Plugins → Plugin list**. Open **Settings → Models** and use **Edit model IDs** in the OpenAI Codex row to add subscription model IDs (one per line). The IDs are saved as `additionalModelIds` on the `llm-codex-share` entry in the profile's `cordis.patch.yml` and take effect without a restart. The installed catalog remains available; clearing the additional IDs restores it. For example, enter a model ID that your account can use but the catalog does not list yet. An unrecognized ID can be listed, but requests to it will fail if the Codex endpoint rejects it. Select a listed model in the model picker or agent preset. To select the primary Codex home (while still discovering other home directories), set the absolute `CODEX_HOME` path in the environment that launches the harness. Direct Cordis composition can configure `codexHome` on the `dsh-codex-share` plugin instead.
 
 The plugin intentionally does not refresh a stale token. When Codex writes a replacement, the next harness request reads it. When Codex's current access token has expired, harness calls fail until Codex refreshes its own login. An API-key-only Codex login is rejected; this route never falls back to `OPENAI_API_KEY`.
 

package/dist/index.d.mts

@@ -19,7 +19,7 @@ declare const name = "llm-codex-share";
 declare const inject: string[];
 /** Settings namespace: the Loader entry id this bundle's patch inserts. */
 declare const SETTINGS_NS = "llm-codex-share";
-/** Plugin configuration. Omit codexHome to follow CODEX_HOME or ~/.codex. */
+/** codexHome/CODEX_HOME selects the primary route; other ~/.codex* homes are discovered. */
 interface Config {
   codexHome?: string;
   /** Extra subscription model IDs alongside the installed pi-ai catalog; edits apply without a restart. */

package/dist/index.mjs

@@ -5,9 +5,10 @@ import { envApiKeyAuth } from "@earendil-works/pi-ai";
 import { openaiCodexProvider } from "@earendil-works/pi-ai/providers/openai-codex";
 import { zaiProvider } from "@earendil-works/pi-ai/providers/zai";
 import { launchEnvironmentOf } from "@deepseek-ai/dsh-launch-environment";
+import { readdirSync, statSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import { isAbsolute, join } from "node:path";
+import { basename, dirname, isAbsolute, join } from "node:path";
 //#region src/auth.ts
 /** Read the exact ChatGPT access token currently stored by Codex CLI. */
 /** Resolve Codex's current auth.json path without retaining a token. */
@@ -38,6 +39,24 @@ async function readCodexAccessToken(codexHome) {
 	if (auth === null || auth.auth_mode !== void 0 && auth.auth_mode !== "chatgpt" || typeof auth.OPENAI_API_KEY === "string" && auth.OPENAI_API_KEY.length > 0 || typeof auth.tokens?.access_token !== "string" || auth.tokens.access_token.length === 0) throw new LlmError(`Codex login at ${path} has no ChatGPT access token; run codex login with ChatGPT`, "MISSING_CREDENTIAL");
 	return auth.tokens.access_token;
 }
+/** Discover account homes at plugin startup; retain only paths, never credentials. */
+function discoverCodexHomes(codexHome) {
+	const primary = dirname(codexAuthPath(codexHome));
+	const homes = /* @__PURE__ */ new Set([primary]);
+	try {
+		for (const entry of readdirSync(homedir()).sort()) {
+			if (!entry.startsWith(".codex")) continue;
+			const home = join(homedir(), entry);
+			try {
+				if (statSync(home).isDirectory() && statSync(join(home, "auth.json")).isFile()) homes.add(home);
+			} catch {}
+		}
+	} catch {}
+	return [...homes].map((home) => ({
+		home,
+		label: basename(home)
+	}));
+}
 //#endregion
 //#region src/index.ts
 /** Harness route for subscription-backed Codex models. */
@@ -84,6 +103,12 @@ function apply(ctx, config = Config({})) {
 		if (this === ctx.fiber) validateModelIds(Config(raw).additionalModelIds.get());
 		return raw;
 	});
+	const accounts = discoverCodexHomes(config.codexHome).map((account, index) => ({
+		...account,
+		provider: index === 0 ? PROVIDER : `${PROVIDER}-${encodeURIComponent(account.label)}`,
+		displayName: `OpenAI Codex (${account.label})`
+	}));
+	const accountHomes = new Map(accounts.map((account) => [account.provider, account.home]));
 	let lastIds;
 	let profiles;
 	const upstream = openaiCodexProvider();
@@ -158,17 +183,18 @@ function apply(ctx, config = Config({})) {
 				name: id
 			};
 		})];
-		const provider = routeProvider(upstream, PROVIDER, upstream.name, "Codex CLI login", models);
-		profiles = new Map([[PROVIDER, {
+		profiles = new Map([...accounts.map((account) => [account.provider, {
 			...profileBase,
-			piProvider: provider
-		}], ...glmProfile === void 0 ? [] : [[GLM_PROVIDER, glmProfile]]]);
+			provider: account.provider,
+			displayName: account.displayName,
+			piProvider: routeProvider(upstream, account.provider, account.displayName, "Codex CLI login", models)
+		}]), ...glmProfile === void 0 ? [] : [[GLM_PROVIDER, glmProfile]]]);
 		lastIds = configured;
 		return profiles;
 	};
 	const adapter = new PiAiAdapter({
 		profiles: resolveProfiles,
-		resolveApiKey: async (provider) => provider === "glm-coding-global" ? glmKey : readCodexAccessToken(config.codexHome),
+		resolveApiKey: async (provider) => provider === "glm-coding-global" ? glmKey : accountHomes.has(provider) ? readCodexAccessToken(accountHomes.get(provider)) : Promise.reject(new LlmError("Unknown Codex account route", "NO_ADAPTER")),
 		resolveAttachments: () => ctx.get("attachments"),
 		resolveImageAccess: (attachments, ref) => resolveImageAttachmentAccess(attachments, (hostPath) => ctx.get("fs")?.processPathFromHostPath(hostPath), ref),
 		auth: {
@@ -188,13 +214,13 @@ function apply(ctx, config = Config({})) {
 			}
 		}
 	});
-	ctx.llm.registerConfigurableProviders([{
-		provider: PROVIDER,
-		displayName: "OpenAI Codex (local login)",
+	ctx.llm.registerConfigurableProviders([...accounts.map(({ provider, displayName }) => ({
+		provider,
+		displayName,
 		settingsNs: SETTINGS_NS,
 		settingsPath: []
-	}]);
-	ctx.llm.registerAdapter(glmProfile === void 0 ? [PROVIDER] : [PROVIDER, GLM_PROVIDER], adapter);
+	}))]);
+	ctx.llm.registerAdapter([...accountHomes.keys(), ...glmProfile === void 0 ? [] : [GLM_PROVIDER]], adapter);
 }
 //#endregion
 export { Config, GLM_PROVIDER, PROVIDER, SETTINGS_NS, apply, codexAuthPath, inject, name, readCodexAccessToken };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-share",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "Use the local Codex CLI ChatGPT subscription login as a DeepSeek Harness LLM provider",
   "type": "module",
   "license": "MIT",
@@ -27,23 +27,17 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "~4.0.5-alpha.1",
-    "@deepseek-ai/dsh-attachment": "0.2.1-alpha.2",
-    "@deepseek-ai/dsh-fs": "0.2.1-alpha.2",
-    "@deepseek-ai/dsh-llm": "0.2.1-alpha.2",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.2.1-alpha.2",
-    "@deepseek-ai/schemastery": "~3.18.5-alpha.1"
-  },
-  "dependencies": {
-    "@deepseek-ai/cordis": "~4.0.5-alpha.1",
-    "@deepseek-ai/dsh-attachment": "0.2.1-alpha.2",
-    "@deepseek-ai/dsh-credentials": "0.2.1-alpha.2",
-    "@deepseek-ai/dsh-launch-environment": "0.2.1-alpha.2",
-    "@deepseek-ai/dsh-llm": "0.2.1-alpha.2",
-    "@deepseek-ai/dsh-llm-pi-ai": "0.2.1-alpha.2",
+    "@deepseek-ai/dsh-attachment": "0.2.1-alpha.2 || ^0.2.1-rc.2",
+    "@deepseek-ai/dsh-fs": "0.2.1-alpha.2 || ^0.2.1-rc.2",
+    "@deepseek-ai/dsh-launch-environment": "0.2.1-alpha.2 || ^0.2.1-rc.2",
+    "@deepseek-ai/dsh-llm": "0.2.1-alpha.2 || ^0.2.1-rc.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "0.2.1-alpha.2 || ^0.2.1-rc.2",
     "@deepseek-ai/schemastery": "~3.18.5-alpha.1",
     "@earendil-works/pi-ai": "^1.0.2"
   },
   "devDependencies": {
+    "@earendil-works/pi-ai": "1.1.0",
+    "@deepseek-ai/dsh-launch-environment": "link:../../deepseek-harness/packages/util/launch-environment",
     "@deepseek-ai/cordis": "link:../../deepseek-harness/vendor/cordis",
     "@deepseek-ai/dsh-api-remotes": "link:../../deepseek-harness/packages/api/remotes",
     "@deepseek-ai/dsh-app-boot": "link:../../deepseek-harness/packages/boot/app-boot",