dsh-data-cleaning-agent 0.8.23 → 0.9.1

package/lib/client.js

@@ -9,7 +9,7 @@
  *   - `sidebar.footer.action` 仅托管入口生命周期和降级渲染；实际入口 Portal 到
  *     `sidebar.workspaces` 前，位于「新会话」与「工作区」之间。
  *   - DSH 原生会话保持在中间，能力入口使用 `conversation.input.dock` 并通过稳定
- *     `data-composer-seat/card` 将自有菜单 Portal 到输入框下方；右侧工作台使用 `shell.overlay`。
+ *     `data-composer-seat/card` 将自有菜单 Portal 到输入框下方；工作台使用 Better Sidebar Session 单例 Tab。
  *   - 提示词生成器使用 `conversation.input.overlay`，只对本插件创建的会话生效。
  *     Hero 标题没有公开替换槽位，故以可恢复、精确文本匹配的 DOM Bridge 对齐业务首页。
  *
@@ -77,136 +77,6 @@ window.__ModuleLoader__.load({
         'aria-hidden': true, focusable: false }, h('path', { d: STAGE_ICON_PATHS[kind] }));
     }
 
-    function workbenchWidthBounds(viewport, available = viewport) {
-      const mobile = viewport <= 760 || available < 740;
-      return { mobile, min: mobile ? viewport : 320, max: mobile ? viewport : Math.max(320, available - 420) };
-    }
-
-    // 自有抽屉的可逆兼容适配；不改 Better Sidebar 或其他插件的面板偏好。
-    function installWorkbenchSizing(drawer, { preferredWidth, expanded, onWidthChange }) {
-      const doc = drawer.ownerDocument;
-      const view = doc.defaultView;
-      const handle = drawer.querySelector('.dcAgentResizeHandle');
-      if (!handle || !view) return () => {};
-      const reservations = new Map();
-      const registryKey = Symbol.for('dsh.data-cleaning.sizing-reservations');
-      const registry = doc[registryKey] || (doc[registryKey] = new WeakMap());
-      let disposed = false;
-      let requested = expanded ? 980 : preferredWidth;
-      let current = 0;
-      let drag = null;
-      const boundsForView = () => workbenchWidthBounds(view.innerWidth,
-        doc.querySelector('[data-conversation-scroll]')?.getBoundingClientRect().width || view.innerWidth);
-      const reserve = () => {
-        if (disposed) return;
-        const width = boundsForView().mobile ? 0 : drawer.getBoundingClientRect().width;
-        for (const el of doc.querySelectorAll('[data-conversation-scroll]')) {
-          if (!reservations.has(el)) {
-            const previous = registry.get(el) || {
-              value: el.style.getPropertyValue('--dc-agent-workbench-reserve'),
-              priority: el.style.getPropertyPriority('--dc-agent-workbench-reserve'),
-              owners: 0,
-            };
-            previous.owners += 1;
-            registry.set(el, previous);
-            reservations.set(el, previous);
-            sizeObserver?.observe(el, { box: 'border-box' });
-          }
-          if (el.style.getPropertyValue('--dc-agent-workbench-reserve') !== `${width}px`) {
-            el.style.setProperty('--dc-agent-workbench-reserve', `${width}px`);
-          }
-        }
-      };
-      const apply = (value) => {
-        if (disposed) return;
-        const bounds = boundsForView();
-        const fallback = view.innerWidth <= 1040 ? Math.min(420, view.innerWidth * .48) : Math.min(460, view.innerWidth * .42);
-        current = Math.round(Math.min(bounds.max, Math.max(bounds.min, Number.isFinite(value) ? value : fallback)));
-        drawer.dataset.narrow = String(bounds.mobile);
-        drawer.style.setProperty('--dc-agent-panel-width', `${current}px`);
-        handle.setAttribute('aria-valuemin', String(bounds.min));
-        handle.setAttribute('aria-valuemax', String(bounds.max));
-        handle.setAttribute('aria-valuenow', String(current));
-        handle.setAttribute('aria-valuetext', `${current} 像素`);
-        reserve();
-      };
-      const end = (cancel = false) => {
-        if (!drag) return;
-        const previous = drag;
-        drag = null;
-        drawer.classList.remove('is-resizing');
-        if (handle.hasPointerCapture?.(previous.id)) handle.releasePointerCapture(previous.id);
-        if (cancel) apply(requested);
-        else { requested = current; onWidthChange(current); }
-      };
-      const down = (event) => {
-        if (event.button !== 0 || drag || boundsForView().mobile) return;
-        event.preventDefault();
-        handle.focus();
-        drag = { id: event.pointerId, startX: event.clientX, startWidth: current };
-        handle.setPointerCapture(event.pointerId);
-        drawer.classList.add('is-resizing');
-      };
-      const move = (event) => {
-        if (drag?.id !== event.pointerId) return;
-        apply(drag.startWidth + drag.startX - event.clientX);
-      };
-      const up = (event) => { if (drag?.id === event.pointerId) end(); };
-      const cancel = () => end(true);
-      const keydown = (event) => {
-        if (event.key === 'Escape' && drag) {
-          event.preventDefault(); event.stopPropagation(); cancel(); return;
-        }
-        if (drag || boundsForView().mobile) return;
-        const bounds = boundsForView();
-        const delta = event.shiftKey ? 48 : 16;
-        const value = { ArrowLeft: current + delta, ArrowRight: current - delta, Home: bounds.min, End: bounds.max }[event.key];
-        if (value === undefined) return;
-        event.preventDefault(); event.stopPropagation();
-        requested = value; apply(value); onWidthChange(current);
-      };
-      const reset = () => { cancel(); requested = null; apply(null); onWidthChange(null); };
-      const resize = () => { cancel(); apply(requested); };
-      const sizeObserver = typeof view.ResizeObserver === 'function' ? new view.ResizeObserver(resize) : null;
-      handle.addEventListener('pointerdown', down);
-      handle.addEventListener('pointermove', move);
-      handle.addEventListener('pointerup', up);
-      handle.addEventListener('pointercancel', cancel);
-      handle.addEventListener('lostpointercapture', cancel);
-      handle.addEventListener('keydown', keydown);
-      handle.addEventListener('dblclick', reset);
-      view.addEventListener('resize', resize);
-      view.addEventListener('blur', cancel);
-      // 会话挂载点可被宿主替换；只对当前存在的滚动区设置自有让位变量。
-      const observer = typeof view.MutationObserver === 'function' ? new view.MutationObserver(reserve) : null;
-      observer?.observe(doc.body, { childList: true, subtree: true });
-      apply(requested);
-      return () => {
-        disposed = true;
-        cancel();
-        observer?.disconnect();
-        sizeObserver?.disconnect();
-        handle.removeEventListener('pointerdown', down);
-        handle.removeEventListener('pointermove', move);
-        handle.removeEventListener('pointerup', up);
-        handle.removeEventListener('pointercancel', cancel);
-        handle.removeEventListener('lostpointercapture', cancel);
-        handle.removeEventListener('keydown', keydown);
-        handle.removeEventListener('dblclick', reset);
-        view.removeEventListener('resize', resize);
-        view.removeEventListener('blur', cancel);
-        drawer.style.removeProperty('--dc-agent-panel-width');
-        delete drawer.dataset.narrow;
-        for (const [el, previous] of reservations) {
-          previous.owners -= 1;
-          if (previous.owners > 0) continue;
-          registry.delete(el);
-          if (previous.value) el.style.setProperty('--dc-agent-workbench-reserve', previous.value, previous.priority);
-          else el.style.removeProperty('--dc-agent-workbench-reserve');
-        }
-      };
-    }
-
     // 搜索仅改变可见字段，绝不清除已选字段或改变 Host 的字段目录。
     function visibleCatalogFields(group, query) {
       const needle = String(query || '').trim().toLowerCase();
@@ -224,7 +94,7 @@ window.__ModuleLoader__.load({
     const stylesCss = `
 /* QCC-blue candidate tokens from shared DSH-UX-001; never theme the global shell. */
 :where(.dcAgentTopMount, .dcAgentLauncher, .dcAgentExperience, .dcAgentCapabilityMount,
- .dcAgentOverlay, .dcAgentPromptLayer, .dcAgentPromptBackdrop, .dcAgentHeaderAction,
+ .dcAgentWorkbenchContent, .dcAgentPromptBackdrop, .dcAgentPromptPanel, .dcAgentPromptLayer,
  .dcAgentToolCard, [data-dc-agent-hero-row="true"]) {
   --dc-action: light-dark(#0875d1, #82c3ff);
   --dc-hover: light-dark(#0666b7, #acd7ff);
@@ -283,44 +153,17 @@ window.__ModuleLoader__.load({
   width: 36px;
   padding-right: 0;
 }
-
-.dcAgentOverlay {
-  position: fixed;
-  inset: 0;
-  z-index: 1000;
-  display: flex;
-  align-items: stretch;
-  justify-content: flex-end;
-  pointer-events: none;
-  background: transparent;
+.dcAgentWorkbenchContent {
+  box-sizing: border-box; display: flex; flex-direction: column;
+  width: 100%; height: 100%; min-width: 0; min-height: 0; overflow: hidden;
+  background: var(--dc-surface); color: var(--dc-text);
+  container-type: inline-size;
 }
-
-.dcAgentWorkbench {
-  position: relative;
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  width: var(--dc-agent-panel-width, min(460px, 42vw));
-  max-width: calc(100vw - 420px);
-  min-width: 320px;
-  height: 100vh;
-  border: 1px solid var(--dc-border);
-  border-radius: 12px 0 0 12px;
-  background: var(--dc-surface);
-  color: var(--dc-text);
-  box-shadow: light-dark(-10px 0 32px rgba(33, 55, 88, .12), -12px 0 40px rgba(0, 0, 0, .32));
-  overflow: hidden;
-  pointer-events: auto;
+@container (max-width: 520px) {
+  .dcAgentRulesGrid, .dcAgentMappingRow { grid-template-columns: 1fr; }
+  .dcAgentMappingRow > b { display: none; }
+  .dcAgentCandidate { grid-template-columns: 1fr; }
 }
-.dcAgentWorkbench.is-expanded { width: var(--dc-agent-panel-width, min(980px, calc(100vw - 420px))); }
-.dcAgentResizeHandle { position: absolute; left: 0; top: 0; bottom: 0; width: 8px; z-index: 5; cursor: col-resize; touch-action: none; outline: none; }
-.dcAgentResizeHandle::after { content: ''; position: absolute; left: 0; top: 0; bottom: 0; width: 3px; background: transparent; }
-.dcAgentResizeHandle:hover::after, .dcAgentResizeHandle:focus-visible::after, .is-resizing .dcAgentResizeHandle::after { background: var(--dc-action); }
-.dcAgentWorkbench.is-resizing { user-select: none; }
-.dcAgentWorkbench[data-narrow="true"] { width: 100vw; max-width: none; min-width: 0; border-radius: 0; }
-.dcAgentWorkbench[data-narrow="true"] .dcAgentResizeHandle { display: none; }
-.dcAgentOverlay:has(.dcAgentWorkbench[data-narrow="true"]) { background: rgba(8, 10, 14, 0.22); pointer-events: auto; }
-
 .dcAgentCapabilities {
   display: flex;
   justify-content: safe center;
@@ -333,8 +176,6 @@ window.__ModuleLoader__.load({
   padding: 2px 16px 0;
   overflow-x: auto;
   scrollbar-width: none;
-  transform: translateX(var(--dc-agent-workbench-shift, 0px));
-  transition: transform 160ms ease;
 }
 .dcAgentCapabilities::-webkit-scrollbar { display: none; }
 .dcAgentCapability {
@@ -610,72 +451,6 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
   color: var(--dc-action);
 }
 
-.dcAgentWbHeader {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 12px 14px;
-  border-bottom: 1px solid var(--dc-border);
-}
-
-.dcAgentWbTitle {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  min-width: 0;
-  flex: 1 1 auto;
-}
-
-.dcAgentWbIcon {
-  width: 36px;
-  height: 36px;
-  display: grid;
-  place-items: center;
-  flex: 0 0 auto;
-  border-radius: 8px;
-  font-size: 18px;
-  background: var(--dc-selected);
-}
-
-.dcAgentWbTitle b,
-.dcAgentWbTitle small { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-.dcAgentWbTitle > div { min-width: 0; }
-.dcAgentWbTitle b { display: block; font-size: 15px; }
-.dcAgentWbTitle small { display: block; max-width: 190px; color: var(--dc-muted); font-size: 12px; }
-
-.dcAgentWbActions {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  flex: 0 0 auto;
-  margin-left: auto;
-}
-
-.dcAgentQccBadge {
-  flex: 0 0 auto;
-  padding: 4px 10px;
-  border: 1px solid var(--dc-border);
-  border-radius: 999px;
-  color: var(--dc-muted);
-  font-size: 12px;
-  white-space: nowrap;
-}
-
-.dcAgentWbClose {
-  flex: 0 0 auto;
-  width: 30px;
-  height: 30px;
-  display: grid;
-  place-items: center;
-  border: 1px solid var(--dc-border);
-  border-radius: 8px;
-  background: transparent;
-  color: inherit;
-  font-size: 15px;
-  cursor: pointer;
-}
-.dcAgentWbClose:hover, .dcAgentWbClose:focus-visible { background: var(--dc-page); }
-
 .dcAgentStepper {
   display: grid;
   grid-template-columns: repeat(var(--dc-stage-count, 5), minmax(0, 1fr));
@@ -1005,33 +780,7 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
 }
 .dcAgentHistoryTask { display: block; width: 100%; padding: 10px; text-align: left; }
 .dcAgentHistoryTask h3 { margin: 0; font-size: 12px; }
-/*
- * DSH 的 root.side slot 是覆盖层。桌面端工作台打开时，让带稳定标记的
- * 会话滚动区主动让出同宽空间，确保消息流和中央 composer 不被遮挡。
- * 移动端仍保留全屏工作台，不压缩底层会话。
- */
-@media (min-width: 1041px) {
-  body:has(.dcAgentWorkbench) [data-conversation-scroll] {
-    box-sizing: border-box;
-    padding-right: var(--dc-agent-workbench-reserve, min(460px, 42vw));
-  }
-}
-@media (min-width: 761px) and (max-width: 1040px) {
-  body:has(.dcAgentWorkbench) [data-conversation-scroll] {
-    box-sizing: border-box;
-    padding-right: var(--dc-agent-workbench-reserve, min(420px, 48vw));
-  }
-}
-@media (min-width: 761px) {
-  body:has(.dcAgentWorkbench.is-expanded) [data-conversation-scroll] {
-    box-sizing: border-box;
-    padding-right: var(--dc-agent-workbench-reserve, min(980px, calc(100vw - 420px)));
-  }
-}
 @media (max-width: 760px) {
-  .dcAgentWorkbench, .dcAgentWorkbench.is-expanded { width: 100vw; max-width: none; min-width: 0; border-radius: 0; }
-  .dcAgentOverlay { background: rgba(8, 10, 14, 0.22); pointer-events: auto; }
-  .dcAgentResizeHandle { display: none; }
   .dcAgentQccBadge, .dcAgentJobsPill { display: none; }
   .dcAgentCandidate { grid-template-columns: 1fr; }
   .dcAgentCapabilities { justify-content: flex-start; padding-inline: 12px; }
@@ -1044,7 +793,6 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
   .dcAgentMappingRow > b { display: none; }
 }
 @media (min-width: 761px) and (max-width: 1040px) {
-  .dcAgentWorkbench { width: var(--dc-agent-panel-width, 420px); }
   .dcAgentQccBadge, .dcAgentJobsPill { display: none; }
 }
 @media (max-width: 360px) {
@@ -1053,8 +801,8 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
   .dcAgentStepIcon svg { width: 18px; height: 18px; }
 }
 /* Distinct levels: management tabs → compact task steps → working content. */
-.dcAgentWorkbench, .dcAgentPromptPanel { font-size: 14px; line-height: 1.5; }
-.dcAgentWbHeader, .dcAgentManagement, .dcAgentStepper { flex: none; }
+.dcAgentManagement, .dcAgentStepper { flex: none; }
+.dcAgentWorkbenchContent, .dcAgentPromptPanel { font-size: 14px; line-height: 1.5; }
 .dcAgentManagement { display: flex; gap: 24px; padding: 0 18px; border-bottom: 1px solid var(--dc-border); }
 .dcAgentManagement .dcAgentButton { border: 0; border-bottom: 3px solid transparent; border-radius: 0; padding: 10px 0; background: transparent; }
 .dcAgentManagement .dcAgentButton[aria-pressed="true"] { border-bottom-color: var(--dc-action); color: var(--dc-action); font-weight: 600; }
@@ -1072,7 +820,7 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
 .dcAgentPromptText, .dcAgentTextarea, .dcAgentField { font-size: 14px; }
 .dcAgentPromptTrigger { border-radius: 6px; }
 .dcAgentPromptAction.is-primary:hover:not(:disabled) { background: var(--dc-hover); }
-:is(.dcAgentWorkbench, .dcAgentPromptPanel, .dcAgentCapabilities, .dcAgentPromptLayer) :is(button, input, select, textarea, summary):focus-visible,
+:is(.dcAgentWorkbenchContent, .dcAgentPromptPanel, .dcAgentCapabilities, .dcAgentPromptLayer) :is(button, input, select, textarea, summary):focus-visible,
 .dcAgentLauncher:focus-visible { outline: 2px solid var(--dc-action); outline-offset: 2px; }
 @media (max-width: 760px) {
   [data-dc-agent-hero-title="true"] { font-size: 20px; }
@@ -1335,11 +1083,6 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
       if (!activeCleaningSessionId || (sessionId && sessionId !== activeCleaningSessionId)) return false;
       const previousSessionId = activeCleaningSessionId;
       activeCleaningSessionId = null;
-      if (rootWorkbenchActions) {
-        stopJobsPolling();
-        rootWorkbenchActions.close?.();
-        rootWorkbenchActions.setActiveSession?.(null);
-      }
       if (typeof window.CustomEvent === 'function' && typeof window.dispatchEvent === 'function') {
         window.dispatchEvent(new window.CustomEvent(CLEANING_SESSION_EVENT, {
           detail: { sessionId: previousSessionId, active: false },
@@ -1723,9 +1466,11 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
       return requestJson(path, body === undefined ? 'GET' : 'POST', body);
     }
 
-    async function waitForQccCommand(commandId, attempts = 180, onStatus) {
+    async function waitForQccCommand(commandId, attempts = 180, onStatus, isActive = () => true) {
       for (let attempt = 0; attempt < attempts; attempt += 1) {
+        if (!isActive()) return null;
         const response = await api(`/data-cleaning/api/g5/commands/${encodeURIComponent(commandId)}`);
+        if (!isActive()) return null;
         const command = response?.command;
         await onStatus?.(command);
         if (command?.state === 'completed' || command?.state === 'failed') return command;
@@ -1752,6 +1497,7 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
       if (Array.isArray(task.objectives)) actions.setObjectives(task.objectives);
       if (Array.isArray(task.mappings)) actions.setMappings(task.mappings);
       if (Array.isArray(task.fieldSelection)) actions.setFieldSelection(task.fieldSelection);
+      for (const [key, value] of Object.entries(task.matchRules || {})) actions.setMatchRule(key, value);
       return task;
     }
 
@@ -1894,7 +1640,10 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
       }
       return response.task;
     }
+    let commandWatchGeneration = 0;
     function watchHostedCommand(actions, sessionId, command) {
+      const generation = commandWatchGeneration;
+      const isActive = () => generation === commandWatchGeneration;
       let openedForExecution = false;
       const ownerVisible = () => typeof document === 'undefined' || [...document.querySelectorAll('.dcAgentExperience')].some(node => node.dataset.sessionId === sessionId);
       void waitForQccCommand(command.commandId, 1800, async (status) => {
@@ -1905,11 +1654,12 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
           openWorkbench(actions, workflowTaskBySession.get(String(sessionId))?.stage || 'match', sessionId);
         }
         if (isCleaningSession(sessionId) && workflowTaskBySession.get(String(sessionId))?.id === command.taskId) actions.setCommandProgress?.({ taskId: command.taskId, ...status.progress });
-      }).then(async (completed) => {
+      }, isActive).then(async (completed) => {
+        if (!completed || !isActive()) return;
         await refreshHostedTask(actions, sessionId, command.taskId, completed.run);
         if (completed.state === 'failed') throw new Error(completed.error?.message || 'Host 执行失败，请在工作台查看状态。');
       }).catch((error) => {
-        if (isCleaningSession(sessionId)) actions.setError(error.message || String(error));
+        if (isActive() && isCleaningSession(sessionId)) actions.setError(error.message || String(error));
       });
     }
 
@@ -1918,8 +1668,6 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
       return defineStore({
         init: () => ({
           open: false,
-          expanded: false,
-          preferredWidth: null,
           step: 'upload',
           busy: false,
           error: null,
@@ -1953,11 +1701,6 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
             if (sessionId) draft.activeSessionId = sessionId;
           },
           close: (draft) => { draft.open = false; },
-          toggleExpanded: (draft) => { draft.expanded = !draft.expanded; },
-          setPreferredWidth: (draft, width) => {
-            draft.preferredWidth = Number.isFinite(width) ? width : null;
-            draft.expanded = false;
-          },
           setStep: (draft, step) => { draft.step = step; },
           setActiveSession: (draft, sessionId) => { draft.activeSessionId = sessionId ?? null; },
           setBusy: (draft, busy) => { draft.busy = busy; },
@@ -2067,11 +1810,20 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
 
     // rc/alpha 兼容边界：原生 startSession 会复用工作区内的空白会话。
     // 只在清洗会话激活时替换此动作，创建普通会话；不改 connectWorkspace 或全局点击。
-    function installNewSessionBridge(ctx) {
+    function installNewSessionBridge(ctx, navigation) {
+      if (!navigation && typeof ctx.inject === 'function') {
+        const legacy = typeof ctx.workspaces?.startSession === 'function'
+          ? installNewSessionBridge(ctx, ctx.workspaces) : () => {};
+        const fiber = ctx.inject(['uiWorkspace'], scope => {
+          scope.effect(() => installNewSessionBridge(scope, scope.uiWorkspace), 'data-cleaning-agent: native new session');
+        });
+        return () => { legacy(); fiber?.dispose?.(); };
+      }
       const workspaces = ctx.workspaces;
-      const original = workspaces?.startSession;
+      navigation = navigation || workspaces;
+      const original = navigation?.startSession;
       if (typeof original !== 'function' || typeof ctx.sessions?.create !== 'function') return () => {};
-      const ownDescriptor = Object.getOwnPropertyDescriptor(workspaces, 'startSession');
+      const ownDescriptor = Object.getOwnPropertyDescriptor(navigation, 'startSession');
       let pending = null;
       let disposed = false;
       const wrapped = function (workspaceId) {
@@ -2094,13 +1846,13 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
             console.warn('[dc-agent] new session failed; current draft retained:', error instanceof Error ? error.message : String(error));
           }).finally(() => { pending = null; });
       };
-      try { workspaces.startSession = wrapped; }
+      try { navigation.startSession = wrapped; }
       catch (_error) { console.warn('[dc-agent] New Session compatibility bridge unavailable'); return () => {}; }
       return () => {
         disposed = true;
-        if (workspaces.startSession !== wrapped) return;
-        if (ownDescriptor) Object.defineProperty(workspaces, 'startSession', ownDescriptor);
-        else delete workspaces.startSession;
+        if (navigation.startSession !== wrapped) return;
+        if (ownDescriptor) Object.defineProperty(navigation, 'startSession', ownDescriptor);
+        else delete navigation.startSession;
       };
     }
 
@@ -2212,20 +1964,19 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
 
     function openWorkbench(actions, step, sessionId) {
       actions.openAt(step, sessionId);
-      startJobsPolling(actions);
+      sessionWorkbenchController?.open(sessionId, step);
     }
 
     const WORKBENCH_OPEN_EVENT = 'dsh:data-cleaning-workbench-open';
     const WORKBENCH_DATASET_EVENT = 'dsh:data-cleaning-workbench-dataset';
     const WORKBENCH_DRAFT_EVENT = 'dsh:data-cleaning-workbench-draft';
     const WORKBENCH_PREPARE_EVENT = 'dsh:data-cleaning-workbench-prepare';
-    const WORKBENCH_OWNER_LEFT_EVENT = 'dsh:data-cleaning-workbench-owner-left';
 
     // session scope 不能复用 root scope 的 store handle。DSH 当前会分别物化 root/session
     // 插槽组件，因此以 document 事件跨 scope 通知；闭包引用仅作为无 DOM 测试降级。
-    let rootWorkbenchActions = null;
+    let sessionWorkbenchController = null;
 
-    /** 从 session scope 的 composer/header 触发 root scope 工作台。 */
+    /** 从 composer/header 请求指定 Session 的唯一工作台 Tab。 */
     function requestWorkbenchOpen(step, sessionId, task = null) {
       if (typeof document !== 'undefined'
         && typeof document.createEvent === 'function'
@@ -2234,7 +1985,7 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
         event.initCustomEvent(WORKBENCH_OPEN_EVENT, false, true, { step, sessionId, task });
         if (!document.dispatchEvent(event)) return;
       }
-      if (rootWorkbenchActions) openWorkbench(rootWorkbenchActions, step, sessionId);
+      sessionWorkbenchController?.open(sessionId, step);
     }
 
     function requestPreparedWorkflow(sessionId, config) {
@@ -2245,7 +1996,7 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
       });
     }
 
-    /** 把提示词生成器解析出的完整表格交给 root 工作台，不把整表塞进模型上下文。 */
+    /** 完整表格交给 Session 业务控制器，不把整表塞进模型上下文。 */
     function requestWorkbenchDataset(result, sessionId, source) {
       if (typeof document !== 'undefined'
         && typeof document.createEvent === 'function'
@@ -2254,9 +2005,9 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
         event.initCustomEvent(WORKBENCH_DATASET_EVENT, false, true, { result, sessionId, source });
         if (!document.dispatchEvent(event)) return;
       }
-      if (rootWorkbenchActions) {
-        applyParsed(result, rootWorkbenchActions, `session:${sessionId || 'unassigned'}`, source);
-        rootWorkbenchActions.setActiveSession(sessionId);
+      if (sessionWorkbenchController?.actionsFor(sessionId)) {
+        applyParsed(result, sessionWorkbenchController?.actionsFor(sessionId), `session:${sessionId || 'unassigned'}`, source);
+        sessionWorkbenchController?.actionsFor(sessionId).setActiveSession(sessionId);
       }
     }
 
@@ -2269,11 +2020,11 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
         event.initCustomEvent(WORKBENCH_DRAFT_EVENT, false, true, { draft, sessionId });
         if (!document.dispatchEvent(event)) return;
       }
-      if (rootWorkbenchActions) {
-        rootWorkbenchActions.setTaskTitle(draft.title);
-        rootWorkbenchActions.setObjectives(draft.objectives);
-        if (draft.mappings) rootWorkbenchActions.setMappings(draft.mappings);
-        rootWorkbenchActions.setFieldSelection(draft.fieldSelection);
+      if (sessionWorkbenchController?.actionsFor(sessionId)) {
+        sessionWorkbenchController?.actionsFor(sessionId).setTaskTitle(draft.title);
+        sessionWorkbenchController?.actionsFor(sessionId).setObjectives(draft.objectives);
+        if (draft.mappings) sessionWorkbenchController?.actionsFor(sessionId).setMappings(draft.mappings);
+        sessionWorkbenchController?.actionsFor(sessionId).setFieldSelection(draft.fieldSelection);
       }
     }
 
@@ -2360,7 +2111,7 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
         '导入企业名单或图片，核验主体、补全字段，并导出可追溯结果。');
     }
 
-    function workflowNavigationIssue(step, task, hasData, profile, qccRun) {
+    function workflowNavigationIssue(step, task, hasData, profile, qccRun, hasLocalResult = false) {
       if (['upload', 'history'].includes(step)) return null;
       if (step === 'download' && task?.artifacts?.length) return null;
       if (!hasData) return '请先在「导入与核验」载入并核对完整名单。';
@@ -2374,6 +2125,7 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
       if (step === 'enrich' && requiresQcc && !['matched', 'enriching', 'export_ready', 'completed', 'partial'].includes(task.state)) {
         return '请先在「主体匹配」确认企业；多候选需要人工核验。';
       }
+      if (step === 'download' && !requiresQcc && hasLocalResult && ['rules_confirmed', 'diagnosed'].includes(task.state)) return null;
       if (step === 'download' && !['export_ready', 'completed', 'partial'].includes(task.state) && !['completed', 'partial'].includes(qccRun?.state)) {
         return '请先完成清洗或字段补全。原始清单可在「导入与核验」下载。';
       }
@@ -2582,10 +2334,12 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
     function DataCleaningExperience(props) {
       const { sessionId, session: ownerSession } = props;
       const enabled = useCleaningSession(sessionId);
+      const [dependencyMessage, setDependencyMessage] = react.useState('');
       react.useEffect(() => {
-        if (!enabled) return undefined;
-        return () => document.dispatchEvent(new CustomEvent(WORKBENCH_OWNER_LEFT_EVENT, { detail: { sessionId } }));
-      }, [enabled, sessionId]);
+        const listener = event => { if (event.detail?.sessionId === sessionId) setDependencyMessage(event.detail.message || ''); };
+        document.addEventListener(DEPENDENCY_EVENT, listener);
+        return () => document.removeEventListener(DEPENDENCY_EVENT, listener);
+      }, [sessionId]);
       const hero = ownerSession?.composerPhase === 'blank';
       const [menuMount, setMenuMount] = react.useState(null);
       react.useEffect(() => {
@@ -2603,6 +2357,7 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
         className: `dcAgentExperience${hero ? ' is-home' : ''}`,
         'data-session-id': sessionId,
       },
+        dependencyMessage ? h('p', { className: 'dcAgentError', role: 'alert' }, dependencyMessage) : null,
         menuMount ? reactDom.createPortal(h(CapabilityBar, { sessionId }), menuMount) : h(CapabilityBar, { sessionId }),
         hero ? h(ProductHome, { sessionId }) : null,
       );
@@ -2950,7 +2705,7 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
           const hasImage = files.length > 0;
           if (!hasImage) return;
           const target = event.target;
-          const inComposer = !open && !target?.closest?.('.dcAgentWorkbench')
+          const inComposer = !open && !target?.closest?.('.dcAgentWorkbenchContent')
             && Boolean(target?.closest?.('textarea, [contenteditable="true"], [role="textbox"]'));
           const inSourceStep = open && wizardStep === 1 && Boolean(target?.closest?.('.dcAgentPromptPanel'));
           if (!inComposer && !inSourceStep) return;
@@ -3489,15 +3244,14 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
       );
     }
 
-    /** 右侧非模态工作台：中央区域始终保留 DSH 原生会话。 */
-    function WorkbenchDrawer(props) {
+    /** Session Tab 业务内容；尺寸、停靠、关闭均由 Better Sidebar 宿主管理。 */
+    function WorkbenchContent(props) {
       const { useStore, actions } = props;
+      const visible = props.visible !== false;
       const sendSessionCommand = props.sendSessionCommand;
       const setSessionDraft = props.setSessionDraft;
       const open = useStore((state) => state.open);
       const step = useStore((state) => state.step);
-      const expanded = useStore((state) => state.expanded);
-      const preferredWidth = useStore((state) => state.preferredWidth);
       const busy = useStore((state) => state.busy);
       const error = useStore((state) => state.error);
       const input = useStore((state) => state.input);
@@ -3519,92 +3273,11 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
       const qccRun = useStore((state) => state.qccRun);
       const commandProgress = useStore((state) => state.commandProgress);
       const paidConfirmed = useStore((state) => state.paidConfirmed);
-      const jobs = useStore((state) => state.jobs);
       const activeSessionId = useStore((state) => state.activeSessionId);
       const [fieldQuery, setFieldQuery] = react.useState('');
 
       react.useEffect(() => {
-        if (!open || typeof document === 'undefined') return undefined;
-        const drawer = document.querySelector('.dcAgentWorkbench');
-        if (!drawer) return undefined;
-        return installWorkbenchSizing(drawer, { preferredWidth, expanded, onWidthChange: actions.setPreferredWidth });
-      }, [open, expanded, preferredWidth, actions]);
-
-      react.useEffect(() => {
-        rootWorkbenchActions = actions;
-        const handleOwnerLeft = () => actions.close();
-        const handleOpen = (event) => {
-          event?.preventDefault?.();
-          const detail = event?.detail ?? {};
-          if (detail.task?.id) {
-            workflowTaskBySession.set(String(detail.sessionId || 'unassigned'), detail.task);
-            actions.setWorkflowTask(detail.task);
-            actions.setTaskTitle(detail.task.title);
-            actions.setMappings(detail.task.mappings || []);
-            actions.setObjectives(detail.task.objectives || []);
-            actions.setFieldSelection(detail.task.fieldSelection || []);
-            for (const [key, value] of Object.entries(detail.task.matchRules || {})) actions.setMatchRule(key, value);
-          }
-          openWorkbench(actions, detail.step ?? null, detail.sessionId ?? null);
-        };
-        const handleDataset = (event) => {
-          event?.preventDefault?.();
-          const detail = event?.detail ?? {};
-          if (detail.result) applyParsed(detail.result, actions, `session:${detail.sessionId || 'unassigned'}`, detail.source);
-          if (detail.sessionId) actions.setActiveSession(detail.sessionId);
-          if (detail.result) {
-            void queueWorkflowOperation(detail.sessionId, () => (
-              persistParsedWorkflow(actions, detail.sessionId, detail.result, detail.source)
-            )).catch((eventError) => {
-              actions.setError(eventError instanceof Error ? eventError.message : String(eventError));
-            });
-          }
-        };
-        const handlePrepare = (event) => {
-          event.preventDefault();
-          const { sessionId, config, resolve, reject } = event.detail;
-          queueWorkflowOperation(sessionId, () => stageConfirmedWorkflow(actions, sessionId, config)).then((command) => {
-            watchHostedCommand(actions, sessionId, command);
-            resolve(command);
-          }, reject);
-        };
-        const handleDraft = (event) => {
-          event?.preventDefault?.();
-          const detail = event?.detail ?? {};
-          const draft = detail.draft ?? {};
-          if (detail.sessionId) actions.setActiveSession(detail.sessionId);
-          if (draft.title) actions.setTaskTitle(draft.title);
-          if (draft.objectives) actions.setObjectives(draft.objectives);
-          if (draft.mappings) actions.setMappings(draft.mappings);
-          if (draft.fieldSelection) actions.setFieldSelection(draft.fieldSelection);
-          for (const [key, value] of Object.entries(draft.matchRules || {})) actions.setMatchRule(key, value);
-          void queueWorkflowOperation(detail.sessionId, async () => {
-            const task = await ensureEditableWorkflowTask(actions, detail.sessionId, draft);
-            return updateWorkflowTask(actions, detail.sessionId, task, draft);
-          }).catch((eventError) => actions.setError(eventError instanceof Error ? eventError.message : String(eventError)));
-        };
-        if (typeof document !== 'undefined' && typeof document.addEventListener === 'function') {
-          document.addEventListener(WORKBENCH_OPEN_EVENT, handleOpen);
-          document.addEventListener(WORKBENCH_OWNER_LEFT_EVENT, handleOwnerLeft);
-          document.addEventListener(WORKBENCH_DATASET_EVENT, handleDataset);
-          document.addEventListener(WORKBENCH_DRAFT_EVENT, handleDraft);
-          document.addEventListener(WORKBENCH_PREPARE_EVENT, handlePrepare);
-        }
-        return () => {
-          if (typeof document !== 'undefined' && typeof document.removeEventListener === 'function') {
-            document.removeEventListener(WORKBENCH_OPEN_EVENT, handleOpen);
-            document.removeEventListener(WORKBENCH_OWNER_LEFT_EVENT, handleOwnerLeft);
-            document.removeEventListener(WORKBENCH_DATASET_EVENT, handleDataset);
-            document.removeEventListener(WORKBENCH_DRAFT_EVENT, handleDraft);
-            document.removeEventListener(WORKBENCH_PREPARE_EVENT, handlePrepare);
-          }
-          stopJobsPolling();
-          if (rootWorkbenchActions === actions) rootWorkbenchActions = null;
-        };
-      }, [actions]);
-
-      react.useEffect(() => {
-        if (!open) return undefined;
+        if (!open || !visible) return undefined;
         let disposed = false;
         requestJson('/data-cleaning/api/workflow/contract').then((response) => {
           if (!disposed) actions.setWorkflowContract(response.contract);
@@ -3612,19 +3285,21 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
         loadWorkflowTasks(actions);
         if (activeSessionId) {
           queueWorkflowOperation(activeSessionId, async () => {
-            const task = await ensureWorkflowTask(actions, activeSessionId, {}, step !== 'history');
-            await refreshHostedTask(actions, activeSessionId, task.id, null, false);
+            const key = String(activeSessionId);
+            const saved = ownedSessionId(key) ? readTaskBindings()[key] : null;
+            const taskId = workflowTaskBySession.get(key)?.id || (/^dcw-[a-zA-Z0-9-]+$/.test(saved || '') ? saved : null);
+            if (taskId) await refreshHostedTask(actions, activeSessionId, taskId, null, false);
           }).catch((taskError) => {
             if (!disposed) actions.setError(taskError instanceof Error ? taskError.message : String(taskError));
           });
         }
         return () => { disposed = true; };
-      }, [open, activeSessionId, actions]);
+      }, [open, visible, activeSessionId, actions]);
 
       // Reopening during execution follows Host metadata, even when the original
       // command watcher was lost on page reload. This performs no QCC calls.
       react.useEffect(() => {
-        if (!open || !workflowTask?.id || !['matching', 'enriching'].includes(workflowTask.state)) return undefined;
+        if (!open || !visible || !workflowTask?.id || !['matching', 'enriching'].includes(workflowTask.state)) return undefined;
         let disposed = false, timer;
         const poll = async () => {
           try {
@@ -3636,51 +3311,9 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
         };
         timer = setTimeout(poll, 2000);
         return () => { disposed = true; clearTimeout(timer); };
-      }, [open, workflowTask?.id, workflowTask?.state, activeSessionId, step, actions]);
+      }, [open, visible, workflowTask?.id, workflowTask?.state, activeSessionId, step, actions]);
 
-      // 非模态右栏会覆盖 Host 的中央画布；按实际重叠量把 composer 能力栏左移，
-      // 保证 Mockup 中的五个入口在窄桌面视口仍可见、可点击。展开态专注工作台，
-      // 不强行挤压到不足一栏的剩余区域。
-      react.useEffect(() => {
-        if (typeof document === 'undefined' || typeof document.querySelectorAll !== 'function') return undefined;
-        const reset = () => {
-          for (const bar of document.querySelectorAll('.dcAgentCapabilities')) {
-            bar.style?.removeProperty('--dc-agent-workbench-shift');
-          }
-        };
-        if (!open || expanded) {
-          reset();
-          return reset;
-        }
-        const align = () => {
-          const drawer = document.querySelector('.dcAgentWorkbench');
-          if (!drawer) return;
-          const drawerRect = drawer.getBoundingClientRect();
-          for (const bar of document.querySelectorAll('.dcAgentCapabilities')) {
-            const barRect = bar.getBoundingClientRect();
-            const overlap = Math.max(0, barRect.right - drawerRect.left + 8);
-            const leftRoom = Math.max(0, barRect.left - 88);
-            const shift = Math.min(overlap, leftRoom);
-            bar.style?.setProperty('--dc-agent-workbench-shift', `${-shift}px`);
-          }
-        };
-        const view = document.defaultView;
-        const frameId = typeof view?.requestAnimationFrame === 'function'
-          ? view.requestAnimationFrame(align)
-          : null;
-        view?.addEventListener?.('resize', align);
-        align();
-        return () => {
-          if (frameId !== null) view?.cancelAnimationFrame?.(frameId);
-          view?.removeEventListener?.('resize', align);
-          reset();
-        };
-      }, [open, expanded, preferredWidth]);
-
-      // DSH 的 useStore 基于 React hooks；所有订阅必须在每次渲染时以相同顺序调用。
-      // 把关闭态 guard 放在全部 useStore 之后，避免首次关闭、随后打开时触发
-      // React #310（Rendered more hooks than during the previous render）。
-      if (!open) return null;
+      // Host 决定 Tab 挂载/可见性；内容不再按私有 open flag 隐藏。
 
       const hasData = dataset !== null && dataset.rowCount > 0;
       const requiresQcc = objectives.includes('validate_identity') || objectives.includes('complete_fields');
@@ -4514,60 +4147,12 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
         );
       }
 
-      return h('div', {
-        className: 'dcAgentOverlay',
+      return h('section', {
+        className: 'dcAgentWorkbenchContent',
         'data-dsh-plugin': 'data-cleaning-agent',
-        onClick: (event) => {
-          if (event.target === event.currentTarget) {
-            stopJobsPolling();
-            actions.close();
-          }
-        },
+        'aria-label': '数据清洗补全工作台',
+        'data-session-id': activeSessionId ?? undefined,
       },
-        h('aside', {
-          className: `dcAgentWorkbench${expanded ? ' is-expanded' : ''}`,
-          role: 'dialog',
-          'aria-modal': 'false',
-          'aria-label': '数据清洗补全工作台',
-          'data-session-id': activeSessionId ?? undefined,
-          id: 'dc-agent-workbench',
-          onKeyDown: (event) => {
-            if (event.key === 'Escape') {
-              event.preventDefault();
-              stopJobsPolling();
-              actions.close();
-            }
-          },
-        },
-          h('div', { className: 'dcAgentResizeHandle', role: 'separator', tabIndex: 0,
-            'aria-label': '调整工作台宽度', 'aria-orientation': 'vertical', 'aria-controls': 'dc-agent-workbench',
-            title: '拖动调整宽度；左右方向键微调，Home/End 最小/最大，双击恢复默认' }),
-          h('header', { className: 'dcAgentWbHeader' },
-            h('div', { className: 'dcAgentWbTitle' },
-              h('span', { className: 'dcAgentWbIcon', 'aria-hidden': 'true' }, h(DatabaseLogo, { size: 22 })),
-              h('div', null,
-                h('b', null, '数据清洗补全'),
-              ),
-            ),
-            h('div', { className: 'dcAgentWbActions' },
-              h('button', {
-                className: 'dcAgentWbClose',
-                type: 'button',
-                'aria-label': expanded ? '收起工作台' : '展开工作台',
-                onClick: () => actions.toggleExpanded(),
-              }, expanded ? '↘' : '↖'),
-              h('button', {
-                className: 'dcAgentWbClose',
-                type: 'button',
-                title: '关闭工作台（Esc）',
-                'aria-label': '关闭',
-                onClick: () => {
-                  stopJobsPolling();
-                  actions.close();
-                },
-              }, '✕'),
-            ),
-          ),
           h('nav', { className: 'dcAgentManagement', 'aria-label': '工作台管理' },
             h('button', { type: 'button', className: 'dcAgentButton', 'aria-pressed': step !== 'history',
               onClick: () => actions.setStep(cachedTask?.stage || 'upload') }, '当前任务'),
@@ -4611,17 +4196,240 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
               h('button', { type: 'button', className: 'dcAgentButton', 'aria-pressed': step === 'rules', onClick: () => actions.setStep('rules') }, '字段映射与规则'),
               h('button', { type: 'button', className: 'dcAgentButton', 'aria-pressed': step === 'profile', onClick: () => actions.setStep('profile') }, '质量体检报告'),
             ) : null,
-            workflowNavigationIssue(step, cachedTask, hasData, profile, qccRun)
+            workflowNavigationIssue(step, cachedTask, hasData, profile, qccRun, Boolean((clean || complete) && exportRows()?.length))
               ? h('section', { className: 'dcAgentSection', role: 'status' },
-                  h('p', null, workflowNavigationIssue(step, cachedTask, hasData, profile, qccRun)),
+                  h('p', null, workflowNavigationIssue(step, cachedTask, hasData, profile, qccRun, Boolean((clean || complete) && exportRows()?.length))),
                   h('button', { type: 'button', className: 'dcAgentButton',
                     onClick: () => actions.setStep(!hasData ? 'upload' : !cachedTask || ['draft', 'uploaded'].includes(cachedTask.state) ? 'rules' : cachedTask.state === 'rules_confirmed' ? 'profile' : step === 'download' ? 'enrich' : 'match') }, '前往前置步骤'))
               : pane,
           ),
-        ),
       );
     }
 
+    // BEGIN generated Better Sidebar adapter (source: lib/better-sidebar-adapter.js)
+    /** Public Better Sidebar seam. No business task creation, cancellation or geometry. */
+    const CLEANING_TAB_ID = 'dsh-data-cleaning-agent:workbench';
+    const SIDEBAR_DEPENDENCY_MESSAGE = '请安装或升级兼容的 dsh-better-sidebar 并重启 DSH（需要 targetedOpen 和 stateSubscription 能力），然后重新点击流程按钮。现有任务和文件不会删除。';
+
+    function sidebarCompatibility(service) {
+      const methods = ['registerTab', 'openTab', 'isTabEnabled', 'getSnapshot', 'subscribeState'];
+      return Boolean(service && methods.every(key => typeof service[key] === 'function')
+        && ['targetedOpen', 'stateSubscription'].every(key => service.features?.includes(key)));
+    }
+
+    function contains(node, id) {
+      if (!node) return false;
+      return node.kind === 'leaf' ? node.tabs.some(tab => tab.id === id)
+        : node.children.some(child => contains(child, id));
+    }
+
+    function revealCleaningTab(state, id) {
+      if (state.floats?.some(item => item.tab.id === id)) return state;
+      if (contains(state.bottomSplits, id)) return state.bottomOpen ? state : { ...state, bottomOpen: true };
+      if (contains(state.splits, id)) return state.panelOpen ? state : { ...state, panelOpen: true };
+      return state;
+    }
+
+    /** One adapter per plugin activation. Session navigation survives closing its Tab. */
+    function createCleaningSidebarAdapter(service, { component, icon, onUnavailable = () => {} }) {
+      const targets = new Map();
+      const destinations = new Map();
+      const pending = new Set();
+      let disposed = false;
+      const compatible = sidebarCompatibility(service);
+      const applyPending = sessionId => {
+        if (disposed || service.getSnapshot().sessionId !== sessionId || !pending.has(sessionId)) return;
+        const target = targets.get(sessionId);
+        if (!target) return;
+        pending.delete(sessionId);
+        target.navigate(destinations.get(sessionId));
+        target.store.reduce(state => revealCleaningTab(state, target.tabId));
+      };
+      const unregister = compatible ? service.registerTab({
+        id: CLEANING_TAB_ID, title: '数据清洗补全', icon, order: 30, single: true, component,
+      }) : () => {};
+      const unsubscribe = compatible ? service.subscribeState(() => {
+        const sessionId = service.getSnapshot().sessionId;
+        if (sessionId) applyPending(sessionId);
+      }) : () => {};
+      return {
+        compatible,
+        open(scope, destination = 'upload') {
+          if (disposed) return false;
+          if (!compatible || !service.isTabEnabled(CLEANING_TAB_ID)) {
+            onUnavailable(compatible ? '请在 Better Sidebar 设置中启用「数据清洗补全」Tab。' : SIDEBAR_DEPENDENCY_MESSAGE);
+            return false;
+          }
+          if (!scope?.sessionId) throw new Error('A target Session is required');
+          destinations.set(scope.sessionId, destination);
+          pending.add(scope.sessionId);
+          service.openTab({ type: CLEANING_TAB_ID }, scope);
+          applyPending(scope.sessionId);
+          return true;
+        },
+        attach(scope, target) {
+          if (disposed) return () => {};
+          targets.set(scope.sessionId, target);
+          // Without a pending shortcut, preserve the Session business store's current view.
+          // Closing/reopening a Tab must not rewind an in-progress task to an older shortcut.
+          applyPending(scope.sessionId);
+          return () => { if (targets.get(scope.sessionId) === target) targets.delete(scope.sessionId); };
+        },
+        dispose() {
+          if (disposed) return;
+          disposed = true;
+          unsubscribe(); unregister();
+          targets.clear(); pending.clear(); destinations.clear();
+        },
+      };
+    }
+
+    // END generated Better Sidebar adapter
+
+    // A shared owner across materialized root/Session factories, never a shared UI store.
+    const CONTROLLER_KEY = Symbol.for('dsh.data-cleaning.session-workbench');
+    const DEPENDENCY_EVENT = 'dsh:data-cleaning-sidebar-dependency';
+    function installSessionWorkbench(ctx) {
+      const host = typeof document === 'undefined' ? window : document;
+      if (host[CONTROLLER_KEY]) {
+        const shared = host[CONTROLLER_KEY];
+        shared.references += 1;
+        sessionWorkbenchController = shared.controller;
+        let released = false;
+        return () => { if (!released) { released = true; shared.release(); } };
+      }
+      let disposed = false;
+      const instances = new Map();
+      const spec = createWorkbenchStore();
+      const instanceFor = sessionId => {
+        if (!sessionId) throw new Error('请先打开数据清洗会话。');
+        if (!instances.has(sessionId)) {
+          const instance = spec.create(sessionId);
+          instance.actions.setActiveSession(sessionId);
+          instances.set(sessionId, instance);
+        }
+        return instances.get(sessionId);
+      };
+      let openingSession = null;
+      const notify = message => {
+        if (openingSession) instanceFor(openingSession).actions.setError(message);
+        if (typeof document?.dispatchEvent === 'function') {
+          const event = document.createEvent('CustomEvent');
+          event.initCustomEvent(DEPENDENCY_EVENT, false, false, { sessionId: openingSession, message });
+          document.dispatchEvent(event);
+        }
+      };
+      let adapter;
+      function SessionWorkbenchTab(props) {
+        const instance = instanceFor(props.scope.sessionId);
+        const useStore = pick => react.useSyncExternalStore(instance.subscribe,
+          () => pick(instance.getSnapshot()), () => pick(instance.getSnapshot()));
+        react.useEffect(() => {
+          instance.actions.openAt(null, props.scope.sessionId);
+          return adapter.attach(props.scope, { tabId: props.tab.id, store: props.store,
+            navigate: destination => instance.actions.setStep(destination || instance.getSnapshot().step) });
+        }, [instance, props.scope.sessionId, props.tab.id, props.store]);
+        return h(WorkbenchContent, { useStore, actions: instance.actions, visible: props.visible,
+          sendSessionCommand: (sessionId, prompt) => sendQccAgentCommand(ctx, sessionId, prompt),
+          setSessionDraft: (sessionId, prompt) => setQccAgentDraft(ctx, sessionId, prompt) });
+      }
+      const adapterOptions = { component: SessionWorkbenchTab, icon: size => h(DatabaseLogo, { size }), onUnavailable: notify };
+      adapter = createCleaningSidebarAdapter(null, adapterOptions);
+      const connectProvider = service => {
+        if (disposed) return () => {};
+        const next = createCleaningSidebarAdapter(service, adapterOptions);
+        adapter.dispose();
+        adapter = next;
+        return () => {
+          next.dispose();
+          if (!disposed && adapter === next) adapter = createCleaningSidebarAdapter(null, adapterOptions);
+        };
+      };
+      // Optional child injection grants Cordis service access and follows provider removal.
+      // Core conversation / Host tools remain loaded when Better Sidebar is absent.
+      const providerFiber = typeof ctx.inject === 'function'
+        ? ctx.inject(['betterSidebar'], providerContext => {
+            providerContext.effect(() => connectProvider(providerContext.betterSidebar), 'data-cleaning-agent: sidebar provider');
+          })
+        : null;
+      const disconnectFixture = typeof ctx.inject !== 'function' ? connectProvider(ctx.betterSidebar) : () => {};
+      const controller = {
+        storeFor: instanceFor,
+        actionsFor: sessionId => instanceFor(sessionId).actions,
+        open(sessionId, step) {
+          if (disposed || !sessionId) return false;
+          const instance = instanceFor(sessionId);
+          instance.actions.openAt(step, sessionId);
+          const sessions = typeof ctx.get === 'function' ? ctx.get('sessions') : ctx.sessions;
+          const summary = sessions?.list?.getSnapshot?.()?.byId?.[sessionId];
+          openingSession = sessionId;
+          try { return adapter.open({ sessionId, ...(summary?.cwd ? { cwd: summary.cwd } : {}) },
+            step || instance.getSnapshot().step); }
+          finally { openingSession = null; }
+        },
+      };
+      sessionWorkbenchController = controller;
+      const listeners = {
+        [WORKBENCH_OPEN_EVENT]: event => {
+          const detail = event.detail || {};
+          const actions = controller.actionsFor(detail.sessionId);
+          if (detail.task?.id) cacheWorkflowTask(actions, detail.sessionId, detail.task);
+          controller.open(detail.sessionId, detail.step);
+        },
+        [WORKBENCH_DATASET_EVENT]: event => {
+          const { sessionId, result, source } = event.detail;
+          const actions = controller.actionsFor(sessionId);
+          if (!result) return;
+          applyParsed(result, actions, `session:${sessionId}`, source);
+          void queueWorkflowOperation(sessionId, () => persistParsedWorkflow(actions, sessionId, result, source))
+            .catch(error => { if (!disposed) actions.setError(error.message || String(error)); });
+        },
+        [WORKBENCH_DRAFT_EVENT]: event => {
+          const { sessionId, draft = {} } = event.detail;
+          const actions = controller.actionsFor(sessionId);
+          if (draft.title) actions.setTaskTitle(draft.title);
+          if (draft.objectives) actions.setObjectives(draft.objectives);
+          if (draft.mappings) actions.setMappings(draft.mappings);
+          if (draft.fieldSelection) actions.setFieldSelection(draft.fieldSelection);
+          for (const [key, value] of Object.entries(draft.matchRules || {})) actions.setMatchRule(key, value);
+          void queueWorkflowOperation(sessionId, async () => {
+            const task = await ensureEditableWorkflowTask(actions, sessionId, draft);
+            return updateWorkflowTask(actions, sessionId, task, draft);
+          }).catch(error => { if (!disposed) actions.setError(error.message || String(error)); });
+        },
+        [WORKBENCH_PREPARE_EVENT]: event => {
+          const { sessionId, config, resolve, reject } = event.detail;
+          const actions = controller.actionsFor(sessionId);
+          queueWorkflowOperation(sessionId, () => stageConfirmedWorkflow(actions, sessionId, config))
+            .then(command => { if (!disposed) watchHostedCommand(actions, sessionId, command); resolve(command); }, reject);
+        },
+      };
+      const bindings = Object.entries(listeners).map(([name, handler]) => {
+        const listener = event => {
+          if (disposed || event.defaultPrevented || !event.detail?.sessionId) return;
+          event.preventDefault();
+          handler(event);
+        };
+        host.addEventListener?.(name, listener);
+        return () => host.removeEventListener?.(name, listener);
+      });
+      const shared = { controller, references: 1, release() {
+        if (--shared.references > 0) return;
+        disposed = true;
+        commandWatchGeneration += 1;
+        for (const remove of bindings) remove();
+        adapter.dispose();
+        disconnectFixture();
+        void providerFiber?.dispose();
+        instances.clear();
+        if (host[CONTROLLER_KEY] === shared) delete host[CONTROLLER_KEY];
+        if (sessionWorkbenchController === controller) sessionWorkbenchController = null;
+      } };
+      host[CONTROLLER_KEY] = shared;
+      let released = false;
+      return () => { if (!released) { released = true; shared.release(); } };
+    }
+
     function apply(ctx) {
       // eslint-disable-next-line no-console
       console.log('[dc-agent] client apply() ran');
@@ -4633,7 +4441,7 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
         promptSlot: 'conversation.input.overlay',
         heroTitleBridge: 'exact-text/reversible',
         headerSlot: 'conversation.session.header.actions',
-        overlay: 'shell.overlay',
+        workbench: 'better-sidebar:session-singleton',
         error: null,
       };
       window.__DC_MVP__ = state;
@@ -4642,17 +4450,7 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
         ctx.effect(() => installUiStyles(), 'data-cleaning-agent: UI styles');
         ctx.effect(() => installSessionOwnershipBridge(ctx), 'data-cleaning-agent: session ownership');
 
-        // 右侧工作台：additive overlay，不替换 DSH 单占位 details 面板。
-        ctx.slots.inject('shell.overlay', () => ctx.slots.register({
-          name: 'shell.overlay',
-          id: 'data-cleaning-agent',
-          order: 200,
-          store: workbenchStore,
-          inject: () => ({
-            sendSessionCommand: (sessionId, prompt) => sendQccAgentCommand(ctx, sessionId, prompt),
-            setSessionDraft: (sessionId, prompt) => setQccAgentDraft(ctx, sessionId, prompt),
-          }),
-        }, WorkbenchDrawer));
+        ctx.effect(() => installSessionWorkbench(ctx), 'data-cleaning-agent: Session workbench');
 
         // 左栏：footer 只托管生命周期和 Portal 降级；实际入口显示在工作区列表前。
         ctx.slots.inject('sidebar.footer.action', () => ctx.slots.register({
@@ -4715,7 +4513,9 @@ body:has(.dcAgentPromptBackdrop) { overflow: hidden; }
     exports.inject = inject;
     // 测试用纯函数，不构成 Host / DSH 稳定 API。
     exports.__testing = {
-      workbenchWidthBounds,
+      createWorkbenchStore,
+      WorkbenchContent,
+      installSessionWorkbench,
       DatabaseLogo,
       visibleCatalogFields,
       installCapabilityMount,