@qilin-agent/client-ui-workspace 3.1.6 → 3.1.7

package/lib/client.js

@@ -724,29 +724,49 @@ window.__ModuleLoader__.load({
 					};
 				}, "ui-workspace: Workspace navigation policy");
 			}
-			async connectWorkspace(workspaceId) {
+			async connectWorkspace(workspaceId, options) {
 				const workspace = this.workspaces.list.getSnapshot().items.find((item) => item.workspaceId === workspaceId);
 				if (workspace === void 0) throw new Error(`uiWorkspace.connectWorkspace: unknown workspace ${workspaceId}`);
 				const inflight = this.connecting.get(workspaceId);
-				if (inflight !== void 0) return inflight;
+				if (inflight !== void 0 && inflight.agentPreset === options?.agentPreset) return inflight.attempt;
 				const archived = this.workspaces.list.getSnapshot().archivedSessionIds;
 				const sessions = this.sessions.list.getSnapshot();
 				for (const id of sessions.ids) {
 					const summary = sessions.byId[id];
-					if (summary !== void 0 && summary.blank && summary.cwd === workspace.path && workspace.sessionIds.includes(summary.id) && !archived.includes(summary.id)) return summary.id;
+					const listed = summary?.projectionValues?.agentPreset;
+					if (summary !== void 0 && summary.blank && summary.cwd === workspace.path && workspace.sessionIds.includes(summary.id) && !archived.includes(summary.id) && (options?.agentPreset === void 0 || typeof listed !== "string" || listed === options.agentPreset)) {
+						const reuse = this.sessions.create({
+							workspaceId,
+							sessionId: summary.id,
+							...options?.agentPreset === void 0 ? {} : { agentPreset: options.agentPreset }
+						}).finally(() => {
+							this.connecting.delete(workspaceId);
+						});
+						this.connecting.set(workspaceId, {
+							agentPreset: options?.agentPreset,
+							attempt: reuse
+						});
+						return reuse;
+					}
 				}
-				const attempt = this.sessions.create({ workspaceId }).finally(() => {
+				const attempt = this.sessions.create({
+					workspaceId,
+					...options?.agentPreset === void 0 ? {} : { agentPreset: options.agentPreset }
+				}).finally(() => {
 					this.connecting.delete(workspaceId);
 				});
-				this.connecting.set(workspaceId, attempt);
+				this.connecting.set(workspaceId, {
+					agentPreset: options?.agentPreset,
+					attempt
+				});
 				return attempt;
 			}
 			openSession(target) {
 				this.replaceMain(target, this.lifetime.signal);
 			}
-			async openWorkspace(workspaceId, beforeOpen) {
+			async openWorkspace(workspaceId, beforeOpen, options) {
 				const navigation = AbortSignal.any([this.ctx.layout.beginNavigation(), this.lifetime.signal]);
-				const sessionId = await this.connectWorkspace(workspaceId);
+				const sessionId = await this.connectWorkspace(workspaceId, options);
 				if (navigation.aborted) return;
 				this.replaceMain(sessionId, navigation, beforeOpen);
 			}
@@ -759,8 +779,9 @@ window.__ModuleLoader__.load({
 				if (!navigation.aborted) this.replaceMain(childId, navigation);
 			}
 			startSession(workspaceId, options) {
-				const draftOptions = options === void 0 ? void 0 : structuredClone(options);
-				const initializeDraft = draftOptions !== void 0 && (draftOptions.prompt !== void 0 || draftOptions.clearPreviousDraft === true);
+				const { agentPreset, ...draft } = options ?? {};
+				const draftOptions = options === void 0 ? void 0 : structuredClone(draft);
+				const initializeDraft = draftOptions !== void 0 && (draftOptions.prompt !== void 0 || (draftOptions.whenDraftExists ?? (draftOptions.clearPreviousDraft === true ? "replace" : "keep")) === "replace");
 				const workspace = this.workspaces.list.getSnapshot();
 				const sessions = this.sessions.list.getSnapshot();
 				const current = this.mainReference?.sessionId;
@@ -782,7 +803,7 @@ window.__ModuleLoader__.load({
 					const binding = this.sessions.binding(id);
 					if (binding === void 0) this.draftPreparationFailed();
 					this.prepareDraft(binding, draftOptions);
-				} : void 0).catch((reason) => {
+				} : void 0, agentPreset === void 0 ? void 0 : { agentPreset }).catch((reason) => {
 					console.warn("new session failed:", reason);
 				});
 			}
@@ -1173,11 +1194,11 @@ window.__ModuleLoader__.load({
 			const workspaceMenuItems = [{
 				id: "rename",
 				label: t("rename"),
-				icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconEditOutline16, {})
+				icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconEditOutlineRegular, {})
 			}, {
 				id: "delete",
 				label: t("delete.workspace"),
-				icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconTrashOutline16, {}),
+				icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconTrashOutlineRegular, {}),
 				danger: true
 			}];
 			const ownRow = (0, react_jsx_runtime.jsxs)("div", {
@@ -1195,11 +1216,11 @@ window.__ModuleLoader__.load({
 				children: [
 					(0, react_jsx_runtime.jsx)("span", {
 						className: clsx(Rows_module_css_default.slot, Rows_module_css_default.folder, active && Rows_module_css_default.folderActive),
-						children: row.expanded ? (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconFolderOpen16, {}) : (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconFolderClose16, {})
+						children: row.expanded ? (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconFolderOpenRegular, {}) : (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconFolderCloseRegular, {})
 					}),
 					(0, react_jsx_runtime.jsx)("span", {
 						className: clsx(Rows_module_css_default.slot, Rows_module_css_default.chevron),
-						children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconTriangleRightFill14, { className: clsx(Rows_module_css_default.arrow, row.expanded && Rows_module_css_default.arrowOpen) })
+						children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconTriangleRightFillRegular, { className: clsx(Rows_module_css_default.arrow, row.expanded && Rows_module_css_default.arrowOpen) })
 					}),
 					(0, react_jsx_runtime.jsx)("span", {
 						className: Rows_module_css_default.projectText,
@@ -1233,7 +1254,7 @@ window.__ModuleLoader__.load({
 									e.stopPropagation();
 									setMenuOpen((v) => !v);
 								},
-								children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconEllipsisOutline16, {})
+								children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconEllipsisOutlineRegular, {})
 							})
 						}), (0, react_jsx_runtime.jsx)("button", {
 							type: "button",
@@ -1243,7 +1264,7 @@ window.__ModuleLoader__.load({
 								e.stopPropagation();
 								onCreate();
 							},
-							children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconPlusOutline16, {})
+							children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconPlusOutlineRegular, {})
 						})]
 					})
 				]
@@ -1449,17 +1470,17 @@ window.__ModuleLoader__.load({
 				{
 					id: "rename",
 					label: t("rename"),
-					icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconEditOutline16, {})
+					icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconEditOutlineRegular, {})
 				},
 				{
 					id: "fork",
 					label: t("menu.fork"),
-					icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconBranchOutline16, {})
+					icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconBranchOutlineRegular, {})
 				},
 				{
 					id: "archive",
 					label: t("menu.archiveSession"),
-					icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconArchiveOutline20, { size: 16 })
+					icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconArchiveOutlineRegular, { size: 16 })
 				},
 				{
 					id: "copyId",
@@ -1538,7 +1559,7 @@ window.__ModuleLoader__.load({
 											e.stopPropagation();
 											setMenuOpen((v) => !v);
 										},
-										children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconEllipsisOutline16, {})
+										children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconEllipsisOutlineRegular, {})
 									})
 								}),
 								(0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.Tooltip, {
@@ -1554,7 +1575,7 @@ window.__ModuleLoader__.load({
 											e.stopPropagation();
 											onArchive(node.id);
 										},
-										children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconArchiveOutline20, { size: 16 })
+										children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconArchiveOutlineRegular, { size: 16 })
 									})
 								}),
 								(0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.Tooltip, {
@@ -1629,14 +1650,14 @@ window.__ModuleLoader__.load({
 			const addEntries = flowAvailable ? [{
 				id: ADD_WORKSPACE,
 				label: t("menu.addWorkspace"),
-				icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconPlusOutline16, { size: 16 }),
+				icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconPlusOutlineRegular, { size: 16 }),
 				disabled: flowBusy
 			}] : [];
 			const pinAdd = !addOnly && workspaces.length > 0;
 			const items = pinAdd ? workspaces.map((workspace) => ({
 				id: workspace.workspaceId,
 				label: workspace.title,
-				icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconFolderClose16, { size: 16 }),
+				icon: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconFolderCloseRegular, { size: 16 }),
 				disabled: flowBusy
 			})) : addEntries;
 			const menuIsEmpty = items.length === 0;
@@ -1969,7 +1990,7 @@ window.__ModuleLoader__.load({
 						onClick: () => {
 							setOpen((v) => !v);
 						},
-						children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconPersonalizationOutline16, {})
+						children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconPersonalizationOutlineRegular, {})
 					})
 				})
 			});
@@ -2900,7 +2921,7 @@ window.__ModuleLoader__.load({
 													setSearchExpanded(true);
 													requestSearch();
 												},
-												children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconSearchOutline16, { size: searchExpanded ? 11 : 14 })
+												children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconSearchOutlineRegular, { size: searchExpanded ? 11 : 14 })
 											})
 										}),
 										(0, react_jsx_runtime.jsx)("input", {
@@ -2929,7 +2950,7 @@ window.__ModuleLoader__.load({
 												setQuery("");
 												setSearchExpanded(false);
 											},
-											children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconCloseFill14, {})
+											children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconCloseFillRegular, {})
 										})
 									]
 								})
@@ -2960,7 +2981,7 @@ window.__ModuleLoader__.load({
 										onClick: () => {
 											requestAddWorkspace();
 										},
-										children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconProjectAddOutline16, { size: 16 })
+										children: (0, react_jsx_runtime.jsx)(_qilin_agent_client_ui_primitives.IconProjectAddOutlineRegular, { size: 16 })
 									})
 								})]
 							}),

package/lib/types/client/navigation.d.ts

@@ -14,8 +14,11 @@ export interface MainSelection {
     readonly sessionId?: SessionId;
     readonly subagentAddress?: SubagentAddress;
 }
-/** Optional content preparation for the resolved target Session. */
-export type StartSessionOptions = DraftInitializationOptions;
+/** Content preparation and Agent preset for the Session a Workspace flow opens. */
+export interface StartSessionOptions extends DraftInitializationOptions {
+    /** Agent preset the Session runs; the Host default when omitted. */
+    readonly agentPreset?: string;
+}
 /** Workspace archive and directory operations consumed by Client UI domains. */
 export interface UiWorkspace {
     /**
@@ -34,9 +37,10 @@ export interface UiWorkspace {
      * @param workspaceId - target Workspace.
      * @param beforeOpen - optional synchronous preparation for the selected Session,
      * skipped after supersession; a throw aborts the open and releases the retained reference.
+     * @param options - choices for the Session the connection creates or reuses.
      * @returns completion; a superseded request may create a Session but does not open it.
      */
-    openWorkspace(workspaceId: WorkspaceId, beforeOpen?: (sessionId: SessionId) => void): Promise<void>;
+    openWorkspace(workspaceId: WorkspaceId, beforeOpen?: (sessionId: SessionId) => void, options?: Pick<StartSessionOptions, 'agentPreset'>): Promise<void>;
     /**
      * Fork a Session and open the child unless a later navigation supersedes it.
      * @param sessionId - source Session.
@@ -46,13 +50,15 @@ export interface UiWorkspace {
     /**
      * Resolve the reusable or newly created blank Session for a Workspace.
      * @param workspaceId - target Workspace.
+     * @param options - choices for the created or reused Session, including the Agent preset.
      * @returns a Session already addressable through the Session Controller.
      */
-    connectWorkspace(workspaceId: WorkspaceId): Promise<SessionId>;
+    connectWorkspace(workspaceId: WorkspaceId, options?: Pick<StartSessionOptions, 'agentPreset'>): Promise<SessionId>;
     /**
      * Start a New Session flow and navigate to its Session.
      * @param workspaceId - explicit target; absent inherits the current or most recent Workspace.
-     * @param options - initial content; existing text or attachments are preserved unless clearPreviousDraft is true.
+     * @param options - initial content, the Agent preset, and `whenDraftExists`;
+     * existing text or attachments are preserved unless that handling replaces them.
      */
     startSession(workspaceId?: WorkspaceId, options?: StartSessionOptions): void;
     /**
@@ -133,9 +139,9 @@ declare class UiWorkspaceService extends Service implements UiWorkspace {
      * @param notify - show one notice through the Workspace notice channel.
      */
     constructor(ctx: Context, directoryPicker: ClientRemote['directoryPicker'], workspaces: IWorkspaces, sessions: ISessions, view: Pick<WorkspaceViewStoreActions, 'pinSessionOrder'>, notify: (toast: RowToast) => void);
-    connectWorkspace(workspaceId: WorkspaceId): Promise<SessionId>;
+    connectWorkspace(workspaceId: WorkspaceId, options?: Pick<StartSessionOptions, 'agentPreset'>): Promise<SessionId>;
     openSession(target: SessionTarget): void;
-    openWorkspace(workspaceId: WorkspaceId, beforeOpen?: (sessionId: SessionId) => void): Promise<void>;
+    openWorkspace(workspaceId: WorkspaceId, beforeOpen?: (sessionId: SessionId) => void, options?: Pick<StartSessionOptions, 'agentPreset'>): Promise<void>;
     forkSession(sessionId: SessionId): Promise<void>;
     startSession(workspaceId?: WorkspaceId, options?: StartSessionOptions): void;
     private prepareDraft;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qilin-agent/client-ui-workspace",
   "description": "Workspace picker plugin: one WorkspacePicker registered into the sidebar and empty-state workspace slots",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "publishConfig": {
     "access": "public"
   },
@@ -54,26 +54,26 @@
     "@types/react": "~18.3.1",
     "clsx": "^2.0.0",
     "react": "^18.2.0",
-    "@qilin-agent/api-remotes": "3.1.6",
-    "@qilin-agent/api-session-controller": "3.1.6",
-    "@qilin-agent/api-workspace-controller": "3.1.6",
-    "@qilin-agent/client-locale": "3.1.6",
-    "@qilin-agent/client-shortcuts": "3.1.6",
-    "@qilin-agent/client-connection": "3.1.6",
-    "@qilin-agent/client-test-runtime": "3.1.6",
-    "@qilin-agent/client-ui-conversation": "3.1.6",
-    "@qilin-agent/client-store": "3.1.6",
-    "@qilin-agent/client-ui-layout": "3.1.6",
-    "@qilin-agent/client-ui-primitives": "3.1.6",
-    "@qilin-agent/client-ui-renderer": "3.1.6",
-    "@qilin-agent/client-ui-session": "3.1.6",
-    "@qilin-agent/client-ui-sidebar": "3.1.6",
-    "@qilin-agent/client-ui-slots": "3.1.6",
-    "@qilin-agent/schedule": "3.1.6",
-    "@qilin-agent/session": "3.1.6",
-    "@qilin-agent/subagent": "3.1.6",
-    "@qilin-agent/typert-protocol": "3.1.6",
-    "@qilin-agent/util-workspace-path": "3.1.6",
+    "@qilin-agent/api-remotes": "3.1.7",
+    "@qilin-agent/api-session-controller": "3.1.7",
+    "@qilin-agent/api-workspace-controller": "3.1.7",
+    "@qilin-agent/client-connection": "3.1.7",
+    "@qilin-agent/client-shortcuts": "3.1.7",
+    "@qilin-agent/client-locale": "3.1.7",
+    "@qilin-agent/client-test-runtime": "3.1.7",
+    "@qilin-agent/client-store": "3.1.7",
+    "@qilin-agent/client-ui-conversation": "3.1.7",
+    "@qilin-agent/client-ui-layout": "3.1.7",
+    "@qilin-agent/client-ui-primitives": "3.1.7",
+    "@qilin-agent/client-ui-renderer": "3.1.7",
+    "@qilin-agent/client-ui-session": "3.1.7",
+    "@qilin-agent/client-ui-sidebar": "3.1.7",
+    "@qilin-agent/client-ui-slots": "3.1.7",
+    "@qilin-agent/schedule": "3.1.7",
+    "@qilin-agent/session": "3.1.7",
+    "@qilin-agent/subagent": "3.1.7",
+    "@qilin-agent/typert-protocol": "3.1.7",
+    "@qilin-agent/util-workspace-path": "3.1.7",
     "@qilin-agent/kylin": "~4.0.5"
   },
   "files": [