@xiaoso/dsh-tool-plus 0.1.16 → 0.1.17-beta.0

package/lib/{devin-QpfTSl9H.mjs → devin-7OEeEb80.mjs}

@@ -1,13 +1,12 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { C as warn } from "./src-AELUUb5U.mjs";
-import { n as discoveryFetch } from "./utils-I4I8azHN.mjs";
-import { n as THINKING_EFFORTS } from "./effort-BdtQMN-_.mjs";
-import { t as collapseVariants } from "./collapse-CkMNRNr7.mjs";
-import { r as devinDiscoveryMetadata } from "./devin-ExGIghmx.mjs";
-import { o as toBinary, t as create } from "./protobuf-BMgDYu_U.mjs";
-import { d as GetCliModelConfigsRequestSchema, f as GetCliModelConfigsResponseSchema, t as decodeDevinUnaryMessage, v as MetadataSchema } from "./devin-proto-DYhp4Ty6.mjs";
-//#region node_modules/.pnpm/@oh-my-pi+pi-catalog@18.1.17/node_modules/@oh-my-pi/pi-catalog/src/discovery/devin.ts
+import { k as warn } from "./src-BhinCSpi.mjs";
+import { t as slugify } from "./slugify-ynYWBIA5.mjs";
+import { L as THINKING_EFFORTS } from "./id-EJwVLDHE.mjs";
+import { n as discoveryFetch } from "./utils-DrDwmNtu.mjs";
+import { i as create, l as toBinary, t as collapseVariants } from "./collapse-_nkb2dn7.mjs";
+import { h as GetCliModelConfigsResponseSchema, i as devinDiscoveryMetadata, m as GetCliModelConfigsRequestSchema, t as decodeDevinUnaryMessage, x as MetadataSchema } from "./devin-proto-C-QreeAv.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-catalog@18.12.6/node_modules/@oh-my-pi/pi-catalog/src/discovery/devin.ts
 const DEVIN_GET_CLI_MODEL_CONFIGS_PATH = "/exa.api_server_pb.ApiServerService/GetCliModelConfigs";
 const DEFAULT_CONTEXT_WINDOW = 2e5;
 const DEFAULT_MAX_TOKENS = 64e3;
@@ -53,6 +52,8 @@ function supportsDevinThinking(config) {
 const DEVIN_COST_LABEL_INPUT = "input";
 const DEVIN_COST_LABEL_CACHE_READ = "cached input";
 const DEVIN_COST_LABEL_OUTPUT = "output";
+/** Normalized label of the marker dimension separating composite rate cards. */
+const DEVIN_SIDEKICK_LABEL = "sidekick";
 /** Leading token count of a cost denominator ("1M tokens", "1K tokens"). */
 const DEVIN_COST_DENOMINATOR_PATTERN = /(\d+(?:\.\d+)?)\s*([kmb])?/i;
 const DEVIN_COST_DENOMINATOR_SCALE = {
@@ -76,8 +77,14 @@ function devinCostDenominatorTokens(denominator) {
 /**
 * Per-million-token rates from the config's cost dimensions. `COST_FUZZY` marks
 * an estimated rate, not a different unit, so both kinds are read. `cacheWrite`
-* has no Cascade dimension — Devin bills cache writes at the input rate — and
-* stays 0.
+* has no Cascade dimension and stays 0; the provider's `cache-write-rate` rules
+* supply Devin's published rate.
+*
+* Composite configs (`fusion`) flatten their own rate card plus every
+* dispatched component's card into one `modelDimensions` list. A `Sidekick`
+* marker dimension separates the composite's own card from the component
+* cards, so reading stops there: a headline card may omit dimensions a
+* component includes, which makes repeated-label detection unreliable.
 */
 function devinModelCost(config) {
 	const cost = {
@@ -87,9 +94,11 @@ function devinModelCost(config) {
 		cacheWrite: 0
 	};
 	for (const dimension of config.modelDimensions) {
+		const label = dimension.label.trim().toLowerCase();
+		if (label === DEVIN_SIDEKICK_LABEL) break;
 		if (dimension.kind !== 1 && dimension.kind !== 2) continue;
 		const perMillion = Math.round(dimension.value * 1e6 / devinCostDenominatorTokens(dimension.denominator) * 1e6) / 1e6;
-		switch (dimension.label.trim().toLowerCase()) {
+		switch (label) {
 			case DEVIN_COST_LABEL_INPUT:
 				cost.input = perMillion;
 				break;
@@ -159,7 +168,7 @@ function collectDevinFamilyLane(lanes, config, uid) {
 		if (DEVIN_FAMILY_EFFORT_KEYS[key]) effort = DEVIN_FAMILY_EFFORT_BY_NAME[value.name.toLowerCase().replace(/[^a-z0-9]+/g, "")];
 	}
 	if (thinking === false) effort = "off";
-	const baseId = label.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+	const baseId = slugify(label);
 	if (!baseId) return;
 	const laneId = `${baseId}${oneMillionContext ? "-1m" : ""}${fast ? "-fast" : ""}`;
 	let lane = lanes.get(laneId);
@@ -221,12 +230,12 @@ async function fetchDevinModels(options) {
 	const controller = new AbortController();
 	const timer = setTimeout(() => controller.abort(), timeoutMs);
 	const signal = options.signal ? AbortSignal.any([controller.signal, options.signal]) : controller.signal;
+	const request = create(GetCliModelConfigsRequestSchema, { metadata: create(MetadataSchema, {
+		...devinDiscoveryMetadata(options.apiKey),
+		supportedModelDisplays: [...DEVIN_SUPPORTED_MODEL_DISPLAYS]
+	}) });
+	let payload;
 	try {
-		const request = create(GetCliModelConfigsRequestSchema, { metadata: create(MetadataSchema, {
-			...devinDiscoveryMetadata(options.apiKey),
-			supportedModelDisplays: [...DEVIN_SUPPORTED_MODEL_DISPLAYS]
-		}) });
-		const body = toBinary(GetCliModelConfigsRequestSchema, request);
 		const response = await discoveryFetch(options.fetch)(requestUrl, {
 			method: "POST",
 			headers: {
@@ -234,23 +243,24 @@ async function fetchDevinModels(options) {
 				"connect-protocol-version": "1",
 				accept: "*/*"
 			},
-			body,
+			body: toBinary(GetCliModelConfigsRequestSchema, request),
 			signal
 		});
 		if (!response.ok) return null;
-		const decoded = decodeDevinUnaryMessage(GetCliModelConfigsResponseSchema, new Uint8Array(await response.arrayBuffer()));
-		if (!decoded) return null;
-		const models = normalizeDevinModels(decoded.clientModelConfigs, options.baseUrl);
-		if (models.length === 0) {
-			warn("Devin returned an empty native model catalog; the pinned CLI identity may be stale", { metadata: devinDiscoveryMetadata(void 0) });
-			return null;
-		}
-		return models;
+		payload = new Uint8Array(await response.arrayBuffer());
 	} catch {
 		return null;
 	} finally {
 		clearTimeout(timer);
 	}
+	const decoded = decodeDevinUnaryMessage(GetCliModelConfigsResponseSchema, payload);
+	if (!decoded) return null;
+	const models = normalizeDevinModels(decoded, options.baseUrl);
+	if (models.length === 0) {
+		warn("Devin returned an empty model catalog; the pinned client identity may be stale", { metadata: devinDiscoveryMetadata(void 0) });
+		return null;
+	}
+	return models;
 }
 /**
 * Wire uids whose configs advertise `supports_images` but whose backend
@@ -264,11 +274,11 @@ async function fetchDevinModels(options) {
 */
 const DEVIN_IMAGE_BLIND_UIDS = /* @__PURE__ */ new Set(["swe-1-6", "swe-1-6-fast"]);
 /** One config as a raw (pre-collapse) spec keyed on its wire uid. */
-function devinModelSpec(config, uid, baseUrl, isRouter) {
+function devinModelSpec(config, uid, baseUrl, isAssignModelRouter) {
 	const features = config.modelInfo?.modelFeatures;
 	const input = (features !== void 0 ? features.supportsImages : config.supportsImages) && !DEVIN_IMAGE_BLIND_UIDS.has(uid) ? ["text", "image"] : ["text"];
 	const compat = {};
-	if (isRouter) compat.modelRouter = true;
+	if (isAssignModelRouter) compat.modelRouter = true;
 	if (features?.supportsParallelToolCalls === true) compat.supportsParallelToolCalls = true;
 	const maxOutputTokens = config.modelInfo?.maxOutputTokens ?? 0;
 	const spec = {
@@ -292,11 +302,65 @@ function devinModelSpec(config, uid, baseUrl, isRouter) {
 	if (config.isRecommended) spec.isRecommended = true;
 	return spec;
 }
-function normalizeDevinModels(configs, baseUrlOverride) {
+/**
+* Lead chat uid of a Fusion pairing `fusion-<lead>[-fast]-sidekick-<sidekick>`.
+* An exact live lead uid wins, so leads whose own uid ends in `-fast`
+* (`swe-1-6-fast`) route as written. Otherwise `-fast` selects the lead's
+* priority lane when the server lists one, then the standard lane.
+*
+* Returns `undefined` for uids that are not pairings and `null` for pairings
+* whose lead is not live: the composite uid itself is never servable.
+*/
+function devinFusionLeadUid(uid, liveUids) {
+	if (!uid.startsWith("fusion-")) return void 0;
+	const cut = uid.indexOf("-sidekick-");
+	if (cut <= 7) return void 0;
+	const lead = uid.slice(7, cut);
+	if (liveUids.has(lead)) return lead;
+	if (lead.endsWith("-fast")) {
+		const base = lead.slice(0, -5);
+		if (liveUids.has(`${base}-priority`)) return `${base}-priority`;
+		if (liveUids.has(base)) return base;
+	}
+	return null;
+}
+/**
+* Point a Fusion pairing at its lead. omp runs only the lead (the sidekick is
+* paired by the native client), so the limits and pricing a caller budgets
+* against are the lead's, not the composite card's. The composite uid names no
+* model, so `buildModel` resolves the row under its `requestModelId` and the
+* lead's catalog rules (cache-write rate, long-context tier) apply there.
+*/
+function routeDevinFusionLead(spec, lead) {
+	spec.requestModelId = lead.id;
+	spec.reasoning = lead.reasoning;
+	spec.input = lead.input;
+	spec.supportsTools = lead.supportsTools;
+	spec.cost = lead.cost;
+	spec.contextWindow = lead.contextWindow;
+	spec.maxTokens = lead.maxTokens;
+	if (lead.compat?.supportsParallelToolCalls) spec.compat = {
+		...spec.compat,
+		supportsParallelToolCalls: true
+	};
+	else if (spec.compat?.supportsParallelToolCalls) {
+		const { supportsParallelToolCalls: _, ...rest } = spec.compat;
+		if (Object.keys(rest).length > 0) spec.compat = rest;
+		else delete spec.compat;
+	}
+}
+function normalizeDevinModels(response, baseUrlOverride) {
+	const configs = response.clientModelConfigs;
+	const accountDefaultUid = response.defaultOverrideModelConfig?.modelUid.trim();
 	const baseUrl = baseUrlOverride ?? "https://server.codeium.com";
 	const specs = [];
 	const seen = /* @__PURE__ */ new Set();
 	const lanes = /* @__PURE__ */ new Map();
+	const liveConfigs = /* @__PURE__ */ new Map();
+	for (const config of configs) {
+		const uid = config.modelUid.trim();
+		if (!config.disabled && uid && !liveConfigs.has(uid)) liveConfigs.set(uid, config);
+	}
 	for (const config of configs) {
 		if (config.disabled) continue;
 		const displayOption = config.modelInfo?.displayOption ?? 0;
@@ -305,12 +369,29 @@ function normalizeDevinModels(configs, baseUrlOverride) {
 		if (!uid || seen.has(uid)) continue;
 		seen.add(uid);
 		const isRouter = displayOption === 3 || config.modelInfo?.isModelRouter === true;
-		specs.push(devinModelSpec(config, uid, baseUrl, isRouter));
+		const isAssignModelRouter = isRouter && (config.modelInfo?.harnessUids.length ?? 0) === 0;
+		const lead = devinFusionLeadUid(uid, liveConfigs);
+		if (lead === null) continue;
+		const spec = devinModelSpec(config, uid, baseUrl, isAssignModelRouter);
+		if (lead !== void 0) routeDevinFusionLead(spec, devinModelSpec(liveConfigs.get(lead), lead, baseUrl, false));
+		if (uid === accountDefaultUid) spec.isProviderDefault = true;
+		specs.push(spec);
 		if (!isRouter) collectDevinFamilyLane(lanes, config, uid);
 	}
 	const families = devinDynamicFamilies(lanes.values());
 	const dynamic = families.length > 0 ? collapseVariants(specs, { table: { families } }) : specs;
-	return collapseVariants(dynamic).sort((a, b) => a.id.localeCompare(b.id));
+	const collapsed = collapseVariants(dynamic);
+	const accountFamily = collapsed.find((spec) => spec.isProviderDefault && spec.thinking?.effortRouting);
+	const accountEffort = THINKING_EFFORTS.find((effort) => accountFamily?.thinking?.effortRouting?.[effort] === accountDefaultUid);
+	if (accountFamily?.thinking && accountEffort !== void 0) {
+		accountFamily.thinking = {
+			...accountFamily.thinking,
+			defaultLevel: accountEffort
+		};
+		if (accountFamily.id === accountDefaultUid) delete accountFamily.requestModelId;
+		else accountFamily.requestModelId = accountDefaultUid;
+	}
+	return collapsed.sort((a, b) => a.id.localeCompare(b.id));
 }
 //#endregion
 export { fetchDevinModels };

package/lib/{devin-proto-DYhp4Ty6.mjs → devin-proto-C-QreeAv.mjs}

@@ -1,10 +1,10 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { a as pb, i as fromBinary } from "./protobuf-BMgDYu_U.mjs";
+import { c as pb, s as fromBinary } from "./collapse-_nkb2dn7.mjs";
 import { gunzipSync } from "node:zlib";
-//#region node_modules/.pnpm/@oh-my-pi+pi-catalog@18.1.17/node_modules/@oh-my-pi/pi-catalog/src/discovery/devin-proto.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-catalog@18.12.6/node_modules/@oh-my-pi/pi-catalog/src/discovery/devin-proto.ts
 /**
-* Devin protocol declarations used by Oh My Pi.
+* Devin protocol declarations used by omp.
 *
 * Each declaration retains only fields consumed by the client or its protocol tests.
 */
@@ -2860,7 +2860,73 @@ const UserStatusSchema = pb("exa.codeium_common_pb.UserStatus", [
 	}
 ]);
 //#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-catalog@18.1.17/node_modules/@oh-my-pi/pi-catalog/src/wire/devin-proto.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-catalog@18.12.6/node_modules/@oh-my-pi/pi-catalog/src/wire/devin.ts
+/**
+* Devin (Codeium Cascade) wire constants shared by catalog discovery, the pi-ai
+* provider, and account usage. This module deliberately stays free of the
+* generated protobuf runtime so the synchronous model seed can import it
+* without pulling devin-gen into the boot path.
+*/
+/** Base host for Codeium/Windsurf's Cascade API (Connect protocol over HTTP/1.1). */
+const DEVIN_DEFAULT_BASE_URL = "https://server.codeium.com";
+const DEVIN_SESSION_TOKEN_PREFIX = "devin-session-token$";
+/** `Metadata.os` vocabulary; `process.platform` is fixed for the process lifetime. */
+const DEVIN_OS = process.platform === "darwin" ? "darwin" : process.platform === "win32" ? "windows" : "linux";
+const DEVIN_LOCALE = "en";
+/**
+* Released Devin CLI request identity. The backend gates behavior on this
+* tuple: `ideType: "chisel"` is what unlocks router assignment (`AssignModel`)
+* and the CLI model surface.
+*/
+const DEVIN_CLI_METADATA = {
+	ideName: "devin-cli",
+	ideType: "chisel",
+	ideVersion: "3000.11.3",
+	extensionName: "chisel",
+	extensionVersion: "3000.11.3",
+	locale: DEVIN_LOCALE,
+	os: DEVIN_OS
+};
+/**
+* Native discovery identity. The Devin CLI announces itself as the `chisel`
+* client on its dev channel for `GetCliModelConfigs`; that identity, not the
+* released chat identity, unlocks the full native config set.
+*/
+const DEVIN_DISCOVERY_METADATA = {
+	ideName: "chisel",
+	ideVersion: "0.0.0-dev",
+	extensionName: "chisel",
+	extensionVersion: "0.0.0-dev",
+	locale: DEVIN_LOCALE,
+	os: DEVIN_OS
+};
+/** Prefixes bare JWT-shaped session tokens; every other key, legacy `sk-ws-` ones included, goes out as stored. */
+function encodeDevinCredential(apiKey) {
+	const key = apiKey?.trim();
+	if (!key) return "";
+	if (key.startsWith(DEVIN_SESSION_TOKEN_PREFIX)) return key;
+	return key.split(".").length === 3 ? `${DEVIN_SESSION_TOKEN_PREFIX}${key}` : key;
+}
+/**
+* Fields for `Metadata` on released-CLI calls (`GetUserJwt`, `AssignModel`,
+* `GetChatMessage`, `GetUserStatus`).
+*/
+function devinCliMetadata(apiKey, userJwt = "") {
+	return {
+		apiKey: encodeDevinCredential(apiKey),
+		userJwt,
+		...DEVIN_CLI_METADATA
+	};
+}
+/** Fields for `Metadata` on the dev-channel `GetCliModelConfigs` call. */
+function devinDiscoveryMetadata(apiKey) {
+	return {
+		apiKey: encodeDevinCredential(apiKey),
+		...DEVIN_DISCOVERY_METADATA
+	};
+}
+//#endregion
+//#region node_modules/.pnpm/@oh-my-pi+pi-catalog@18.12.6/node_modules/@oh-my-pi/pi-catalog/src/wire/devin-proto.ts
 /**
 * Protobuf decoding helpers for Devin's unary Connect RPCs. Kept separate from
 * `wire/devin.ts`: that module stays protobuf-free for the synchronous catalog
@@ -2885,4 +2951,4 @@ function decodeDevinUnaryMessage(schema, payload) {
 	}
 }
 //#endregion
-export { ImageDataSchema as _, ChatToolCallSchema as a, TeamsTier as b, CompletionConfigurationSchema as c, GetCliModelConfigsRequestSchema as d, GetCliModelConfigsResponseSchema as f, GetUserStatusResponseSchema as g, GetUserStatusRequestSchema as h, ChatMessagePromptSchema as i, GetChatMessageRequestSchema as l, GetUserJwtResponseSchema as m, AssignModelRequestSchema as n, ChatToolChoiceSchema as o, GetUserJwtRequestSchema as p, AssignModelResponseSchema as r, ChatToolDefinitionSchema as s, decodeDevinUnaryMessage as t, GetChatMessageResponseSchema as u, MetadataSchema as v, PromptCacheOptionsSchema as y };
+export { TeamsTier as C, PromptCacheOptionsSchema as S, GetUserJwtResponseSchema as _, AssignModelRequestSchema as a, ImageDataSchema as b, ChatToolCallSchema as c, CompletionConfigurationSchema as d, GetChatMessageRequestSchema as f, GetUserJwtRequestSchema as g, GetCliModelConfigsResponseSchema as h, devinDiscoveryMetadata as i, ChatToolChoiceSchema as l, GetCliModelConfigsRequestSchema as m, DEVIN_DEFAULT_BASE_URL as n, AssignModelResponseSchema as o, GetChatMessageResponseSchema as p, devinCliMetadata as r, ChatMessagePromptSchema as s, decodeDevinUnaryMessage as t, ChatToolDefinitionSchema as u, GetUserStatusRequestSchema as v, MetadataSchema as x, GetUserStatusResponseSchema as y };