@xiaoso/dsh-tool-plus 0.1.6 → 0.1.7-beta.1

package/lib/muse-code-Di1VZmB1.mjs

@@ -0,0 +1,143 @@
+import { installBunShim as __installBunShim } from "./bun-shim.mjs";
+__installBunShim();
+import { r as __exportAll } from "./fs-promises-shim-Bx0fpxuk.mjs";
+import { f as OAuthError, t as ConfigurationError } from "./error-CORgGg5a.mjs";
+import { type } from "@oh-my-pi/omptype";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/registry/oauth/muse-code.ts
+var muse_code_exports = /* @__PURE__ */ __exportAll({
+	attachMuseCodeApiKey: () => attachMuseCodeApiKey,
+	parseMuseCodeCredential: () => parseMuseCodeCredential,
+	requestMuseCodeKey: () => requestMuseCodeKey
+});
+const PROVIDER = "muse-code";
+const MUSE_KEY_URL = "https://api.meta.ai/muse-code/key";
+const API_VERSION = "1.0.0";
+const REQUEST_TIMEOUT_MS = 2e4;
+const subscriptionWindowSchema = type({
+	"used_percent?": "number",
+	"resets_at?": "string | number",
+	"window_duration_mins?": "number"
+});
+const subscriptionUsageSchema = type({
+	"window?": subscriptionWindowSchema.or("null"),
+	"weekly?": subscriptionWindowSchema.or("null")
+});
+const museCodeKeyResponseSchema = type({
+	"api_key?": "string",
+	"require_payment_action_url?": "string",
+	"require_payment?": "boolean",
+	"action_url?": "string | null",
+	"user_email?": "string",
+	"user_id?": "string",
+	"is_subs_active?": "boolean",
+	"subs_tier_id?": "string",
+	"subs_tier_name?": "string",
+	"subs_usage?": subscriptionUsageSchema.or("null")
+});
+const museCodeCredentialSchema = type({
+	oauthAccessToken: "string",
+	apiKey: "string"
+});
+function requestSignal(signal) {
+	const timeout = AbortSignal.timeout(REQUEST_TIMEOUT_MS);
+	return signal ? AbortSignal.any([signal, timeout]) : timeout;
+}
+function parseMuseCodeCredential(value) {
+	let payload;
+	try {
+		payload = JSON.parse(value);
+	} catch (cause) {
+		throw new ConfigurationError("Muse Code credential is invalid; sign in again", { cause });
+	}
+	const parsed = museCodeCredentialSchema(payload);
+	if (parsed instanceof type.errors || !parsed.oauthAccessToken.trim() || !parsed.apiKey.trim()) throw new ConfigurationError("Muse Code credential is invalid; sign in again");
+	return parsed;
+}
+function encodeMuseCodeCredential(oauthAccessToken, apiKey) {
+	return JSON.stringify({
+		oauthAccessToken,
+		apiKey
+	});
+}
+async function requestMuseCodeKey(accessToken, options = {}) {
+	const response = await (options.fetch ?? fetch)(MUSE_KEY_URL, {
+		method: "POST",
+		headers: {
+			Accept: "application/json",
+			Authorization: `Bearer ${accessToken}`,
+			"Content-Type": "application/json",
+			"x-api-version": API_VERSION
+		},
+		body: JSON.stringify(options.onboard ? { onboard: true } : {}),
+		redirect: "error",
+		signal: requestSignal(options.signal)
+	});
+	const text = await response.text();
+	if (!response.ok) {
+		const excerpt = text.trim() ? ` ${text.slice(0, 500).trim()}` : "";
+		throw new OAuthError(`Muse Code key exchange failed: ${response.status}${excerpt}`, {
+			kind: "token-exchange",
+			provider: PROVIDER,
+			status: response.status
+		});
+	}
+	let payload;
+	try {
+		payload = JSON.parse(text);
+	} catch (cause) {
+		throw new OAuthError("Muse Code key exchange returned invalid JSON", {
+			kind: "validation",
+			provider: PROVIDER,
+			status: response.status,
+			cause
+		});
+	}
+	const parsed = museCodeKeyResponseSchema(payload);
+	if (parsed instanceof type.errors) throw new OAuthError(`Invalid Muse Code key response: ${parsed.summary}`, {
+		kind: "validation",
+		provider: PROVIDER
+	});
+	return parsed;
+}
+/** Exchange Meta account access for the Model API key authorized by a Muse subscription. */
+const attachMuseCodeApiKey = async (credentials, context) => {
+	try {
+		if (parseMuseCodeCredential(credentials.access).apiKey.trim()) return credentials;
+	} catch {}
+	const payload = await requestMuseCodeKey(credentials.access, {
+		fetch: context.fetch,
+		signal: context.signal,
+		onboard: true
+	});
+	if (payload.is_subs_active === false) throw new OAuthError("invalid_grant: Muse Code subscription is inactive", {
+		kind: "token-exchange",
+		provider: PROVIDER,
+		status: 403
+	});
+	const apiKey = payload.api_key?.trim() || "";
+	if (!apiKey) {
+		const actionUrl = payload.action_url?.trim() || payload.require_payment_action_url?.trim();
+		if (payload.require_payment === true || actionUrl) throw new OAuthError(actionUrl ? `Muse Code subscription is required: ${actionUrl}` : "Muse Code subscription is required", {
+			kind: "entitlement",
+			provider: PROVIDER
+		});
+		throw new OAuthError("Muse Code key response is missing api_key", {
+			kind: "validation",
+			provider: PROVIDER
+		});
+	}
+	const email = payload.user_email?.trim().toLowerCase();
+	const accountId = payload.user_id?.trim() || email;
+	if (!accountId) throw new OAuthError("Muse Code key response is missing a stable account identity", {
+		kind: "validation",
+		provider: PROVIDER
+	});
+	return {
+		...credentials,
+		access: encodeMuseCodeCredential(credentials.access, apiKey),
+		accountId,
+		email
+	};
+};
+//#endregion
+export { parseMuseCodeCredential as n, requestMuseCodeKey as r, muse_code_exports as t };

package/lib/{ollama-Df9ce-Cp.mjs → ollama-B8ic3sEp.mjs}

@@ -1,15 +1,15 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
 import { r as __exportAll } from "./fs-promises-shim-Bx0fpxuk.mjs";
-import { g as parseStreamingJson, i as readJsonl } from "./src-BcD0_rQR.mjs";
-import { G as fetchWithRetry, b as LLAMA_CPP_TOOL_CALL_PARSE_PATTERN, g as MissingApiKeyError, l as finalize, z as OllamaApiError } from "./error-C-f_Wnw4.mjs";
-import { C as kStreamingPartialJson, I as sanitizeSchemaForOllama, a as normalizeSystemPrompts, h as clearStreamingPartialJson, k as toolWireSchema, m as transformMessages } from "./utils-Cp2Mxf_U.mjs";
-import { Ct as withEmptyCompletionRetry, n as getEnvApiKey } from "./stream-Bjq8wjfr.mjs";
-import { i as partitionVisionContent, r as joinTextWithImagePlaceholder } from "./vision-guard-mBmtAHx0.mjs";
-import { t as AssistantMessageEventStream } from "./event-stream-Dh2guZxS.mjs";
-import { n as getOpenAIStreamFirstEventTimeoutMs, r as getOpenAIStreamIdleTimeoutMs, t as armPreResponseTimeout } from "./idle-iterator-CYAxUkSD.mjs";
-import { n as getStreamMarkupHealingPattern, t as StreamMarkupHealing } from "./stream-markup-healing-DZ6bVDxH.mjs";
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/providers/ollama.ts
+import { _ as parseStreamingJson, i as readJsonl } from "./src-BwW51vA5.mjs";
+import { G as fetchWithRetry, c as finalize, h as MissingApiKeyError, y as LLAMA_CPP_TOOL_CALL_PARSE_PATTERN, z as OllamaApiError } from "./error-CORgGg5a.mjs";
+import { A as toolWireSchema, R as sanitizeSchemaForOllama, g as clearStreamingPartialJson, h as transformMessages, o as normalizeSystemPrompts, w as kStreamingPartialJson } from "./utils-CUPhpw9A.mjs";
+import { At as withReplaySafeStreamRetry, n as getEnvApiKey } from "./stream-B_7qN-bA.mjs";
+import { i as partitionVisionContent, r as joinTextWithImagePlaceholder } from "./vision-guard-_XwsL1DF.mjs";
+import { t as AssistantMessageEventStream } from "./event-stream-ulcDenZD.mjs";
+import { n as getOpenAIStreamFirstEventTimeoutMs, r as getOpenAIStreamIdleTimeoutMs, t as armPreResponseTimeout } from "./idle-iterator-DlUkEfzW.mjs";
+import { n as getStreamMarkupHealingPattern, t as StreamMarkupHealing } from "./stream-markup-healing-DKT1lnkW.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/providers/ollama.ts
 var ollama_exports = /* @__PURE__ */ __exportAll({ streamOllama: () => streamOllama });
 function normalizeBaseUrl(baseUrl) {
 	const value = baseUrl?.trim();
@@ -139,22 +139,6 @@ function convertTools(tools) {
 		}
 	}));
 }
-/**
-* Ollama Cloud rejects `num_predict` above this value with HTTP 400
-* (`max_tokens (...) exceeds model's maximum output tokens (65536)`).
-* The cap currently applies uniformly to cloud-served models; the cloud-side
-* limit was confirmed empirically against `deepseek-v4-pro`/`-flash` and is
-* the same cap surfaced for every other Ollama Cloud model we've probed.
-*
-* Acts as a wire-level safety net so stale `models.db` rows (or custom
-* `modelOverrides` re-enabling `num_predict`) cannot 400 the request — even
-* when `model.omitMaxOutputTokens` was never applied. See #3392.
-*/
-const OLLAMA_CLOUD_NUM_PREDICT_CAP = 65536;
-function resolveNumPredict(model, requested) {
-	if (model.provider === "ollama-cloud") return Math.min(requested, OLLAMA_CLOUD_NUM_PREDICT_CAP);
-	return requested;
-}
 function createChatBody(model, context, options) {
 	const think = mapReasoning(model, options?.reasoning, options?.disableReasoning);
 	const toolChoice = mapToolChoice(options?.toolChoice);
@@ -162,7 +146,7 @@ function createChatBody(model, context, options) {
 	const runtimeOptions = {};
 	let hasRuntimeOptions = false;
 	if (options?.maxTokens !== void 0 && !model.omitMaxOutputTokens) {
-		runtimeOptions.num_predict = resolveNumPredict(model, options.maxTokens);
+		runtimeOptions.num_predict = model.provider === "ollama-cloud" ? Math.min(options.maxTokens, 65536) : options.maxTokens;
 		hasRuntimeOptions = true;
 	}
 	if (options?.temperature !== void 0) {
@@ -292,7 +276,7 @@ const streamOllamaOnce = (model, context, options = {}) => {
 		let activeThinkingIndex;
 		let activeTextIndex;
 		const activeToolIndices = /* @__PURE__ */ new Set();
-		const streamMarkupHealingPattern = getStreamMarkupHealingPattern(model.provider, model.id);
+		const streamMarkupHealingPattern = getStreamMarkupHealingPattern(model);
 		const streamMarkupHealing = streamMarkupHealingPattern ? new StreamMarkupHealing({ pattern: streamMarkupHealingPattern }) : void 0;
 		let healedToolCallEmitted = false;
 		let suppressHealedThinking = false;
@@ -522,9 +506,10 @@ const streamOllamaOnce = (model, context, options = {}) => {
 					activeToolIndices.clear();
 					output.stopReason = mapDoneReason(chunk.done_reason, output);
 					if (healedToolCallEmitted && output.stopReason === "stop") output.stopReason = "toolUse";
-					output.usage.input = chunk.prompt_eval_count ?? 0;
+					output.usage.cacheRead = chunk.prompt_eval_cached_count ?? 0;
+					output.usage.input = (chunk.prompt_eval_count ?? 0) - output.usage.cacheRead;
 					output.usage.output = chunk.eval_count ?? 0;
-					output.usage.totalTokens = output.usage.input + output.usage.output;
+					output.usage.totalTokens = output.usage.input + output.usage.output + output.usage.cacheRead;
 				}
 			}
 			if (streamMarkupHealing) {
@@ -584,6 +569,6 @@ const streamOllamaOnce = (model, context, options = {}) => {
 	return stream;
 };
 /** Retry EOS-only Ollama completions before the agent loop sees an empty stop. */
-const streamOllama = (model, context, options) => withEmptyCompletionRetry(model, context, options, streamOllamaOnce);
+const streamOllama = (model, context, options) => withReplaySafeStreamRetry(model, context, options, streamOllamaOnce, { retryEmptyCompletion: true });
 //#endregion
 export { ollama_exports as t };

package/lib/{openai-codex-CAVI3Me-.mjs → openai-codex-DuJNC99x.mjs}

@@ -1,21 +1,11 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { c as OAuthError, h as LoginCancelledError } from "./error-C-f_Wnw4.mjs";
-import "./utils-Cp2Mxf_U.mjs";
-import { n as isRecord } from "./type-guards-B9VVjRDK.mjs";
-import { t as OAuthCallbackFlow } from "./callback-server-CFJK-jvK.mjs";
-import { t as generatePKCE } from "./pkce-BlQikGPu.mjs";
-import { i as OPENAI_HEADER_VALUES } from "./codex-P1dGpX7G.mjs";
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/registry/oauth/openai-codex.ts
-/**
-* OpenAI Codex (ChatGPT OAuth) flow — browser and device-code flows.
-*/
+import { f as OAuthError, m as LoginCancelledError } from "./error-CORgGg5a.mjs";
+import "./utils-CUPhpw9A.mjs";
+import { n as isRecord } from "./type-guards-CttAANEx.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/registry/oauth/openai-codex.ts
 const CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann";
-const AUTHORIZE_URL = "https://auth.openai.com/oauth/authorize";
 const TOKEN_URL = "https://auth.openai.com/oauth/token";
-const CALLBACK_PORT = 1455;
-const CALLBACK_PATH = "/auth/callback";
-const SCOPE = "openid profile email offline_access api.connectors.read api.connectors.invoke";
 const JWT_CLAIM_PATH = "https://api.openai.com/auth";
 const JWT_PROFILE_CLAIM = "https://api.openai.com/profile";
 const TOKEN_REQUEST_TIMEOUT_MS = 15e3;
@@ -49,8 +39,8 @@ function getTokenProfile(accessToken, idToken) {
 	const idPayload = idToken ? decodeJwt(idToken) : null;
 	const auth = payload?.[JWT_CLAIM_PATH];
 	const idAuth = idPayload?.[JWT_CLAIM_PATH];
-	const accountId = auth?.chatgpt_account_id;
-	const email = payload?.[JWT_PROFILE_CLAIM]?.email?.trim().toLowerCase();
+	const accountId = auth?.chatgpt_account_id ?? idAuth?.chatgpt_account_id;
+	const email = (payload?.[JWT_PROFILE_CLAIM]?.email ?? idPayload?.[JWT_PROFILE_CLAIM]?.email)?.trim().toLowerCase();
 	const planType = (auth?.chatgpt_plan_type ?? idAuth?.chatgpt_plan_type)?.trim().toLowerCase();
 	return {
 		accountId: typeof accountId === "string" && accountId.length > 0 ? accountId : void 0,
@@ -70,7 +60,28 @@ function describeTokenEndpointValue(value) {
 	if (code && message && code !== message) return `${code}: ${message}`;
 	return code ?? message ?? JSON.stringify(value);
 }
-/** Formats OpenAI Codex OAuth token endpoint errors for login and refresh failures. */
+/** Enriches declaratively exchanged Codex credentials from access/id-token JWT claims. */
+const openAICodexProfileHook = async (credentials, context) => {
+	const idToken = isRecord(context.raw) && typeof context.raw.id_token === "string" ? context.raw.id_token : void 0;
+	const { accountId, email, planType } = getTokenProfile(credentials.access, idToken);
+	if (context.phase === "login" && !accountId) throw new OAuthError("Failed to extract accountId from token", {
+		kind: "validation",
+		provider: context.provider
+	});
+	const resolvedAccountId = accountId ?? context.stored?.accountId;
+	return {
+		...credentials,
+		...resolvedAccountId ? { accountId: resolvedAccountId } : {},
+		...email ? { email } : context.stored?.email ? { email: context.stored.email } : {},
+		...context.phase === "login" && resolvedAccountId ? { orgId: resolvedAccountId } : {},
+		...context.phase === "login" && planType ? { orgName: planType } : {},
+		...context.phase === "refresh" && context.stored?.orgId ? { orgId: context.stored.orgId } : {},
+		...context.phase === "refresh" && context.stored?.orgName ? { orgName: context.stored.orgName } : {}
+	};
+};
+/**
+* Formats OpenAI Codex OAuth token endpoint errors for login and refresh failures.
+*/
 function formatOpenAICodexTokenEndpointError(status, bodyText) {
 	const trimmed = bodyText.trim();
 	if (trimmed.length === 0) return `${status}`;
@@ -85,52 +96,6 @@ function formatOpenAICodexTokenEndpointError(status, bodyText) {
 		return `${status} ${trimmed}`;
 	}
 }
-/** Builds the Codex browser OAuth URL used by browser login; exported for auth regression tests. */
-function createOpenAICodexAuthorizationUrl(args) {
-	const originator = args.originator?.trim() || OPENAI_HEADER_VALUES.ORIGINATOR_CODEX;
-	const searchParams = new URLSearchParams({
-		response_type: "code",
-		client_id: CLIENT_ID,
-		redirect_uri: args.redirectUri,
-		scope: SCOPE,
-		code_challenge: args.challenge,
-		code_challenge_method: "S256",
-		state: args.state,
-		id_token_add_organizations: "true",
-		codex_cli_simplified_flow: "true",
-		originator
-	});
-	return `${AUTHORIZE_URL}?${searchParams.toString()}`;
-}
-var OpenAICodexOAuthFlow = class extends OAuthCallbackFlow {
-	#pkce;
-	#originator;
-	#fetch;
-	constructor(ctrl, pkce, originator, fetchImpl) {
-		super(ctrl, {
-			preferredPort: CALLBACK_PORT,
-			callbackPath: CALLBACK_PATH,
-			redirectUri: `http://localhost:${CALLBACK_PORT}${CALLBACK_PATH}`
-		});
-		this.#pkce = pkce;
-		this.#originator = originator;
-		this.#fetch = fetchImpl;
-	}
-	async generateAuthUrl(state, redirectUri) {
-		return {
-			url: createOpenAICodexAuthorizationUrl({
-				state,
-				redirectUri,
-				challenge: this.#pkce.challenge,
-				originator: this.#originator
-			}),
-			instructions: "A browser window should open. Complete login to finish."
-		};
-	}
-	async exchangeToken(code, _state, redirectUri) {
-		return exchangeCodeForToken(code, this.#pkce.verifier, redirectUri, this.#fetch);
-	}
-};
 async function exchangeCodeForToken(code, verifier, redirectUri, fetchImpl = fetch) {
 	const tokenResponse = await fetchImpl(TOKEN_URL, {
 		method: "POST",
@@ -165,9 +130,6 @@ async function exchangeCodeForToken(code, verifier, redirectUri, fetchImpl = fet
 		orgName: planType
 	};
 }
-async function loginOpenAICodex(options) {
-	return new OpenAICodexOAuthFlow(options, await generatePKCE(), options.originator?.trim() || OPENAI_HEADER_VALUES.ORIGINATOR_CODEX, options.fetch ?? fetch).login();
-}
 /**
 * Login with OpenAI Codex using the device-code (headless) flow.
 *
@@ -219,37 +181,5 @@ async function loginOpenAICodexDevice(ctrl) {
 	}
 	throw new OAuthError("Device authorization timed out — user did not complete login in time", { kind: "timeout" });
 }
-/**
-* Refresh OpenAI Codex OAuth token
-*/
-async function refreshOpenAICodexToken(refreshToken) {
-	const response = await fetch(TOKEN_URL, {
-		method: "POST",
-		headers: { "Content-Type": "application/x-www-form-urlencoded" },
-		body: new URLSearchParams({
-			grant_type: "refresh_token",
-			refresh_token: refreshToken,
-			client_id: CLIENT_ID
-		}),
-		signal: AbortSignal.timeout(TOKEN_REQUEST_TIMEOUT_MS)
-	});
-	if (!response.ok) {
-		const bodyText = await response.text();
-		throw new OAuthError(`OpenAI Codex token refresh failed: ${formatOpenAICodexTokenEndpointError(response.status, bodyText)}`, {
-			kind: "token-refresh",
-			status: response.status
-		});
-	}
-	const tokenData = await response.json();
-	if (!tokenData.access_token || !tokenData.refresh_token || typeof tokenData.expires_in !== "number") throw new OAuthError("Token response missing required fields", { kind: "validation" });
-	const { accountId, email } = getTokenProfile(tokenData.access_token);
-	return {
-		access: tokenData.access_token,
-		refresh: tokenData.refresh_token || refreshToken,
-		expires: Date.now() + tokenData.expires_in * 1e3,
-		accountId: accountId ?? void 0,
-		email
-	};
-}
 //#endregion
-export { loginOpenAICodex, loginOpenAICodexDevice, refreshOpenAICodexToken };
+export { loginOpenAICodexDevice, openAICodexProfileHook };