codex-subscription-oauth-plugin 0.1.5 → 0.1.7

package/README.ja.md

@@ -20,6 +20,27 @@ pnpm dsh plugin --profile acp add github:askdkc/dsh-codex
 
 プラグインはプロファイルごとに読み込まれるため、`web` に導入しただけでは `acp` にモデルは追加されません。ACPクライアントが起動するDSHプロセスを再起動し、モデル選択を開き直してください。別のプロファイルを使っている場合は、`acp` をその名前に置き換えます。
 
+このプラグインはビルド済みの `lib` を配布しており、インストール時のビルドスクリプトは不要です。インストールや更新が `ERR_PNPM_IGNORED_BUILDS` で失敗し、`codex-subscription-oauth-plugin` が表示された場合は、対象プロファイルの `pnpm-workspace.yaml`（標準では `~/.dsh/profiles/web/pnpm-workspace.yaml`）を編集します。既存の `allowBuilds` 内で、このパッケージのビルドスクリプトを実行しないよう明示してください。
+
+```yaml
+allowBuilds:
+  codex-subscription-oauth-plugin: false
+```
+
+既に `codex-subscription-oauth-plugin: true` があれば `false` に変更します。`allowBuilds` のキーが `codex-subscription-oauth-plugin@` で始まる他の項目は、リポジトリURL、コミットURL、生成された `set this to true or false` のプレースホルダーも含めて削除してください。このパッケージの項目は名前だけの `false` 一つにし、他のパッケージの設定は保持します。再実行する前に、プロファイルの設定ファイルを保存してください。
+
+名前だけの `true` と異なり、名前だけの `false` はGit依存関係にも適用されます。pnpmにスクリプトを実行しない判断を明示するため、更新のたびにコミットハッシュを書き換える必要はありません。この復旧手順はpnpm 11.7.0で動作し、pnpmの更新は不要です。詳しくはpnpmの [Git依存関係のビルド設定](https://pnpm.io/settings/build#allowbuilds) を参照してください。
+
+その後、DeepSeek Harnessのチェックアウトから、失敗した `pnpm dsh plugin ...` コマンドを再実行します。別のプラグインを更新する場合も、このプロファイルの依存関係が確認されます。例えば、失敗したKiokukoの更新を再実行する場合:
+
+```sh
+pnpm dsh plugin --profile web update kiokuko-dsh --latest
+```
+
+コマンドが正常終了するまで確認してください。`Already up to date` はビルド設定のエラーより前に表示される場合があり、その表示だけでは更新成功とは判断できません。
+
+設定を編集するプロファイルと再実行するプロファイルを合わせてください。`DSH_HOME` を変更している場合はパスも合わせます。Harnessのチェックアウトで `pnpm approve-builds` を実行しても、対象はそのチェックアウトであり、プラグインのプロファイルではありません。`minimumReleaseAge` を変更しても、ビルドの承認エラーは解消しません。
+
 既存のACPプロファイルへのインストールが `ERR_PNPM_UNEXPECTED_STORE` で失敗した場合は、現在のpnpmストアを使ってそのプロファイルの依存関係を再インストールしてから、プラグインの追加を再実行します。
 
 ```sh
@@ -43,6 +64,12 @@ Codex用のChatGPTアカウントでログインします。
 pnpm dsh plugin --profile web remove codex-subscription-oauth-plugin
 ```
 
+## モデルと接続診断
+
+GPT-6.1 Terraには、Astraからのコピーではなく[公式Codexカタログ](https://github.com/openai/codex/blob/main/codex-rs/models-manager/models.json)の通常コンテキスト500,000、テキスト・画像入力と、本アダプターで扱えるlow〜maxのreasoning情報を使用します。出力上限と価格の見積りは[Terraのモデル情報](https://developers.openai.com/api/docs/models/gpt-6.1-terra)と[API価格](https://developers.openai.com/api/docs/pricing)に基づきます。アカウントでの表示可否は認証済みカタログで決まります。実行に必要な出力上限・価格情報がない未知モデルには `MODEL_METADATA_MISSING` を出し、他モデルの能力を推測でコピーしません。
+
+接続失敗には、SDKの開始前・開始後の段階、SSE切替の有無と安全なエラーコードを残します。診断には生のclose理由・stack・header・本文を含めません。最初の応答イベントより前ではSDKがSSEに切り替えることがありますが、プラグインは再試行を追加せず、途中の応答やツール出力を再送しません。キャンセルを維持し、SSEのHTTPエラーではホストが分類できるようstatusを保持します。
+
 ## ライセンス
 
 MITライセンスです。詳細は [LICENSE](./LICENSE) を参照してください。

package/README.md

@@ -20,6 +20,27 @@ pnpm dsh plugin --profile acp add github:askdkc/dsh-codex
 
 Profiles load plugins independently: installing into `web` does not add models to `acp`. Restart the DSH process launched by your ACP client, then reopen its model selector. If the client uses a different profile, replace `acp` with that name.
 
+This plugin ships prebuilt `lib` files and does not need install-time build scripts. If an installation or update fails with `ERR_PNPM_IGNORED_BUILDS` naming `codex-subscription-oauth-plugin`, edit the target profile's `pnpm-workspace.yaml` (by default, `~/.dsh/profiles/web/pnpm-workspace.yaml`). In its existing `allowBuilds` map, explicitly skip this package's build scripts:
+
+```yaml
+allowBuilds:
+  codex-subscription-oauth-plugin: false
+```
+
+Change an existing `codex-subscription-oauth-plugin: true` to `false`. Delete any other `allowBuilds` entries whose key starts with `codex-subscription-oauth-plugin@`, including repository URLs, commit URLs, and generated `set this to true or false` placeholders. Keep only the name-only `false` entry for this package and preserve other packages' settings. Save the profile file before retrying.
+
+Unlike a name-only `true`, a name-only `false` also applies to Git dependencies: pnpm records an explicit decision to skip the scripts, so updates do not require commit-hash edits. This recovery works with pnpm 11.7.0; upgrading pnpm is not required. See pnpm's [Git dependency build settings](https://pnpm.io/settings/build#allowbuilds).
+
+Then rerun the failed `pnpm dsh plugin ...` command from the DeepSeek Harness checkout. Even an update of another plugin checks this profile's dependencies; for example, retry a failed Kiokuko update with:
+
+```sh
+pnpm dsh plugin --profile web update kiokuko-dsh --latest
+```
+
+Wait for the command to exit successfully. `Already up to date` can appear before a build-policy error and does not by itself mean the update succeeded.
+
+Use the same profile for the configuration edit and retry; adjust the path for a custom `DSH_HOME`. Running `pnpm approve-builds` in the Harness checkout targets that checkout, not the plugin profile. Changing `minimumReleaseAge` does not resolve build approval failures.
+
 If installation into an existing ACP profile fails with `ERR_PNPM_UNEXPECTED_STORE`, reinstall that profile's dependencies using the current pnpm store, then retry:
 
 ```sh
@@ -43,6 +64,12 @@ Remove the plugin:
 pnpm dsh plugin --profile web remove codex-subscription-oauth-plugin
 ```
 
+## Models and connection diagnostics
+
+GPT-6.1 Terra uses its own [Codex catalog metadata](https://github.com/openai/codex/blob/main/codex-rs/models-manager/models.json): a 500,000-token default context, text/image input, and low through max reasoning supported by this adapter. Its output cap and cost estimate come from the [Terra model page](https://developers.openai.com/api/docs/models/gpt-6.1-terra) and [API pricing](https://developers.openai.com/api/docs/pricing), rather than Astra. Account visibility still comes from the authenticated catalog. Unknown entries without executable output/cost metadata emit `MODEL_METADATA_MISSING`; their capabilities are not guessed from another model.
+
+Connection failures retain the SDK's before/after-start phase, fallback choice and safe error code. Raw close reasons, stacks, headers and bodies are omitted from these diagnostics. The SDK may switch to SSE before its first response event; the plugin adds no retries and does not replay an interrupted response or tool output. Cancellation stays cancelled, and an SSE HTTP error retains its status for the host's classification.
+
 ## License
 
 MIT. See [LICENSE](./LICENSE).

package/lib/index.js

@@ -1,9 +1,9 @@
-import { c as lazyApi, i as createProvider, r as createModels } from "./models-BdCc9Ab5.js";
+import { c as lazyApi, i as createProvider, r as createModels, u as createAssistantMessageEventStream } from "./models-SNl0ezHJ.js";
 import AuthorizationService, { AuthorizationDeclinedError } from "@deepseek-ai/dsh-authorization";
 import { credentialKey, credentialKeyId, credentialKeyScope, isCredentialKeySegment } from "@deepseek-ai/dsh-credentials";
 import { LlmError, resolveImageAttachmentAccess, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
 import { PiAiAdapter, recordKeyFor } from "@deepseek-ai/dsh-llm-pi-ai";
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/auth/helpers.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/auth/helpers.js
 /**
 * Wraps a dynamically imported `OAuthAuth` so provider definitions can
 * advertise OAuth without importing the implementation. The flow loads on
@@ -27,10 +27,10 @@ function lazyOAuth(input) {
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.lazy.js
-const openAICodexResponsesApi = () => lazyApi(() => import("./openai-codex-responses-DKg-2_3a.js"));
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.lazy.js
+const openAICodexResponsesApi = () => lazyApi(() => import("./openai-codex-responses-CYGCQRS8.js"));
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/auth/oauth/load.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/auth/oauth/load.js
 var __rewriteRelativeImportExtension = function(path, preserveJsx) {
 	if (typeof path === "string" && /^\.\.?\//.test(path)) return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m, tsx, d, ext, cm) {
 		return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : d + ext + "." + cm.toLowerCase() + "js";
@@ -50,7 +50,7 @@ const loadOpenAICodexOAuth = async () => {
 	return (await importOAuthModule("./openai-codex.ts")).openaiCodexOAuth;
 };
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/providers/data/openai-codex.json
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/providers/data/openai-codex.json
 var openai_codex_default = { "openai-codex-responses": {
 	"gpt-5.3-codex-spark": {
 		"id": "gpt-5.3-codex-spark",
@@ -305,15 +305,15 @@ var openai_codex_default = { "openai-codex-responses": {
 	}
 } };
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/model-catalog.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/model-catalog.js
 function flattenModelCatalog(_provider, groups) {
 	return Object.assign({}, ...Object.values(groups));
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/providers/openai-codex.models.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/providers/openai-codex.models.js
 const OPENAI_CODEX_MODELS = flattenModelCatalog("openai-codex", openai_codex_default);
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/providers/openai-codex.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/providers/openai-codex.js
 function openaiCodexProvider() {
 	return createProvider({
 		id: "openai-codex",
@@ -525,6 +525,8 @@ var CodexCatalog = class {
 			}
 			const official = parseOfficialModels(payload);
 			if (official.length === 0) throw Object.assign(/* @__PURE__ */ new Error("empty model list"), { code: "EMPTY_LIST" });
+			const missing = official.filter((entry) => !this.baselineById.has(entry.slug)).length;
+			if (missing > 0) this.warn(`codex-subscription-oauth: MODEL_METADATA_MISSING (${missing} listed models)`);
 			const models = official.map((entry) => {
 				const baseline = this.baselineById.get(entry.slug);
 				if (baseline === void 0) return void 0;
@@ -751,13 +753,114 @@ function toBundledCodexContext(context) {
 	};
 }
 /** Freeze a catalog generation and bridge both provider streaming entry points. */
-function providerWithModels(provider, models) {
+function providerWithModels(provider, models, warn = () => {}) {
 	const generation = Object.freeze([...models]);
+	function observed(model, run) {
+		const stream = createAssistantMessageEventStream();
+		let httpStatus;
+		(async () => {
+			for await (const event of run((response) => {
+				httpStatus = response.status;
+			})) {
+				if (event.type !== "done" && event.type !== "error") {
+					stream.push(event);
+					continue;
+				}
+				const message = event.type === "done" ? event.message : event.error;
+				const diagnostics = message.diagnostics?.map((diagnostic) => {
+					if (diagnostic.type !== "provider_transport_failure") return diagnostic;
+					const details = diagnostic.details ?? {};
+					const safe = {};
+					for (const key of ["configuredTransport", "fallbackTransport"]) if ([
+						"auto",
+						"sse",
+						"websocket",
+						"websocket-cached"
+					].includes(String(details[key]))) safe[key] = String(details[key]);
+					if (details.phase === "before_message_stream_start" || details.phase === "after_message_stream_start") safe.phase = details.phase;
+					if (typeof details.eventsEmitted === "boolean") safe.eventsEmitted = details.eventsEmitted;
+					if (Number.isSafeInteger(details.requestBytes) && Number(details.requestBytes) >= 0) safe.requestBytes = Number(details.requestBytes);
+					const code = diagnostic.error?.code;
+					if (typeof code === "number" && Number.isSafeInteger(code) || typeof code === "string" && /^[A-Z0-9_]{1,64}$/.test(code)) safe.code = code;
+					const summary = `Codex WebSocket failure ${JSON.stringify(safe)}`;
+					warn(summary);
+					return {
+						type: diagnostic.type,
+						timestamp: diagnostic.timestamp,
+						error: { message: summary },
+						details: safe
+					};
+				});
+				const failures = diagnostics?.filter((diagnostic) => diagnostic.type === "provider_transport_failure") ?? [];
+				const terminal = {
+					...message,
+					...diagnostics === void 0 ? {} : { diagnostics },
+					...message.stopReason !== "aborted" && event.type === "error" && failures.some((diagnostic) => diagnostic.details?.phase === "after_message_stream_start") ? { errorMessage: failures.map((diagnostic) => diagnostic.error?.message).join("; ") } : {}
+				};
+				if (event.type === "error" && message.stopReason !== "aborted" && httpStatus !== void 0 && httpStatus >= 400) {
+					terminal.errorMessage = `Codex HTTP ${httpStatus} failure`;
+					warn(terminal.errorMessage);
+				}
+				Object.assign(message, terminal);
+				stream.push(event.type === "done" ? {
+					...event,
+					message: terminal
+				} : {
+					...event,
+					error: terminal
+				});
+			}
+			stream.end();
+		})().catch(() => {
+			stream.push({
+				type: "error",
+				reason: "error",
+				error: {
+					role: "assistant",
+					content: [],
+					api: model.api,
+					provider: model.provider,
+					model: model.id,
+					timestamp: Date.now(),
+					stopReason: "error",
+					errorMessage: "Codex provider stream failed",
+					usage: {
+						input: 0,
+						output: 0,
+						cacheRead: 0,
+						cacheWrite: 0,
+						totalTokens: 0,
+						cost: {
+							input: 0,
+							output: 0,
+							cacheRead: 0,
+							cacheWrite: 0,
+							total: 0
+						}
+					}
+				}
+			});
+			stream.end();
+		});
+		return stream;
+	}
 	return {
 		...provider,
 		getModels: () => generation,
-		stream: (model, context, options) => provider.stream(model, toBundledCodexContext(context), options),
-		streamSimple: (model, context, options) => provider.streamSimple(model, toBundledCodexContext(context), options)
+		stream: (model, context, options) => observed(model, (onResponse) => provider.stream(model, toBundledCodexContext(context), {
+			...options,
+			onResponse: (response, responseModel) => {
+				onResponse(response);
+				return options?.onResponse?.(response, responseModel);
+			}
+		})),
+		streamSimple: (model, context, options) => observed(model, (onResponse) => provider.streamSimple(model, toBundledCodexContext(context), {
+			...options,
+			onResponse: (response, responseModel) => {
+				onResponse(response);
+				return options?.onResponse?.(response, responseModel);
+			}
+		}))
 	};
 }
 //#endregion
@@ -988,36 +1091,65 @@ function bundledCodexModels(provider) {
 			cacheWrite: .125
 		}
 	];
-	return Object.freeze([...models, ...additions.filter((entry) => !models.some((model) => model.id === entry.id)).map((entry) => Object.freeze({
-		...astra,
-		id: entry.id,
-		name: entry.name,
-		thinkingLevelMap: {
-			off: null,
-			...entry.id === "gpt-6.1-sol" ? { minimal: null } : {},
-			low: "low",
-			medium: "medium",
-			high: "high",
-			xhigh: "xhigh",
-			max: "max"
-		},
-		cost: {
-			input: entry.input,
-			output: entry.output,
-			cacheRead: entry.cacheRead,
-			cacheWrite: entry.cacheWrite,
-			tiers: [{
-				inputTokensAbove: 272e3,
-				input: entry.input * 2,
-				output: entry.output * 1.5,
-				cacheRead: entry.cacheRead * 2,
-				cacheWrite: entry.cacheWrite * 2
-			}]
-		}
-	}))]);
+	return Object.freeze([
+		...models,
+		...additions.filter((entry) => !models.some((model) => model.id === entry.id)).map((entry) => Object.freeze({
+			...astra,
+			id: entry.id,
+			name: entry.name,
+			thinkingLevelMap: {
+				off: null,
+				...entry.id === "gpt-6.1-sol" ? { minimal: null } : {},
+				low: "low",
+				medium: "medium",
+				high: "high",
+				xhigh: "xhigh",
+				max: "max"
+			},
+			cost: {
+				input: entry.input,
+				output: entry.output,
+				cacheRead: entry.cacheRead,
+				cacheWrite: entry.cacheWrite,
+				tiers: [{
+					inputTokensAbove: 272e3,
+					input: entry.input * 2,
+					output: entry.output * 1.5,
+					cacheRead: entry.cacheRead * 2,
+					cacheWrite: entry.cacheWrite * 2
+				}]
+			}
+		})),
+		...models.some((model) => model.id === "gpt-6.1-terra") ? [] : [{
+			id: "gpt-6.1-terra",
+			name: "GPT-6.1 Terra",
+			api: "openai-codex-responses",
+			provider: ROUTE,
+			baseUrl: "https://chatgpt.com/backend-api",
+			reasoning: true,
+			input: ["text", "image"],
+			contextWindow: 5e5,
+			maxTokens: 128e3,
+			thinkingLevelMap: {
+				off: null,
+				minimal: null,
+				low: "low",
+				medium: "medium",
+				high: "high",
+				xhigh: "xhigh",
+				max: "max"
+			},
+			cost: {
+				input: 1,
+				output: 5,
+				cacheRead: .05,
+				cacheWrite: 1.25
+			}
+		}]
+	]);
 }
 /** Build the one profile shape consumed by DSH's public pi-ai adapter. */
-function profileFor(provider, models) {
+function profileFor(provider, models, warn) {
 	return /* @__PURE__ */ new Map([[ROUTE, {
 		provider: ROUTE,
 		displayName: provider.name,
@@ -1028,7 +1160,7 @@ function profileFor(provider, models) {
 		retryPolicy: resolveRetryPolicy(void 0, `codex-subscription-oauth: provider "${ROUTE}" retryPolicy`),
 		configuredMaxTokens: /* @__PURE__ */ new Map(),
 		modelErrors: /* @__PURE__ */ new Map(),
-		piProvider: providerWithModels(provider, models)
+		piProvider: providerWithModels(provider, models, warn)
 	}]]);
 }
 /** Register the command, dynamic model route, and fallback authorization service. */
@@ -1051,6 +1183,9 @@ function apply(ctx, config = {}) {
 	authModels.setProvider(upstream);
 	let profiles;
 	let registration;
+	const warn = (message) => {
+		ctx.logger.warn(message);
+	};
 	const catalog = new CodexCatalog({
 		...catalogConfig,
 		baseline: bundledModels,
@@ -1066,12 +1201,12 @@ function apply(ctx, config = {}) {
 			};
 		},
 		onChange(snapshot) {
-			profiles = profileFor(upstream, snapshot.models);
+			profiles = profileFor(upstream, snapshot.models, warn);
 			registration?.replace([ROUTE]);
 		},
-		warn: (message) => ctx.logger.warn(message)
+		warn
 	});
-	profiles = profileFor(upstream, catalog.current.models);
+	profiles = profileFor(upstream, catalog.current.models, warn);
 	const adapter = new LiveCodexAdapter({
 		profiles: () => profiles,
 		resolveApiKey: async () => void 0,

package/lib/{models-BdCc9Ab5.js → models-SNl0ezHJ.js}

@@ -1,4 +1,4 @@
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/event-stream.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/event-stream.js
 var EventStream = class {
 	queue = [];
 	waiting = [];
@@ -57,8 +57,12 @@ var AssistantMessageEventStream = class extends EventStream {
 		});
 	}
 };
+/** Factory function for AssistantMessageEventStream (for use in extensions) */
+function createAssistantMessageEventStream() {
+	return new AssistantMessageEventStream();
+}
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/api/lazy.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/api/lazy.js
 function createSetupErrorMessage(model, error) {
 	return {
 		role: "assistant",
@@ -128,7 +132,7 @@ function lazyApi(load, capabilities) {
 	return api;
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/auth/context.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/auth/context.js
 var __rewriteRelativeImportExtension = function(path, preserveJsx) {
 	if (typeof path === "string" && /^\.\.?\//.test(path)) return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function(m, tsx, d, ext, cm) {
 		return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : d + ext + "." + cm.toLowerCase() + "js";
@@ -163,7 +167,7 @@ function defaultProviderAuthContext() {
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/abort.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/abort.js
 function abortReason(signal) {
 	if (signal.reason !== void 0) return signal.reason;
 	const error = /* @__PURE__ */ new Error("The operation was aborted");
@@ -208,7 +212,7 @@ function raceWithAbortSignal(operation, signal) {
 	});
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/auth/credential-store.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/auth/credential-store.js
 /**
 * Default in-memory credential store. Apps inject persistent stores.
 * Keyed by `Provider.id`, one credential per provider; see `CredentialStore`.
@@ -260,7 +264,7 @@ var InMemoryCredentialStore = class {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/diagnostics.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/diagnostics.js
 function formatThrownValue(value) {
 	if (value instanceof Error) return value.message || value.name;
 	if (typeof value === "string") return value;
@@ -291,7 +295,7 @@ function appendAssistantMessageDiagnostic(message, diagnostic) {
 	message.diagnostics = [...message.diagnostics ?? [], diagnostic];
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/auth/resolve.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/auth/resolve.js
 var ModelsError = class extends Error {
 	code;
 	constructor(code, message, options) {
@@ -408,7 +412,7 @@ async function readCredential(credentials, providerId, signal) {
 	}
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/models-store.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/models-store.js
 var InMemoryModelsStore = class {
 	entries = /* @__PURE__ */ new Map();
 	async read(providerId, options) {
@@ -426,7 +430,7 @@ var InMemoryModelsStore = class {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/models.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/models.js
 function mergeHeaders(base, override) {
 	if (!base && !override) return void 0;
 	const merged = { ...base };
@@ -938,4 +942,4 @@ function clampThinkingLevel(model, level) {
 	return availableLevels[0] ?? "off";
 }
 //#endregion
-export { appendAssistantMessageDiagnostic as a, lazyApi as c, createProvider as i, AssistantMessageEventStream as l, clampThinkingLevel as n, createAssistantMessageDiagnostic as o, createModels as r, formatThrownValue as s, calculateCost as t };
+export { appendAssistantMessageDiagnostic as a, lazyApi as c, createProvider as i, AssistantMessageEventStream as l, clampThinkingLevel as n, createAssistantMessageDiagnostic as o, createModels as r, formatThrownValue as s, calculateCost as t, createAssistantMessageEventStream as u };

package/lib/{openai-codex-responses-DKg-2_3a.js → openai-codex-responses-CYGCQRS8.js}

@@ -1,6 +1,6 @@
-import { n as __commonJSMin, t as getProviderEnvValue } from "./provider-env-BoYS8tP5.js";
-import { a as appendAssistantMessageDiagnostic, l as AssistantMessageEventStream, n as clampThinkingLevel, o as createAssistantMessageDiagnostic, s as formatThrownValue, t as calculateCost } from "./models-BdCc9Ab5.js";
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/session-resources.js
+import { n as __commonJSMin, t as getProviderEnvValue } from "./provider-env-BO8sNc-2.js";
+import { a as appendAssistantMessageDiagnostic, l as AssistantMessageEventStream, n as clampThinkingLevel, o as createAssistantMessageDiagnostic, s as formatThrownValue, t as calculateCost } from "./models-SNl0ezHJ.js";
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/session-resources.js
 const sessionResourceCleanups = /* @__PURE__ */ new Set();
 function registerSessionResourceCleanup(cleanup) {
 	sessionResourceCleanups.add(cleanup);
@@ -9,7 +9,7 @@ function registerSessionResourceCleanup(cleanup) {
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/partial-json@0.1.7/node_modules/partial-json/dist/options.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/partial-json/dist/options.js
 var require_options = /* @__PURE__ */ __commonJSMin(((exports) => {
 	/**
 	* Sometimes you don't allow every type to be partially parsed.
@@ -99,7 +99,7 @@ var require_options = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.default = exports.Allow;
 }));
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/json-parse.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/json-parse.js
 var import_dist = (/* @__PURE__ */ __commonJSMin(((exports) => {
 	var __createBinding = exports && exports.__createBinding || (Object.create ? (function(o, m, k, k2) {
 		if (k2 === void 0) k2 = k;
@@ -388,7 +388,7 @@ function parseStreamingJson(partialJson) {
 	}
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/uuid.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/uuid.js
 const MAX_UUID_V7_TIMESTAMP = 0xffffffffffff;
 const MAX_SEQUENCE = (1n << 41n) - 1n;
 let lastOrdinaryTimestamp = -1;
@@ -418,7 +418,7 @@ function uuidv7(timestampMs) {
 	return `${hex.slice(0, 4).join("")}-${hex.slice(4, 6).join("")}-${hex.slice(6, 8).join("")}-${hex.slice(8, 10).join("")}-${hex.slice(10).join("")}`;
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/abort-signals.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/abort-signals.js
 function combineAbortSignals(signals) {
 	const activeSignals = signals.filter((signal) => signal !== void 0);
 	if (activeSignals.length === 0) return { cleanup: () => {} };
@@ -451,7 +451,7 @@ function combineAbortSignals(signals) {
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/deferred-tools.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/deferred-tools.js
 const identityToolName = (name) => name;
 /** Split current tools into prefix and transcript-loaded definitions. */
 function splitDeferredTools(context, enabled, normalizeName = identityToolName) {
@@ -479,7 +479,7 @@ function splitDeferredTools(context, enabled, normalizeName = identityToolName)
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/error-body.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/error-body.js
 const MAX_PROVIDER_ERROR_BODY_CHARS = 4e3;
 function normalizeProviderError(error) {
 	if (!(error instanceof Error)) return {
@@ -579,14 +579,14 @@ function safeJsonStringify$1(value) {
 	}
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/headers.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/headers.js
 function headersToRecord(headers) {
 	const result = {};
 	for (const [key, value] of headers.entries()) result[key] = value;
 	return result;
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/node-http-proxy.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/node-http-proxy.js
 const DEFAULT_PROXY_PORTS = {
 	ftp: 21,
 	gopher: 70,
@@ -691,7 +691,7 @@ function resolveHttpProxyUrlForTarget(targetUrl, env) {
 	return proxyUrl;
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/pi-user-agent.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/pi-user-agent.js
 function loadNodeOs() {
 	if (typeof process === "undefined" || !(process.versions?.node || process.versions?.bun)) return null;
 	return process.getBuiltinModule?.("node:os") ?? null;
@@ -701,7 +701,7 @@ function getPiUserAgent() {
 	return nodeOs ? `pi (${nodeOs.platform()} ${nodeOs.release()}; ${nodeOs.arch()})` : "pi (browser)";
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/api/constrained-sampling.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/api/constrained-sampling.js
 var UnsupportedStrictJsonSchemaError = class extends Error {};
 const UNSUPPORTED_STRICT_SCHEMA_KEYS = [
 	"$ref",
@@ -860,7 +860,7 @@ function clampOpenAIPromptCacheKey(key) {
 	return chars.slice(0, 64).join("");
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/hash.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/hash.js
 /** Fast deterministic hash to shorten long strings */
 function shortHash(str) {
 	let h1 = 3735928559;
@@ -875,7 +875,7 @@ function shortHash(str) {
 	return (h2 >>> 0).toString(36) + (h1 >>> 0).toString(36);
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/sanitize-unicode.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/sanitize-unicode.js
 /**
 * Removes unpaired Unicode surrogate characters from a string.
 *
@@ -900,7 +900,7 @@ function sanitizeSurrogates(text) {
 	return text.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "");
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/api/transform-messages.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/api/transform-messages.js
 const NON_VISION_USER_IMAGE_PLACEHOLDER = "(image omitted: model does not support images)";
 const NON_VISION_TOOL_IMAGE_PLACEHOLDER = "(tool image omitted: model does not support images)";
 function replaceImagesWithPlaceholder(content, placeholder) {
@@ -1047,7 +1047,7 @@ function transformMessages(messages, model, normalizeToolCallId) {
 	return result;
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/api/openai-responses-shared.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/api/openai-responses-shared.js
 function encodeTextSignatureV1(id, phase) {
 	const payload = {
 		v: 1,
@@ -1624,7 +1624,7 @@ function mapStopReason(status, incompleteReason) {
 	}
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/estimate.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/estimate.js
 const CHARS_PER_TOKEN = 4;
 const ESTIMATED_IMAGE_CHARS = 4800;
 function calculateContextTokens(usage) {
@@ -1725,7 +1725,7 @@ function estimateContextTokens(context) {
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/api/simple-options.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/api/simple-options.js
 const CONTEXT_SAFETY_TOKENS = 4096;
 const MIN_MAX_TOKENS = 1;
 function clampMaxTokensToContext(model, context, maxTokens) {
@@ -1761,7 +1761,7 @@ function buildBaseOptions(model, context, options, apiKey) {
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/api/openai-codex-responses.js
 const DEFAULT_CODEX_BASE_URL = "https://chatgpt.com/backend-api";
 const JWT_CLAIM_PATH = "https://api.openai.com/auth";
 const DEFAULT_MAX_RETRIES = 0;

package/lib/openai-codex.js

@@ -1,5 +1,5 @@
-import { t as getProviderEnvValue } from "./provider-env-BoYS8tP5.js";
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/auth/oauth/device-code.js
+import { t as getProviderEnvValue } from "./provider-env-BO8sNc-2.js";
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/auth/oauth/device-code.js
 const CANCEL_MESSAGE = "Login cancelled";
 const TIMEOUT_MESSAGE = "Device flow timed out";
 const SLOW_DOWN_TIMEOUT_MESSAGE = "Device flow timed out after one or more slow_down responses. This is often caused by clock drift in WSL or VM environments. Please sync or restart the VM clock and try again.";
@@ -47,7 +47,7 @@ async function pollOAuthDeviceCodeFlow(options) {
 	throw new Error(slowDownResponses > 0 ? SLOW_DOWN_TIMEOUT_MESSAGE : TIMEOUT_MESSAGE);
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/auth/oauth/oauth-page.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/auth/oauth/oauth-page.js
 const LOGO_SVG = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 800" aria-hidden="true"><path fill="#fff" fill-rule="evenodd" d="M165.29 165.29 H517.36 V400 H400 V517.36 H282.65 V634.72 H165.29 Z M282.65 282.65 V400 H400 V282.65 Z"/><path fill="#fff" d="M517.36 400 H634.72 V634.72 H517.36 Z"/></svg>`;
 function escapeHtml(value) {
 	return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;").replaceAll("'", "&#39;");
@@ -148,7 +148,7 @@ function oauthErrorHtml(message, details) {
 	});
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/auth/oauth/pkce.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/auth/oauth/pkce.js
 /**
 * PKCE utilities using Web Crypto API.
 * Works in both Node.js 20+ and browsers.
@@ -177,7 +177,7 @@ async function generatePKCE() {
 	};
 }
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/auth/oauth/openai-codex.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/auth/oauth/openai-codex.js
 /**
 * OpenAI Codex (ChatGPT OAuth) flow
 *

package/lib/{provider-env-BoYS8tP5.js → provider-env-BO8sNc-2.js}

@@ -3,7 +3,7 @@ import { createRequire } from "node:module";
 var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 //#endregion
-//#region node_modules/.pnpm/@earendil-works+pi-ai@0.85.1_ws@8.21.3_zod@4.6.4/node_modules/@earendil-works/pi-ai/dist/utils/provider-env.js
+//#region ../../../../Users/dkc/Sites/Src/dsh-codex/node_modules/@earendil-works/pi-ai/dist/utils/provider-env.js
 let procEnvCache = null;
 /**
 * Fallback for https://github.com/oven-sh/bun/issues/27802.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-subscription-oauth-plugin",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Out-of-tree DSH bundle for ChatGPT Codex OAuth and live models",
   "private": false,
   "license": "MIT",