@kasenri/dsh-orbit 0.5.1 → 0.5.2

package/lib/client.js

@@ -18,10 +18,47 @@ window.__ModuleLoader__.load({
 				for (const model of group.models) if (model.id === route.model) return model;
 			}
 		}
+		/**
+		* UI-only fallback ladder for models whose catalog entry declares no reasoning
+		* metadata. The DSH catalog is never modified: this only fills the Orbit
+		* picker, and a provider that rejects an effort still fails through the normal
+		* selection error path.
+		*/
+		const FALLBACK_REASONING_EFFORTS = [
+			"low",
+			"medium",
+			"high",
+			"xhigh",
+			"max"
+		];
+		const FALLBACK_EFFORT_LABELS = {
+			low: "Low",
+			medium: "Medium",
+			high: "High",
+			xhigh: "XHigh",
+			max: "Max"
+		};
+		/**
+		* Effort options for one model: the adapter's explicit list when the catalog
+		* declares one, otherwise the Orbit UI fallback ladder.
+		*/
+		function effortsOf(model) {
+			const explicit = model?.reasoning?.efforts ?? [];
+			if (explicit.length > 0) return explicit.map((effort) => ({
+				id: effort.id,
+				name: effort.name
+			}));
+			return FALLBACK_REASONING_EFFORTS.map((id) => ({
+				id,
+				name: FALLBACK_EFFORT_LABELS[id] ?? id
+			}));
+		}
 		/** Human effort label for a stored effort id; falls back to the raw id. */
 		function effortLabelOf(model, effort) {
 			if (effort === void 0 || effort === "") return void 0;
-			return model?.reasoning?.efforts.find((entry) => entry.id === effort)?.name ?? effort;
+			const explicit = model?.reasoning?.efforts.find((entry) => entry.id === effort);
+			if (explicit !== void 0) return explicit.name;
+			return FALLBACK_EFFORT_LABELS[effort] ?? effort;
 		}
 		/** Display name for a stored route: catalog name, then its model id. */
 		function routeLabelOf(state, route) {
@@ -53,22 +90,20 @@ window.__ModuleLoader__.load({
 				...effort === void 0 ? {} : { reasoningEffort: effort }
 			};
 		}
-		/** Effort rows for one model; empty when the adapter publishes none. */
+		/**
+		* Effort rows for one model: Provider default (an undefined effort) first,
+		* then the model's explicit ladder or the Orbit UI fallback.
+		*/
 		function effortChoicesOf(model, providerDefaultLabel) {
-			const reasoning = model?.reasoning;
-			if (reasoning === void 0) return [];
-			const choices = [];
-			if (reasoning.defaultEffort !== void 0) choices.push({
+			return [{
 				id: "provider-default",
 				label: providerDefaultLabel,
 				effort: void 0
-			});
-			for (const effort of reasoning.efforts) choices.push({
+			}, ...effortsOf(model).map((effort) => ({
 				id: `effort:${effort.id}`,
 				label: effort.name,
 				effort: effort.id
-			});
-			return choices;
+			}))];
 		}
 		/** Normalize one settings wire value into a complete route. */
 		function routeFromSettingsValue(value) {
@@ -97,20 +132,20 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var OrbitModelSelect_module_css_default = {
+			"hint": "f77nca_hint",
+			"back": "f77nca_back",
 			"rowValue": "f77nca_rowValue",
 			"rowValueActive": "f77nca_rowValueActive",
-			"row": "f77nca_row",
-			"hint": "f77nca_hint",
 			"title": "f77nca_title",
-			"group": "f77nca_group",
-			"chevron": "f77nca_chevron",
-			"error": "f77nca_error",
 			"panel": "f77nca_panel",
-			"back": "f77nca_back",
-			"rowLabel": "f77nca_rowLabel",
+			"row": "f77nca_row",
 			"rowDetail": "f77nca_rowDetail",
+			"separator": "f77nca_separator",
+			"error": "f77nca_error",
+			"group": "f77nca_group",
+			"rowLabel": "f77nca_rowLabel",
 			"check": "f77nca_check",
-			"separator": "f77nca_separator"
+			"chevron": "f77nca_chevron"
 		};
 		//#endregion
 		//#region client/OrbitModelSelect.tsx
@@ -197,25 +232,31 @@ window.__ModuleLoader__.load({
 				if (ok) setOpen(false);
 			};
 			const currentRouteOf = (role) => role === "commander" ? config.commander : role === "watchdog" ? config.watchdog : executorRoute;
+			const roleLabelOf = (role) => role === "commander" ? commanderLabel : role === "watchdog" ? watchdogLabel : executorLabel;
+			const roleEffortLabelOf = (role) => role === "commander" ? commanderEffort : role === "watchdog" ? watchdogEffort : executorEffort;
+			const commitEffort = async (role, route, effort) => {
+				const next = {
+					provider: route.provider,
+					model: route.model,
+					...effort === void 0 ? {} : { reasoningEffort: effort }
+				};
+				if (role === "executor") {
+					await commitExecutor(next);
+					return;
+				}
+				await commitRole(role, next);
+			};
 			const modelRow = (role, provider, providerName, model) => {
 				const current = currentRouteOf(role);
 				const active = current?.provider === provider && current.model === model.id;
-				const reasoning = model.reasoning;
 				return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 					type: "button",
 					role: "menuitem",
 					className: OrbitModelSelect_module_css_default.row,
 					disabled: busy,
 					onClick: () => {
-						if (reasoning !== void 0 && reasoning.efforts.length > 0) {
-							const effort = active ? current?.reasoningEffort ?? reasoning.defaultEffort : reasoning.defaultEffort;
-							setPane({
-								kind: "efforts",
-								role,
-								provider,
-								modelId: model.id,
-								effort
-							});
+						if (active) {
+							setOpen(false);
 							return;
 						}
 						if (role === "executor") {
@@ -236,38 +277,9 @@ window.__ModuleLoader__.load({
 					}) : null]
 				}, `${provider}/${model.id}`);
 			};
-			const effortRow = (role, provider, modelId, id, label, effort, currentEffort) => {
-				const healthy = pane.kind === "efforts" ? pane.effort : currentEffort;
-				const active = id === "provider-default" ? healthy === void 0 : healthy === effort;
-				return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-					type: "button",
-					role: "menuitem",
-					className: OrbitModelSelect_module_css_default.row,
-					disabled: busy,
-					onClick: () => {
-						if (role === "executor") {
-							commitExecutor({
-								provider,
-								model: modelId,
-								...effort === void 0 ? {} : { reasoningEffort: effort }
-							});
-							return;
-						}
-						commitRole(role, {
-							provider,
-							model: modelId,
-							...effort === void 0 ? {} : { reasoningEffort: effort }
-						});
-					},
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-						className: OrbitModelSelect_module_css_default.rowLabel,
-						children: label
-					}), active ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-						className: OrbitModelSelect_module_css_default.check,
-						children: "✓"
-					}) : null]
-				}, id);
-			};
+			const effortPaneRoute = pane.kind === "efforts" ? currentRouteOf(pane.role) : void 0;
+			const effortPaneModel = modelOf(dir, effortPaneRoute);
+			const effortPaneChoices = pane.kind === "efforts" ? effortChoicesOf(effortPaneModel, t("providerDefault")) : [];
 			const settingsError = config.error;
 			const modelError = dir.status === "error" ? dir.error ?? t("loadFailed") : void 0;
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
@@ -302,16 +314,19 @@ window.__ModuleLoader__.load({
 				},
 				role: "menu",
 				children: [
-					pane.kind !== "root" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					pane.kind === "root" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: OrbitModelSelect_module_css_default.title,
+						children: t("title")
+					}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 						type: "button",
 						className: OrbitModelSelect_module_css_default.back,
 						onClick: () => {
-							setPane({ kind: "root" });
+							setPane(pane.kind === "role" ? { kind: "root" } : {
+								kind: "role",
+								role: pane.role
+							});
 						},
-						children: `${BACK} ${t("back")}`
-					}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-						className: OrbitModelSelect_module_css_default.title,
-						children: t("title")
+						children: `${BACK} ${pane.kind === "role" ? t("back") : t(pane.role)}`
 					}),
 					settingsError === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: OrbitModelSelect_module_css_default.error,
@@ -343,7 +358,7 @@ window.__ModuleLoader__.load({
 							disabled: busy,
 							onClick: () => {
 								setPane({
-									kind: "models",
+									kind: "role",
 									role: "commander"
 								});
 							},
@@ -369,7 +384,7 @@ window.__ModuleLoader__.load({
 							disabled: busy,
 							onClick: () => {
 								setPane({
-									kind: "models",
+									kind: "role",
 									role: "executor"
 								});
 							},
@@ -399,7 +414,7 @@ window.__ModuleLoader__.load({
 							disabled: busy,
 							onClick: () => {
 								setPane({
-									kind: "models",
+									kind: "role",
 									role: "watchdog"
 								});
 							},
@@ -419,10 +434,72 @@ window.__ModuleLoader__.load({
 							]
 						})
 					] }) : null,
+					pane.kind === "role" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: OrbitModelSelect_module_css_default.group,
+							children: t(pane.role)
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+							type: "button",
+							role: "menuitem",
+							className: OrbitModelSelect_module_css_default.row,
+							disabled: busy,
+							onClick: () => {
+								setPane({
+									kind: "models",
+									role: pane.role
+								});
+							},
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.rowLabel,
+									children: t("models")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.rowValue,
+									children: roleLabelOf(pane.role) ?? t("triggerFallback")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.chevron,
+									children: CHEVRON
+								})
+							]
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+							type: "button",
+							role: "menuitem",
+							className: OrbitModelSelect_module_css_default.row,
+							disabled: busy,
+							onClick: () => {
+								setPane({
+									kind: "efforts",
+									role: pane.role
+								});
+							},
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.rowLabel,
+									children: t("effort")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.rowValue,
+									children: roleEffortLabelOf(pane.role) ?? t("providerDefault")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.chevron,
+									children: CHEVRON
+								})
+							]
+						}),
+						pane.role === "executor" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: OrbitModelSelect_module_css_default.hint,
+							children: t("followsSession")
+						}) : null
+					] }) : null,
 					pane.kind === "models" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							className: OrbitModelSelect_module_css_default.group,
-							children: `${t(pane.role)} · ${t("models")}`
+							children: t("models")
 						}),
 						dir.groups.map((group) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							className: OrbitModelSelect_module_css_default.group,
@@ -433,15 +510,25 @@ window.__ModuleLoader__.load({
 							children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: `${failure.name}: ${failure.message}` })
 						}, failure.id))
 					] }) : null,
-					pane.kind === "efforts" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					pane.kind === "efforts" && effortPaneRoute !== void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: OrbitModelSelect_module_css_default.group,
-						children: `${t(pane.role)} · ${t("effort")}`
-					}), effortChoicesOf((() => {
-						for (const group of dir.groups) {
-							if (group.id !== pane.provider) continue;
-							for (const model of group.models) if (model.id === pane.modelId) return model;
-						}
-					})(), t("providerDefault")).map((choice) => effortRow(pane.role, pane.provider, pane.modelId, choice.id, choice.label, choice.effort, pane.effort))] }) : null,
+						children: t("effort")
+					}), effortPaneChoices.map((choice) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+						type: "button",
+						role: "menuitem",
+						className: OrbitModelSelect_module_css_default.row,
+						disabled: busy,
+						onClick: () => {
+							commitEffort(pane.role, effortPaneRoute, choice.effort);
+						},
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: OrbitModelSelect_module_css_default.rowLabel,
+							children: choice.label
+						}), effortPaneRoute.reasoningEffort === choice.effort ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: OrbitModelSelect_module_css_default.check,
+							children: "✓"
+						}) : null]
+					}, choice.id))] }) : null,
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: OrbitModelSelect_module_css_default.separator }),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: OrbitModelSelect_module_css_default.hint,
@@ -462,7 +549,7 @@ window.__ModuleLoader__.load({
 			executor: "Executor",
 			watchdog: "Watchdog",
 			followsSession: "Follows current session model",
-			models: "Models",
+			models: "Model",
 			effort: "Reasoning effort",
 			providerDefault: "Provider default",
 			back: "Back",
@@ -482,7 +569,7 @@ window.__ModuleLoader__.load({
 			watchdog: "监控模型",
 			followsSession: "跟随当前会话模型",
 			models: "模型",
-			effort: "推理强度",
+			effort: "推理等级",
 			providerDefault: "提供方默认",
 			back: "返回",
 			retry: "重试",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kasenri/dsh-orbit",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "type": "module",
   "description": "Deterministic engineering orchestration for DeepSeek Harness with Commander, Executor, Smart Watchdog, bounded recovery and durable execution state.",
   "license": "MIT",