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

package/lib/{cursor-B8m6SqAH.mjs → cursor-LKGjucn2.mjs}

@@ -1,13 +1,13 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { A as semverGte, D as bareModelId, O as parseGlmModel, r as getBundledModels, y as isKimiK3ModelId } from "./models-DRA2c_8U.mjs";
-import "./identity-HNO1Oe9B.mjs";
-import { r as toModelSpec } from "./bundled-references-ChZSPDFw.mjs";
-import { E as create, i as fromBinary, t as toBinary } from "./to-binary-B1BEBIPC.mjs";
-import { H as GetUsableModelsRequestSchema, U as GetUsableModelsResponseSchema } from "./agent_pb-Rizyt9Zg.mjs";
+import { d as compareRevision, f as parseRevision, n as classifyModel } from "./taxonomy-DSIM99rS.mjs";
+import { r as getBundledModels } from "./models-DnXMYGcJ.mjs";
+import { r as toModelSpec } from "./bundled-references-DY3EJxZV.mjs";
+import { i as fromBinary, o as toBinary, t as create } from "./protobuf-aab1UGVn.mjs";
+import { nt as GetUsableModelsResponseSchema, tt as GetUsableModelsRequestSchema } from "./cursor-proto-B8Wj8bv9.mjs";
 import { type } from "@oh-my-pi/omptype";
 import * as http2$1 from "node:http2";
-//#region node_modules/.pnpm/@oh-my-pi+pi-catalog@17.3.5/node_modules/@oh-my-pi/pi-catalog/src/discovery/cursor.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-catalog@18.1.17/node_modules/@oh-my-pi/pi-catalog/src/discovery/cursor.ts
 const CURSOR_DEFAULT_BASE_URL = "https://api2.cursor.sh";
 const CURSOR_DEFAULT_CLIENT_VERSION = "cli-2026.02.13-41ac335";
 const CURSOR_GET_USABLE_MODELS_PATH = "/agent.v1.AgentService/GetUsableModels";
@@ -22,15 +22,6 @@ const DEFAULT_MAX_TOKENS = 64e3;
 */
 const CURSOR_1M_CONTEXT_WINDOW = 1e6;
 const CURSOR_1M_NAME_PATTERN = /\b1m\b/i;
-const CURSOR_MAX_MODE_1M_ID_PATTERN = /claude|gemini/;
-/** Kimi's official bare K3 id (`k3`, `kimi/k3`); `k3-256k` is the 256k SKU and stays out. */
-const CURSOR_KIMI_K3_BARE_ID_PATTERN = /(^|\/)k3$/i;
-/**
-* Model-id families whose native catalogs (anthropic, openai/openai-codex,
-* google) are multimodal. Cursor-only or text-only families (`composer-*`,
-* `grok-code-*`) intentionally stay outside this pattern.
-*/
-const CURSOR_MULTIMODAL_ID_PATTERN = /claude|gemini|gpt-|codex/;
 const OptionalDisplayNameSchema = type("unknown").pipe((raw) => typeof raw === "string" ? raw : void 0);
 const CursorAliasesSchema = type("unknown").pipe((raw) => {
 	if (Array.isArray(raw)) return raw.filter((alias) => typeof alias === "string");
@@ -168,6 +159,25 @@ function decodeConnectUnaryBody(payload) {
 	}
 	return null;
 }
+function isCursorKimiK3(id) {
+	const identity = classifyModel("cursor", id, { lenient: true });
+	return identity.class === "kimi" && identity.family === "k3";
+}
+function isCursorVersionedGrok(id) {
+	const identity = classifyModel("cursor", id, { lenient: true });
+	if (identity.class !== "xai" || identity.revision === void 0) return false;
+	const revision = parseRevision(identity.revision);
+	const floor = parseRevision("4");
+	return revision !== void 0 && floor !== void 0 && compareRevision(revision, floor) >= 0;
+}
+function isCursorGlm52CodingModel(id) {
+	const identity = classifyModel("cursor", id, { lenient: true });
+	if (identity.class !== "glm" || identity.revision === void 0) return false;
+	if (identity.family !== void 0 && identity.family !== "air" && identity.family !== "turbo") return false;
+	const revision = parseRevision(identity.revision);
+	const floor = parseRevision("5.2");
+	return revision !== void 0 && floor !== void 0 && compareRevision(revision, floor) >= 0;
+}
 function normalizeCursorModels(models, baseUrlOverride, references) {
 	if (!models || models.length === 0) return [];
 	const byId = /* @__PURE__ */ new Map();
@@ -186,13 +196,14 @@ function normalizeCursorModel(model, baseUrlOverride, references) {
 	if (!id) return null;
 	const name = pickModelDisplayName(details, id);
 	const reference = references.get(id);
-	const reasoning = isKimiK3ModelId(id) || Boolean(details.thinkingDetails) || reference?.reasoning === true;
+	const reasoning = isCursorKimiK3(id) || isCursorVersionedGrok(id) || Boolean(details.thinkingDetails) || reference?.reasoning === true;
 	if (reference) return {
 		...reference,
 		id,
 		name,
 		baseUrl: baseUrlOverride ?? reference.baseUrl,
 		reasoning,
+		input: resolveCursorInput(id, reference.input),
 		contextWindow: resolveCursorContextWindow(details, id, reference.contextWindow),
 		cursorMaxMode: details.maxMode
 	};
@@ -203,7 +214,7 @@ function normalizeCursorModel(model, baseUrlOverride, references) {
 		provider: "cursor",
 		baseUrl: baseUrlOverride ?? CURSOR_DEFAULT_BASE_URL,
 		reasoning,
-		input: inferInputFromCursorId(id),
+		input: resolveCursorInput(id),
 		cost: {
 			input: 0,
 			output: 0,
@@ -220,27 +231,25 @@ function normalizeCursorModel(model, baseUrlOverride, references) {
 * signal fires (never below a larger bundled reference), else the fallback.
 */
 function resolveCursorContextWindow(model, id, fallback) {
-	if (CURSOR_1M_NAME_PATTERN.test(id) || [
+	const labeled1M = CURSOR_1M_NAME_PATTERN.test(id) || [
 		model.displayName,
 		model.displayNameShort,
 		model.displayModelId,
 		...model.aliases
-	].some((candidate) => typeof candidate === "string" && CURSOR_1M_NAME_PATTERN.test(candidate)) || isCursorNative1MModelId(id) || model.maxMode && CURSOR_MAX_MODE_1M_ID_PATTERN.test(id)) return Math.max(fallback ?? 0, CURSOR_1M_CONTEXT_WINDOW);
+	].some((candidate) => typeof candidate === "string" && CURSOR_1M_NAME_PATTERN.test(candidate));
+	const identity = classifyModel("cursor", id, { lenient: true });
+	const maxMode1M = model.maxMode && (identity.class === "anthropic" || identity.class === "gemini");
+	if (labeled1M || isCursorNative1MModelId(id) || maxMode1M) return Math.max(fallback ?? 0, CURSOR_1M_CONTEXT_WINDOW);
 	return fallback;
 }
 /**
-* Natively 1M-context families Cursor serves without a "1M" label: Kimi K3 and
-* GLM 5.2+ coding SKUs. The shared family parsers cover namespace forms
-* (`moonshotai/kimi-k3`, `z-ai/glm-5.2`) and future GLM versions (`glm-5.10`,
-* `glm-6`); vision and sub-1M variants stay out via the same gates as
-* `isGlm52ReasoningEffortModelId`.
+* Natively 1M-context families Cursor serves without a "1M" label: GLM 5.2+
+* base/air/turbo coding SKUs (structured family and revision gates exclude
+* vision and sub-1M variants). K3 — including Cursor's bare `k3` alias — is
+* rule-owned via `context-window-floor` in `providers/cursor.kdl`.
 */
 function isCursorNative1MModelId(id) {
-	if (isKimiK3ModelId(id) || CURSOR_KIMI_K3_BARE_ID_PATTERN.test(id)) return true;
-	const glm = parseGlmModel(bareModelId(id));
-	if (!glm || glm.vision) return false;
-	if (glm.variant !== "base" && glm.variant !== "air" && glm.variant !== "turbo") return false;
-	return semverGte(glm.version, "5.2");
+	return isCursorGlm52CodingModel(id);
 }
 function pickModelDisplayName(model, fallbackId) {
 	const candidates = [
@@ -258,16 +267,17 @@ function pickModelDisplayName(model, fallbackId) {
 	return fallbackId;
 }
 /**
-* Infers input modalities for Cursor models without a bundled reference.
-*
-* `GetUsableModels` carries no per-model modality metadata, so classification
-* falls back to the model family: families that are multimodal in OMP's own
-* native catalogs accept images, everything else stays text-only. Mirrors
-* `inferInputFromGeminiId` in ./gemini.ts.
+* Resolves input modalities from a bundled reference when available. The
+* Cursor-verified families (K3, grok-4, composer-2.5) are rule-owned via
+* `input-modalities` in `providers/cursor.kdl` and corrected at build time.
+* Without a reference, families whose native catalogs are multimodal
+* (anthropic, gemini, openai) fall back to id classification.
 */
-function inferInputFromCursorId(id) {
-	if (CURSOR_MULTIMODAL_ID_PATTERN.test(id.toLowerCase())) return ["text", "image"];
+function resolveCursorInput(id, referenceInput) {
+	if (referenceInput) return referenceInput;
+	const identity = classifyModel("cursor", id, { lenient: true });
+	if (identity.class === "anthropic" || identity.class === "gemini" || identity.class === "openai") return ["text", "image"];
 	return ["text"];
 }
 //#endregion
-export { fetchCursorUsableModels };
+export { fetchCursorUsableModels, resolveCursorInput };