weir-harness 1.1.1 → 1.1.3

package/cordis.patch.yml

@@ -90,11 +90,6 @@
     # dsh.client manifest).
     - id: ui-weir-settings
       name: 'weir-harness'
-    # Isolated reusable model picker client module (own package + own client
-    # export): the settings page requires it and renders it inside an error
-    # boundary, so a picker failure can never blank the page.
-    - id: ui-weir-model-picker
-      name: 'weir-model-picker'
     - id: preset-weir
       name: '@deepseek-ai/dsh-agent-preset'
       config:

package/lib/client.chain-editor.js

@@ -8,7 +8,11 @@ window.__ModuleLoader__.load({
 		let react = require("react");
 		let react_jsx_runtime = require("react/jsx-runtime");
 		let primitives = require("@deepseek-ai/dsh-client-ui-primitives");
-		let modelPicker = require("weir-model-picker");
+		// The model picker is a sibling package-local chunk supplied by the
+		// composition root as the `modelPicker` prop (same-package sync require
+		// is impossible here); absent means its chunk is still in flight or its
+		// load failed, which degrades each rung to a hint instead of breaking the
+		// editor's other work.
 		// Model-chains editor with the lane list as a PROP: the category lanes
 		// are the default (no row props → the pre-generalization category
 		// behaviour, byte-identical); the curated-agent lanes pass their own
@@ -49,6 +53,7 @@ window.__ModuleLoader__.load({
 		/** Visual editor for one model-chains map: pick models per lane, JSON synthesized on save. */
 		function ChainEditorField(props) {
 			const model = props.model;
+			const picker = props.modelPicker;
 			// Lane parameterization: which lanes render, which settings field
 			// the synthesized JSON is written to, and which dictionary stems
 			// label the rows — the defaults are exactly the category treatment.
@@ -113,7 +118,7 @@ window.__ModuleLoader__.load({
 								react_jsx_runtime.jsx("span", { style: chainDescStyle, children: props.t(`${rowLabelPrefix}${row}_desc`) })
 							] }),
 							...rungs.map((rung, index) => react_jsx_runtime.jsxs("div", { style: chainRungStyle, key: index, children: [
-								react_jsx_runtime.jsx(modelPicker.ModelPickerField, {
+								picker === void 0 || picker === null ? react_jsx_runtime.jsx("span", { style: hintStyle, children: props.t("pickerUnavailable") }) : react_jsx_runtime.jsx(picker.ModelPickerField, {
 									value: rung,
 									onChange: (selection) => updateRung(row, index, selection),
 									getSession: () => props.getSession(),

package/lib/client.edit-lock-maintenance.js

@@ -154,6 +154,101 @@ window.__ModuleLoader__.load({
 			}
 			return candidates;
 		}
+		/** Recovery-UX zone copy (D1/D2). The entry dictionaries (client.js) are
+		 * owned by the entry chunk, so the new zone copy lives HERE as
+		 * template-layer English per the text discipline; file paths, session ids
+		 * and statuses stay dynamic instance content. */
+		const RECOVERY_UX = Object.freeze({
+			blockedHeader: "Blocked files — one-click force release",
+			blockedHint: "Opening the panel ran the read-only inspection automatically. Each row settles the holder's unresolved publication fence (when present) and releases the lock in one operator-confirmed step.",
+			unmetHeader: "Blocked files — recovery preconditions not met",
+			forceRelease: "Force release",
+			holder: "holder",
+			stateFence: "publication fence",
+			stateInterrupted: "interrupted",
+			stateActive: "active",
+			reasonNotInterrupted: "The holding session is not durably interrupted; the online administrative recovery can only override an interrupted historical owner. Stop the session first, or ask it to release the file.",
+			reasonPrepared: "The owner still has a prepared operation; recover to stable unknown history before an administrative override.",
+			reasonPublishing: "The owner still has an operation in the publishing phase; only unknown outcomes can be overridden online.",
+			reasonDisposition: "An administrative recovery is already recorded for this owner; admission for its operations is no longer blocked.",
+			reasonNoUnresolved: "The owner has no unresolved operations; an ordinary unlock may be enough.",
+			reasonUnknownSession: "The owner session is not recorded in this authority image.",
+		});
+		/** The first failing precondition of an ineligible blocking owner, in the
+		 * manager's refusal order (revoked/disposition → owner unknown → not
+		 * interrupted → prepared → publishing → no unresolved operations).
+		 * @param {string} owner @param {any} snapshot @returns {string} */
+		function unmetReason(owner, snapshot) {
+			const unresolved = Array.isArray(snapshot?.unresolved) ? snapshot.unresolved : [];
+			const ownerOps = unresolved.filter((op) => op?.key?.sessionId === owner);
+			const prepared = (Array.isArray(snapshot?.prepared) ? snapshot.prepared : []).filter((op) => op?.key?.sessionId === owner);
+			const session = (Array.isArray(snapshot?.sessions) ? snapshot.sessions : []).find((row) => row?.sessionId === owner);
+			if (ownerOps.some((op) => op?.admissionBlocked === false)) return RECOVERY_UX.reasonDisposition;
+			if (!session) return RECOVERY_UX.reasonUnknownSession;
+			if (session.interrupted !== true) return RECOVERY_UX.reasonNotInterrupted;
+			if (prepared.length > 0) return RECOVERY_UX.reasonPrepared;
+			if (ownerOps.some((op) => op?.phase === "publishing")) return RECOVERY_UX.reasonPublishing;
+			return RECOVERY_UX.reasonNoUnresolved;
+		}
+		/** Recovery-UX diagnosis (D1/D2): the three-zone classification the panel
+		 * renders from one inspection. Eligibility is recoveryCandidates — the
+		 * SAME scope and confirmation algorithm — and every ineligible blocking
+		 * owner carries the named failing precondition. Blocking artifacts are
+		 * retained locks plus still-blocking (admissionBlocked) unresolved
+		 * publications; file-scoped fences become rows, wider fences name their
+		 * scope path in the unmet zone. Pure: no fetch, no state, no clock.
+		 * @param {string} root @param {any} snapshot */
+		function recoveryDiagnosis(root, snapshot) {
+			const candidates = recoveryCandidates(root, snapshot);
+			const candidateByOwner = new Map(candidates.map((candidate) => [candidate.owner, candidate]));
+			const sessions = Array.isArray(snapshot?.sessions) ? snapshot.sessions : [];
+			const interruptedByOwner = new Map(sessions.map((session) => [session.sessionId, session?.interrupted === true]));
+			const retained = Array.isArray(snapshot?.retainedLocks) ? snapshot.retainedLocks : [];
+			/** @type {Map<string, {resourceId: string, owner: string, lockStatus: string|null, fence: boolean, interrupted: boolean}>} */
+			const rowsByResource = new Map();
+			const blockedOwners = new Set();
+			for (const lock of retained) {
+				if (typeof lock?.resourceId !== "string" || typeof lock?.owner !== "string") continue;
+				blockedOwners.add(lock.owner);
+				const row = rowsByResource.get(lock.resourceId) ?? { resourceId: lock.resourceId, owner: lock.owner, lockStatus: null, fence: false, interrupted: interruptedByOwner.get(lock.owner) ?? false };
+				row.lockStatus = row.lockStatus ?? (typeof lock.status === "string" ? lock.status : null);
+				rowsByResource.set(lock.resourceId, row);
+			}
+			/** @type {Map<string, {owner: string, scopePaths: string[]}>} */
+			const fencedOwners = new Map();
+			for (const op of Array.isArray(snapshot?.unresolved) ? snapshot.unresolved : []) {
+				if (op?.admissionBlocked !== true || typeof op?.key?.sessionId !== "string") continue;
+				blockedOwners.add(op.key.sessionId);
+				const scope = op?.scope ?? null;
+				if (scope?.kind === "file" && typeof scope.path === "string") {
+					const existing = rowsByResource.get(scope.path);
+					if (existing) {
+						// Same owner locks AND fences the file (the incident shape): one row.
+						if (existing.owner === op.key.sessionId) existing.fence = true;
+						else {
+							const entry = fencedOwners.get(op.key.sessionId) ?? { owner: op.key.sessionId, scopePaths: /** @type {string[]} */ ([]) };
+							if (!entry.scopePaths.includes(scope.path)) entry.scopePaths.push(scope.path);
+							fencedOwners.set(op.key.sessionId, entry);
+						}
+					} else {
+						rowsByResource.set(scope.path, { resourceId: scope.path, owner: op.key.sessionId, lockStatus: null, fence: true, interrupted: interruptedByOwner.get(op.key.sessionId) ?? false });
+					}
+				} else {
+					const entry = fencedOwners.get(op.key.sessionId) ?? { owner: op.key.sessionId, scopePaths: /** @type {string[]} */ ([]) };
+					if (typeof scope?.path === "string" && !entry.scopePaths.includes(scope.path)) entry.scopePaths.push(scope.path);
+					fencedOwners.set(op.key.sessionId, entry);
+				}
+			}
+			const rows = [...rowsByResource.values()];
+			const blocked = rows.filter((row) => candidateByOwner.has(row.owner));
+			blocked.sort((a, b) => a.resourceId.localeCompare(b.resourceId));
+			const unmet = [];
+			for (const owner of [...blockedOwners].sort()) {
+				if (candidateByOwner.has(owner)) continue;
+				unmet.push({ owner, rows: rows.filter((row) => row.owner === owner), scopePaths: fencedOwners.get(owner)?.scopePaths ?? [], reason: unmetReason(owner, snapshot) });
+			}
+			return { candidates, blocked, unmet };
+		}
 		/** Error boundary isolating the maintenance panel from the settings page. */
 		class EditLockMaintenanceBoundary extends react.Component {
 			constructor(props) {
@@ -220,6 +315,11 @@ window.__ModuleLoader__.load({
 				post("api/weir-edit-lock/maintenance/status")
 					.then((payload) => {
 						setView(payload?.ok ? { status: "ready", value: payload.value } : { status: "error", message: payload?.error?.message ?? "unknown" });
+						// Recovery UX D1: opening the panel auto-runs the read-only
+						// inspection for every server-derived domain root, so the
+						// blocked/unmet zones render without any manual step. The
+						// inspection itself stays read-only (the same endpoint).
+						if (payload?.ok && Array.isArray(payload.value?.domains)) payload.value.domains.forEach((domain) => inspect(domain.root, false));
 					})
 					.catch((error) => setView({ status: "error", message: String(error?.message ?? error) }));
 			};
@@ -229,8 +329,9 @@ window.__ModuleLoader__.load({
 				setExpanded(null);
 				if (next) load();
 			};
-			const inspect = (root) => {
-				setExpanded(root);
+			/** @param {string} root @param {boolean} [expand] manual clicks expand the per-domain detail; the automatic pass does not */
+			const inspect = (root, expand = true) => {
+				if (expand) setExpanded(root);
 				setInspections((previous) => ({ ...previous, [root]: { status: "loading" } }));
 				post("api/weir-edit-lock/maintenance/inspect", { root })
 					.then((payload) => {
@@ -279,6 +380,58 @@ window.__ModuleLoader__.load({
 					}) })
 				], key: recoveryKey(root, candidate.owner) });
 			};
+			/** Row state fragment: lock status / publication fence + session liveness. */
+			const holderStateText = (row) => {
+				const parts = [];
+				if (row.lockStatus) parts.push(row.lockStatus);
+				if (row.fence) parts.push(RECOVERY_UX.stateFence);
+				parts.push(row.interrupted ? RECOVERY_UX.stateInterrupted : RECOVERY_UX.stateActive);
+				return parts.join(" · ");
+			};
+			/** Blocked-zone group for one eligible owner: one row per blocked file
+			 * (file, holder, holder state, one primary force-release action per
+			 * row) plus the FULL scope, risk and computed digest the operator
+			 * accepts with the click — the same confirmation algorithm as the
+			 * offline path, unchanged. */
+			const blockedZoneCard = (root, candidate, rows) => {
+				const state = recoveries[recoveryKey(root, candidate.owner)];
+				return react_jsx_runtime.jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "4px", padding: "8px", border: "1px solid var(--dsw-alias-border-l2)", borderRadius: "var(--dsw-radius-md)" }, children: [
+					...rows.map((row) => react_jsx_runtime.jsxs("div", { style: { display: "flex", alignItems: "center", gap: "8px" }, children: [
+						react_jsx_runtime.jsxs("span", { style: { display: "flex", flexDirection: "column", gap: "2px", minWidth: 0 }, children: [
+							react_jsx_runtime.jsx("span", { style: monoStyle, children: row.resourceId }),
+							react_jsx_runtime.jsx("span", { style: chainDescStyle, children: `${RECOVERY_UX.holder} ${row.owner} · ${holderStateText(row)}` })
+						] }),
+						react_jsx_runtime.jsx("span", { style: { flex: 1 } }),
+						react_jsx_runtime.jsx("button", {
+							type: "button",
+							style: chainButtonStyle,
+							disabled: state?.status === "busy",
+							onClick: () => recover(root, candidate),
+							children: state?.status === "busy" ? t("editLockMaintRecoverBusy") : RECOVERY_UX.forceRelease
+						})
+					], key: row.resourceId })),
+					react_jsx_runtime.jsx("div", { style: chainDescStyle, children: `${t("editLockMaintRecoverRoot")}: ${candidate.scope.root}` }),
+					react_jsx_runtime.jsx("div", { style: chainDescStyle, children: `${t("editLockMaintRecoverOwner")}: ${candidate.owner}` }),
+					react_jsx_runtime.jsx("div", { style: chainDescStyle, children: `${t("editLockMaintRecoverRevision")}: ${candidate.scope.expectedRevision}` }),
+					react_jsx_runtime.jsxs("div", { style: chainDescStyle, children: [
+						react_jsx_runtime.jsx("div", { children: `${t("editLockMaintRecoverOperations")}:` }),
+						...candidate.scope.operationIds.map((id, index) => react_jsx_runtime.jsx("div", { style: monoStyle, children: id }, index))
+					] }),
+					react_jsx_runtime.jsx("div", { style: dangerStyle, children: `${t("editLockMaintRecoverRisk")}: ${LATE_WRITER_RISK}` }),
+					react_jsx_runtime.jsx("div", { style: monoStyle, children: `${t("editLockMaintRecoverDigest")}: ${candidate.confirmation}` }),
+					state?.status === "error"
+						? react_jsx_runtime.jsx("div", { style: dangerStyle, children: `${t("editLockMaintRecoverFailed")} ${state.message}` })
+						: null,
+				], key: recoveryKey(root, candidate.owner) });
+			};
+			/** Unmet-zone row for one ineligible blocking owner: the blocked files
+			 * and the NAMED failing precondition, never a silent missing action. */
+			const unmetZoneRow = (root, entry) => react_jsx_runtime.jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "4px", padding: "8px", border: "1px solid var(--dsw-alias-border-l2)", borderRadius: "var(--dsw-radius-md)" }, children: [
+				react_jsx_runtime.jsx("div", { style: chainDescStyle, children: `${t("editLockMaintRecoverOwner")}: ${entry.owner}` }),
+				...entry.rows.map((row, index) => react_jsx_runtime.jsx("div", { style: monoStyle, children: `${row.resourceId} · ${RECOVERY_UX.holder} ${row.owner} · ${holderStateText(row)}` }, index)),
+				...entry.scopePaths.map((path, index) => react_jsx_runtime.jsx("div", { style: monoStyle, children: path }, index)),
+				react_jsx_runtime.jsx("div", { style: dangerStyle, children: entry.reason })
+			], key: `${root}\n${entry.owner}\nunmet` });
 			const snapshotSection = (/** @type {string} */ root, /** @type {any} */ snapshot) => react_jsx_runtime.jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "6px" }, children: [
 				react_jsx_runtime.jsx("div", { style: chainDescStyle, children: t("editLockMaintCounts")
 					.replace("{sessions}", String(snapshot.counts.sessions))
@@ -348,6 +501,27 @@ window.__ModuleLoader__.load({
 				}
 				const value = view.value;
 				const stateKey = STATE_KEYS[value.state] ?? "Unknown";
+				// Recovery UX D1: aggregate the zones from every auto-inspected root.
+				// Blocked rows (with a force-release action) render first, then the
+				// owners whose preconditions fail with the named reason; everything
+				// else is the normal zone (banner, warnings, per-domain detail).
+				const zoneGroups = new Map();
+				const zoneUnmet = [];
+				for (const root of Object.keys(inspections)) {
+					const inspection = inspections[root];
+					if (inspection?.status !== "ready" || inspection.value?.presence !== "valid") continue;
+					const diagnosis = recoveryDiagnosis(root, inspection.value.snapshot);
+					for (const row of diagnosis.blocked) {
+						const candidate = diagnosis.candidates.find((entry) => entry.owner === row.owner);
+						const key = recoveryKey(root, row.owner);
+						const group = zoneGroups.get(key) ?? { root, candidate, rows: [] };
+						group.rows.push(row);
+						zoneGroups.set(key, group);
+					}
+					for (const entry of diagnosis.unmet) zoneUnmet.push({ root, entry });
+				}
+				const blockedGroups = [...zoneGroups.values()];
+				zoneUnmet.sort((a, b) => a.entry.owner.localeCompare(b.entry.owner));
 				return react_jsx_runtime.jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "10px" }, children: [
 					react_jsx_runtime.jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "2px" }, children: [
 						react_jsx_runtime.jsx("span", { style: chainCategoryStyle, children: t(`editLockMaintState${stateKey}`) }),
@@ -360,6 +534,19 @@ window.__ModuleLoader__.load({
 						react_jsx_runtime.jsx("span", { style: warnStyle, children: t("editLockMaintWarnKeepHistory") }),
 						react_jsx_runtime.jsx("span", { style: warnStyle, children: t("editLockMaintWarnUnlock") })
 					] }),
+					blockedGroups.length > 0
+						? react_jsx_runtime.jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "4px" }, children: [
+							react_jsx_runtime.jsx("span", { style: chainCategoryStyle, children: RECOVERY_UX.blockedHeader }),
+							react_jsx_runtime.jsx("span", { style: chainDescStyle, children: RECOVERY_UX.blockedHint }),
+							...blockedGroups.map((group) => blockedZoneCard(group.root, group.candidate, group.rows))
+						] })
+						: null,
+					zoneUnmet.length > 0
+						? react_jsx_runtime.jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "4px" }, children: [
+							react_jsx_runtime.jsx("span", { style: chainCategoryStyle, children: RECOVERY_UX.unmetHeader }),
+							...zoneUnmet.map(({ root, entry }) => unmetZoneRow(root, entry))
+						] })
+						: null,
 					value.blocked.length > 0
 						? react_jsx_runtime.jsxs("div", { style: { display: "flex", flexDirection: "column", gap: "4px" }, children: [
 							react_jsx_runtime.jsx("span", { style: chainCategoryStyle, children: t("editLockMaintBlocked") }),
@@ -391,7 +578,7 @@ window.__ModuleLoader__.load({
 		exports.EditLockMaintenanceBoundary = EditLockMaintenanceBoundary;
 		exports.EditLockMaintenanceField = EditLockMaintenanceField;
 		// Exported for the chunk test's 对拍 against the server-side digest.
-		exports.editLockRecovery = Object.freeze({ canonicalJson, sha256Hex, recoveryConfirmation, recoveryCandidates, recoveryKey, LATE_WRITER_RISK });
+		exports.editLockRecovery = Object.freeze({ canonicalJson, sha256Hex, recoveryConfirmation, recoveryCandidates, recoveryDiagnosis, unmetReason, recoveryKey, LATE_WRITER_RISK, RECOVERY_UX });
 		return module.exports;
 	}
 });

package/lib/client.js

@@ -1,4 +1,4 @@
-// Weir client chunks: {"client.blackboard-model.js":"66fd9fc5438477d6d7ff156631f810a647ce352612a16051e987e8cd449bc4c9","client.blackboard-panel.js":"f961e0242dad7bf311829a25e265bf091925711b2fb9c19d2141997fbdf792b5","client.capability-badge.js":"4e5805596a9ad34eac03cbd62c956f8b79789527c72279d6a4078f5c9d0eabab","client.capability-manager.js":"c36efbad8bcdb1e6dfee52368b89485127f953e9d04ae7921032740439fffcdd","client.capability-model.js":"34af92420fe4f182ba9bf962dfe6986e8f54c79b147e5981eec3bbfc06cdbc21","client.capability-presets.js":"66aeb7ecde8a73165a3f010bed0dc56b8a8be70812c1e3b56c324f7be095adab","client.chain-editor.js":"c29ae07483a296ef0eac6ec5dcb06fda99236a4a5d7a9f52789220362aea1b0d","client.chain-model.js":"81cdd04626900a63c38ccb3d9c4d117686c6f8a5da2ce9131b7aaf2f089dea77","client.disabled-categories-editor.js":"d4606a3172b47b25caf76fd64c8420a0079cd5f008bc67a9c71b3f146724e393","client.edit-lock-maintenance.js":"3a9e94fff33bb17cb60c51c7c317060c881486113209642bf7dc6f5c8f59eb51","client.edit-lock-panel.js":"deb1d536353c51405b3d1b7b49e4847cb593547a0dfa468a5f39346ad25f745d","client.hash-edit-model.js":"99df87cc3cc261abd160b83124b5ce726d0708f3c87eba9d58ad9e5a1f41bae9","client.hash-edit-view.js":"fc0f4dabddab9a48527553ad4232b3715e46e6863aab75e02ae2dcd6687265c2","client.lsp-model.js":"6b5bead2900289427a1ad723b9c7bea85af4c5547029e486c620ff94ece24775","client.lsp-panel.js":"39211da7658e0810abc0984b8bcbbfb4ee6a6299fedfd21649ded1ab39d1f291","client.lsp-toggle.js":"4d960984ccf1045c617be6d282665513a9cf636779563a276973b55036a59fb6","client.notify-permissions.js":"c1c103ce5976a4032b62e12b3b3ecb907a574159bf89512539c68c4886ea37a7","client.notify-web.js":"b2ccf831524be4e94c532324cb5495793d4424e3b78d6014d2a3f3d20e9c5871","client.robash-editor.js":"cd6a283b72cb02598e32ca4ce03a1b8de5f328ecdd1f5f920377524f3bdcbe1c","client.robash-model.js":"356ee7a679223bcd351720b2bc9e7300e390d97a60d1c8d75998706b4644923b","client.settings-page.js":"03b228e12bb191a10e34d3af9fef0acc9d1093cfc2bf0e1a35bc59b57c0af72f","client.worktree-model.js":"761a0f6316a3f3af3f924a7784d61ca4bdbfd3c6b63c81c5681bf3a801280c26","client.worktree-view.js":"c8399f67041061a357e6f11bfed1e40340494d75216b4c10ce4b940a763f0824"}
+// Weir client chunks: {"client.blackboard-model.js":"66fd9fc5438477d6d7ff156631f810a647ce352612a16051e987e8cd449bc4c9","client.blackboard-panel.js":"f961e0242dad7bf311829a25e265bf091925711b2fb9c19d2141997fbdf792b5","client.capability-badge.js":"4e5805596a9ad34eac03cbd62c956f8b79789527c72279d6a4078f5c9d0eabab","client.capability-manager.js":"c36efbad8bcdb1e6dfee52368b89485127f953e9d04ae7921032740439fffcdd","client.capability-model.js":"34af92420fe4f182ba9bf962dfe6986e8f54c79b147e5981eec3bbfc06cdbc21","client.capability-presets.js":"66aeb7ecde8a73165a3f010bed0dc56b8a8be70812c1e3b56c324f7be095adab","client.chain-editor.js":"1e9a33bc68cabc43bc27b91ef83eab5028a33256596c147e15722d684687765b","client.chain-model.js":"81cdd04626900a63c38ccb3d9c4d117686c6f8a5da2ce9131b7aaf2f089dea77","client.disabled-categories-editor.js":"d4606a3172b47b25caf76fd64c8420a0079cd5f008bc67a9c71b3f146724e393","client.edit-lock-maintenance.js":"0559d47df0e8e180eaadfd40b15bcfbf6409ec265902514db37366eb270f8e12","client.edit-lock-panel.js":"deb1d536353c51405b3d1b7b49e4847cb593547a0dfa468a5f39346ad25f745d","client.hash-edit-model.js":"99df87cc3cc261abd160b83124b5ce726d0708f3c87eba9d58ad9e5a1f41bae9","client.hash-edit-view.js":"fc0f4dabddab9a48527553ad4232b3715e46e6863aab75e02ae2dcd6687265c2","client.lsp-model.js":"6b5bead2900289427a1ad723b9c7bea85af4c5547029e486c620ff94ece24775","client.lsp-panel.js":"39211da7658e0810abc0984b8bcbbfb4ee6a6299fedfd21649ded1ab39d1f291","client.lsp-toggle.js":"4d960984ccf1045c617be6d282665513a9cf636779563a276973b55036a59fb6","client.model-picker.js":"57f96826e00b37ae6d6474a6750f31b4e128e5fdb37e302875a41cdb2e18f14a","client.notify-permissions.js":"c1c103ce5976a4032b62e12b3b3ecb907a574159bf89512539c68c4886ea37a7","client.notify-web.js":"b2ccf831524be4e94c532324cb5495793d4424e3b78d6014d2a3f3d20e9c5871","client.robash-editor.js":"cd6a283b72cb02598e32ca4ce03a1b8de5f328ecdd1f5f920377524f3bdcbe1c","client.robash-model.js":"356ee7a679223bcd351720b2bc9e7300e390d97a60d1c8d75998706b4644923b","client.settings-page.js":"7520be405d2e67904ed5344aeb09f18ddfc14f209243a86249179cc5930ba46c","client.worktree-model.js":"761a0f6316a3f3af3f924a7784d61ca4bdbfd3c6b63c81c5681bf3a801280c26","client.worktree-view.js":"c8399f67041061a357e6f11bfed1e40340494d75216b4c10ce4b940a763f0824"}
 window.__ModuleLoader__.load({
 	id: "weir-harness",
 	factory: (require) => {
@@ -54,6 +54,7 @@ window.__ModuleLoader__.load({
 			catalogFailed: "Provider catalog unavailable; enter provider and model manually.",
 			providerEmpty: "Select a provider",
 			modelEmpty: "Select a model",
+			pickerUnavailable: "Model picker unavailable — reload the settings page to retry.",
 			groupIntent: "Intent",
 			groupDelegate: "Delegation",
 			groupTodo: "Continuation",
@@ -748,6 +749,7 @@ window.__ModuleLoader__.load({
 			catalogFailed: "Provider 目录不可用；可手动填写 provider 与模型。",
 			providerEmpty: "选择 provider",
 			modelEmpty: "选择模型",
+			pickerUnavailable: "模型选择器不可用——请重新加载设置页后重试。",
 			groupIntent: "意图分类",
 			groupDelegate: "委派与模型链",
 			groupTodo: "续推",
@@ -2096,6 +2098,11 @@ window.__ModuleLoader__.load({
 					getSession: () => ctx.remote.session
 				};
 				let arrival = null;
+				// The picker chunk has its own arrival state on purpose: a picker load
+				// failure must degrade only the rows that show a picker, never the card
+				// around them, so it is deliberately NOT a member of the settings-chunk
+				// Promise.all below.
+				const loadModelPickerChunk = lazyChunks(() => require.async("./client.model-picker.js"));
 				const ensureSettingsChunks = () => {
 					if (arrival === null) {
 						arrival = Promise.all([
@@ -2146,8 +2153,9 @@ window.__ModuleLoader__.load({
 				}
 				function SettingsCardWrapper(props) {
 					const cardArrival = useChunkArrival(ensureSettingsChunks);
+					const pickerArrival = useChunkArrival(loadModelPickerChunk);
 					if (cardArrival?.chunks) {
-						return react_jsx_runtime.jsx(cardArrival.chunks.settingsPage.WeirCard, { ...props, editors: cardArrival.chunks.editors });
+						return react_jsx_runtime.jsx(cardArrival.chunks.settingsPage.WeirCard, { ...props, editors: cardArrival.chunks.editors, modelPicker: pickerArrival?.chunks });
 					}
 					if (cardArrival?.error) {
 						return react_jsx_runtime.jsx("div", { style: settingsLoadFailedStyle, children: `${props.t("loadFailed")} ${describeChunkError(cardArrival.error)}` });

package/lib/client.model-picker.js

@@ -0,0 +1,232 @@
+window.__ModuleLoader__.load({
+	id: "weir-harness",
+	chunk: "client.model-picker.js",
+	factory: (require) => {
+		var module = { exports: {} };
+		var exports = module.exports;
+		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+		let react = require("react");
+		let react_jsx_runtime = require("react/jsx-runtime");
+		// Reusable composer-style model picker: one trigger showing
+		// "model · effort", expanding into a two-level menu (provider-grouped
+		// model list / reasoning-effort list). Self-contained catalog loading
+		// (lazy + backoff retries + manual retry) over the caller-provided
+		// session RPC accessor, and a React error boundary so a picker failure
+		// renders the caller's fallback instead of blanking the page.
+		//
+		// Package-local chunk (client-module-chunking): the picker was a
+		// separate `weir-model-picker` package until it turned out to be
+		// undeliverable — a bundle patch can only mount packages the profile can
+		// resolve, that package was private and never published, so every
+		// registry install lost it and the row failed to import. It is now one
+		// more chunk of this package, pulled by the composition root through
+		// `require.async` with its own arrival state, so a picker failure still
+		// degrades only the surfaces that show a picker.
+		const chevron = "url(\"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12' fill='none'%3E%3Cpath d='M3 4.5L6 7.5L9 4.5' stroke='%2381858C' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E\")";
+		const triggerStyle = {
+			borderRadius: "var(--dsw-radius-sm)",
+			maxWidth: "280px",
+			height: "28px",
+			color: "var(--dsw-alias-label-secondary)",
+			whiteSpace: "nowrap",
+			cursor: "pointer",
+			appearance: "none",
+			backgroundColor: "transparent",
+			backgroundImage: chevron,
+			backgroundPosition: "right 4px center",
+			backgroundRepeat: "no-repeat",
+			backgroundSize: "12px 12px",
+			border: "none",
+			outline: "none",
+			padding: "0 20px 0 8px",
+			fontSize: "13px",
+			fontWeight: 500,
+			lineHeight: "20px",
+			textAlign: "left",
+			overflow: "hidden",
+			textOverflow: "ellipsis"
+		};
+		const menuBaseStyle = {
+			position: "absolute",
+			top: "calc(100% + 4px)",
+			zIndex: 1000,
+			minWidth: "260px",
+			maxHeight: "320px",
+			overflowY: "auto",
+			background: "var(--dsw-specific-selector)",
+			border: "1px solid var(--dsw-alias-border-l2)",
+			borderRadius: "var(--dsw-radius-md)",
+			boxShadow: "var(--dsw-elevation-soft)",
+			padding: "4px"
+		};
+		const menuRowStyle = { display: "flex", alignItems: "center", justifyContent: "space-between", gap: "12px", width: "100%", padding: "8px 10px", borderRadius: "var(--dsw-radius-sm)", background: "none", border: "none", cursor: "pointer", fontSize: "13px", lineHeight: "18px", textAlign: "left", color: "var(--dsw-alias-label-primary)" };
+		const menuHeaderStyle = { fontSize: "11px", fontWeight: 600, textTransform: "uppercase", letterSpacing: "0.04em", color: "var(--dsw-alias-label-secondary)", padding: "8px 10px 2px" };
+		function ModelPickerField(props) {
+			const { value, onChange, getSession, t, disabled = false } = props;
+			const [open, setOpen] = react.useState(false);
+			const [pane, setPane] = react.useState("root");
+			const [align, setAlign] = react.useState("left");
+			const triggerRef = react.useRef(null);
+			const [catalog, setCatalog] = react.useState({ status: "idle", groups: [] });
+			const inflightRef = react.useRef(null);
+			const retriesRef = react.useRef(0);
+			const timerRef = react.useRef(void 0);
+			const rootRef = react.useRef(null);
+			const loadCatalog = react.useCallback(() => {
+				if (catalog.status === "ready" || inflightRef.current !== null) return;
+				setCatalog((current) => ({ ...current, status: "loading" }));
+				const session = getSession();
+				if (session === undefined || session === null) {
+					setCatalog({ status: "error", groups: [] });
+					scheduleRetry();
+					return;
+				}
+				inflightRef.current = session.modelCatalog().then((response) => {
+					inflightRef.current = null;
+					if (response.ok) {
+						setCatalog({ status: "ready", groups: response.value.groups ?? [] });
+						retriesRef.current = 0;
+					} else {
+						setCatalog({ status: "error", groups: [] });
+						scheduleRetry();
+					}
+				}).catch(() => {
+					inflightRef.current = null;
+					setCatalog({ status: "error", groups: [] });
+					scheduleRetry();
+				});
+			}, [catalog.status, getSession]);
+			const scheduleRetry = react.useCallback(() => {
+				if (timerRef.current !== void 0 || retriesRef.current >= 4) return;
+				const delay = 2000 * 2 ** retriesRef.current;
+				retriesRef.current += 1;
+				timerRef.current = setTimeout(() => {
+					timerRef.current = void 0;
+					setCatalog((current) => current.status === "error" ? { ...current, status: "idle" } : current);
+				}, delay);
+			}, []);
+			const retry = react.useCallback(() => {
+				if (timerRef.current !== void 0) {
+					clearTimeout(timerRef.current);
+					timerRef.current = void 0;
+				}
+				retriesRef.current = 0;
+				setCatalog({ status: "idle", groups: [] });
+			}, []);
+			// lazy load on mount and after manual retry
+			react.useEffect(() => {
+				loadCatalog();
+			}, [loadCatalog]);
+			react.useEffect(() => () => {
+				if (timerRef.current !== void 0) clearTimeout(timerRef.current);
+			}, []);
+			// open/close handling
+			react.useEffect(() => {
+				if (!open) return;
+				const onDown = (event) => {
+					if (rootRef.current?.contains(event.target) === true) return;
+					setOpen(false);
+					setPane("root");
+				};
+				const onKey = (event) => {
+					if (event.key === "Escape") {
+						setOpen(false);
+						setPane("root");
+					}
+				};
+				document.addEventListener("mousedown", onDown);
+				document.addEventListener("keydown", onKey);
+				return () => {
+					document.removeEventListener("mousedown", onDown);
+					document.removeEventListener("keydown", onKey);
+				};
+			}, [open]);
+			const groups = catalog.status === "ready" ? catalog.groups.filter((group) => group.models?.length > 0) : [];
+			const models = groups.flatMap((group) => group.models.map((model) => ({ group, model })));
+			const provider = (value?.provider ?? "").trim();
+			const model = (value?.model ?? "").trim();
+			const effort = (value?.reasoningEffort ?? "").trim();
+			const current = models.find((entry) => entry.group.id === provider && entry.model.id === model);
+			const reasoning = current?.model.reasoning;
+			const effortChoices = reasoning === undefined ? [] : [
+				...(reasoning.defaultEffort === undefined ? [{ id: "", label: t("effortProviderDefault") }] : []),
+				...(reasoning.efforts ?? []).map((entry) => ({ id: entry.id, label: entry.name }))
+			];
+			const modelLabel = current?.model.name ?? (provider || model ? `${provider}/${model}` : t("modelEmpty"));
+			const effortLabel = reasoning === undefined ? "" : effortChoices.find((choice) => choice.id === effort)?.label ?? (effort || t("effortProviderDefault"));
+			const menuRow = (item) => react_jsx_runtime.jsxs("button", { type: "button", style: menuRowStyle, onClick: () => item.onSelect(), children: [
+				react_jsx_runtime.jsx("span", { children: item.label }),
+				item.checked ? react_jsx_runtime.jsx("span", { style: { opacity: 0.9 }, children: "✓" }) : item.chevron ? react_jsx_runtime.jsx("span", { style: { opacity: 0.6 }, children: "›" }) : null
+			] });
+			return react_jsx_runtime.jsxs("div", { ref: rootRef, style: { position: "relative" }, children: [
+				react_jsx_runtime.jsx("button", {
+					ref: triggerRef,
+					type: "button",
+					style: triggerStyle,
+					disabled,
+					onClick: () => {
+						if (catalog.status === "error") retry();
+						// Viewport-aware alignment: grow right when the trigger
+						// sits near the left (e.g. inside an editor panel),
+						// grow left when it sits near the right edge (settings
+						// rows) — otherwise the menu overflows its container.
+						const rect = triggerRef.current?.getBoundingClientRect();
+						if (rect) setAlign(rect.left + 272 < (globalThis.innerWidth ?? 100000) ? "left" : "right");
+						setOpen(!open);
+						setPane("root");
+					},
+					children: catalog.status === "ready" ? `${modelLabel}${effortLabel ? ` · ${effortLabel}` : ""}` : catalog.status === "error" ? (provider || model ? modelLabel : t("catalogFailed")) : t("catalogLoading")
+				}),
+				open ? react_jsx_runtime.jsxs("div", { role: "menu", style: { ...menuBaseStyle, ...(align === "left" ? { left: 0 } : { right: 0 }) }, children: pane === "root" ? [
+					menuRow({ label: t("pickerModel"), chevron: true, onSelect: () => setPane("model") }),
+					menuRow({ label: t("pickerEffort"), chevron: true, onSelect: () => setPane("effort") })
+				] : pane === "model" ? groups.flatMap((group) => [
+					react_jsx_runtime.jsx("div", { style: menuHeaderStyle, children: group.id, key: `h-${group.id}` }),
+					...group.models.map((entry) => menuRow({
+						label: entry.name ?? entry.id,
+						checked: provider === group.id && model === entry.id,
+						onSelect: () => {
+							onChange({
+								provider: group.id,
+								model: entry.id,
+								reasoningEffort: entry.reasoning?.defaultEffort ?? ""
+							});
+							setOpen(false);
+							setPane("root");
+						}
+					}))
+				]) : effortChoices.map((choice) => menuRow({
+					label: choice.label,
+					checked: choice.id === "" ? !effort : effort === choice.id,
+					onSelect: () => {
+						onChange({
+							provider,
+							model,
+							reasoningEffort: choice.id
+						});
+						setOpen(false);
+						setPane("root");
+					}
+				})) }) : null
+			] });
+		}
+		var ModelPickerBoundary = class extends react.Component {
+			constructor(props) {
+				super(props);
+				this.state = { failed: false };
+			}
+			static getDerivedStateFromError() {
+				return { failed: true };
+			}
+			componentDidCatch(error) {
+				console.error("weir-model-picker contained:", error);
+			}
+			render() {
+				return this.state.failed ? this.props.fallback : this.props.children;
+			}
+		};
+		exports.ModelPickerField = ModelPickerField;
+		exports.ModelPickerBoundary = ModelPickerBoundary;
+		return module.exports;
+	}
+});