dsh-codex-share 0.2.0 → 0.3.1

package/README.md

@@ -4,7 +4,7 @@ A DeepSeek Harness LLM adapter that uses the same ChatGPT subscription login as
 
 ## Requirements
 
-- DeepSeek Harness `0.1.5-rc.3` or a compatible later release, with Node.js `^22.19.0 || >=24`.
+- DeepSeek Harness `0.1.7-rc.2` or a compatible later release (0.1.5 releases are no longer supported), with Node.js `^22.19.0 || >=24`.
 - 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,13 +16,15 @@ Install the bundle into a harness profile:
 dsh plugin --profile web add dsh-codex-share
 ```
 
-For this checkout before publication, from its directory:
+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.
+
+For development from this checkout, from its directory:
 
 ```sh
 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. 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 installed catalog remains available; clearing the additional IDs restores it. For example, enter `gpt-6-sol` and `gpt-6-luna` if your account can use them. 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 mounts one provider route, `openai-codex-local`, with the model catalog supplied by pi-ai plus GPT-6 Sol (`gpt-6-sol`) and GPT-6 Luna (`gpt-6-luna`), whose metadata is taken from pi-ai 0.87 because the harness's pi-ai adapter still runs on pi-ai 0.85. 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.
 
 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`.
 
@@ -36,4 +38,4 @@ pnpm build
 pnpm pack
 ```
 
-The development links in `package.json` point to the adjacent `../deepseek-harness` checkout. Replace those dev links when developing elsewhere; they are not installed by consumers of the published package.
+The development links in `package.json` and local overrides in `pnpm-workspace.yaml` point to the adjacent `../deepseek-harness` checkout. Replace those paths when developing elsewhere; consumers of the published package use the versioned runtime dependencies instead.

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import z from "@deepseek-ai/schemastery";
-import { Context } from "@deepseek-ai/cordis";
+import { Context, Volatile } from "@deepseek-ai/cordis";
 //#region src/auth.d.ts
 /** Resolve Codex's current auth.json path without retaining a token. */
 declare function codexAuthPath(codexHome?: string): string;
@@ -15,14 +15,15 @@ declare function readCodexAccessToken(codexHome?: string): Promise<string>;
 declare const PROVIDER = "openai-codex-local";
 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. */
 interface Config {
   codexHome?: string;
-  /** Extra subscription model IDs alongside the installed pi-ai catalog. */
-  additionalModelIds?: string[];
+  /** Extra subscription model IDs alongside the installed pi-ai catalog; edits apply without a restart. */
+  additionalModelIds: Volatile<string[]>;
 }
-declare const Config: z<Config>;
+declare const Config: z<Partial<Record<keyof Config, unknown>>, Config>;
 /** Register the Codex subscription model catalog and stream adapter. */
 declare function apply(ctx: Context, config?: Config): void;
 //#endregion

package/dist/index.mjs

@@ -42,23 +42,85 @@ async function readCodexAccessToken(codexHome) {
 const PROVIDER = "openai-codex-local";
 const name = "llm-codex-share";
 const inject = ["llm"];
+/** Settings namespace: the Loader entry id this bundle's patch inserts. */
 const SETTINGS_NS = "llm-codex-share";
 const Config = z.object({
 	codexHome: z.string(),
-	additionalModelIds: z.array(z.string().min(1))
+	additionalModelIds: z.array(z.string().min(1)).default([]).volatile()
 });
-function validateModelIds(config) {
-	const ids = config.additionalModelIds;
-	if (ids !== void 0 && (new Set(ids).size !== ids.length || ids.some((id) => id.trim() !== id))) throw new TypeError("Additional Codex model IDs must be unique, non-empty, and trimmed");
+/**
+* GPT-6 Sol and Luna as pi-ai 0.87 catalogs them. pi-ai 0.87 providers take a
+* different stream context than the dsh 0.1.7 adapter (built on 0.85) sends,
+* so the dependency stays on 0.85 and these entries are added on top of its
+* GPT-6 Astra entry. An installed catalog that already lists an ID wins.
+*/
+const GPT6_MODELS = [{
+	id: "gpt-6-sol",
+	name: "GPT-6 Sol",
+	cost: {
+		input: 2,
+		output: 10,
+		cacheRead: .2,
+		cacheWrite: 2.5,
+		tiers: [{
+			inputTokensAbove: 272e3,
+			input: 4,
+			output: 15,
+			cacheRead: .4,
+			cacheWrite: 5
+		}]
+	}
+}, {
+	id: "gpt-6-luna",
+	name: "GPT-6 Luna",
+	cost: {
+		input: .1,
+		output: .5,
+		cacheRead: .01,
+		cacheWrite: .125,
+		tiers: [{
+			inputTokensAbove: 272e3,
+			input: .2,
+			output: .75,
+			cacheRead: .02,
+			cacheWrite: .25
+		}]
+	}
+}];
+const GPT6_THINKING = {
+	off: "none",
+	minimal: "low",
+	low: "low",
+	medium: "medium",
+	high: "high",
+	xhigh: "xhigh",
+	max: "max"
+};
+function validateModelIds(ids) {
+	if (new Set(ids).size !== ids.length || ids.some((id) => id.trim() !== id)) throw new TypeError("Additional Codex model IDs must be unique, non-empty, and trimmed");
 }
 /** Register the Codex subscription model catalog and stream adapter. */
-function apply(ctx, config = {}) {
-	validateModelIds(config);
-	let current = () => config;
-	let lastConfig;
+function apply(ctx, config = Config({})) {
+	validateModelIds(config.additionalModelIds.get());
+	ctx.on("internal/config", function(_raw, next) {
+		const raw = next();
+		if (this === ctx.fiber) validateModelIds(Config(raw).additionalModelIds.get());
+		return raw;
+	});
+	let lastIds;
 	let profiles;
 	const upstream = openaiCodexProvider();
-	const catalog = upstream.getModels();
+	const installed = upstream.getModels();
+	const astra = installed.find((model) => model.id === "gpt-6-astra");
+	const catalog = astra === void 0 ? installed : [...installed, ...GPT6_MODELS.filter((extra) => !installed.some((model) => model.id === extra.id)).map((extra) => ({
+		...astra,
+		...extra,
+		thinkingLevelMap: GPT6_THINKING,
+		cost: {
+			...extra.cost,
+			tiers: [...extra.cost.tiers]
+		}
+	}))];
 	const profileBase = {
 		provider: PROVIDER,
 		displayName: "OpenAI Codex (local login)",
@@ -79,9 +141,9 @@ function apply(ctx, config = {}) {
 		}
 	};
 	const resolveProfiles = () => {
-		const active = current();
-		if (active === lastConfig && profiles !== void 0) return profiles;
-		const ids = active.additionalModelIds?.filter((id) => !catalog.some((model) => model.id === id)) ?? [];
+		const configured = config.additionalModelIds.get();
+		if (configured === lastIds && profiles !== void 0) return profiles;
+		const ids = configured.filter((id) => !catalog.some((model) => model.id === id));
 		const models = [...catalog, ...ids.map((id) => {
 			const family = id.endsWith("-luna") ? "gpt-5.6-luna" : id.endsWith("-sol") ? "gpt-5.6-sol" : "gpt-6-astra";
 			return {
@@ -103,12 +165,12 @@ function apply(ctx, config = {}) {
 			...profileBase,
 			piProvider: provider
 		}]]);
-		lastConfig = active;
+		lastIds = configured;
 		return profiles;
 	};
 	const adapter = new PiAiAdapter({
 		profiles: resolveProfiles,
-		resolveApiKey: async () => readCodexAccessToken(current().codexHome),
+		resolveApiKey: async () => readCodexAccessToken(config.codexHome),
 		resolveAttachments: () => ctx.get("attachments"),
 		resolveImageAccess: (attachments, ref) => resolveImageAttachmentAccess(attachments, (hostPath) => ctx.get("fs")?.processPathFromHostPath(hostPath), ref),
 		auth: {
@@ -135,15 +197,6 @@ function apply(ctx, config = {}) {
 		settingsPath: []
 	}]);
 	ctx.llm.registerAdapter([PROVIDER], adapter);
-	ctx.inject(["settings"], (settingsCtx) => {
-		settingsCtx.settings.installSection(ctx, SETTINGS_NS, Config, config, {
-			validate: validateModelIds,
-			setSource: (source) => {
-				current = source;
-			},
-			onChange: () => {}
-		});
-	});
 }
 //#endregion
 export { Config, PROVIDER, SETTINGS_NS, apply, codexAuthPath, inject, name, readCodexAccessToken };

package/lib/client.js

@@ -3,6 +3,7 @@ const module = { exports: {} }; const exports = module.exports;
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 let react = require("react");
 //#region src/client/index.ts
+const SETTINGS_NS = "llm-codex-share";
 function CodexModelsCard(props) {
 	const settings = props.useSettings((snapshot) => snapshot);
 	const configured = settings.value?.additionalModelIds ?? [];
@@ -23,11 +24,12 @@ function CodexModelsCard(props) {
 		setBusy(true);
 		setMessage(void 0);
 		try {
-			const error = await props.save(ids, settings.revision);
-			if (error === void 0) {
+			if (await props.save(ids, settings.revision)) {
 				setEditing(false);
 				setMessage("Codex model IDs saved.");
-			} else setMessage(error);
+			} else setMessage("The harness refused these model IDs; the saved list is unchanged.");
+		} catch (error) {
+			setMessage(error instanceof Error ? error.message : String(error));
 		} finally {
 			setBusy(false);
 		}
@@ -84,30 +86,22 @@ function CodexModelsCard(props) {
 	}, "Edit model IDs")];
 	return (0, react.createElement)("div", { style: { padding: "8px 0" } }, ...children, message === void 0 ? null : (0, react.createElement)("p", { role: "status" }, message));
 }
-const inject = [
-	"slots",
-	"settingsScope",
-	"remote",
-	"remote.settings"
-];
+const inject = ["slots", "configForms"];
 function apply(ctx) {
-	const scope = ctx.settingsScope.bind({ namespace: "llm-codex-share" });
+	const form = ctx.configForms.get(SETTINGS_NS);
 	ctx.slots.inject("settings.models.provider-card", () => ctx.slots.register({
 		name: "settings.models.provider-card",
-		key: "llm-codex-share",
+		key: SETTINGS_NS,
 		inject: () => ({
-			hooks: { settings: scope },
-			save: async (ids, revision) => {
-				const response = await ctx.remote.settings.mutate("llm-codex-share", [ids.length === 0 ? {
-					op: "unset",
-					path: ["additionalModelIds"]
-				} : {
-					op: "set",
-					path: ["additionalModelIds"],
-					value: ids
-				}], revision);
-				return response.ok ? void 0 : response.error.message;
-			}
+			hooks: { settings: form },
+			save: (ids, revision) => form.mutate([ids.length === 0 ? {
+				op: "unset",
+				path: ["additionalModelIds"]
+			} : {
+				op: "set",
+				path: ["additionalModelIds"],
+				value: ids
+			}], revision)
 		})
 	}, CodexModelsCard));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-share",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "Use the local Codex CLI ChatGPT subscription login as a DeepSeek Harness LLM provider",
   "type": "module",
   "license": "MIT",
@@ -35,14 +35,20 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-attachment": "^0.1.5-rc.3",
-    "@deepseek-ai/dsh-fs": "^0.1.5-rc.3",
-    "@deepseek-ai/dsh-llm": "^0.1.5-rc.3",
-    "@deepseek-ai/dsh-llm-pi-ai": "^0.1.5-rc.3",
-    "@deepseek-ai/dsh-settings": "^0.1.5-rc.3",
+    "@deepseek-ai/dsh-attachment": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-fs": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "^0.1.7-rc.2",
     "@deepseek-ai/schemastery": "^3.18.2"
   },
   "dependencies": {
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-attachment": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-credentials": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-launch-environment": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm-pi-ai": "^0.1.7-rc.2",
+    "@deepseek-ai/schemastery": "^3.18.2",
     "@earendil-works/pi-ai": "^0.85.1"
   },
   "devDependencies": {