@ran-sh/dsh-crew 1.0.2 → 1.1.0

package/lib/client.js

@@ -195,7 +195,7 @@ function runtimeState(runtime, readinessSnapshot) {
 }
 function bridgeState(surface) {
 	if (surface === "official-bridge") return READINESS_STATES.READY;
-	if (surface === "native-crew-harness") return READINESS_STATES.UNAVAILABLE;
+	if (surface === "native-crew-harness") return READINESS_STATES.UNKNOWN;
 	return READINESS_STATES.UNKNOWN;
 }
 /** Project only structured, non-secret installer/runtime evidence. */
@@ -265,12 +265,31 @@ function classifyCrewSurface({ bridgeStatus, runtime } = {}) {
 	if (runtime?.ok === true && runtime.service === "dsh-crew-hub" && (runtime.surface === CREW_UI_SURFACES.NATIVE || runtime.surface === void 0)) return CREW_UI_SURFACES.NATIVE;
 	return CREW_UI_SURFACES.UNKNOWN;
 }
+/**
+* Surface capability model. The NATIVE 3210 Crew harness is the single full
+* control plane; the OFFICIAL 3080 surface is a narrow quick-controls panel
+* (total switch, flash/pro model priority, vision/imagegen toggles) plus a
+* deep link back to 3210. Unknown surfaces get diagnostics only — never write
+* authority. This replaces the old binary full-vs-minimal assumption.
+*/
 function surfaceResponsibilities(surface) {
-	const fullControlPlane = surface === CREW_UI_SURFACES.OFFICIAL;
-	return {
-		fullControlPlane,
-		minimalDiagnostics: !fullControlPlane
-	};
+	switch (surface) {
+		case CREW_UI_SURFACES.NATIVE: return {
+			fullControlPlane: true,
+			quickControlPlane: true,
+			diagnostics: true
+		};
+		case CREW_UI_SURFACES.OFFICIAL: return {
+			fullControlPlane: false,
+			quickControlPlane: true,
+			diagnostics: true
+		};
+		default: return {
+			fullControlPlane: false,
+			quickControlPlane: false,
+			diagnostics: true
+		};
+	}
 }
 //#endregion
 //#region src/client/task-telemetry.mjs
@@ -511,6 +530,13 @@ const COPY = {
 		providerJobs: (count) => `${count} 个运行任务`,
 		providerOfficialBuiltin: "· 官方内置（不可删除）",
 		providerSourceUnresolved: "· 来源未解析（安全锁定）",
+		providerLayerMigration: "检测到旧版 profile Provider",
+		providerLayerMigrationHint: "这些 Provider 仍在 Crew profile/base 层，所以 3210 原生页面不会显示删除。请先按迁移计划提升到 Harness 用户设置层；不会复制密钥。",
+		providerLayerMigrationPlan: "迁移计划",
+		providerLayerMigrate: "迁移到用户层",
+		providerLayerMigrating: "迁移中…",
+		providerLayerMigrationConfirm: "确认把这个 Provider 移到 Harness 用户设置层？会先保存可回滚快照，不会复制密钥值。",
+		providerLayerRollback: "回滚迁移",
 		providerDeletePlan: "生成删除计划",
 		providerDelete: "确认删除",
 		providerPlanReady: "计划已生成；再次确认后才会修改 3210 配置。",
@@ -537,8 +563,8 @@ const COPY = {
 		credentialPurging: "清理中…",
 		credentialPurgeUnavailable: "凭据清理不可用",
 		credentialPurgeUnverified: "已执行清理，但验证失败；引用仍保留用于恢复检查",
-		customProviders: "自定义 Provider",
-		addProvider: "＋ 添加 Provider",
+		customProviders: "多模态适配器",
+		addProvider: "＋ 添加多模态适配器",
 		noCustomProviders: "暂无。添加后会出现在上方的视觉 / 生图 provider 选择里。",
 		providerName: "名称",
 		modelsField: "模型列表（逗号分隔）",
@@ -842,6 +868,13 @@ const COPY = {
 		providerJobs: (count) => `${count} running jobs`,
 		providerOfficialBuiltin: "· official built-in (immutable)",
 		providerSourceUnresolved: "· source unresolved (locked)",
+		providerLayerMigration: "Legacy profile Providers detected",
+		providerLayerMigrationHint: "These Providers still exist in the Crew profile/base layer, so the native 3210 page cannot show Delete. Promote them to Harness user settings with an explicit plan; keys are never copied.",
+		providerLayerMigrationPlan: "Migration plan",
+		providerLayerMigrate: "Migrate to user layer",
+		providerLayerMigrating: "Migrating…",
+		providerLayerMigrationConfirm: "Move this Provider into Harness user settings? A rollback snapshot is saved first; credential values are never copied.",
+		providerLayerRollback: "Rollback migration",
 		providerDeletePlan: "Plan deletion",
 		providerDelete: "Confirm delete",
 		providerPlanReady: "Plan ready; a second confirmation is required before changing 3210 config.",
@@ -868,8 +901,8 @@ const COPY = {
 		credentialPurging: "Purging…",
 		credentialPurgeUnavailable: "Credential purge unavailable",
 		credentialPurgeUnverified: "Purge ran but verification failed; the reference remains visible for recovery",
-		customProviders: "Custom providers",
-		addProvider: "＋ Add provider",
+		customProviders: "Multimodal adapters",
+		addProvider: "＋ Add multimodal adapter",
 		noCustomProviders: "None yet. Added providers appear in the vision / image-gen selects above.",
 		providerName: "Name",
 		modelsField: "Models (comma-separated)",
@@ -1577,7 +1610,7 @@ function WorkersPanel({ ctx }) {
 		} catch {}
 	}, [get]);
 	(0, react.useEffect)(() => {
-		if (surface !== CREW_UI_SURFACES.OFFICIAL) return void 0;
+		if (!surfaceResponsibilities(surface).fullControlPlane) return void 0;
 		refreshAll();
 		const timer = setInterval(() => {
 			Promise.all([get("/jobs"), get("/provider-health").catch(() => null)]).then(([j, health]) => {
@@ -1661,10 +1694,10 @@ function WorkersPanel({ ctx }) {
 		withLang
 	]);
 	(0, react.useEffect)(() => {
-		if (surface === CREW_UI_SURFACES.OFFICIAL) refreshHarnessModels();
+		if (surfaceResponsibilities(surface).fullControlPlane) refreshHarnessModels();
 	}, [surface, refreshHarnessModels]);
 	(0, react.useEffect)(() => {
-		if (surface === CREW_UI_SURFACES.OFFICIAL) refreshProviderInventory();
+		if (surfaceResponsibilities(surface).fullControlPlane) refreshProviderInventory();
 	}, [surface, refreshProviderInventory]);
 	const act = (0, react.useCallback)(async (target, confirmName) => {
 		if (confirmName && !window.confirm(copy.confirmRestore(confirmName))) return;
@@ -1707,6 +1740,34 @@ function WorkersPanel({ ctx }) {
 		get,
 		copy
 	]);
+	/** Request a Crew 3210 restart through the durable supervisor channel
+	*  (hub writes the request; the Windows watcher executes it). Polls until
+	*  VERIFIED or a terminal failure. Same-origin against the 3210 API — the
+	*  legacy 3080 supervisor endpoint is retired. */
+	const requestRestart = (0, react.useCallback)(async (reason) => {
+		const created = await post("/runtime/restart-request", {
+			confirm: true,
+			reason: reason ?? "configuration change"
+		});
+		if (!created.ok) throw new Error(created.code ?? created.error ?? copy.providerLifecycleError);
+		const requestId = created.request_id;
+		const deadline = Date.now() + 9e4;
+		for (;;) {
+			await new Promise((resolve) => setTimeout(resolve, 1e3));
+			if (Date.now() > deadline) throw new Error("Crew restart timed out");
+			const status = await get(`/runtime/restart-status?id=${encodeURIComponent(requestId)}`);
+			if (!status.ok) continue;
+			if (status.state === "VERIFIED") return {
+				ok: true,
+				...status
+			};
+			if (status.state !== "RESTART_REQUESTED") throw new Error(status.state ?? "Crew restart failed");
+		}
+	}, [
+		post,
+		get,
+		copy
+	]);
 	/** Selects & checkboxes: apply immediately. */
 	const field = (key, value) => {
 		setConfig((c) => ({
@@ -2006,13 +2067,7 @@ function WorkersPanel({ ctx }) {
 			}), path);
 			if (!result.ok) throw new Error(result.code ?? result.error ?? copy.providerLifecycleError);
 			if (result.restart_required === true && result.result?.state === "RESTART_PENDING") {
-				const restartPath = "http://127.0.0.1:3080/_dsh/dsh-crew/supervisor/restart";
-				const restarted = await readJson(await fetch(restartPath, {
-					method: "POST",
-					headers: { "content-type": "application/json" },
-					body: JSON.stringify({ confirm: true })
-				}), restartPath);
-				if (!restarted.ok) throw new Error(restarted.code ?? restarted.error ?? copy.providerLifecycleError);
+				await requestRestart("provider delete");
 				const verified = await post(`/providers/${encoded}/verify-delete`, {
 					transaction_id: planned.plan.plan_id,
 					confirm: true
@@ -2030,6 +2085,68 @@ function WorkersPanel({ ctx }) {
 			setProviderLifecycleBusy(null);
 		}
 	};
+	const migrateHarnessProvider = async (entry) => {
+		if (!entry || !["promote-existing-user", "materialize-user"].includes(entry.action)) {
+			setNotice(entry?.blocked_reason ?? copy.providerLayerMigrationHint);
+			return;
+		}
+		if (!window.confirm(copy.providerLayerMigrationConfirm)) return;
+		const id = String(entry.provider_id ?? "");
+		if (!id) return;
+		setProviderLifecycleBusy(`migrate:${id}`);
+		setNotice(copy.providerLayerMigrating);
+		try {
+			const encoded = encodeURIComponent(id);
+			const planned = await post(`/providers/${encoded}/migrate-plan`, {});
+			if (!planned.ok || !planned.plan) throw new Error(planned.code ?? copy.providerLifecycleError);
+			if (!window.confirm(`${copy.providerLayerMigrationConfirm}\n\n${id}`)) return;
+			const result = await post(`/providers/${encoded}/migrate`, {
+				plan_id: planned.plan.plan_id,
+				confirm: true
+			});
+			if (!result.ok) throw new Error(result.code ?? result.error ?? copy.providerLifecycleError);
+			if (result.restart_required === true && result.result?.state === "RESTART_PENDING") {
+				await requestRestart("provider migrate");
+				const verified = await post(`/providers/${encoded}/verify-migration`, {
+					transaction_id: planned.plan.plan_id,
+					confirm: true
+				});
+				if (!verified.ok || verified.state !== "VERIFIED") throw new Error(verified.code ?? verified.error ?? copy.providerLifecycleError);
+			}
+			setNotice(copy.saved);
+			await refreshProviderInventory();
+		} catch (error) {
+			try {
+				await refreshProviderInventory();
+			} catch {}
+			setNotice(String(error?.message ?? error));
+		} finally {
+			setProviderLifecycleBusy(null);
+		}
+	};
+	const rollbackHarnessMigration = async (record, transactionId) => {
+		if (!record?.id || !transactionId || !window.confirm(copy.providerRollbackConfirm)) return;
+		setProviderLifecycleBusy(`rollback-migrate:${record.id}`);
+		setNotice(copy.working);
+		try {
+			const encoded = encodeURIComponent(record.id);
+			const result = await post(`/providers/${encoded}/rollback-migration`, {
+				transaction_id: transactionId,
+				confirm: true
+			});
+			if (!result.ok) throw new Error(result.code ?? result.error ?? copy.providerLifecycleError);
+			if (result.restart_required === true) await requestRestart("provider migrate");
+			setNotice(copy.saved);
+			await refreshProviderInventory();
+		} catch (error) {
+			setNotice(String(error?.message ?? error));
+			try {
+				await refreshProviderInventory();
+			} catch {}
+		} finally {
+			setProviderLifecycleBusy(null);
+		}
+	};
 	const rollbackHarnessProvider = async (record, transactionId, transactionState = "VERIFIED") => {
 		const continuing = ["ROLLBACK_PENDING", "ROLLBACK_RESTART_PENDING"].includes(transactionState);
 		const recoverable = [
@@ -2063,13 +2180,7 @@ function WorkersPanel({ ctx }) {
 			});
 			if (!result.ok) throw new Error(result.code ?? result.error ?? copy.providerLifecycleError);
 			if (result.restart_required === true && result.state === "ROLLBACK_PENDING") {
-				const restartPath = "http://127.0.0.1:3080/_dsh/dsh-crew/supervisor/restart";
-				const restarted = await readJson(await fetch(restartPath, {
-					method: "POST",
-					headers: { "content-type": "application/json" },
-					body: JSON.stringify({ confirm: true })
-				}), restartPath);
-				if (!restarted.ok) throw new Error(restarted.code ?? restarted.error ?? copy.providerLifecycleError);
+				await requestRestart("provider migrate");
 				const verified = await post(`/providers/${encoded}/verify-rollback`, {
 					transaction_id: transactionId,
 					confirm: true
@@ -3642,6 +3753,78 @@ function WorkersPanel({ ctx }) {
 							},
 							children: providerInventoryError
 						}),
+						!providerInventoryError && (providerInventory?.migration?.providers?.length ?? 0) > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							style: {
+								border: "1px solid rgba(201,135,53,0.45)",
+								borderRadius: 7,
+								padding: "8px 10px",
+								marginBottom: 8
+							},
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									style: {
+										fontWeight: 650,
+										fontSize: 12.5
+									},
+									children: copy.providerLayerMigration
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									style: {
+										fontSize: 11.5,
+										opacity: .7,
+										marginTop: 3
+									},
+									children: copy.providerLayerMigrationHint
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									style: {
+										fontSize: 11,
+										marginTop: 6,
+										fontFamily: "monospace"
+									},
+									children: (providerInventory.migration.providers ?? []).map((entry) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										style: {
+											display: "flex",
+											alignItems: "center",
+											gap: 6,
+											marginTop: 3
+										},
+										children: [
+											entry.provider_id,
+											" · ",
+											entry.action,
+											entry.harness_default ? " · Harness Default" : "",
+											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { style: { flex: 1 } }),
+											["promote-existing-user", "materialize-user"].includes(entry.action) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+												type: "button",
+												style: {
+													...S.btn,
+													padding: "2px 7px"
+												},
+												disabled: providerLifecycleBusy !== null,
+												onClick: () => {
+													migrateHarnessProvider(entry);
+												},
+												children: providerLifecycleBusy === `migrate:${entry.provider_id}` ? copy.providerLayerMigrating : copy.providerLayerMigrate
+											})
+										]
+									}, entry.provider_id))
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("a", {
+									href: "http://127.0.0.1:3210/",
+									target: "_blank",
+									rel: "noopener noreferrer",
+									style: {
+										...S.btn,
+										display: "inline-block",
+										textDecoration: "none",
+										marginTop: 7,
+										padding: "3px 8px"
+									},
+									children: [copy.providerLayerMigrationPlan, " → 3210"]
+								})
+							]
+						}),
 						!providerInventoryError && (providerInventory?.records?.length ?? 0) === 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							style: {
 								fontSize: 12,
@@ -3673,7 +3856,10 @@ function WorkersPanel({ ctx }) {
 								"DELETE_RESTART_PENDING",
 								"ROLLBACK_RESTART_PENDING",
 								"ROLLBACK_RESTORED",
-								"ROLLBACK_APPLYING"
+								"ROLLBACK_APPLYING",
+								"PREPARED",
+								"USER_MATERIALIZED",
+								"BASE_REMOVED"
 							].includes(entry.state)).sort((a, b) => String(a.updated_at ?? "").localeCompare(String(b.updated_at ?? ""))).at(-1);
 							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 								style: {
@@ -3741,7 +3927,7 @@ function WorkersPanel({ ctx }) {
 										"ROLLBACK_RESTART_PENDING",
 										"ROLLBACK_RESTORED",
 										"ROLLBACK_APPLYING"
-									].includes(rollbackTransaction?.state)) && rollbackTransaction && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									].includes(rollbackTransaction?.state)) && rollbackTransaction && rollbackTransaction.source !== "provider-layer-migration" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 										type: "button",
 										style: {
 											...S.btn,
@@ -3752,6 +3938,18 @@ function WorkersPanel({ ctx }) {
 											rollbackHarnessProvider(record, rollbackTransaction.transaction_id, rollbackTransaction.state);
 										},
 										children: providerLifecycleBusy === `rollback:${record.id}` ? copy.working : rollbackTransaction.state === "ROLLBACK_PENDING" ? copy.providerRollbackContinue : copy.providerRollback
+									}),
+									rollbackTransaction?.source === "provider-layer-migration" && rollbackTransaction.transaction_id && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										style: {
+											...S.btn,
+											padding: "2px 8px"
+										},
+										disabled: providerLifecycleBusy !== null,
+										onClick: () => {
+											rollbackHarnessMigration(record, rollbackTransaction.transaction_id);
+										},
+										children: providerLifecycleBusy === `rollback-migrate:${record.id}` ? copy.working : copy.providerLayerRollback
 									})
 								]
 							}, record.id);
@@ -4577,7 +4775,7 @@ function WorkersPanel({ ctx }) {
 }
 function apply$1(ctx) {
 	let runningCount = 0;
-	let officialSurface = null;
+	let badgeSurface = null;
 	ctx.slots.inject("settings.section", () => {
 		let dispose = register();
 		function register() {
@@ -4606,11 +4804,14 @@ function apply$1(ctx) {
 		const poll = async () => {
 			if (document.visibilityState !== "visible") return;
 			try {
-				if (officialSurface === null) {
-					const response = await fetch(`${API}/bridge-status`, { cache: "no-store" });
-					officialSurface = classifyCrewSurface({ bridgeStatus: response.ok ? await response.json() : null }) === CREW_UI_SURFACES.OFFICIAL;
+				if (badgeSurface === null) {
+					const [bridgeStatus, runtime] = await Promise.all([fetch(`${API}/bridge-status`, { cache: "no-store" }).then((r) => r.ok ? r.json() : null).catch(() => null), fetch(`${API}/runtime`, { cache: "no-store" }).then((r) => r.ok ? r.json() : null).catch(() => null)]);
+					badgeSurface = surfaceResponsibilities(classifyCrewSurface({
+						bridgeStatus,
+						runtime
+					})).fullControlPlane;
 				}
-				if (!officialSurface) return;
+				if (!badgeSurface) return;
 				const r = await (await fetch(`${API}/jobs`, { cache: "no-store" })).json();
 				const n = r.ok ? (r.jobs ?? []).filter((j) => j.status === "running").length : 0;
 				if (n !== runningCount) {