dsh-github-copilot 0.4.0-alpha.25 → 0.4.0-alpha.27

package/lib/client.js

@@ -5113,7 +5113,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				return required(ZodNonOptional, this, args[0]);
 			}
 		});
-		function object(shape, params) {
+		function object$1(shape, params) {
 			const def = {
 				type: "object",
 				shape: shape ?? {},
@@ -5380,36 +5380,36 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		//#region lib/types/dual-model-remote.js
 		const id = string().min(1).max(512);
 		const revision = number().int().nonnegative().max(Number.MAX_SAFE_INTEGER);
-		const DualModelConfigSchema = object({
+		const DualModelConfigSchema = object$1({
 			enabled: boolean(),
 			plannerModel: string().max(512),
 			executorModel: string().max(512)
 		}).strict();
-		const DualModelViewSchema = object({
+		const DualModelViewSchema = object$1({
 			supported: boolean(),
 			diagnostic: string().min(1).max(128).optional(),
 			writable: boolean(),
 			revision: revision.nullable(),
 			configuration: DualModelConfigSchema,
-			models: array(object({
+			models: array(object$1({
 				id,
 				name: string().min(1).max(1024)
 			}).strict()).max(512),
-			workspaces: array(object({
+			workspaces: array(object$1({
 				id,
 				name: string().min(1).max(1024)
 			}).strict()).max(1024)
 		}).strict();
-		const DualModelSaveSchema = object({
+		const DualModelSaveSchema = object$1({
 			configuration: DualModelConfigSchema,
 			expectedRevision: revision
 		}).strict();
-		const DualModelCreateSchema = object({
+		const DualModelCreateSchema = object$1({
 			requestId: string().uuid(),
 			workspaceId: id,
 			expectedRevision: revision
 		}).strict();
-		const DualModelCreateResultSchema = object({ sessionId: id }).strict();
+		const DualModelCreateResultSchema = object$1({ sessionId: id }).strict();
 		const contribution$2 = {
 			package: "dsh-github-copilot",
 			descriptors: [
@@ -5454,9 +5454,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		};
 		//#endregion
 		//#region lib/types/search-routing-remote.js
-		const SearchProviderCatalogSchema = object({
+		const SearchProviderCatalogSchema = object$1({
 			supported: boolean(),
-			providers: array(object({ id: string().min(1).max(512) }).strict()).max(512)
+			providers: array(object$1({ id: string().min(1).max(512) }).strict()).max(512)
 		}).strict();
 		const contribution$1 = {
 			package: "dsh-github-copilot",
@@ -5477,7 +5477,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		*/
 		const direct = { kind: "direct" };
 		const GITHUB_COPILOT_AUTHORIZATION_VIEW_TYPE_SYMBOL = "dsh-github-copilot#GitHubCopilotAuthorizationView";
-		const GitHubCopilotAuthorizationViewSchema = object({
+		const GitHubCopilotAuthorizationViewSchema = object$1({
 			phase: _enum([
 				"signed-out",
 				"authorizing",
@@ -5487,12 +5487,12 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			configured: boolean(),
 			writable: boolean(),
 			inFlight: boolean(),
-			notices: array(object({
+			notices: array(object$1({
 				message: string(),
 				url: string().optional(),
 				code: string().optional()
 			}).strict()),
-			catalog: object({
+			catalog: object$1({
 				state: _enum([
 					"current",
 					"partially-outdated",
@@ -5504,7 +5504,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				temporarilyUnavailableModelIds: array(string()).optional(),
 				previewModelIds: array(string()).optional()
 			}).strict().optional(),
-			accountModels: object({
+			accountModels: object$1({
 				state: _enum([
 					"idle",
 					"loading",
@@ -5515,23 +5515,23 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					"unconfigured",
 					"unavailable"
 				]),
-				models: array(object({
+				models: array(object$1({
 					id: string(),
 					name: string(),
 					api: string()
 				}).strict()).max(512),
-				rejected: array(object({
+				rejected: array(object$1({
 					id: string().optional(),
 					code: string()
 				}).strict()).max(1024),
-				warnings: array(object({
+				warnings: array(object$1({
 					id: string(),
 					code: string()
 				}).strict()).max(1024).optional(),
 				discoveredAt: number().int().nonnegative().optional(),
 				error: string().optional()
 			}).strict().optional(),
-			route: object({
+			route: object$1({
 				state: _enum([
 					"ready",
 					"needs-repair",
@@ -5549,34 +5549,34 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		}).strict();
 		const result = strictRemoteCodec(GITHUB_COPILOT_AUTHORIZATION_VIEW_TYPE_SYMBOL, GitHubCopilotAuthorizationViewSchema);
 		const GITHUB_COPILOT_MIGRATION_STATUS_TYPE_SYMBOL = "dsh-github-copilot#GitHubCopilotMigrationStatus";
-		const selectionSchema = object({
+		const selectionSchema = object$1({
 			provider: string().min(1).max(512),
 			model: string().min(1).max(512),
 			reasoningEffort: string().min(1).max(512).optional()
 		}).strict();
 		/** Independent Ops result: strict at every object level; no account or private Session data. */
-		const GitHubCopilotMigrationStatusSchema = object({
-			plugin: object({
+		const GitHubCopilotMigrationStatusSchema = object$1({
+			plugin: object$1({
 				name: literal("dsh-github-copilot"),
 				version: string().min(1).max(512)
 			}).strict(),
 			protocolVersion: literal(1),
 			historyScope: literal("live-agents-only"),
 			observedAt: number().int().nonnegative().max(Number.MAX_SAFE_INTEGER),
-			capabilities: object({
+			capabilities: object$1({
 				agentsList: boolean(),
 				sessionProjections: boolean(),
 				settingsCas: boolean(),
 				providerRegistry: boolean(),
 				defaultSelection: boolean()
 			}).strict(),
-			complete: object({
+			complete: object$1({
 				sessions: boolean(),
 				defaultSelection: boolean(),
 				routes: boolean()
 			}).strict(),
 			defaultSelection: selectionSchema.nullable(),
-			sessions: array(object({
+			sessions: array(object$1({
 				id: string().min(1).max(512),
 				status: _enum(["idle", "running"]),
 				effectiveSelection: selectionSchema.nullable(),
@@ -5588,7 +5588,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				]),
 				activeRequestSelection: selectionSchema.nullable()
 			}).strict()).max(1024),
-			routes: object({
+			routes: object$1({
 				nativeConfigured: boolean().nullable(),
 				nativeRegistered: boolean().nullable(),
 				managedRegistered: boolean().nullable()
@@ -5894,6 +5894,36 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			};
 		}
 		//#endregion
+		//#region lib/types/native-select-style.js
+		const optionStyle = {
+			backgroundColor: "var(--dsw-alias-bg-layer-1, Canvas)",
+			color: "var(--dsw-alias-label-primary, CanvasText)"
+		};
+		const disabledOptionStyle = {
+			...optionStyle,
+			color: "var(--dsw-alias-label-secondary, GrayText)"
+		};
+		const selectStyle = {
+			...optionStyle,
+			width: "100%",
+			minWidth: 0,
+			boxSizing: "border-box",
+			padding: "9px 11px",
+			borderRadius: "9px",
+			border: "1px solid var(--dsw-alias-border-l2, ButtonBorder)",
+			font: "inherit"
+		};
+		const disabledSelectStyle = {
+			...selectStyle,
+			color: "var(--dsw-alias-label-secondary, GrayText)"
+		};
+		function nativeSelectStyle(disabled = false) {
+			return disabled ? disabledSelectStyle : selectStyle;
+		}
+		function nativeOptionStyle(disabled = false) {
+			return disabled ? disabledOptionStyle : optionStyle;
+		}
+		//#endregion
 		//#region lib/types/web-search-routing-card.js
 		const GITHUB_COPILOT_SETTINGS_NAMESPACE = "github-copilot";
 		const WEB_SEARCH_ROUTING_SETTINGS_NAMESPACE = "github-copilot-search-routing";
@@ -5915,7 +5945,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			gap: "6px",
 			minWidth: 0
 		};
-		const controlStyle$1 = {
+		const controlStyle = {
 			width: "100%",
 			minWidth: 0,
 			boxSizing: "border-box",
@@ -6149,11 +6179,13 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			]);
 			const providerOptions = () => providers.map((id) => (0, react.createElement)("option", {
 				key: id,
-				value: id
+				value: id,
+				style: nativeOptionStyle()
 			}, id));
 			const unavailableOption = (id, known) => known ? null : (0, react.createElement)("option", {
 				value: id,
-				disabled: true
+				disabled: true,
+				style: nativeOptionStyle(true)
 			}, `${id || "(empty)"} — unavailable`);
 			return (0, react.createElement)("section", {
 				style: cardStyle$1,
@@ -6170,7 +6202,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				fontSize: "13px",
 				fontWeight: 600
 			} }, "Search provider"), (0, react.createElement)("select", {
-				style: controlStyle$1,
+				style: nativeSelectStyle(disabled),
 				disabled,
 				value: draft.primary,
 				"data-dsh-web-search-mode": true,
@@ -6181,11 +6213,17 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						primary
 					}));
 				}
-			}, (0, react.createElement)("option", { value: "auto" }, "Auto — follow Chat"), draft.primary === "none" ? (0, react.createElement)("option", { value: "none" }, "Disabled — saved configuration") : null, ...providerOptions(), unavailableOption(draft.primary, primaryKnown))), (0, react.createElement)("label", { style: fieldStyle$1 }, (0, react.createElement)("span", { style: {
+			}, (0, react.createElement)("option", {
+				value: "auto",
+				style: nativeOptionStyle()
+			}, "Auto — follow Chat"), draft.primary === "none" ? (0, react.createElement)("option", {
+				value: "none",
+				style: nativeOptionStyle()
+			}, "Disabled — saved configuration") : null, ...providerOptions(), unavailableOption(draft.primary, primaryKnown))), (0, react.createElement)("label", { style: fieldStyle$1 }, (0, react.createElement)("span", { style: {
 				fontSize: "13px",
 				fontWeight: 600
 			} }, "Default search provider"), (0, react.createElement)("select", {
-				style: controlStyle$1,
+				style: nativeSelectStyle(disabled),
 				disabled,
 				value: draft.provider,
 				"data-dsh-web-search-provider": true,
@@ -6196,7 +6234,10 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 						provider
 					}));
 				}
-			}, (0, react.createElement)("option", { value: NO_DEFAULT_SEARCH_PROVIDER }, "None — no fallback"), ...providerOptions(), unavailableOption(draft.provider, fallbackKnown)), (0, react.createElement)("span", { style: hintStyle }, "Final fallback only: used when Auto has no matching provider or the primary search fails. The same provider is never retried as its own fallback.")), catalogReady && providers.length === 0 ? (0, react.createElement)("p", {
+			}, (0, react.createElement)("option", {
+				value: NO_DEFAULT_SEARCH_PROVIDER,
+				style: nativeOptionStyle()
+			}, "None — no fallback"), ...providerOptions(), unavailableOption(draft.provider, fallbackKnown)), (0, react.createElement)("span", { style: hintStyle }, "Final fallback only: used when Auto has no matching provider or the primary search fails. The same provider is never retried as its own fallback.")), catalogReady && providers.length === 0 ? (0, react.createElement)("p", {
 				role: "status",
 				style: hintStyle
 			}, "No search providers are registered. Enable a search provider, then reload settings.") : null, catalogReady && missingProvider ? (0, react.createElement)("p", {
@@ -6206,7 +6247,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				fontSize: "13px",
 				fontWeight: 600
 			} }, "Copilot search model"), (0, react.createElement)("input", {
-				style: controlStyle$1,
+				style: controlStyle,
 				list: "dsh-copilot-search-models",
 				disabled: disabled || missingCopilot,
 				value: draft.model,
@@ -6264,7 +6305,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			en: {
 				title: "Model roles",
 				description: "The planning model plans and reviews acceptance. The execution model changes code and runs tests.",
-				scope: "Only new dual-model sessions use this configuration. Existing sessions and the global default stay unchanged. Models are never substituted automatically.",
+				scope: "These role settings are profile-global, not workspace-specific. They apply only when you explicitly create a dedicated dual-model session. Ordinary and existing sessions, history, and the global default stay unchanged. Models are never substituted automatically.",
 				enabled: "Enable dual-model sessions",
 				planner: "Planning model",
 				executor: "Execution model",
@@ -6272,9 +6313,12 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				selectModel: "Select an available model",
 				unavailable: "unavailable",
 				modelsMissing: "Choose two available account models to save an enabled configuration. An unavailable saved model is kept, not replaced.",
-				workspace: "Workspace for the new session",
-				selectWorkspace: "Select a workspace",
-				noWorkspaces: "No accessible workspaces are available. Reload settings after opening a workspace.",
+				newSession: "New dedicated session",
+				sessionScope: "Create a new session in the current workspace using the saved role settings.",
+				workspace: "New session destination",
+				originalWorkspace: "Original destination (retained for this request)",
+				noWorkspace: "No current workspace. Open a workspace to create a session; you can still save role settings.",
+				currentWorkspaceUnavailable: "The current workspace is unavailable. Open an accessible workspace and reload settings before creating a session.",
 				save: "Save configuration",
 				saving: "Saving…",
 				create: "Create session with this configuration",
@@ -6291,7 +6335,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				revision: "A settings revision is unavailable. Reload settings before saving or creating a session.",
 				conflict: "These settings changed elsewhere. Reload settings to review the saved configuration before trying again.",
 				modelUnavailable: "A selected model is unavailable. Reload settings and choose available account models. No model was substituted.",
-				workspaceUnavailable: "The selected workspace is unavailable. Reload settings and choose an accessible workspace.",
+				workspaceUnavailable: "The creation workspace is unavailable. Open an accessible workspace and reload settings before creating a new session.",
 				loadError: "Could not load model roles. Reload settings to retry.",
 				saveError: "The save was not confirmed. Reload settings to check the saved configuration before trying again.",
 				uncertain: "Session creation is not confirmed. Retry the same request to recover its result without creating a duplicate. Workspace and configuration are held until confirmation.",
@@ -6304,7 +6348,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			zh: {
 				title: "模型分工",
 				description: "主模型负责规划与验收；执行模型负责修改代码和运行测试。",
-				scope: "仅对新建的双模型会话生效。已有会话和全局默认模型保持不变。不会自动替换模型。",
+				scope: "模型分工设置适用于整个配置档案，不按工作区保存；仅在显式新建专用双模型会话时生效。普通会话、已有会话、历史记录和全局默认模型保持不变。不会自动替换模型。",
 				enabled: "启用双模型会话",
 				planner: "主模型（规划）",
 				executor: "执行模型",
@@ -6312,9 +6356,12 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				selectModel: "选择可用模型",
 				unavailable: "不可用",
 				modelsMissing: "启用时须选择两个当前账号可用的模型才能保存。已保存但不可用的模型会保留，不会自动替换。",
-				workspace: "新会话的工作区",
-				selectWorkspace: "选择工作区",
-				noWorkspaces: "暂无可访问的工作区。打开工作区后重新加载设置。",
+				newSession: "新建专用会话",
+				sessionScope: "使用已保存的模型分工设置，在当前工作区新建会话。",
+				workspace: "新会话目标工作区",
+				originalWorkspace: "原目标工作区（为此请求保留）",
+				noWorkspace: "当前没有工作区。请打开工作区后新建会话；仍可保存模型分工设置。",
+				currentWorkspaceUnavailable: "当前工作区不可用。请打开可访问的工作区并重新加载设置后，再新建会话。",
 				save: "保存配置",
 				saving: "正在保存…",
 				create: "用此配置新建会话",
@@ -6331,7 +6378,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				revision: "无法获取设置版本。请重新加载设置后，再保存或新建会话。",
 				conflict: "设置已在其他位置修改。请重新加载，检查已保存的配置后再重试。",
 				modelUnavailable: "所选模型当前不可用。请重新加载设置并选择可用模型。未自动替换任何模型。",
-				workspaceUnavailable: "所选工作区当前不可用。请重新加载设置并选择可访问的工作区。",
+				workspaceUnavailable: "创建会话的目标工作区不可用。请打开可访问的工作区并重新加载设置后，再新建会话。",
 				loadError: "无法加载模型分工。请重新加载设置以重试。",
 				saveError: "尚未确认保存结果。请重新加载并检查已保存的配置后再重试。",
 				uncertain: "尚未确认会话创建结果。请重试同一请求以获取结果，避免重复创建。确认前将保持原工作区和配置不变。",
@@ -6400,17 +6447,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			fontSize: "13px",
 			fontWeight: 600
 		};
-		const controlStyle = {
-			width: "100%",
-			minWidth: 0,
-			boxSizing: "border-box",
-			padding: "9px 11px",
-			borderRadius: "9px",
-			color: "inherit",
-			border: "1px solid color-mix(in srgb, currentColor 24%, transparent)",
-			background: "color-mix(in srgb, currentColor 3%, transparent)",
-			font: "inherit"
-		};
 		const buttonStyle = {
 			padding: "9px 16px",
 			maxWidth: "100%",
@@ -6434,7 +6470,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			const id = (0, react.useId)();
 			const [view, setView] = (0, react.useState)();
 			const [draft, setDraft] = (0, react.useState)(off);
-			const [workspace, setWorkspace] = (0, react.useState)("");
 			const [phase, setPhase] = (0, react.useState)("loading");
 			const [message, setMessage] = (0, react.useState)();
 			const [needsReload, setNeedsReload] = (0, react.useState)(false);
@@ -6455,7 +6490,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				setNeedsReload(true);
 				const creation = creations.get(props.remote);
 				setPending(creation);
-				if (creation) setWorkspace(creation.input.workspaceId);
 				try {
 					const result = await props.remote.view();
 					if (!current()) return;
@@ -6485,7 +6519,6 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				owner.active = true;
 				setView(void 0);
 				setDraft(off);
-				setWorkspace("");
 				load();
 				return () => {
 					owner.active = false;
@@ -6499,7 +6532,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			const validModels = models.some((model) => model.id === draft.plannerModel) && models.some((model) => model.id === draft.executorModel);
 			const disabled = busy || !!pending || needsReload || !view?.supported || !view.writable || !validRevision(view.revision);
 			const saveDisabled = disabled || draft.enabled && !validModels;
-			const createDisabled = pending ? busy : disabled || dirty || !draft.enabled || !validModels || !view?.workspaces.some((item) => item.id === workspace);
+			const workspaceId = pending?.input.workspaceId ?? props.currentWorkspaceId;
+			const destination = view?.workspaces.find((item) => item.id === workspaceId);
+			const createDisabled = pending ? busy : disabled || dirty || !draft.enabled || !validModels || !destination;
 			const save = async () => {
 				const owner = lifecycle.current;
 				if (!owner.active || owner.busy || saveDisabled || !view || !validRevision(view.revision)) return;
@@ -6539,11 +6574,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				if (!owner.active || owner.busy || createDisabled) return;
 				let creation = creations.get(props.remote);
 				if (!creation) {
-					if (!view || !validRevision(view.revision)) return;
+					if (!view || !validRevision(view.revision) || !props.currentWorkspaceId || !view.workspaces.some((item) => item.id === props.currentWorkspaceId)) return;
 					try {
 						creation = { input: {
 							requestId: globalThis.crypto.randomUUID(),
-							workspaceId: workspace,
+							workspaceId: props.currentWorkspaceId,
 							expectedRevision: view.revision
 						} };
 					} catch {
@@ -6609,7 +6644,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					style: labelStyle
 				}, label), (0, react.createElement)("select", {
 					id: `${id}-${role}`,
-					style: controlStyle,
+					style: nativeSelectStyle(disabled),
 					value,
 					disabled,
 					[`data-dsh-dual-model-${role}`]: true,
@@ -6626,18 +6661,21 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					}
 				}, (0, react.createElement)("option", {
 					value: "",
-					disabled: true
+					disabled: true,
+					style: nativeOptionStyle(true)
 				}, t.selectModel), missing ? (0, react.createElement)("option", {
 					value,
-					disabled: true
+					disabled: true,
+					style: nativeOptionStyle(true)
 				}, `${value} (${t.unavailable})`) : null, ...models.map((model) => (0, react.createElement)("option", {
 					key: model.id,
-					value: model.id
+					value: model.id,
+					style: nativeOptionStyle()
 				}, model.name || model.id))));
 			};
 			const viewNotice = !view ? void 0 : !view.supported ? diagnostic(view.diagnostic) ?? "unsupported" : !view.writable ? "readonly" : !validRevision(view.revision) ? "revision" : void 0;
 			const status = phase === "loading" ? t.loading : message ? t[message] : "";
-			const shownWorkspace = pending?.input.workspaceId ?? workspace;
+			const workspaceLabel = destination?.name || (pending ? pending.input.workspaceId : destination ? t.workspace : workspaceId ? t.currentWorkspaceUnavailable : t.noWorkspace);
 			return (0, react.createElement)("section", {
 				style: cardStyle,
 				"data-dsh-dual-model-card": true,
@@ -6684,29 +6722,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			}, t.enabled)), field("planner", t.planner, draft.plannerModel), field("executor", t.executor, draft.executorModel), (0, react.createElement)("p", {
 				id: `${id}-model-help`,
 				style: textStyle
-			}, t.acceptance, view && draft.enabled && !validModels ? ` ${t.modelsMissing}` : ""), (0, react.createElement)("div", { style: fieldStyle }, (0, react.createElement)("label", {
-				htmlFor: `${id}-workspace`,
-				style: labelStyle
-			}, t.workspace), (0, react.createElement)("select", {
-				id: `${id}-workspace`,
-				style: controlStyle,
-				disabled,
-				value: shownWorkspace,
-				"data-dsh-dual-model-workspace": true,
-				onChange: (event) => {
-					const value = event.currentTarget.value;
-					if (!disabled && view?.workspaces.some((item) => item.id === value)) setWorkspace(value);
-				}
-			}, (0, react.createElement)("option", {
-				value: "",
-				disabled: true
-			}, t.selectWorkspace), shownWorkspace && !view?.workspaces.some((item) => item.id === shownWorkspace) ? (0, react.createElement)("option", {
-				value: shownWorkspace,
-				disabled: true
-			}, `${shownWorkspace} (${t.unavailable})`) : null, ...(view?.workspaces ?? []).map((item) => (0, react.createElement)("option", {
-				key: item.id,
-				value: item.id
-			}, item.name || item.id))), view && view.workspaces.length === 0 ? (0, react.createElement)("p", { style: textStyle }, t.noWorkspaces) : null), viewNotice ? (0, react.createElement)("p", { style: textStyle }, t[viewNotice]) : null, !pending && view && !viewNotice ? (0, react.createElement)("p", { style: textStyle }, dirty ? t.dirty : !draft.enabled ? t.disabled : "") : null, (0, react.createElement)("div", { style: {
+			}, t.acceptance, view && draft.enabled && !validModels ? ` ${t.modelsMissing}` : ""), viewNotice ? (0, react.createElement)("p", { style: textStyle }, t[viewNotice]) : null, (0, react.createElement)("div", { style: {
 				display: "flex",
 				gap: "12px",
 				flexWrap: "wrap",
@@ -6722,7 +6738,43 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				}
 			}, phase === "saving" ? t.saving : t.save), (0, react.createElement)("button", {
 				type: "button",
-				style: styleForButton(createDisabled),
+				style: styleForButton(busy || !!pending),
+				disabled: busy || !!pending,
+				title: t.reloadTitle,
+				"data-dsh-dual-model-reload": true,
+				onClick: () => {
+					if (!creations.has(props.remote)) load();
+				}
+			}, t.reload)), (0, react.createElement)("div", {
+				role: "group",
+				"aria-labelledby": `${id}-new-session`,
+				style: {
+					...fieldStyle,
+					gap: "8px",
+					borderTop: "1px solid color-mix(in srgb, currentColor 20%, transparent)",
+					paddingTop: "14px"
+				}
+			}, (0, react.createElement)("h4", {
+				id: `${id}-new-session`,
+				style: {
+					...labelStyle,
+					margin: 0
+				}
+			}, t.newSession), !pending ? (0, react.createElement)("p", { style: textStyle }, t.sessionScope) : null, (0, react.createElement)("div", { style: fieldStyle }, (0, react.createElement)("span", {
+				id: `${id}-workspace-label`,
+				style: labelStyle
+			}, pending ? t.originalWorkspace : t.workspace), (0, react.createElement)("p", {
+				id: `${id}-workspace`,
+				style: textStyle,
+				"aria-labelledby": `${id}-workspace-label`,
+				"data-dsh-dual-model-workspace": true,
+				"data-workspace-id": workspaceId
+			}, workspaceLabel)), !pending && view && !viewNotice ? (0, react.createElement)("p", { style: textStyle }, dirty ? t.dirty : !draft.enabled ? t.disabled : "") : null, (0, react.createElement)("button", {
+				type: "button",
+				style: {
+					...styleForButton(createDisabled),
+					justifySelf: "start"
+				},
 				disabled: createDisabled,
 				"data-dsh-dual-model-create": true,
 				onClick: () => {
@@ -6733,30 +6785,112 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 				"aria-live": "polite",
 				"aria-atomic": true,
 				style: textStyle
-			}, status), (0, react.createElement)("button", {
-				type: "button",
-				style: {
-					...styleForButton(busy || !!pending),
-					justifySelf: "start"
+			}, status));
+		}
+		//#endregion
+		//#region lib/types/current-workspace.js
+		const object = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+		function listOf(value) {
+			if (!object(value) || !object(value.list)) return void 0;
+			const list = value.list;
+			return typeof list.getSnapshot === "function" && typeof list.subscribe === "function" ? list : void 0;
+		}
+		function selectedSession(selection) {
+			if (!object(selection) || selection.phase !== "ready") return void 0;
+			if (Object.hasOwn(selection, "current")) return typeof selection.current === "string" && selection.current ? selection.current : void 0;
+			if (!object(selection.byId)) return void 0;
+			let selected;
+			for (const row of Object.values(selection.byId)) {
+				if (!object(row) || !object(row.retainedBy)) continue;
+				const count = row.retainedBy.mainView;
+				if (count === void 0 || count === 0) continue;
+				if (typeof count !== "number" || !Number.isSafeInteger(count) || count < 0 || typeof row.id !== "string" || !row.id || selected !== void 0) return void 0;
+				selected = row.id;
+			}
+			return selected;
+		}
+		function selectedWorkspace(sessions, workspaces) {
+			try {
+				const sessionId = selectedSession(sessions.getSnapshot()), registry = workspaces.getSnapshot();
+				if (sessionId === void 0 || !object(registry) || registry.phase !== "ready" || registry.state === "error" || !Array.isArray(registry.items)) return void 0;
+				let match;
+				for (const item of registry.items) {
+					if (!object(item) || typeof item.workspaceId !== "string" || !item.workspaceId || !Array.isArray(item.sessionIds)) return void 0;
+					if (!item.sessionIds.includes(sessionId)) continue;
+					if (match !== void 0) return void 0;
+					match = item.workspaceId;
+				}
+				return match;
+			} catch {
+				return;
+			}
+		}
+		/** Observe only current membership. Do not call navigation/create or use a recent-workspace fallback. */
+		function createCurrentWorkspaceSource(ctx) {
+			const listeners = /* @__PURE__ */ new Set();
+			let active = true;
+			let current;
+			const notify = () => {
+				if (active) for (const listener of listeners) listener();
+			};
+			const injection = ctx.inject(["sessions", "workspaces"], (scope) => {
+				if (!active) return;
+				const sessions = listOf(scope.get("sessions")), workspaces = listOf(scope.get("workspaces"));
+				if (!sessions || !workspaces) return;
+				const binding = {
+					sessions,
+					workspaces
+				};
+				let stopSessions, stopWorkspaces;
+				try {
+					stopSessions = sessions.subscribe(notify);
+					stopWorkspaces = workspaces.subscribe(notify);
+				} catch {
+					stopSessions?.();
+					stopWorkspaces?.();
+					return;
+				}
+				current = binding;
+				scope.effect(() => () => {
+					stopSessions?.();
+					stopWorkspaces?.();
+					if (current === binding) {
+						current = void 0;
+						notify();
+					}
+				});
+				notify();
+			});
+			return {
+				getSnapshot: () => active && current ? selectedWorkspace(current.sessions, current.workspaces) : void 0,
+				subscribe(listener) {
+					if (!active) return () => {};
+					listeners.add(listener);
+					return () => {
+						listeners.delete(listener);
+					};
 				},
-				disabled: busy || !!pending,
-				title: t.reloadTitle,
-				"data-dsh-dual-model-reload": true,
-				onClick: () => {
-					if (!creations.has(props.remote)) load();
+				dispose() {
+					if (!active) return;
+					active = false;
+					current = void 0;
+					listeners.clear();
+					injection.dispose();
 				}
-			}, t.reload));
+			};
 		}
 		//#endregion
 		//#region lib/types/dual-model-ui.js
 		const emptySubscribe = () => () => {};
-		function DualModelSurface({ ctx, close }) {
+		function DualModelSurface({ ctx, remote, workspaceSource, close }) {
 			const locale = ctx.get("locale");
 			const navigation = ctx.get("uiWorkspace");
 			const language = (0, react.useSyncExternalStore)(locale === void 0 ? emptySubscribe : (listener) => locale.subscribe(listener), () => locale?.getLocale().active ?? "en", () => "en");
+			const currentWorkspaceId = (0, react.useSyncExternalStore)(workspaceSource.subscribe, workspaceSource.getSnapshot, () => void 0);
 			return (0, react.createElement)(DualModelCard, {
-				remote: ctx.remote.githubCopilotDualModel,
+				remote,
 				locale: language,
+				currentWorkspaceId,
 				onOpenSession: navigation === void 0 ? void 0 : (id) => {
 					navigation.openSession(id);
 					close?.();
@@ -6765,7 +6899,9 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 		}
 		/** A single visible seat under Models, with a section fallback on older Clients. */
 		function registerDualModelUi(ctx) {
-			if (ctx.remote.githubCopilotDualModel === void 0) return () => {};
+			const remote = ctx.remote.githubCopilotDualModel;
+			if (remote === void 0) return () => {};
+			const workspaceSource = createCurrentWorkspaceSource(ctx);
 			let active = true, footerActive = false, sectionActive = false;
 			let fallback;
 			const syncFallback = () => {
@@ -6776,6 +6912,8 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 					label: "Copilot · Model roles"
 				}, (props) => (0, react.createElement)(DualModelSurface, {
 					ctx,
+					remote,
+					workspaceSource,
 					close: props.close
 				}));
 				else {
@@ -6793,7 +6931,11 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 							name: "settings.models.footer",
 							id: "github-copilot-dual-model",
 							order: 15
-						}, () => (0, react.createElement)(DualModelSurface, { ctx }));
+						}, () => (0, react.createElement)(DualModelSurface, {
+							ctx,
+							remote,
+							workspaceSource
+						}));
 						footerActive = true;
 						syncFallback();
 						let removed = false;
@@ -6822,6 +6964,7 @@ Set the \`cycles\` parameter to \`"ref"\` to resolve cyclical schemas with defs.
 			});
 			return () => {
 				active = false;
+				workspaceSource.dispose();
 				footer();
 				section();
 				fallback?.();