dsh-codex-share 0.1.1 → 0.2.0

package/README.md

@@ -10,7 +10,7 @@ A DeepSeek Harness LLM adapter that uses the same ChatGPT subscription login as
 
 ## Install
 
-Once published, install the bundle into a harness profile:
+Install the bundle into a harness profile:
 
 ```sh
 dsh plugin --profile web add dsh-codex-share
@@ -22,7 +22,7 @@ For this checkout before publication, from its directory:
 dsh plugin --profile web add .
 ```
 
-Restart the profile after installation or update. The bundle mounts one provider route, `openai-codex`, with the model catalog supplied by pi-ai. The Host plugin appears in **Settings → Plugins → Plugin list** under the global entries; it has no separate Plugin configuration card. Select that provider and a listed model in the harness model settings 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. 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.
 
 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

@@ -1,3 +1,4 @@
+import z from "@deepseek-ai/schemastery";
 import { Context } from "@deepseek-ai/cordis";
 //#region src/auth.d.ts
 /** Resolve Codex's current auth.json path without retaining a token. */
@@ -11,14 +12,18 @@ declare function readCodexAccessToken(codexHome?: string): Promise<string>;
 //#endregion
 //#region src/index.d.ts
 /** Harness route for subscription-backed Codex models. */
-declare const PROVIDER = "openai-codex";
+declare const PROVIDER = "openai-codex-local";
 declare const name = "llm-codex-share";
 declare const inject: string[];
+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[];
 }
+declare const Config: z<Config>;
 /** Register the Codex subscription model catalog and stream adapter. */
 declare function apply(ctx: Context, config?: Config): void;
 //#endregion
-export { Config, PROVIDER, apply, codexAuthPath, inject, name, readCodexAccessToken };
+export { Config, PROVIDER, SETTINGS_NS, apply, codexAuthPath, inject, name, readCodexAccessToken };

package/dist/index.mjs

@@ -1,3 +1,4 @@
+import z from "@deepseek-ai/schemastery";
 import { LlmError, resolveImageAttachmentAccess } from "@deepseek-ai/dsh-llm";
 import { PiAiAdapter } from "@deepseek-ai/dsh-llm-pi-ai";
 import { envApiKeyAuth } from "@earendil-works/pi-ai";
@@ -38,19 +39,29 @@ async function readCodexAccessToken(codexHome) {
 //#endregion
 //#region src/index.ts
 /** Harness route for subscription-backed Codex models. */
-const PROVIDER = "openai-codex";
+const PROVIDER = "openai-codex-local";
 const name = "llm-codex-share";
 const inject = ["llm"];
+const SETTINGS_NS = "llm-codex-share";
+const Config = z.object({
+	codexHome: z.string(),
+	additionalModelIds: z.array(z.string().min(1))
+});
+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");
+}
 /** Register the Codex subscription model catalog and stream adapter. */
 function apply(ctx, config = {}) {
-	const provider = {
-		...openaiCodexProvider(),
-		auth: { apiKey: envApiKeyAuth("Codex CLI login", []) }
-	};
-	const profiles = /* @__PURE__ */ new Map([[PROVIDER, {
+	validateModelIds(config);
+	let current = () => config;
+	let lastConfig;
+	let profiles;
+	const upstream = openaiCodexProvider();
+	const catalog = upstream.getModels();
+	const profileBase = {
 		provider: PROVIDER,
 		displayName: "OpenAI Codex (local login)",
-		piProvider: provider,
 		modelErrors: /* @__PURE__ */ new Map(),
 		configuredMaxTokens: /* @__PURE__ */ new Map(),
 		streamIdleTimeoutMs: 12e4,
@@ -66,10 +77,38 @@ function apply(ctx, config = {}) {
 			maxDelayMs: 0,
 			jitterRatio: 0
 		}
-	}]]);
+	};
+	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 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 {
+				...catalog.find((model) => model.id === family) ?? catalog[0],
+				id,
+				name: id
+			};
+		})].map((model) => ({
+			...model,
+			provider: PROVIDER
+		}));
+		const provider = {
+			...upstream,
+			id: PROVIDER,
+			auth: { apiKey: envApiKeyAuth("Codex CLI login", []) },
+			getModels: () => models
+		};
+		profiles = /* @__PURE__ */ new Map([[PROVIDER, {
+			...profileBase,
+			piProvider: provider
+		}]]);
+		lastConfig = active;
+		return profiles;
+	};
 	const adapter = new PiAiAdapter({
-		profiles: () => profiles,
-		resolveApiKey: async () => readCodexAccessToken(config.codexHome),
+		profiles: resolveProfiles,
+		resolveApiKey: async () => readCodexAccessToken(current().codexHome),
 		resolveAttachments: () => ctx.get("attachments"),
 		resolveImageAccess: (attachments, ref) => resolveImageAttachmentAccess(attachments, (hostPath) => ctx.get("fs")?.processPathFromHostPath(hostPath), ref),
 		auth: {
@@ -89,7 +128,22 @@ function apply(ctx, config = {}) {
 			}
 		}
 	});
+	ctx.llm.registerConfigurableProviders([{
+		provider: PROVIDER,
+		displayName: "OpenAI Codex (local login)",
+		settingsNs: SETTINGS_NS,
+		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 { PROVIDER, apply, codexAuthPath, inject, name, readCodexAccessToken };
+export { Config, PROVIDER, SETTINGS_NS, apply, codexAuthPath, inject, name, readCodexAccessToken };

package/lib/client.js

@@ -0,0 +1,119 @@
+window.__ModuleLoader__.load({ id: 'dsh-codex-share', factory: (require) => {
+const module = { exports: {} }; const exports = module.exports;
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+let react = require("react");
+//#region src/client/index.ts
+function CodexModelsCard(props) {
+	const settings = props.useSettings((snapshot) => snapshot);
+	const configured = settings.value?.additionalModelIds ?? [];
+	const [draft, setDraft] = (0, react.useState)(() => configured.join("\n"));
+	const [editing, setEditing] = (0, react.useState)(false);
+	const [busy, setBusy] = (0, react.useState)(false);
+	const [message, setMessage] = (0, react.useState)();
+	(0, react.useEffect)(() => {
+		if (!editing) setDraft(configured.join("\n"));
+	}, [settings.revision, editing]);
+	const submit = async () => {
+		const ids = draft.split(/\r?\n/).map((id) => id.trim()).filter(Boolean);
+		if (new Set(ids).size !== ids.length) {
+			setMessage("Each model ID must appear only once.");
+			return;
+		}
+		if (settings.revision === void 0) return;
+		setBusy(true);
+		setMessage(void 0);
+		try {
+			const error = await props.save(ids, settings.revision);
+			if (error === void 0) {
+				setEditing(false);
+				setMessage("Codex model IDs saved.");
+			} else setMessage(error);
+		} finally {
+			setBusy(false);
+		}
+	};
+	const children = editing ? [
+		(0, react.createElement)("label", {
+			key: "label",
+			htmlFor: "codex-share-model-ids"
+		}, "Additional model IDs (one per line)"),
+		(0, react.createElement)("textarea", {
+			key: "input",
+			id: "codex-share-model-ids",
+			rows: 4,
+			value: draft,
+			placeholder: "gpt-6-sol\ngpt-6-luna",
+			disabled: busy || !settings.writable,
+			onChange: (event) => setDraft(event.target.value),
+			style: {
+				display: "block",
+				width: "100%",
+				boxSizing: "border-box",
+				margin: "8px 0"
+			}
+		}),
+		(0, react.createElement)("p", { key: "hint" }, "These IDs are added to the installed Codex catalog. The subscription endpoint must accept each ID."),
+		(0, react.createElement)("button", {
+			key: "save",
+			type: "button",
+			disabled: busy || !settings.writable,
+			onClick: () => {
+				submit();
+			}
+		}, busy ? "Saving…" : "Save model IDs"),
+		(0, react.createElement)("button", {
+			key: "cancel",
+			type: "button",
+			disabled: busy,
+			onClick: () => {
+				setEditing(false);
+				setMessage(void 0);
+			},
+			style: { marginLeft: 8 }
+		}, "Cancel")
+	] : [(0, react.createElement)("span", { key: "list" }, configured.length > 0 ? `Additional models: ${configured.join(", ")}` : "Using installed Codex model catalog"), (0, react.createElement)("button", {
+		key: "edit",
+		type: "button",
+		disabled: !settings.writable,
+		onClick: () => {
+			setDraft(configured.join("\n"));
+			setMessage(void 0);
+			setEditing(true);
+		},
+		style: { marginLeft: 8 }
+	}, "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"
+];
+function apply(ctx) {
+	const scope = ctx.settingsScope.bind({ namespace: "llm-codex-share" });
+	ctx.slots.inject("settings.models.provider-card", () => ctx.slots.register({
+		name: "settings.models.provider-card",
+		key: "llm-codex-share",
+		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;
+			}
+		})
+	}, CodexModelsCard));
+}
+//#endregion
+exports.apply = apply;
+exports.inject = inject;
+
+return module.exports;
+} });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-codex-share",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Use the local Codex CLI ChatGPT subscription login as a DeepSeek Harness LLM provider",
   "type": "module",
   "license": "MIT",
@@ -11,11 +11,13 @@
       "types": "./dist/index.d.mts",
       "default": "./dist/index.mjs"
     },
+    "./client": "./lib/client.js",
     "./cordis.patch.yml": "./cordis.patch.yml",
     "./package.json": "./package.json"
   },
   "files": [
     "dist",
+    "lib/client.js",
     "cordis.patch.yml",
     "README.md",
     "LICENSE"
@@ -25,34 +27,52 @@
   },
   "packageManager": "pnpm@11.7.0",
   "scripts": {
-    "build": "tsdown src/index.ts --dts --platform node --format esm",
+    "build": "tsdown src/index.ts --dts --platform node --format esm && pnpm build:client",
+    "build:client": "tsdown src/client/index.ts --platform browser --format cjs --out-dir lib --no-clean --external react --external @deepseek-ai/cordis --external @deepseek-ai/dsh-client-ui-slots && node scripts/wrap-client.mjs",
     "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "prepack": "pnpm build"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-llm": "^0.1.5-rc.3",
     "@deepseek-ai/dsh-attachment": "^0.1.5-rc.3",
     "@deepseek-ai/dsh-fs": "^0.1.5-rc.3",
-    "@deepseek-ai/dsh-llm-pi-ai": "^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/schemastery": "^3.18.2"
   },
   "dependencies": {
     "@earendil-works/pi-ai": "^0.85.1"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "link:../deepseek-harness/vendor/cordis",
-    "@deepseek-ai/dsh-llm": "link:../deepseek-harness/packages/llm/llm",
+    "@deepseek-ai/dsh-api-remotes": "link:../deepseek-harness/packages/api/remotes",
+    "@deepseek-ai/dsh-app-boot": "link:../deepseek-harness/packages/boot/app-boot",
     "@deepseek-ai/dsh-attachment": "link:../deepseek-harness/packages/attachment/attachment",
+    "@deepseek-ai/dsh-client-ui-renderer": "link:../deepseek-harness/packages/client/ui-renderer",
+    "@deepseek-ai/dsh-client-ui-settings": "link:../deepseek-harness/packages/client/ui-settings",
+    "@deepseek-ai/dsh-client-ui-settings-models": "link:../deepseek-harness/packages/client/ui-settings-models",
+    "@deepseek-ai/dsh-client-ui-slots": "link:../deepseek-harness/packages/client/ui-slots",
     "@deepseek-ai/dsh-fs": "link:../deepseek-harness/packages/fs/fs",
+    "@deepseek-ai/dsh-llm": "link:../deepseek-harness/packages/llm/llm",
     "@deepseek-ai/dsh-llm-pi-ai": "link:../deepseek-harness/packages/llm/llm-pi-ai",
+    "@deepseek-ai/dsh-settings": "link:../deepseek-harness/packages/settings/settings",
+    "@deepseek-ai/schemastery": "link:../deepseek-harness/vendor/schemastery",
     "@types/node": "^22.20.0",
+    "@types/react": "~18.3.31",
+    "react": "^18.3.1",
     "tsdown": "^0.22.2",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.8",
-    "@deepseek-ai/dsh-app-boot": "link:../deepseek-harness/packages/boot/app-boot"
+    "vitest": "^4.1.8"
   },
   "dsh": {
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-settings-models"
+      ]
+    },
     "bundle": {
       "patch": "./cordis.patch.yml"
     }