@eddyskywalker/dsh-chatgpt-subscription 0.59.0 → 0.60.0

package/lib/index.js

@@ -1,15 +1,16 @@
 import { a as resolveProgressUpdatesSettings, n as attachProgressSettings } from "./entry-progress-updates-CxQewio9.js";
 import { attachPlanModePipelineSettings, resolvePlanModePipelineEnabled } from "./plan-mode-pipeline.js";
+import { n as PLUGIN_MESSAGE_SOURCE_KIND, r as normalizeGenerateOptions, t as LlmError$1 } from "./llm-compat-u9mor0uu.js";
 import { DEFAULT_SKIP_PROVIDERS, PRUNER_SERVICE_NAME, resolveSkipProviders, shouldSkipPruningForSession } from "./tool-result-pruner.js";
 import { PLAN_PROJECTION_KEY, createPlanNotice } from "./plan-mode.js";
 import { createRequire } from "node:module";
 import * as LlmModule from "@deepseek-ai/dsh-llm";
-import { EMPTY_RESPONSE_CODE, HarnessError, LlmAdapter, LlmError, LlmError as LlmError$1, ProviderRequestId, ReasoningEffortId, ToolCallId, attributionHeaders, createUserMessage, errorChain, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
+import { EMPTY_RESPONSE_CODE, HarnessError, LlmAdapter, LlmError, ProviderRequestId, ReasoningEffortId, ToolCallId, attributionHeaders, createUserMessage, errorChain, resolveRetryPolicy } from "@deepseek-ai/dsh-llm";
 import { defineTool } from "@deepseek-ai/dsh-tools";
 import { z } from "zod";
 import z$1 from "@deepseek-ai/schemastery";
 import fs, { chmod, lstat, mkdir, open, readFile, realpath, rename, stat, unlink, writeFile } from "node:fs/promises";
-import path, { basename, dirname, extname, join, relative, resolve } from "node:path";
+import path, { basename, dirname, extname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import os, { homedir, platform, userInfo } from "node:os";
 import { constants, createCipheriv, createDecipheriv, createHash, createHmac, publicEncrypt, randomBytes, randomUUID } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
@@ -807,7 +808,7 @@ const ROUTE_PREFIX$5 = "/api/dsh-chatgpt-subscription";
 * `test/responses-client.test.ts` asserts the two agree, so a release that
 * forgets this constant fails the suite instead of shipping quietly.
 */
-const PLUGIN_VERSION = "0.59.0";
+const PLUGIN_VERSION = "0.60.0";
 const CODEX_CHATGPT_PROVIDER_ID = "codex-chatgpt";
 const CODEX_API_BASE = "https://chatgpt.com/backend-api/codex";
 const CODEX_RESPONSES_URL = `${CODEX_API_BASE}/responses`;
@@ -4434,7 +4435,7 @@ var OAuthService = class {
 			throw new OAuthServiceError("oauth-token-exchange-failed", `The ChatGPT device code could not be issued (${response.status}${detail === null ? "" : `, ${detail}`}).`, response.status);
 		}
 		const payload = await response.json().catch(() => null);
-		const record = isRecord$68(payload) ? payload : {};
+		const record = isRecord$67(payload) ? payload : {};
 		const authId = nonEmptyString$11(record.device_auth_id);
 		const userCode = nonEmptyString$11(record.user_code) ?? nonEmptyString$11(record.usercode);
 		if (authId === void 0 || userCode === void 0) throw new OAuthServiceError("oauth-token-exchange-failed", "ChatGPT returned no device code.");
@@ -4501,7 +4502,7 @@ var OAuthService = class {
 			const detail = deviceErrorIdentifier(payload);
 			throw new OAuthServiceError("oauth-token-exchange-failed", `The ChatGPT device confirmation was refused (${response.status}${detail === void 0 ? "" : `, ${detail}`}).`, response.status);
 		}
-		const record = isRecord$68(payload) ? payload : {};
+		const record = isRecord$67(payload) ? payload : {};
 		const authorizationCode = nonEmptyString$11(record.authorization_code);
 		const codeVerifier = nonEmptyString$11(record.code_verifier);
 		if (authorizationCode === void 0 || codeVerifier === void 0) throw new OAuthServiceError("oauth-token-exchange-failed", "ChatGPT confirmed the device code but returned no authorization code.");
@@ -4834,11 +4835,11 @@ const DEVICE_PENDING_STATUSES = /* @__PURE__ */ new Set([
 function isPendingDeviceAnswer(response, payload) {
 	if (response.status === 403 || response.status === 404) return true;
 	if (!response.ok && response.status !== 400) return false;
-	if (!isRecord$68(payload)) return false;
+	if (!isRecord$67(payload)) return false;
 	const status = payload.status;
 	if (typeof status === "string" && DEVICE_PENDING_STATUSES.has(status.toLowerCase())) return true;
 	const error = payload.error;
-	if (isRecord$68(error)) {
+	if (isRecord$67(error)) {
 		const code = error.code;
 		if (typeof code === "string" && DEVICE_PENDING_STATUSES.has(code.toLowerCase())) return true;
 	}
@@ -4852,18 +4853,18 @@ function isPendingDeviceAnswer(response, payload) {
 * wrong.
 */
 function deviceErrorIdentifier(payload) {
-	if (!isRecord$68(payload)) return void 0;
+	if (!isRecord$67(payload)) return void 0;
 	const candidates = [payload.code];
 	const error = payload.error;
 	if (typeof error === "string") candidates.push(error);
-	else if (isRecord$68(error)) candidates.push(error.code, error.type);
+	else if (isRecord$67(error)) candidates.push(error.code, error.type);
 	candidates.push(payload.status);
 	for (const candidate of candidates) if (typeof candidate === "string" && /^[a-z0-9_.-]{1,64}$/i.test(candidate)) return candidate;
 }
 function nonEmptyString$11(value) {
 	return typeof value === "string" && value !== "" ? value : void 0;
 }
-function isRecord$68(value) {
+function isRecord$67(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 async function oauthErrorIdentifier(response) {
@@ -5044,7 +5045,7 @@ const CODEX_CLI_CREDENTIAL_SOURCE = "codex";
 * here, and the import has to be repeated afterwards.
 */
 const ADOPTED_CODEX_CREDENTIAL_EXPIRED_HINT = "The sign-in imported from the Codex CLI has expired. Sign in again in the Codex CLI, then import it again from this settings card.";
-function isRecord$67(value) {
+function isRecord$66(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 /** A trimmed, non-empty string, or nothing. */
@@ -5146,7 +5147,7 @@ function decodeJwtClaims$1(token) {
 	if (parts.length !== 3) return void 0;
 	try {
 		const value = JSON.parse(Buffer.from(parts[1], "base64url").toString("utf8"));
-		return isRecord$67(value) ? value : void 0;
+		return isRecord$66(value) ? value : void 0;
 	} catch {
 		return;
 	}
@@ -5191,10 +5192,10 @@ function expiryFromAccessToken(accessToken) {
 * the file carries cannot reach the result.
 */
 function parseAdoptedCodexCredential(value, sourcePath) {
-	if (!isRecord$67(value)) return void 0;
+	if (!isRecord$66(value)) return void 0;
 	if (value.auth_mode !== "chatgpt") return void 0;
 	const tokens = value[CODEX_CLI_TOKENS_KEY];
-	if (!isRecord$67(tokens)) return void 0;
+	if (!isRecord$66(tokens)) return void 0;
 	const accessToken = nonEmptyString$10(tokens.access_token);
 	if (accessToken === void 0) return void 0;
 	const refreshToken = nonEmptyString$10(tokens.refresh_token);
@@ -5213,7 +5214,7 @@ function parseAdoptedCodexCredential(value, sourcePath) {
 		const email = claims === void 0 ? void 0 : nonEmptyString$10(claims.email);
 		if (email !== void 0) credentials.email = email;
 		const authClaims = claims === void 0 ? void 0 : claims[CODEX_AUTH_CLAIMS_KEY];
-		const planType = isRecord$67(authClaims) ? nonEmptyString$10(authClaims.chatgpt_plan_type) : void 0;
+		const planType = isRecord$66(authClaims) ? nonEmptyString$10(authClaims.chatgpt_plan_type) : void 0;
 		if (planType !== void 0) credentials.planType = planType;
 	}
 	const accountId = nonEmptyString$10(tokens.account_id);
@@ -5999,114 +6000,6 @@ function webServerOrigin(server) {
 	return `http://${server.host === "0.0.0.0" ? "127.0.0.1" : server.host}:${server.port}`;
 }
 //#endregion
-//#region src/host/common/llm-compat.ts
-/** This package's kind in the harness message-source map. */
-const PLUGIN_MESSAGE_SOURCE_KIND = "dsh-chatgpt-subscription";
-function isRecord$66(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-/** Read a message body's blocks, keeping every entry that carries a block tag. */
-function readBlocks(raw) {
-	if (!Array.isArray(raw)) return [];
-	return raw.filter((block) => isRecord$66(block) && typeof block.type === "string");
-}
-/**
-* The first value that is a non-empty string.
-*
-* Used for fields the two generations spell in different places: a value that
-* is present but empty must not shadow a real one further down the chain, which
-* is what `??` alone does.
-*/
-function firstNonEmptyString(...values) {
-	for (const value of values) if (typeof value === "string" && value !== "") return value;
-	return "";
-}
-/**
-* The result block a `role: 'tool'` message already carries inside its body.
-*
-* Some harness generations deliver the call id inside the result block rather
-* than on the message, and one shape carries both: `role: 'tool'` with a
-* `tool-result` block holding the id. Reading only the message-level fields
-* leaves {@link toolCallIdOf} nothing to find.
-*/
-function embeddedToolResult(content) {
-	if (content.length !== 1) return void 0;
-	const [block] = content;
-	return block?.type === "tool-result" ? block : void 0;
-}
-/**
-* The call id one `role: 'tool'` message associates with its `tool-call`.
-*
-* The id is the only thing tying a result to the call it answers: a mapper that
-* sends it empty makes every result an orphan and tells the repair pass that no
-* call was answered, which some gateways reject outright (WorkBuddy answers
-* `11148`, "tool calls and tool results do not match"). It therefore has to be
-* read from every place the harness generations put it — the message, the
-* message's source, and the result block inside the body — and an empty string
-* must not shadow a later, real one.
-*/
-function toolCallIdOf(raw, source, embedded) {
-	return firstNonEmptyString(raw.toolCallId, raw.callId, source?.callId, embedded?.toolCallId);
-}
-/**
-* Normalize one harness message list into {@link Message}.
-*
-* A 0.1.7 `role: 'tool'` message is re-wrapped as the user-role message holding
-* one {@link ToolResultBlock} that the mappers expect, keeping the tool
-* provenance (`kind: 'tool'`) they use to tell a real tool result from a user
-* turn. A message that already carries that block keeps its own body instead of
-* nesting a second `tool-result` around it. Everything a newer harness adds
-* beside that keeps its own shape.
-* @param messages - Messages straight off the request options, in either generation's shape.
-* @returns The same conversation in the pre-0.1.7 vocabulary.
-*/
-function normalizeMessages(messages) {
-	const normalized = [];
-	for (const raw of messages ?? []) {
-		if (!isRecord$66(raw)) continue;
-		const content = readBlocks(raw.content);
-		if (raw.role === "tool") {
-			const source = isRecord$66(raw.source) ? raw.source : void 0;
-			const embedded = embeddedToolResult(content);
-			const callId = toolCallIdOf(raw, source, embedded);
-			const isError = raw.isError === true || embedded?.isError === true;
-			normalized.push({
-				id: raw.id,
-				role: "user",
-				content: [{
-					type: "tool-result",
-					toolCallId: callId,
-					content: embedded === void 0 ? content : embedded.content,
-					...isError ? { isError: true } : {}
-				}],
-				source: {
-					kind: "tool",
-					callId
-				}
-			});
-			continue;
-		}
-		normalized.push({
-			id: raw.id,
-			role: typeof raw.role === "string" ? raw.role : "user",
-			content,
-			...isRecord$66(raw.source) ? { source: raw.source } : {}
-		});
-	}
-	return normalized;
-}
-/**
-* Normalize request options for the mappers.
-* @param options - Request options the harness handed the adapter.
-* @returns The same options with {@link Message} history.
-*/
-function normalizeGenerateOptions(options) {
-	return {
-		...options,
-		messages: normalizeMessages(options.messages)
-	};
-}
-//#endregion
 //#region src/host/codex-images.ts
 /**
 * Output canvases the Codex image endpoint accepts in `size`.
@@ -20079,6 +19972,21 @@ const COMMAND_CODE_MODELS = [
 		maxTokens: 256e3,
 		hidden: false
 	},
+	{
+		id: "stealth/crouton-alpha",
+		name: "Crouton Alpha",
+		inputModalities: ["text", "image"],
+		reasoningEfforts: [
+			"low",
+			"medium",
+			"high",
+			"xhigh",
+			"max"
+		],
+		contextWindow: 1048576,
+		maxTokens: 943718,
+		hidden: false
+	},
 	{
 		id: "reflection/beam:free",
 		name: "Beam 1.0",
@@ -20096,7 +20004,7 @@ const COMMAND_CODE_MODELS = [
 	},
 	{
 		id: "poolside/laguna-s-2.1-free",
-		name: "Laguna S 2.1",
+		name: "Laguna S 2.1 (Free)",
 		inputModalities: ["text"],
 		reasoningEfforts: [],
 		contextWindow: 256e3,
@@ -20125,6 +20033,32 @@ const COMMAND_CODE_MODELS = [
 		maxTokens: 32768,
 		hidden: false
 	},
+	{
+		id: "inclusionai/ling-3.1-flash-1019",
+		name: "Ling 3.1 Flash 1019",
+		inputModalities: ["text"],
+		reasoningEfforts: [
+			"low",
+			"medium",
+			"high"
+		],
+		contextWindow: 1e6,
+		maxTokens: 262144,
+		hidden: false
+	},
+	{
+		id: "inclusionai/ling-3.1-flash-1019:free",
+		name: "Ling 3.1 Flash 1019",
+		inputModalities: ["text"],
+		reasoningEfforts: [
+			"low",
+			"medium",
+			"high"
+		],
+		contextWindow: 1e6,
+		maxTokens: 262144,
+		hidden: true
+	},
 	{
 		id: "meta/muse-spark-1.1",
 		name: "Muse Spark 1.1",
@@ -20286,42 +20220,37 @@ const COMMAND_CODE_MODELS = [
 function commandCodeModelDef(modelId) {
 	return COMMAND_CODE_MODELS.find((model) => model.id === modelId);
 }
-/**
-* Model ids the 1.88.2 catalog refresh added to the shipped default selection.
-*
-* The shipped default is the set of models the settings card offers before the
-* user edits it, and a stored selection that still equals it counts as "never
-* edited" (see `resolveEnabledModelIds` in `./routes.ts`). A refresh that
-* changed the default without saying so would make every untouched selection
-* from the previous release look edited, and the models this release adds
-* would stay hidden behind a list nobody touched. These two lists carry that
-* change: the retired ids are the ones the previous default had and this one
-* does not, and the added ids are the ones it gained.
-*/
-const SHIPPED_DEFAULT_ADDED_MODEL_IDS = [
-	"claude-haiku-5-5",
-	"gpt-6.1-terra",
-	"moonshotai/Kimi-K3.1-Pro",
-	"minimax/minimax-m3.1-flash",
-	"ornith/ornith-1.5-122b",
-	"Qwen/Qwen3.8-Max-Prime",
-	"google/gemini-4-argon",
-	"nvidia/nemotron-3.5-super-vl",
-	"stealth/glyph-cluster:free",
-	"reflection/beam:free",
-	"inclusionai/ling-3.1-flash",
-	"meta/muse-spark-open",
-	"meta/muse-wonder-1.0",
-	"mistral/mistral-large-4"
-];
-/** Model ids the 1.88.2 catalog refresh dropped from the shipped default selection. */
-const SHIPPED_DEFAULT_RETIRED_MODEL_IDS = [
-	"xiaomi/mimo-v2.5-pro",
-	"xiaomi/mimo-v2.5",
-	"stealth/space-bunny-alpha",
-	"inclusionai/ling-3.0-flash-sante:free",
-	"inclusionai/ling-3.1-flash:free"
-];
+/** Default-selection deltas recognized by `resolveEnabledModelIds` in `./routes.ts`. */
+const SHIPPED_DEFAULT_MIGRATIONS = [{
+	version: "1.88.4",
+	added: ["stealth/crouton-alpha", "inclusionai/ling-3.1-flash-1019"],
+	retired: []
+}, {
+	version: "1.88.2",
+	added: [
+		"claude-haiku-5-5",
+		"gpt-6.1-terra",
+		"moonshotai/Kimi-K3.1-Pro",
+		"minimax/minimax-m3.1-flash",
+		"ornith/ornith-1.5-122b",
+		"Qwen/Qwen3.8-Max-Prime",
+		"google/gemini-4-argon",
+		"nvidia/nemotron-3.5-super-vl",
+		"stealth/glyph-cluster:free",
+		"reflection/beam:free",
+		"inclusionai/ling-3.1-flash",
+		"meta/muse-spark-open",
+		"meta/muse-wonder-1.0",
+		"mistral/mistral-large-4"
+	],
+	retired: [
+		"xiaomi/mimo-v2.5-pro",
+		"xiaomi/mimo-v2.5",
+		"stealth/space-bunny-alpha",
+		"inclusionai/ling-3.0-flash-sante:free",
+		"inclusionai/ling-3.1-flash:free"
+	]
+}];
 //#endregion
 //#region src/host/command-code/types.ts
 const PROVIDER_ID$11 = "command-code";
@@ -24692,16 +24621,20 @@ function resolveEnabledModelIds$5(stored, catalog, enabled = true) {
 /**
 * Whether a stored selection still is a shipped default.
 *
-* The current one, and the one the previous release shipped: the refresh moved
-* a handful of models in and out of the default, and the difference between the
-* two defaults is exactly the pair of id lists the catalog records.
+* Walk the recorded catalog refreshes newest-first. Each step reconstructs one
+* earlier default, so users who never edited either the immediate previous
+* release or an older recorded release still receive the current catalog.
 */
 function isUneditedSelection(stored, shipped) {
 	if (stored.length === 0) return false;
 	if (sameSelection(stored, shipped)) return true;
-	const previous = new Set([...shipped].filter((id) => !SHIPPED_DEFAULT_ADDED_MODEL_IDS.includes(id)));
-	for (const id of SHIPPED_DEFAULT_RETIRED_MODEL_IDS) previous.add(id);
-	return sameSelection(stored, previous);
+	let previous = new Set(shipped);
+	for (const migration of SHIPPED_DEFAULT_MIGRATIONS) {
+		previous = new Set([...previous].filter((id) => !migration.added.includes(id)));
+		for (const id of migration.retired) previous.add(id);
+		if (sameSelection(stored, previous)) return true;
+	}
+	return false;
 }
 /** Whether two id lists name exactly the same models, in any order. */
 function sameSelection(stored, other) {
@@ -92408,6 +92341,7 @@ const RENAMED_PACKAGES = /* @__PURE__ */ new Map([["@deepseek-ai/dsh-workflow-wo
 */
 const OPTIONALLY_ABSENT_PACKAGES = [
 	"@deepseek-ai/dsh-tool-present",
+	"@deepseek-ai/dsh-tool-subagent-control/list-agents",
 	"@eddyskywalker/dsh-chatgpt-subscription/plan-mode-pipeline",
 	"@eddyskywalker/dsh-chatgpt-subscription/plan-mode",
 	"@eddyskywalker/dsh-chatgpt-subscription/tool-result-pruner"
@@ -92470,12 +92404,20 @@ function candidatePackageRoots(entryScript = process.argv[1]) {
 	} catch {}
 	return [...roots];
 }
+/** The package-name portion of a bare package or package-subpath specifier. */
+function packageNameOf(specifier) {
+	return specifier.split("/").slice(0, specifier.startsWith("@") ? 2 : 1).join("/");
+}
 /**
 * Whether a package or exported subpath is installed in any candidate node_modules tree.
 * A subpath needs its own exact `exports` key; the package root alone is not enough.
+*
+* The nearest manifest on each Node resolution chain is authoritative. Looking
+* farther out after that manifest rejects a subpath would let an unrelated old
+* installation resurrect an export the running package deliberately removed.
 */
 function packageInstalled(specifier, roots = candidatePackageRoots()) {
-	const pkg = specifier.split("/").slice(0, specifier.startsWith("@") ? 2 : 1).join("/");
+	const pkg = packageNameOf(specifier);
 	const subpath = specifier.slice(pkg.length);
 	for (const root of roots) {
 		let dir = root;
@@ -92485,9 +92427,9 @@ function packageInstalled(specifier, roots = candidatePackageRoots()) {
 				if (subpath === "") return true;
 				try {
 					const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
-					if (manifest.exports !== void 0 && Object.prototype.hasOwnProperty.call(manifest.exports, `.${subpath}`)) return true;
+					return manifest.exports !== void 0 && Object.prototype.hasOwnProperty.call(manifest.exports, `.${subpath}`);
 				} catch {
-					continue;
+					return false;
 				}
 			}
 			const parent = dirname(dir);
@@ -92498,20 +92440,72 @@ function packageInstalled(specifier, roots = candidatePackageRoots()) {
 	return false;
 }
 /**
-* Whether a bare specifier resolves from this module in the running
-* installation. A harness whose Node build exposes no `import.meta.resolve`
-* or whose plugin is executed from outside the profile tree falls through to
-* checking candidate `node_modules` trees across the running harness home.
+* Packages the preset intentionally loads from the plugin's own dependency
+* closure rather than the harness installation. Every other harness row must
+* resolve where the registry mounts it, not merely beside this plugin.
+*/
+const PLUGIN_RESOLVED_PACKAGES = ["@eddyskywalker/dsh-chatgpt-subscription", "@deepseek-ai/dsh-tool-executor-native"];
+/** Whether `candidate` is `root` itself or one of its descendants. */
+function pathInside(root, candidate) {
+	const rel = relative(root, candidate);
+	return rel === "" || rel !== ".." && !rel.startsWith(`..${sep}`) && !isAbsolute(rel);
+}
+/**
+* Whether a plugin-side resolution points into the package the harness's own
+* entry script reaches. Walking ancestors mirrors Node's node_modules lookup;
+* the CLI commonly sits in `bin/`, beside rather than inside node_modules.
+*/
+function resolvedFromHarness(resolved, entryDir, specifier) {
+	if (typeof resolved !== "string") return false;
+	let path;
+	try {
+		path = fileURLToPath(resolved);
+	} catch {
+		return false;
+	}
+	const pkg = packageNameOf(specifier);
+	let dir = entryDir;
+	for (;;) {
+		if (pathInside(join(dir, "node_modules", pkg), path)) return true;
+		const parent = dirname(dir);
+		if (parent === dir) return false;
+		dir = parent;
+	}
+}
+/**
+* Resolve against the installation that will actually mount the preset.
+*
+* `import.meta.resolve` is based at this plugin, while the harness mounts
+* runtime-declared preset rows from its own context. A successful plugin-side
+* resolution is therefore not sufficient for a harness package: an old copy in
+* the profile tree must not override the running harness's missing export.
+* Plugin-owned rows and the plugin-borne native executor are the deliberate
+* exceptions. With no harness entry, retain the legacy local probe behavior.
+*/
+function resolvesFromInstallation(specifier, entryScript, resolveFromPlugin) {
+	const entryDir = harnessEntryDir(entryScript);
+	if (entryDir !== void 0 && packageInstalled(specifier, [entryDir])) return true;
+	let resolved;
+	let didResolve = false;
+	if (resolveFromPlugin !== void 0) try {
+		resolved = resolveFromPlugin(specifier);
+		didResolve = true;
+	} catch {}
+	if (entryDir === void 0) {
+		if (didResolve) return true;
+		return packageInstalled(specifier, candidatePackageRoots(entryScript));
+	}
+	if (didResolve && PLUGIN_RESOLVED_PACKAGES.includes(packageNameOf(specifier))) return true;
+	return didResolve && resolvedFromHarness(resolved, entryDir, specifier);
+}
+/**
+* Whether a bare specifier resolves in the installation that mounts presets.
 * @param specifier - bare package specifier.
 * @returns whether the specifier resolves.
 */
 function resolvesFromHere(specifier) {
-	const resolve = import.meta.resolve;
-	if (resolve !== void 0) try {
-		resolve(specifier);
-		return true;
-	} catch {}
-	return packageInstalled(specifier);
+	const resolveFromPlugin = import.meta.resolve;
+	return resolvesFromInstallation(specifier, process.argv[1], resolveFromPlugin);
 }
 /**
 * Point every renamed package name at the spelling this installation ships.
@@ -92900,8 +92894,8 @@ const DISPATCH_PRESET = {
 
 ## R0.5 · Compatibility Gate (Once per New Session, Before R0)
 A legacy Agent Teams runtime (pre-#7519) registers spawn_teammate and replaces send_message / list_agents / interrupt_agent with team-scoped variants, leaving spawned subagents unreachable. The current runtime only adds a shared task board (team_task_create and its list/get/update siblings) and reuses this mode's tools.
-Criterion: whether spawn_teammate exists (PTC: tools.spawn_teammate). Never gate on wait_agent, send_message, list_agents, or interrupt_agent: this mode mounts those itself.
-- Absent -> Write "Orchestration ready: subagent" and proceed to R0. The board tools stay visible in the PTC SDK whether or not the board is on - frozen declaration, not availability - so confirm with team_task_list before relying on it. When the board is on it is bookkeeping, not a second dispatcher: the dispatch ledger stays the dispatch authority and R5 briefs stay the task contract; publish cross-agent dependencies (blocked_by) and write scopes on one team task per brief, claimed and completed by the child that owns it; never start work because a task is ready, and never reassign a task to skip R6.
+Criterion: whether spawn_teammate exists (check via code_run). Never gate on wait_agent, send_message, list_agents, or interrupt_agent: this mode mounts those itself.
+- Absent -> Write "Orchestration ready: subagent" and proceed to R0. The board tools stay declared whether or not the board is on - frozen declaration, not availability - so confirm with team_task_list before relying on it. When the board is on it is bookkeeping, not a second dispatcher: the dispatch ledger stays the dispatch authority and R5 briefs stay the task contract; publish cross-agent dependencies (blocked_by) and write scopes on one team task per brief, claimed and completed by the child that owns it; never start work because a task is ready, and never reassign a task to skip R6.
 - Present -> This session runs the legacy runtime and is **not orchestratable**. In order, and nothing else:
   1. State in one sentence that the legacy runtime shadows the coordination tools and this mode has no degraded path.
   2. Call ask_user_question once (see R-W) offering: disable the legacy runtime, restart Host, **start a new session**; switch preset; or execute this task directly.
@@ -92931,7 +92925,7 @@ L0/L1: execute directly (or 1 subagent for L1). L2: R-G, R9, and R6 are mandator
 - [Media generation] Generate/revise/retry images directly; delegate complex creative work, never a bare call.
 
 ## R2 · Model Routing (Check Availability First, Then Decide How to Dispatch)
-Check whether list_subagent_models exists (in PTC mode: tools.list_subagent_models). The tool row and provider/model/reasoning_effort parameters are mounted statically, so they are present even in a session that authorized no route at all. Read that fact instead of inferring it from the tool's output:
+Check whether list_subagent_models exists. The tool row and provider/model/reasoning_effort parameters are mounted statically, so they are present even in a session that authorized no route at all. Read that fact instead of inferring it from the tool's output:
 - If the output says neither—no authorized-routes block and no "No allowlist is in force" sentence—the annotation is absent and you cannot read the posture. Treat it as [State: Unlisted] for behaviour, but say "unconfirmed" rather than claiming either posture, and never report a route as authorized.
 - [State: Listed] Output ends with "Authorized child routes for this Session": enforcement is active.
   - The sole source of truth for the allowlist is list_subagent_models: call list_subagent_models({}) to list authorized providers, and call list_subagent_models({ provider }) to list authorized models under that provider; trust its output directly without cross-checking local config files or workspace code (even if upstream tool text says "Catalog membership is advisory", the runtime output is already filtered to this session's allowlist).
@@ -92947,7 +92941,7 @@ A subagent has full authority to plan, execute, and self-verify within its assig
 Every task brief covers six elements: Goal / Boundary (which files or modules may be touched) / Constraints / Limits (see below) / Acceptance Criteria / Required Evidence to Report.
 - [Compact Delta Brief] Standing default limits and the report schema already live in [Role Identification], so use a Compact Delta Brief by default: state Goal, original file/line Source Pointers (do not paraphrase code into long prose), Module-Interface Boundary, Constraints, Acceptance Criteria, and Required Evidence, and omit repeating standing limits unless overriding them.
 - [Limits] When overriding any standing limit, write one line per limit spelling out four things: **what it bounds, in what unit, the cap, and whether it accumulates**. Write explicit caps ("at most 3 attempts", "edits at most 5 files", "test runs: unlimited"), never ranges ("2–5 files"); where an override dimension is left unstated, silence is read as a limit of zero, and a quota that resets per cycle is lost, not banked.
-- Do not ask the child to restate your rules back as a correctness check; if a limit is genuinely unclear, instruct the child to spend one minimal tool call to verify it. Dispatch independent tasks concurrently in one message (via Promise.all in PTC mode) only after the interview has converged.
+- Do not ask the child to restate your rules back as a correctness check; if a limit is genuinely unclear, instruct the child to spend one minimal tool call to verify it. Dispatch independent tasks concurrently in one message (native calls; use code_run Promise.all for batch filter/MCP) only after the interview has converged.
 
 ## R6 · Review & Acceptance
 Two layers: subagent self-check -> your independent review (reading diffs, running tests, checking each criterion). The completion notification is a post-hoc signal: it tells you a child stopped, not that the work passed.

package/lib/llm-compat-u9mor0uu.js

@@ -0,0 +1,110 @@
+import { LlmError as LlmError$1 } from "@deepseek-ai/dsh-llm";
+//#region src/host/common/llm-compat.ts
+/** This package's kind in the harness message-source map. */
+const PLUGIN_MESSAGE_SOURCE_KIND = "dsh-chatgpt-subscription";
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+/** Read a message body's blocks, keeping every entry that carries a block tag. */
+function readBlocks(raw) {
+	if (!Array.isArray(raw)) return [];
+	return raw.filter((block) => isRecord(block) && typeof block.type === "string");
+}
+/**
+* The first value that is a non-empty string.
+*
+* Used for fields the two generations spell in different places: a value that
+* is present but empty must not shadow a real one further down the chain, which
+* is what `??` alone does.
+*/
+function firstNonEmptyString(...values) {
+	for (const value of values) if (typeof value === "string" && value !== "") return value;
+	return "";
+}
+/**
+* The result block a `role: 'tool'` message already carries inside its body.
+*
+* Some harness generations deliver the call id inside the result block rather
+* than on the message, and one shape carries both: `role: 'tool'` with a
+* `tool-result` block holding the id. Reading only the message-level fields
+* leaves {@link toolCallIdOf} nothing to find.
+*/
+function embeddedToolResult(content) {
+	if (content.length !== 1) return void 0;
+	const [block] = content;
+	return block?.type === "tool-result" ? block : void 0;
+}
+/**
+* The call id one `role: 'tool'` message associates with its `tool-call`.
+*
+* The id is the only thing tying a result to the call it answers: a mapper that
+* sends it empty makes every result an orphan and tells the repair pass that no
+* call was answered, which some gateways reject outright (WorkBuddy answers
+* `11148`, "tool calls and tool results do not match"). It therefore has to be
+* read from every place the harness generations put it — the message, the
+* message's source, and the result block inside the body — and an empty string
+* must not shadow a later, real one.
+*/
+function toolCallIdOf(raw, source, embedded) {
+	return firstNonEmptyString(raw.toolCallId, raw.callId, source?.callId, embedded?.toolCallId);
+}
+/**
+* Normalize one harness message list into {@link Message}.
+*
+* A 0.1.7 `role: 'tool'` message is re-wrapped as the user-role message holding
+* one {@link ToolResultBlock} that the mappers expect, keeping the tool
+* provenance (`kind: 'tool'`) they use to tell a real tool result from a user
+* turn. A message that already carries that block keeps its own body instead of
+* nesting a second `tool-result` around it. Everything a newer harness adds
+* beside that keeps its own shape.
+* @param messages - Messages straight off the request options, in either generation's shape.
+* @returns The same conversation in the pre-0.1.7 vocabulary.
+*/
+function normalizeMessages(messages) {
+	const normalized = [];
+	for (const raw of messages ?? []) {
+		if (!isRecord(raw)) continue;
+		const content = readBlocks(raw.content);
+		if (raw.role === "tool") {
+			const source = isRecord(raw.source) ? raw.source : void 0;
+			const embedded = embeddedToolResult(content);
+			const callId = toolCallIdOf(raw, source, embedded);
+			const isError = raw.isError === true || embedded?.isError === true;
+			normalized.push({
+				id: raw.id,
+				role: "user",
+				content: [{
+					type: "tool-result",
+					toolCallId: callId,
+					content: embedded === void 0 ? content : embedded.content,
+					...isError ? { isError: true } : {}
+				}],
+				source: {
+					kind: "tool",
+					callId
+				}
+			});
+			continue;
+		}
+		normalized.push({
+			id: raw.id,
+			role: typeof raw.role === "string" ? raw.role : "user",
+			content,
+			...isRecord(raw.source) ? { source: raw.source } : {}
+		});
+	}
+	return normalized;
+}
+/**
+* Normalize request options for the mappers.
+* @param options - Request options the harness handed the adapter.
+* @returns The same options with {@link Message} history.
+*/
+function normalizeGenerateOptions(options) {
+	return {
+		...options,
+		messages: normalizeMessages(options.messages)
+	};
+}
+//#endregion
+export { PLUGIN_MESSAGE_SOURCE_KIND as n, normalizeGenerateOptions as r, LlmError$1 as t };