@kasenri/dsh-orbit 0.5.9 → 0.6.0

package/README.md

@@ -3,10 +3,12 @@
 Community plugin for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) (DSH).
 Not affiliated with or endorsed by DeepSeek.
 
+**让 AI 项目可以在无人监管下持续推进。**
+Orbit 会自动规划任务、分工执行、逐步检查并继续完成后续工作；不同环节可以使用不同模型，让低成本模型承担执行任务、强模型负责规划和审核，从而降低整体 AI 使用成本。Watchdog 还会监控运行异常，在任务卡死或中断时协助恢复。
+
 **Orbit — Deterministic Engineering Orchestration for DeepSeek Harness**
 
-Orbit is a deterministic engineering orchestration runtime for DSH, implemented
-as a Cordis plugin:
+Technical integration:
 
 - an `OrbitService` on `ctx.orbit`
 - a model-facing `orbit_controller` tool (`cx_controller` remains a legacy alias)
@@ -42,6 +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` |
 | Node.js | `>= 22.19.0` |
 
 Requires the DSH base services: `agents`, `subagents`, `tools`, `sessions`
@@ -54,6 +57,10 @@ mirror remains available when a Git source is preferred:
 
 ```bash
 dsh plugin --profile web add @kasenri/dsh-orbit
+
+# 可选：为 Orbit 的关键步骤启用多候选 MoA 选优
+dsh plugin --profile web add @goodandready/dsh-moa@0.2.19
+
 # Git source alternative, tracks the mirror repository HEAD:
 # dsh plugin --profile web add github:KasenRi/dsh-orbit
 ```
@@ -110,9 +117,10 @@ provider/model provenance. The parent model and parent tools remain bypassed.
 
 ## Model configuration (Web)
 
-The Orbit model control sits immediately left of the native composer model
-seat (`conversation.input.right` renders before `conversation.input.model`).
-Its button names the Commander's model; the menu edits three roles:
+The Orbit model control is the final entry in `conversation.input.right`, so
+other composer-side controls (for example DSH's rollback control) stay to its
+left while the native `conversation.input.model` seat stays immediately to its
+right. Its button names the Commander's model; the menu edits three roles:
 
 - **Commander** and **Watchdog** pick from the same native model catalog and
   persist into the DSH `orbit` settings namespace (`settings.yaml`). Picking a
@@ -131,6 +139,40 @@ Commander/Watchdog use settings then explicit config; Executor uses the Session
 selection, with explicit config only when there is no Session. Missing or
 unavailable roles block creation of a Run before any child starts.
 
+### Optional MoA execution mode (v0.6.0)
+
+Orbit 可以把少量高不确定性步骤标记为 `execution_mode: "MOA"`。这不是新的顶层 Supervisor，也不会把状态机交给 MoA：
+
+```text
+Commander PLAN
+      ↓
+SINGLE ─────────────→ Executor
+      \
+       MOA → Candidate 1 ─┐
+             Candidate 2 ─┼→ Judge → Orbit controlled promotion → Executor verification
+             Candidate 3 ─┘
+                                              ↓
+                                      Commander STEP_EVALUATE
+```
+
+关键边界：
+
+- Candidate 和 Judge 都是**零工具**的一次性模型调用，不能直接 `write/edit/bash/subagent`。
+- 候选文件只写入 `.cx/moa/<run>/<step>/candidate-N/`，普通 Executor 不能修改 `.cx`。
+- Judge 只负责在已有候选中做相对选择，必须返回 `WINNER_CANDIDATE_INDEX`；它不能决定 `PASS_CURRENT_STEP`，也不能生成新的综合实现。
+- 胜出候选由 Orbit Supervisor 确定性提升到项目目录；之后仍由 Executor 运行真实测试，最后由 Commander 做绝对验收。
+- 整个 MoA Step 只消耗一个 Orbit loop；候选和 Judge 的内部调用受独立的候选数和 `maxMoaSteps` 限制。
+- 候选数固定为 2–4；至少需要 2 个成功候选。失败不会偷偷回退成单 Executor，也不会自动换 Judge 模型。
+- `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 和总计，刷新/重连后仍可恢复。
+- 冷恢复按 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 时，只需替换该适配层。
+
 ## State machine
 
 ```text
@@ -143,6 +185,11 @@ PLAN → EXECUTE → EVALUATE → SUCCESS
 ```
 
 - Only a normally completed Executor step consumes one loop from the budget.
+- Runs without an explicit user/tool budget start from the historical floor of
+  5 loops; after PLAN, Orbit deterministically reserves two extra bounded slots
+  beyond the accepted base plan (`max(5, steps + 2)`, therefore at most 7 for
+  the 1–5-step plan schema). Explicit `approved_loop_count` / `max_loops`
+  values are never enlarged automatically.
 - Corrections are limited per base step and reserve budget for the remaining
   planned steps.
 - Commander decisions are validated in code (`PASS_CURRENT_STEP` /
@@ -182,6 +229,13 @@ PLAN → EXECUTE → EVALUATE → SUCCESS
 | `routes.commander` | none | Explicit profile fallback; normally user-selected in Orbit settings. |
 | `routes.executor` | none | Explicit config only without a Session; otherwise follows DSH Session selection. |
 | `routes.watchdog` | none | Explicit profile fallback; normally user-selected in Orbit settings. |
+| `moa.enabled` | `false` | 允许 Commander 为关键步骤选择 `MOA` 执行模式。 |
+| `moa.candidateCount` | `3` | 固定候选数量，运行时只允许 2–4。 |
+| `moa.candidates` | none | 用户显式选择的 Candidate routes；不会从 Executor 猜测或继承。 |
+| `moa.judge` | none | 用户显式选择的 Judge route。 |
+| `moa.peerCritique` | `false` | 是否启用一轮有界候选互评。 |
+| `moa.maxMoaSteps` | `2` | 一个 Run 最多允许的 MoA 步骤数（上限受 1–5 步 Plan 约束）。 |
+| MoA prices | none | 若 `dsh-moa` settings 已配置 `prices`，Orbit 在新 Run 冻结该表并据真实 Token 计算成本；否则不估价。 |
 | `executorTools` | read/read_image/glob/grep | Base read-only subset; mutation tools require Step capabilities. |
 | `browserTools` | `["agent_browser"]` | Browser capability tool names. |
 | `commanderReadOnlyTools` | read/glob/grep/web… | Commander allowlist. |
@@ -216,7 +270,7 @@ dsh plugin --profile web add github:KasenRi/dsh-orbit
 | CX mode | Orbit mode (`orbit模式`; `cx模式` still works) |
 | `ctx.cx` | `ctx.orbit` (same `OrbitService` instance; `ctx.cx` remains an alias) |
 
-- `.cx/state.json` remains unchanged.
+- `.cx/state.json` 路径保持不变；v0.6.0 写入 schema 3，旧 schema 2 状态可继续读取，并在下一次正常持久化时升级。
 - Legacy `cx模式` remains supported.
 - Existing durable runs do not need migration: Orbit reads the same
   `.cx/state.json`, including historical `CX_*` error strings.

package/lib/activation.js

@@ -118,6 +118,13 @@ export function registerOrbitToggleCommand(ctx) {
 export function installOrbitGestureBoundary(ctx, options = {}) {
     ctx.on('agent/pre-step', async (payload, next) => {
         const { agent, messages, signal } = payload;
+        const blocked = options.competingMutationBlock?.(agent, messages);
+        if (blocked !== undefined) {
+            for (const message of messages)
+                agent.session.append('user/message', message, { surfaceOp: 'append' });
+            options.onBlocked?.(agent, blocked);
+            return { kind: 'enter', messages: [] };
+        }
         const decision = await next();
         if (decision.kind === 'reject')
             return decision;

package/lib/client.js

@@ -83,7 +83,7 @@ window.__ModuleLoader__.load({
 			};
 		}
 		//#endregion
-		//#region \0dsh-css:/root/code/dsh-pi-parity/packages/orbit/client/OrbitModelSelect.module.css.mjs
+		//#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 tagId = "@kasenri/dsh-orbit/OrbitModelSelect.module.css";
 		if (typeof document !== "undefined" && document.querySelector("style[data-plugin-css=" + JSON.stringify(tagId) + "]") === null) {
@@ -94,21 +94,21 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var OrbitModelSelect_module_css_default = {
-			"title": "f77nca_title",
-			"panel": "f77nca_panel",
-			"switchControl": "f77nca_switchControl",
+			"rowValueActive": "f77nca_rowValueActive",
 			"error": "f77nca_error",
-			"rowDetail": "f77nca_rowDetail",
-			"chevron": "f77nca_chevron",
+			"rowValue": "f77nca_rowValue",
+			"switchRow": "f77nca_switchRow",
+			"check": "f77nca_check",
 			"group": "f77nca_group",
+			"panel": "f77nca_panel",
 			"row": "f77nca_row",
-			"switchRow": "f77nca_switchRow",
-			"hint": "f77nca_hint",
-			"rowValueActive": "f77nca_rowValueActive",
-			"rowValue": "f77nca_rowValue",
+			"title": "f77nca_title",
+			"switchControl": "f77nca_switchControl",
 			"rowLabel": "f77nca_rowLabel",
-			"check": "f77nca_check",
+			"rowDetail": "f77nca_rowDetail",
+			"chevron": "f77nca_chevron",
 			"separator": "f77nca_separator",
+			"hint": "f77nca_hint",
 			"back": "f77nca_back"
 		};
 		//#endregion
@@ -142,10 +142,11 @@ window.__ModuleLoader__.load({
 		* @param props - injected directory/settings faces plus the locale seat.
 		* @returns the trigger and, while open, the panel.
 		*/
-		function OrbitModelSelect({ t, available, directory, settings, loadModels, selectModel, writeRole, setOrbitEnabled, reloadSettings, useProjection }) {
+		function OrbitModelSelect({ t, available, directory, settings, loadModels, selectModel, writeRole, writeMoaPolicy, setOrbitEnabled, reloadSettings, useProjection }) {
 			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;
@@ -198,6 +199,17 @@ 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;
+				const index = Number(role.slice(14)) - 1;
+				return Number.isInteger(index) ? config.moa.candidates[index] : void 0;
+			};
 			const commitRole = async (role, route) => {
 				if (submitting.current || config.status !== "ready") return;
 				submitting.current = true;
@@ -209,6 +221,17 @@ window.__ModuleLoader__.load({
 					setBusy(false);
 				}
 			};
+			const commitMoaPolicy = async (patch) => {
+				if (submitting.current || config.status !== "ready") return;
+				submitting.current = true;
+				setBusy(true);
+				try {
+					await writeMoaPolicy(patch);
+				} finally {
+					submitting.current = false;
+					setBusy(false);
+				}
+			};
 			const commitExecutor = async (selection) => {
 				if (submitting.current) return;
 				submitting.current = true;
@@ -220,10 +243,34 @@ window.__ModuleLoader__.load({
 					setBusy(false);
 				}
 			};
-			const currentRouteOf = (role) => role === "commander" ? config.commander : role === "watchdog" ? config.watchdog : executorRoute;
-			const roleLabelOf = (role) => role === "commander" ? commanderLabel : role === "watchdog" ? watchdogLabel : executorLabel;
-			const roleModelLabelOf = (role) => t(role === "commander" ? "commanderModel" : role === "executor" ? "executorModel" : "watchdogModel");
-			const roleEffortLabelOf = (role) => role === "commander" ? commanderEffort : role === "watchdog" ? watchdogEffort : executorEffort;
+			const currentRouteOf = (role) => role === "commander" ? config.commander : role === "watchdog" ? config.watchdog : role === "executor" ? executorRoute : moaRouteOf(role);
+			const roleLabelOf = (role) => {
+				const route = currentRouteOf(role);
+				if (role === "commander") return commanderLabel;
+				if (role === "watchdog") return watchdogLabel;
+				if (role === "executor") return executorLabel;
+				return route === void 0 ? void 0 : routeLabelOf(dir, route) ?? route.model;
+			};
+			const roleTitleOf = (role) => {
+				if (role === "commander") return t("commander");
+				if (role === "executor") return t("executor");
+				if (role === "watchdog") return t("watchdog");
+				if (role === "moa-judge") return t("moaJudge");
+				return `${t("moaCandidate")} ${role.slice(14)}`;
+			};
+			const roleModelLabelOf = (role) => {
+				if (role === "commander") return t("commanderModel");
+				if (role === "executor") return t("executorModel");
+				if (role === "watchdog") return t("watchdogModel");
+				return t("models");
+			};
+			const roleEffortLabelOf = (role) => {
+				if (role === "commander") return commanderEffort;
+				if (role === "watchdog") return watchdogEffort;
+				if (role === "executor") return executorEffort;
+				const route = moaRouteOf(role);
+				return effortLabelOf(modelOf(dir, route), route?.reasoningEffort);
+			};
 			const commitEffort = async (role, route, effort) => {
 				const next = {
 					provider: route.provider,
@@ -312,7 +359,7 @@ window.__ModuleLoader__.load({
 								role: pane.role
 							});
 						},
-						children: `${BACK} ${pane.kind === "role" ? t("back") : t(pane.role)}`
+						children: `${BACK} ${pane.kind === "role" ? t("back") : roleTitleOf(pane.role)}`
 					}),
 					settingsError === void 0 ? null : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 						className: OrbitModelSelect_module_css_default.error,
@@ -353,6 +400,65 @@ 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",
@@ -434,6 +540,124 @@ window.__ModuleLoader__.load({
 									children: CHEVRON
 								})
 							]
+						}),
+						/* @__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.switchRow,
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: OrbitModelSelect_module_css_default.rowLabel,
+								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.jsxs)("button", {
+							type: "button",
+							role: "menuitem",
+							className: OrbitModelSelect_module_css_default.row,
+							disabled: busy,
+							onClick: () => {
+								commitMoaPolicy({ candidateCount: config.moa.candidateCount >= 4 ? 2 : config.moa.candidateCount + 1 });
+							},
+							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.jsxs)("div", {
+							className: OrbitModelSelect_module_css_default.switchRow,
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: OrbitModelSelect_module_css_default.rowLabel,
+								children: t("moaPeerCritique")
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_deepseek_ai_dsh_client_ui_primitives.Switch, {
+								className: OrbitModelSelect_module_css_default.switchControl,
+								checked: config.moa.peerCritique,
+								disabled: busy,
+								label: t("moaPeerCritique"),
+								onChange: (next) => {
+									commitMoaPolicy({ peerCritique: next });
+								}
+							})]
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+							type: "button",
+							role: "menuitem",
+							className: OrbitModelSelect_module_css_default.row,
+							disabled: busy,
+							onClick: () => {
+								commitMoaPolicy({ maxMoaSteps: config.moa.maxMoaSteps >= 5 ? 1 : config.moa.maxMoaSteps + 1 });
+							},
+							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
+							})]
+						}),
+						Array.from({ length: config.moa.candidateCount }, (_, offset) => {
+							const role = `moa-candidate-${offset + 1}`;
+							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+								type: "button",
+								role: "menuitem",
+								className: OrbitModelSelect_module_css_default.row,
+								disabled: busy,
+								onClick: () => {
+									setPane({
+										kind: "role",
+										role
+									});
+								},
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: OrbitModelSelect_module_css_default.rowLabel,
+										children: `${t("moaCandidate")} ${offset + 1}`
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: OrbitModelSelect_module_css_default.rowValue,
+										children: roleLabelOf(role) ?? t("triggerFallback")
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: OrbitModelSelect_module_css_default.chevron,
+										children: CHEVRON
+									})
+								]
+							}, role);
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+							type: "button",
+							role: "menuitem",
+							className: OrbitModelSelect_module_css_default.row,
+							disabled: busy,
+							onClick: () => {
+								setPane({
+									kind: "role",
+									role: "moa-judge"
+								});
+							},
+							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: roleLabelOf("moa-judge") ?? t("triggerFallback")
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+									className: OrbitModelSelect_module_css_default.chevron,
+									children: CHEVRON
+								})
+							]
 						})
 					] }) : null,
 					pane.kind === "role" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
@@ -552,6 +776,19 @@ window.__ModuleLoader__.load({
 			commanderModel: "Commander model",
 			executorModel: "Executor model",
 			watchdogModel: "Watchdog model",
+			moa: "MoA",
+			moaEnable: "Enable MoA for eligible steps",
+			moaCandidate: "Candidate",
+			moaCandidateCount: "Candidate count",
+			moaJudge: "Judge",
+			moaPeerCritique: "Peer critique",
+			moaMaxSteps: "Max MoA steps per run",
+			runtime: "Current run",
+			moaRuntimePhase: "MoA phase",
+			moaTokens: "tokens",
+			moaTotalUsage: "MoA total",
+			moaCostUnavailable: "cost unavailable",
+			moaWaiting: "Waiting",
 			followsSession: "Follows current session model",
 			models: "Model",
 			effort: "Reasoning effort",
@@ -577,6 +814,19 @@ window.__ModuleLoader__.load({
 			commanderModel: "指挥官模型",
 			executorModel: "执行员模型",
 			watchdogModel: "监控模型",
+			moa: "MoA 多候选模式",
+			moaEnable: "允许关键步骤使用 MoA",
+			moaCandidate: "候选模型",
+			moaCandidateCount: "候选数量",
+			moaJudge: "Judge 评审模型",
+			moaPeerCritique: "候选互评",
+			moaMaxSteps: "每个 Run 最多 MoA 步骤",
+			runtime: "当前运行",
+			moaRuntimePhase: "MoA 阶段",
+			moaTokens: "Token",
+			moaTotalUsage: "MoA 总计",
+			moaCostUnavailable: "未配置价格，无法计算成本",
+			moaWaiting: "等待中",
 			followsSession: "跟随当前会话模型",
 			models: "模型",
 			effort: "推理等级",
@@ -592,6 +842,13 @@ window.__ModuleLoader__.load({
 		//#region client/index.ts
 		/** The host settings namespace Orbit registers for its own two roles. */
 		const ORBIT_SETTINGS_NS = "orbit";
+		/**
+		* Keep Orbit as the final list entry in `conversation.input.right`.
+		* DSH renders the whole right list before the named model seat, so this gives
+		* the stable local order: other right-side controls → Orbit → model selector.
+		*/
+		const ORBIT_INPUT_RIGHT_PRIORITY = Number.MAX_SAFE_INTEGER;
+		const ORBIT_INPUT_RIGHT_ORDER = Number.MAX_SAFE_INTEGER;
 		/** Required client services: slots, the shared model directory, Remote (settings namespace), and locale. */
 		const inject = [
 			"slots",
@@ -610,13 +867,33 @@ window.__ModuleLoader__.load({
 				zh,
 				en
 			}), "dsh-orbit: model control dictionaries");
-			const settings = (0, _deepseek_ai_dsh_client_store.createSnapshotStore)({ status: "loading" });
+			const settings = (0, _deepseek_ai_dsh_client_store.createSnapshotStore)({
+				status: "loading",
+				moa: {
+					enabled: false,
+					candidateCount: 3,
+					peerCritique: false,
+					maxMoaSteps: 2,
+					candidates: []
+				}
+			});
 			const adoptView = (view) => {
 				const value = view.value;
+				const rawMoa = value?.moa;
+				const rawCandidates = Array.isArray(rawMoa?.["candidates"]) ? rawMoa?.["candidates"] : [];
+				const moa = {
+					enabled: rawMoa?.["enabled"] === true,
+					candidateCount: typeof rawMoa?.["candidateCount"] === "number" ? rawMoa["candidateCount"] : 3,
+					peerCritique: rawMoa?.["peerCritique"] === true,
+					maxMoaSteps: typeof rawMoa?.["maxMoaSteps"] === "number" ? rawMoa["maxMoaSteps"] : 2,
+					candidates: rawCandidates.map(routeFromSettingsValue).filter((route) => route !== void 0),
+					judge: routeFromSettingsValue(rawMoa?.["judge"])
+				};
 				settings.set({
 					status: "ready",
 					commander: routeFromSettingsValue(value?.commander),
 					watchdog: routeFromSettingsValue(value?.watchdog),
+					moa,
 					revision: view.revision
 				});
 			};
@@ -657,15 +934,28 @@ window.__ModuleLoader__.load({
 					reloadSettings();
 				});
 			}, "dsh-orbit: settings mirror");
-			const writeRole = async (role, route) => {
+			const wireRoute = (route) => ({
+				provider: route.provider,
+				model: route.model,
+				reasoningEffort: route.reasoningEffort ?? ""
+			});
+			const moaWire = (moa) => ({
+				enabled: moa.enabled,
+				candidateCount: moa.candidateCount,
+				peerCritique: moa.peerCritique,
+				maxMoaSteps: moa.maxMoaSteps,
+				candidates: moa.candidates.map((route) => wireRoute(route)),
+				judge: moa.judge ? wireRoute(moa.judge) : {
+					provider: "",
+					model: "",
+					reasoningEffort: ""
+				}
+			});
+			const updateSettings = async (patch) => {
 				const snapshot = settings.getSnapshot();
 				if (snapshot.status !== "ready" || snapshot.revision === void 0) return false;
 				try {
-					const response = await ctx.remote.settings.update(ORBIT_SETTINGS_NS, { [role]: {
-						provider: route.provider,
-						model: route.model,
-						reasoningEffort: route.reasoningEffort ?? ""
-					} }, snapshot.revision);
+					const response = await ctx.remote.settings.update(ORBIT_SETTINGS_NS, patch, snapshot.revision);
 					if (!response.ok) {
 						settings.update((draft) => {
 							draft.error = response.error.message;
@@ -683,6 +973,34 @@ window.__ModuleLoader__.load({
 					return false;
 				}
 			};
+			const writeRole = async (role, route) => {
+				const snapshot = settings.getSnapshot();
+				if (role === "commander" || role === "watchdog") return updateSettings({ [role]: wireRoute(route) });
+				const nextMoa = {
+					...snapshot.moa,
+					candidates: [...snapshot.moa.candidates]
+				};
+				if (role === "moa-judge") nextMoa.judge = route;
+				else {
+					const index = Number(role.slice(14)) - 1;
+					if (!Number.isInteger(index) || index < 0 || index > 3) return false;
+					while (nextMoa.candidates.length <= index) nextMoa.candidates.push({
+						provider: "",
+						model: ""
+					});
+					nextMoa.candidates[index] = route;
+				}
+				return updateSettings({ moa: moaWire(nextMoa) });
+			};
+			const writeMoaPolicy = async (patch) => {
+				const snapshot = settings.getSnapshot();
+				const nextMoa = {
+					...snapshot.moa,
+					...patch,
+					candidates: [...snapshot.moa.candidates]
+				};
+				return updateSettings({ moa: moaWire(nextMoa) });
+			};
 			ctx.inject([
 				"slots",
 				"modelDirectories",
@@ -702,6 +1020,7 @@ window.__ModuleLoader__.load({
 						},
 						selectModel: (selection) => available ? directory.select(selection).then(() => true, () => false) : Promise.resolve(false),
 						writeRole,
+						writeMoaPolicy,
 						setOrbitEnabled: async (enabled) => {
 							const session = sessions.binding(sessionId)?.session;
 							if (session === void 0) return false;
@@ -718,13 +1037,16 @@ window.__ModuleLoader__.load({
 				scope.slots.inject("conversation.input.right", () => scope.slots.register({
 					name: "conversation.input.right",
 					id: "orbit-model",
-					order: 10,
+					priority: ORBIT_INPUT_RIGHT_PRIORITY,
+					order: ORBIT_INPUT_RIGHT_ORDER,
 					locale: NS,
 					inject: injected
 				}, OrbitModelSelect));
 			});
 		}
 		//#endregion
+		exports.ORBIT_INPUT_RIGHT_ORDER = ORBIT_INPUT_RIGHT_ORDER;
+		exports.ORBIT_INPUT_RIGHT_PRIORITY = ORBIT_INPUT_RIGHT_PRIORITY;
 		exports.ORBIT_SETTINGS_NS = ORBIT_SETTINGS_NS;
 		exports.apply = apply;
 		exports.inject = inject;