@kasenri/dsh-orbit 0.6.0 → 0.6.1

package/README.md

@@ -44,7 +44,7 @@ Executor, Smart Watchdog, durable state and bounded recovery.
 |---|---|
 | `@deepseek-ai/dsh` | `0.1.5-rc.2` |
 | `@deepseek-ai/cordis` | `4.0.2` |
-| `@goodandready/dsh-moa`（可选 MoA 集成） | `0.2.19` |
+| `@goodandready/dsh-moa`（可选 MoA 集成） | `>=0.2.19`（已验证 0.2.19、0.2.20） |
 | Node.js | `>= 22.19.0` |
 
 Requires the DSH base services: `agents`, `subagents`, `tools`, `sessions`
@@ -59,7 +59,7 @@ mirror remains available when a Git source is preferred:
 dsh plugin --profile web add @kasenri/dsh-orbit
 
 # 可选：为 Orbit 的关键步骤启用多候选 MoA 选优
-dsh plugin --profile web add @goodandready/dsh-moa@0.2.19
+dsh plugin --profile web add @goodandready/dsh-moa@0.2.20
 
 # Git source alternative, tracks the mirror repository HEAD:
 # dsh plugin --profile web add github:KasenRi/dsh-orbit
@@ -166,12 +166,12 @@ SINGLE ─────────────→ Executor
 - `peerCritique` 默认关闭；开启时只允许一轮有界互评。
 - 新 Run 会冻结 Candidate/Judge 的 provider、model、reasoningEffort、MoA policy，以及原版 MoA settings 中用户显式配置的价格表（如果存在）。中途修改 UI 只影响下一次 Run。
 - Candidate/Judge 的 input/output/cache Token 来自 DSH 子 Session 的真实 `assistant/message.usage`；如果冻结的价格表能匹配对应 Route，同时记录美元成本；没有价格时只展示 Token，并明确标记无法计算成本，不猜价格。
-- Orbit 会把一个不含目标正文、候选正文、Judge 推理或代码的有界运行快照写进所属 DSH Session projection。Web UI 可显示当前 Step、MoA 阶段、各候选模型/成败、Token、Judge、winner 和总计，刷新/重连后仍可恢复。
+- Orbit 会把一个不含目标正文、候选正文、Judge 推理或代码的有界运行快照写进所属 DSH Session projection。v0.6.1 的配置首页不再直接展开这些运行详情，而是保持紧凑；运行快照仍保留给会话恢复与后续运行态界面使用。
 - 冷恢复按 durable phase 继续：`JUDGE` 不重跑 Candidate，`SELECTED` 不重跑 Candidate/Judge，`PROMOTED` 不重跑 Candidate/Judge/Promotion。
 - Orbit ACTIVE 时会在下游 hook 之前阻止独立 `/moa`，避免原版 MoA 的自动 Promotion 与 Orbit 同时争夺 workspace。
 - `@goodandready/dsh-moa` 是可选依赖；未安装时普通 SINGLE 模式完全不受影响。
 
-当前兼容层针对 `@goodandready/dsh-moa@0.2.19`。Orbit 只依赖它公开的项目上下文接口；候选调度、Judge、持久化与 Promotion 权限均由 `moa-adapter.ts` 封装。未来 MoA 提供正式 integration/manual-promotion API 时，只需替换该适配层。
+当前兼容层接受 `@goodandready/dsh-moa >=0.2.19`，并已在 0.2.19 与 0.2.20 上完成真实 DSH 烟雾验证。更高版本不再被 Orbit 主动版本上限拦截；若上游未来发生实际 API 不兼容，再按真实故障修正。Orbit 只依赖它公开的项目上下文接口；候选调度、Judge、持久化与 Promotion 权限均由 `moa-adapter.ts` 封装。
 
 ## State machine
 

package/lib/client.js

@@ -84,7 +84,7 @@ window.__ModuleLoader__.load({
 		}
 		//#endregion
 		//#region \0dsh-css:/root/.devspace/worktrees/dsh-pi-parity-b411f55f/packages/orbit/client/OrbitModelSelect.module.css.mjs
-		const css = ".f77nca_panel{z-index:60;border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-specific-menu);min-width:260px;max-width:420px;max-height:min(55vh,420px);box-shadow:var(--dsw-elevation-prominent);color:var(--dsw-alias-label-primary);border-radius:12px;flex-direction:column;padding:6px;font-size:13px;line-height:1.4;display:flex;position:fixed;overflow:auto}.f77nca_title{color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap;padding:6px 8px 2px;font-size:11px;overflow:hidden}.f77nca_group{color:var(--dsw-alias-label-tertiary);padding:8px 8px 2px;font-size:11px}.f77nca_row{width:100%;color:inherit;font:inherit;text-align:left;cursor:pointer;background:0 0;border:0;border-radius:8px;align-items:center;gap:8px;padding:7px 8px;display:flex}.f77nca_row:hover{background:var(--dsw-alias-interactive-bg-hover)}.f77nca_switchRow{align-items:center;gap:8px;padding:4px 8px 6px;display:flex}.f77nca_switchControl{margin-left:auto}.f77nca_rowLabel{flex:none}.f77nca_rowValue{max-width:190px;color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap;margin-left:auto;overflow:hidden}.f77nca_rowValueActive{color:var(--dsw-alias-label-primary)}.f77nca_rowDetail{color:var(--dsw-alias-label-tertiary);margin-left:auto;font-size:11px}.f77nca_check{color:var(--dsw-alias-state-business-primary);flex:none;margin-left:6px}.f77nca_chevron{color:var(--dsw-alias-label-tertiary);flex:none;margin-left:6px}.f77nca_separator{background:var(--dsw-alias-border-l1);height:1px;margin:6px 4px}.f77nca_hint{color:var(--dsw-alias-label-tertiary);padding:6px 8px;font-size:11px}.f77nca_error{color:var(--dsw-alias-state-error-primary);align-items:center;gap:8px;padding:8px;font-size:12px;display:flex}.f77nca_back{width:100%;color:var(--dsw-alias-label-tertiary);font:inherit;text-align:left;cursor:pointer;background:0 0;border:0;align-items:center;gap:6px;padding:6px 8px 8px;font-size:12px;display:flex}";
+		const css = ".f77nca_panel{z-index:60;border:1px solid var(--dsw-alias-border-l1);background:var(--dsw-specific-menu);min-width:260px;max-width:420px;max-height:min(55vh,420px);box-shadow:var(--dsw-elevation-prominent);color:var(--dsw-alias-label-primary);border-radius:12px;flex-direction:column;padding:6px;font-size:13px;line-height:1.4;display:flex;position:fixed;overflow:auto}.f77nca_title{color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap;padding:6px 8px 2px;font-size:11px;overflow:hidden}.f77nca_group{color:var(--dsw-alias-label-tertiary);padding:8px 8px 2px;font-size:11px}.f77nca_row{width:100%;color:inherit;font:inherit;text-align:left;cursor:pointer;background:0 0;border:0;border-radius:8px;align-items:center;gap:8px;padding:7px 8px;display:flex}.f77nca_row:hover{background:var(--dsw-alias-interactive-bg-hover)}.f77nca_switchRow{align-items:center;gap:8px;padding:4px 8px 6px;display:flex}.f77nca_switchNavRow{align-items:center;gap:6px;padding:2px 4px 2px 8px;display:flex}.f77nca_switchNavLabel{min-width:0;color:inherit;font:inherit;text-align:left;cursor:pointer;background:0 0;border:0;flex:1;padding:5px 0}.f77nca_chevronButton{width:26px;height:26px;color:var(--dsw-alias-label-tertiary);font:inherit;cursor:pointer;background:0 0;border:0;border-radius:6px;justify-content:center;align-items:center;padding:0;display:inline-flex}.f77nca_switchNavLabel:hover,.f77nca_chevronButton:hover{background:var(--dsw-alias-interactive-bg-hover)}.f77nca_switchControl{margin-left:auto}.f77nca_rowLabel{flex:none}.f77nca_rowValue{max-width:190px;color:var(--dsw-alias-label-tertiary);text-overflow:ellipsis;white-space:nowrap;margin-left:auto;overflow:hidden}.f77nca_rowValueActive{color:var(--dsw-alias-label-primary)}.f77nca_rowDetail{color:var(--dsw-alias-label-tertiary);margin-left:auto;font-size:11px}.f77nca_check{color:var(--dsw-alias-state-business-primary);flex:none;margin-left:6px}.f77nca_chevron{color:var(--dsw-alias-label-tertiary);flex:none;margin-left:6px}.f77nca_separator{background:var(--dsw-alias-border-l1);height:1px;margin:6px 4px}.f77nca_hint{color:var(--dsw-alias-label-tertiary);padding:6px 8px;font-size:11px}.f77nca_error{color:var(--dsw-alias-state-error-primary);align-items:center;gap:8px;padding:8px;font-size:12px;display:flex}.f77nca_navHeader{grid-template-columns:auto 1fr auto;align-items:center;min-height:32px;display:grid}.f77nca_back{color:var(--dsw-alias-label-tertiary);font:inherit;text-align:left;cursor:pointer;background:0 0;border:0;align-items:center;gap:6px;padding:6px 8px 8px;font-size:12px;display:flex}.f77nca_navTitle{color:var(--dsw-alias-label-primary);text-align:center;text-overflow:ellipsis;white-space:nowrap;grid-column:2;font-size:12px;font-weight:600;overflow:hidden}.f77nca_choiceMark{width:16px;color:var(--dsw-alias-label-tertiary);text-align:center;flex:none}";
 		const tagId = "@kasenri/dsh-orbit/OrbitModelSelect.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
 			const tag = document.createElement("style");
@@ -94,22 +94,28 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var OrbitModelSelect_module_css_default = {
-			"rowValueActive": "f77nca_rowValueActive",
 			"error": "f77nca_error",
-			"rowValue": "f77nca_rowValue",
 			"switchRow": "f77nca_switchRow",
+			"rowDetail": "f77nca_rowDetail",
+			"rowLabel": "f77nca_rowLabel",
+			"switchControl": "f77nca_switchControl",
+			"rowValueActive": "f77nca_rowValueActive",
 			"check": "f77nca_check",
-			"group": "f77nca_group",
 			"panel": "f77nca_panel",
 			"row": "f77nca_row",
 			"title": "f77nca_title",
-			"switchControl": "f77nca_switchControl",
-			"rowLabel": "f77nca_rowLabel",
-			"rowDetail": "f77nca_rowDetail",
+			"switchNavRow": "f77nca_switchNavRow",
+			"rowValue": "f77nca_rowValue",
+			"group": "f77nca_group",
+			"switchNavLabel": "f77nca_switchNavLabel",
 			"chevron": "f77nca_chevron",
-			"separator": "f77nca_separator",
 			"hint": "f77nca_hint",
-			"back": "f77nca_back"
+			"back": "f77nca_back",
+			"navTitle": "f77nca_navTitle",
+			"choiceMark": "f77nca_choiceMark",
+			"chevronButton": "f77nca_chevronButton",
+			"separator": "f77nca_separator",
+			"navHeader": "f77nca_navHeader"
 		};
 		//#endregion
 		//#region client/OrbitModelSelect.tsx
@@ -146,7 +152,6 @@ window.__ModuleLoader__.load({
 			const dir = (0, react.useSyncExternalStore)((listener) => directory.subscribe(listener), () => directory.getSnapshot());
 			const config = (0, react.useSyncExternalStore)((listener) => settings.subscribe(listener), () => settings.getSnapshot());
 			const orbitSession = useProjection("orbitSession");
-			const orbitRuntime = useProjection("orbitRuntime");
 			const [orbitOverride, setOrbitOverride] = (0, react.useState)(null);
 			const [orbitPending, setOrbitPending] = (0, react.useState)(false);
 			const orbitEnabled = orbitOverride ?? orbitSession?.enabled === true;
@@ -199,11 +204,6 @@ window.__ModuleLoader__.load({
 			const watchdogModel = modelOf(dir, watchdogRoute);
 			const watchdogLabel = watchdogRoute === void 0 ? void 0 : routeLabelOf(dir, watchdogRoute) ?? watchdogRoute.model;
 			const watchdogEffort = effortLabelOf(watchdogModel, watchdogRoute?.reasoningEffort);
-			const usageText = (usage) => {
-				if (!usage) return void 0;
-				const tokens = `${usage.total_tokens.toLocaleString()} ${t("moaTokens")}`;
-				return usage.cost_usd === void 0 ? tokens : `${tokens} · $${usage.cost_usd.toFixed(4)}`;
-			};
 			const moaRouteOf = (role) => {
 				if (role === "moa-judge") return config.moa.judge;
 				if (!role.startsWith("moa-candidate-")) return void 0;
@@ -222,11 +222,11 @@ window.__ModuleLoader__.load({
 				}
 			};
 			const commitMoaPolicy = async (patch) => {
-				if (submitting.current || config.status !== "ready") return;
+				if (submitting.current || config.status !== "ready") return false;
 				submitting.current = true;
 				setBusy(true);
 				try {
-					await writeMoaPolicy(patch);
+					return await writeMoaPolicy(patch);
 				} finally {
 					submitting.current = false;
 					setBusy(false);
@@ -258,6 +258,23 @@ window.__ModuleLoader__.load({
 				if (role === "moa-judge") return t("moaJudge");
 				return `${t("moaCandidate")} ${role.slice(14)}`;
 			};
+			const isMoaRole = (role) => role === "moa-judge" || role.startsWith("moa-candidate-");
+			const paneTitle = () => {
+				if (pane.kind === "moa") return t("moa");
+				if (pane.kind === "moa-candidate-count") return t("moaCandidateCount");
+				if (pane.kind === "moa-max-steps") return t("moaMaxSteps");
+				if (pane.kind === "role" || pane.kind === "models" || pane.kind === "efforts") return roleTitleOf(pane.role);
+				return "";
+			};
+			const parentPane = () => {
+				if (pane.kind === "moa" || pane.kind === "moa-candidate-count" || pane.kind === "moa-max-steps") return pane.kind === "moa" ? { kind: "root" } : { kind: "moa" };
+				if (pane.kind === "role") return isMoaRole(pane.role) ? { kind: "moa" } : { kind: "root" };
+				if (pane.kind === "models" || pane.kind === "efforts") return {
+					kind: "role",
+					role: pane.role
+				};
+				return { kind: "root" };
+			};
 			const roleModelLabelOf = (role) => {
 				if (role === "commander") return t("commanderModel");
 				if (role === "executor") return t("executorModel");
@@ -347,19 +364,19 @@ window.__ModuleLoader__.load({
 				},
 				role: "menu",
 				children: [
-					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(pane.kind === "role" ? { kind: "root" } : {
-								kind: "role",
-								role: pane.role
-							});
-						},
-						children: `${BACK} ${pane.kind === "role" ? t("back") : roleTitleOf(pane.role)}`
+					pane.kind === "root" ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: OrbitModelSelect_module_css_default.navHeader,
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							className: OrbitModelSelect_module_css_default.back,
+							onClick: () => {
+								setPane(parentPane());
+							},
+							children: `${BACK} ${t("back")}`
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: OrbitModelSelect_module_css_default.navTitle,
+							children: paneTitle()
+						})]
 					}),
 					settingsError === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: OrbitModelSelect_module_css_default.error,
@@ -400,65 +417,6 @@ window.__ModuleLoader__.load({
 							})]
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: OrbitModelSelect_module_css_default.separator }),
-						orbitRuntime ? /* @__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("runtime")
-							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-								className: OrbitModelSelect_module_css_default.row,
-								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-									className: OrbitModelSelect_module_css_default.rowLabel,
-									children: orbitRuntime.currentStep?.id ?? orbitRuntime.phase
-								}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-									className: OrbitModelSelect_module_css_default.rowValue,
-									children: [orbitRuntime.currentStep?.executionMode ?? orbitRuntime.phase, ` · ${orbitRuntime.loop.used}/${orbitRuntime.loop.max}`]
-								})]
-							}),
-							orbitRuntime.moa ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: OrbitModelSelect_module_css_default.row,
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: OrbitModelSelect_module_css_default.rowLabel,
-										children: t("moaRuntimePhase")
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: OrbitModelSelect_module_css_default.rowValue,
-										children: orbitRuntime.moa.phase
-									})]
-								}),
-								orbitRuntime.moa.candidates.map((candidate) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: OrbitModelSelect_module_css_default.row,
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: OrbitModelSelect_module_css_default.rowLabel,
-										children: `${t("moaCandidate")} ${candidate.index}`
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-										className: OrbitModelSelect_module_css_default.rowValue,
-										children: [`${candidate.ok ? "✓" : "✗"} ${candidate.provider}/${candidate.model}`, usageText(candidate.usage) ? ` · ${usageText(candidate.usage)}` : ""]
-									})]
-								}, candidate.index)),
-								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: OrbitModelSelect_module_css_default.row,
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: OrbitModelSelect_module_css_default.rowLabel,
-										children: t("moaJudge")
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: OrbitModelSelect_module_css_default.rowValue,
-										children: orbitRuntime.moa.winnerModel ?? orbitRuntime.moa.judgeModel ?? t("moaWaiting")
-									})]
-								}),
-								orbitRuntime.moa.totalUsage ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-									className: OrbitModelSelect_module_css_default.row,
-									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-										className: OrbitModelSelect_module_css_default.rowLabel,
-										children: t("moaTotalUsage")
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-										className: OrbitModelSelect_module_css_default.rowValue,
-										children: [usageText(orbitRuntime.moa.totalUsage), orbitRuntime.moa.totalUsage.cost_usd === void 0 ? ` · ${t("moaCostUnavailable")}` : ""]
-									})]
-								}) : null
-							] }) : null,
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: OrbitModelSelect_module_css_default.separator })
-						] }) : null,
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 							type: "button",
 							role: "menuitem",
@@ -542,11 +500,47 @@ window.__ModuleLoader__.load({
 							]
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: OrbitModelSelect_module_css_default.separator }),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: OrbitModelSelect_module_css_default.switchNavRow,
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									role: "menuitem",
+									className: OrbitModelSelect_module_css_default.switchNavLabel,
+									disabled: busy,
+									onClick: () => {
+										setPane({ kind: "moa" });
+									},
+									children: t("moa")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Switch, {
+									className: OrbitModelSelect_module_css_default.switchControl,
+									checked: config.moa.enabled,
+									disabled: busy,
+									label: t("moaEnable"),
+									onChange: (next) => {
+										commitMoaPolicy({ enabled: next });
+									}
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: OrbitModelSelect_module_css_default.chevronButton,
+									"aria-label": t("moaOpenSettings"),
+									disabled: busy,
+									onClick: () => {
+										setPane({ kind: "moa" });
+									},
+									children: CHEVRON
+								})
+							]
+						})
+					] }) : null,
+					pane.kind === "moa" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: OrbitModelSelect_module_css_default.switchRow,
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								className: OrbitModelSelect_module_css_default.rowLabel,
-								children: t("moa")
+								children: t("moaEnable")
 							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Switch, {
 								className: OrbitModelSelect_module_css_default.switchControl,
 								checked: config.moa.enabled,
@@ -563,15 +557,22 @@ window.__ModuleLoader__.load({
 							className: OrbitModelSelect_module_css_default.row,
 							disabled: busy,
 							onClick: () => {
-								commitMoaPolicy({ candidateCount: config.moa.candidateCount >= 4 ? 2 : config.moa.candidateCount + 1 });
+								setPane({ kind: "moa-candidate-count" });
 							},
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: OrbitModelSelect_module_css_default.rowLabel,
-								children: t("moaCandidateCount")
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: OrbitModelSelect_module_css_default.rowValue,
-								children: config.moa.candidateCount
-							})]
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.rowLabel,
+									children: t("moaCandidateCount")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.rowValue,
+									children: config.moa.candidateCount
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.chevron,
+									children: CHEVRON
+								})
+							]
 						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: OrbitModelSelect_module_css_default.switchRow,
@@ -594,16 +595,24 @@ window.__ModuleLoader__.load({
 							className: OrbitModelSelect_module_css_default.row,
 							disabled: busy,
 							onClick: () => {
-								commitMoaPolicy({ maxMoaSteps: config.moa.maxMoaSteps >= 5 ? 1 : config.moa.maxMoaSteps + 1 });
+								setPane({ kind: "moa-max-steps" });
 							},
-							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: OrbitModelSelect_module_css_default.rowLabel,
-								children: t("moaMaxSteps")
-							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-								className: OrbitModelSelect_module_css_default.rowValue,
-								children: config.moa.maxMoaSteps
-							})]
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.rowLabel,
+									children: t("moaMaxSteps")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.rowValue,
+									children: config.moa.maxMoaSteps
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.chevron,
+									children: CHEVRON
+								})
+							]
 						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", { className: OrbitModelSelect_module_css_default.separator }),
 						Array.from({ length: config.moa.candidateCount }, (_, offset) => {
 							const role = `moa-candidate-${offset + 1}`;
 							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
@@ -660,6 +669,54 @@ window.__ModuleLoader__.load({
 							]
 						})
 					] }) : null,
+					pane.kind === "moa-candidate-count" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: [
+						2,
+						3,
+						4
+					].map((count) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+						type: "button",
+						role: "menuitemradio",
+						"aria-checked": config.moa.candidateCount === count,
+						className: OrbitModelSelect_module_css_default.row,
+						disabled: busy,
+						onClick: () => {
+							commitMoaPolicy({ candidateCount: count }).then((ok) => {
+								if (ok) setPane({ kind: "moa" });
+							});
+						},
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: OrbitModelSelect_module_css_default.choiceMark,
+							children: config.moa.candidateCount === count ? "●" : "○"
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: OrbitModelSelect_module_css_default.rowLabel,
+							children: `${count} ${t("moaCandidatesUnit")}`
+						})]
+					}, count)) }) : null,
+					pane.kind === "moa-max-steps" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(react_jsx_runtime.Fragment, { children: [
+						1,
+						2,
+						3,
+						4,
+						5
+					].map((count) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+						type: "button",
+						role: "menuitemradio",
+						"aria-checked": config.moa.maxMoaSteps === count,
+						className: OrbitModelSelect_module_css_default.row,
+						disabled: busy,
+						onClick: () => {
+							commitMoaPolicy({ maxMoaSteps: count }).then((ok) => {
+								if (ok) setPane({ kind: "moa" });
+							});
+						},
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: OrbitModelSelect_module_css_default.choiceMark,
+							children: config.moa.maxMoaSteps === count ? "●" : "○"
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+							className: OrbitModelSelect_module_css_default.rowLabel,
+							children: count
+						})]
+					}, count)) }) : null,
 					pane.kind === "role" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 							type: "button",
@@ -751,11 +808,10 @@ window.__ModuleLoader__.load({
 							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", {
+					pane.kind === "root" || pane.kind === "moa" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__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,
 						children: t("applyOnNextSend")
-					})
+					})] }) : null
 				]
 			}), document.body) : null] });
 		}
@@ -777,8 +833,10 @@ window.__ModuleLoader__.load({
 			executorModel: "Executor model",
 			watchdogModel: "Watchdog model",
 			moa: "MoA",
-			moaEnable: "Enable MoA for eligible steps",
+			moaEnable: "Enable MoA",
+			moaOpenSettings: "Open MoA settings",
 			moaCandidate: "Candidate",
+			moaCandidatesUnit: "candidates",
 			moaCandidateCount: "Candidate count",
 			moaJudge: "Judge",
 			moaPeerCritique: "Peer critique",
@@ -815,8 +873,10 @@ window.__ModuleLoader__.load({
 			executorModel: "执行员模型",
 			watchdogModel: "监控模型",
 			moa: "MoA 多候选模式",
-			moaEnable: "允许关键步骤使用 MoA",
+			moaEnable: "启用 MoA",
+			moaOpenSettings: "打开 MoA 设置",
 			moaCandidate: "候选模型",
+			moaCandidatesUnit: "个候选",
 			moaCandidateCount: "候选数量",
 			moaJudge: "Judge 评审模型",
 			moaPeerCritique: "候选互评",

package/lib/moa-adapter.js

@@ -12,7 +12,22 @@ import { dirname, join, relative, resolve } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { copyFile, lstat, mkdir, readFile, readdir, realpath, stat, writeFile } from 'node:fs/promises';
 import { redactText, truncateSafe } from "./sanitize.js";
-const SUPPORTED_MOA_VERSION = '0.2.19';
+const MIN_SUPPORTED_MOA_VERSION = [0, 2, 19];
+function isSupportedMoaVersion(version) {
+    const match = version.match(/^(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/u);
+    if (!match)
+        return false;
+    const current = [Number(match[1]), Number(match[2]), Number(match[3])];
+    for (let index = 0; index < MIN_SUPPORTED_MOA_VERSION.length; index += 1) {
+        const actual = current[index] ?? 0;
+        const minimum = MIN_SUPPORTED_MOA_VERSION[index] ?? 0;
+        if (actual > minimum)
+            return true;
+        if (actual < minimum)
+            return false;
+    }
+    return true;
+}
 const MAX_CONTEXT_CHARS = 16_000;
 const MAX_CANDIDATE_TEXT = 12_000;
 const MAX_JUDGE_TEXT = 8_000;
@@ -222,8 +237,8 @@ export class OrbitMoaAdapter {
             }
             const pkg = JSON.parse(await readFile(packageJsonPath, 'utf8'));
             const version = String(pkg.version ?? '');
-            if (version !== SUPPORTED_MOA_VERSION) {
-                throw new Error('ORBIT_MOA_VERSION_UNSUPPORTED: 当前支持 ' + SUPPORTED_MOA_VERSION + '，检测到 ' + (version || 'unknown') + '。');
+            if (!isSupportedMoaVersion(version)) {
+                throw new Error('ORBIT_MOA_VERSION_UNSUPPORTED: 当前要求 @goodandready/dsh-moa >= 0.2.19，检测到 ' + (version || 'unknown') + '。');
             }
             const entry = require.resolve('@goodandready/dsh-moa');
             const api = await import(__rewriteRelativeImportExtension(pathToFileURL(entry).href));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kasenri/dsh-orbit",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "description": "让 AI 项目可以在无人监管下持续推进。Orbit 会自动规划任务、分工执行、逐步检查并继续完成后续工作；不同环节可以使用不同模型，让低成本模型承担执行任务、强模型负责规划和审核，从而降低整体 AI 使用成本。Watchdog 还会监控运行异常，在任务卡死或中断时协助恢复。",
   "license": "MIT",
@@ -62,7 +62,7 @@
     "@deepseek-ai/dsh-llm": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-subagent": "^0.1.5-rc.2",
     "@deepseek-ai/dsh-tools": "^0.1.5-rc.2",
-    "@goodandready/dsh-moa": "0.2.19"
+    "@goodandready/dsh-moa": ">=0.2.19"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh-commands": {