dsh-more 0.0.6 → 0.0.7

package/dist/client.js

@@ -25,7 +25,7 @@ __export(index_exports, {
   inject: () => inject
 });
 module.exports = __toCommonJS(index_exports);
-var import_react11 = require("react");
+var import_react12 = require("react");
 var import_react_dom = require("react-dom");
 
 // src/generated/patch-catalog.ts
@@ -36,7 +36,7 @@ var PATCH_CATALOG = [
   { "id": "conversation-markdown-export", "name": "\u5BFC\u51FA\u5B8C\u6574\u804A\u5929\u8BB0\u5F55", "description": "\u5C06\u5F53\u524D\u4F1A\u8BDD\u7684\u5B8C\u6574\u804A\u5929\u8BB0\u5F55\u4E0B\u8F7D\u4E3A Markdown \u6587\u4EF6", "defaultEnabled": true, "order": 400, "clientKind": "standalone" },
   { "id": "model-capabilities", "name": "\u6A21\u578B\u80FD\u529B\u914D\u7F6E", "description": "\u5728\u6A21\u578B\u914D\u7F6E\u9875\u8BBE\u7F6E\u6BCF\u4E2A\u6A21\u578B\u7684\u8BC6\u56FE\u80FD\u529B\u3001\u53EF\u9009\u601D\u8003\u7C7B\u578B\u4E0E\u601D\u8003\u53C2\u6570\u683C\u5F0F", "defaultEnabled": true, "order": 500, "clientKind": "standalone" },
   { "id": "session-auto-title", "name": "\u4F1A\u8BDD\u81EA\u52A8\u547D\u540D", "description": "\u65B0\u4F1A\u8BDD\u9996\u6761\u9700\u6C42\u540E\uFF0C\u4F7F\u7528\u5F53\u524D\u6A21\u578B\u751F\u6210\u300C\u7C7B\u578B \xB7 \u5177\u4F53\u4EFB\u52A1\u300D\u6807\u9898\uFF1B\u4FDD\u7559\u624B\u52A8\u547D\u540D\uFF0C\u5931\u8D25\u65F6\u4FDD\u7559\u539F\u6709\u6807\u9898", "defaultEnabled": true, "order": 600, "clientKind": "standalone" },
-  { "id": "projectless-tasks", "name": "\u72EC\u7ACB\u4EFB\u52A1", "description": "\u5728\u5DE5\u4F5C\u533A\u4E0B\u62C9\u6846\u9009\u62E9\u72EC\u7ACB\u4EFB\u52A1\uFF0C\u6216\u6E05\u9664\u5DF2\u9009\u76EE\u5F55\u5207\u6362\uFF0C\u4FDD\u7559\u8349\u7A3F\u5E76\u81EA\u52A8\u4F7F\u7528\u72EC\u7ACB\u76EE\u5F55", "defaultEnabled": true, "order": 700, "clientKind": "standalone" }
+  { "id": "projectless-tasks", "name": "\u72EC\u7ACB\u4EFB\u52A1", "description": "\u5728\u5DE5\u4F5C\u533A\u4E0B\u62C9\u6846\u521B\u5EFA\u72EC\u7ACB\u4EFB\u52A1\u5E76\u4FDD\u7559\u8349\u7A3F\uFF0C\u4E5F\u53EF\u5C06\u672A\u5206\u7EC4\u4F1A\u8BDD\u79FB\u5165\u5DE5\u4F5C\u533A\u5217\u8868", "defaultEnabled": true, "order": 700, "clientKind": "standalone" }
 ];
 var DEFAULT_PATCH_SETTINGS = {
   "message-edit": true,
@@ -678,10 +678,83 @@ function markdownFilename(title, sessionId) {
   return `${safeStem(title) || fallback}.md`;
 }
 
+// src/patches/conversation-markdown-export/client/menu.ts
+var MENU_ITEM_ATTRIBUTE = "data-dshmore-markdown-export";
+var MORE_BUTTON_SELECTOR = 'button[class*="_moreButton"][aria-haspopup="menu"]';
+function installMarkdownExportMenu(fallback, options) {
+  const header = fallback.closest("header");
+  if (header === null) return () => {
+  };
+  let item = null;
+  let source = null;
+  let frame = null;
+  const removeItem = () => {
+    item?.remove();
+    item = null;
+    source = null;
+  };
+  const sync = () => {
+    frame = null;
+    const trigger = Array.from(header.querySelectorAll(MORE_BUTTON_SELECTOR)).find((button2) => ["\u66F4\u591A\u64CD\u4F5C", "More actions"].includes(button2.getAttribute("aria-label") ?? ""));
+    fallback.hidden = trigger !== void 0;
+    const download = trigger?.parentElement?.querySelector('button[role="menuitem"]');
+    const text = download?.textContent?.trim();
+    if (download === void 0 || download === null || !["\u4E0B\u8F7D Session \u65E5\u5FD7", "Download session log"].includes(text ?? "")) {
+      removeItem();
+      return;
+    }
+    if (source === download && item?.isConnected === true) return;
+    removeItem();
+    const wrapper = download.parentElement;
+    if (wrapper === null || wrapper.getAttribute("role") === "menu") return;
+    const clone = wrapper.cloneNode(true);
+    if (!(clone instanceof HTMLElement)) return;
+    const button = clone.querySelector('button[role="menuitem"]');
+    if (button === null) return;
+    const label = options.busy ? "\u6B63\u5728\u5BFC\u51FA\u2026" : "\u5BFC\u51FA Markdown";
+    const walker = document.createTreeWalker(button, NodeFilter.SHOW_TEXT);
+    for (let node = walker.nextNode(); node !== null; node = walker.nextNode()) {
+      if (node.nodeValue?.trim() === text) node.nodeValue = label;
+    }
+    clone.setAttribute(MENU_ITEM_ATTRIBUTE, "");
+    button.disabled = options.busy;
+    button.setAttribute("aria-busy", String(options.busy));
+    button.setAttribute("aria-label", "\u5BFC\u51FA\u5B8C\u6574\u804A\u5929\u8BB0\u5F55\u4E3A Markdown");
+    button.addEventListener("click", (event) => {
+      event.preventDefault();
+      event.stopPropagation();
+      if (options.busy) return;
+      options.download();
+      if (trigger?.getAttribute("aria-expanded") === "true") trigger.click();
+    });
+    source = download;
+    item = clone;
+    wrapper.after(clone);
+  };
+  sync();
+  const observer = new MutationObserver(() => {
+    frame ??= window.requestAnimationFrame(sync);
+  });
+  observer.observe(header, {
+    childList: true,
+    subtree: true,
+    attributes: true,
+    attributeFilter: ["aria-label", "aria-expanded"],
+    characterData: true
+  });
+  return () => {
+    observer.disconnect();
+    if (frame !== null) window.cancelAnimationFrame(frame);
+    removeItem();
+    fallback.hidden = false;
+  };
+}
+
 // src/patches/conversation-markdown-export/client/index.tsx
 var import_jsx_runtime4 = require("react/jsx-runtime");
 var exportStyles = `
 .dshmore-markdown-export-button { box-sizing: border-box; min-width: 128px; height: 32px; color: var(--dsw-alias-label-primary); cursor: pointer; background: transparent; border: 1px solid var(--dsw-alias-border-l2); border-radius: 18px; display: inline-flex; align-items: center; justify-content: center; gap: 5px; padding: 6px 12px; font-family: var(--dsw-font-family); font-size: 13px; line-height: 20px; }
+.dshmore-markdown-export-button[hidden] { display: none; }
 .dshmore-markdown-export-button:hover:not(:disabled) { background: var(--dsw-alias-interactive-bg-hover); }
 .dshmore-markdown-export-button:disabled { color: var(--dsw-alias-label-dimmed); cursor: wait; }
 .dshmore-markdown-export-button > span, .dshmore-markdown-export-button > svg { flex: none; }
@@ -705,15 +778,23 @@ function ConversationMarkdownExportButton(props) {
   const title = props.useSessions((state) => state.byId[props.sessionId]?.displayTitle ?? String(props.sessionId));
   const [busy, setBusy] = (0, import_react4.useState)(false);
   const [error, setError] = (0, import_react4.useState)(null);
+  const button = (0, import_react4.useRef)(null);
+  const inFlight = (0, import_react4.useRef)(false);
   const generation = (0, import_react4.useRef)(0);
   const activeSession = (0, import_react4.useRef)(null);
   activeSession.current = enabled ? String(props.sessionId) : null;
   (0, import_react4.useEffect)(() => {
     generation.current += 1;
+    inFlight.current = false;
     setBusy(false);
     setError(null);
+    return () => {
+      generation.current += 1;
+    };
   }, [enabled, props.sessionId]);
   const download = async () => {
+    if (inFlight.current) return;
+    inFlight.current = true;
     const requestSessionId = String(props.sessionId);
     const requestGeneration = ++generation.current;
     setBusy(true);
@@ -729,15 +810,25 @@ function ConversationMarkdownExportButton(props) {
     } catch (caught) {
       if (generation.current === requestGeneration && activeSession.current === requestSessionId) setError(apiErrorText(caught));
     } finally {
-      if (generation.current === requestGeneration && activeSession.current === requestSessionId) setBusy(false);
+      if (generation.current === requestGeneration && activeSession.current === requestSessionId) {
+        inFlight.current = false;
+        setBusy(false);
+      }
     }
   };
+  (0, import_react4.useEffect)(() => {
+    if (!enabled || button.current === null) return;
+    return installMarkdownExportMenu(button.current, { busy, download: () => {
+      void download();
+    } });
+  }, [enabled, props.sessionId, title, busy]);
   if (!enabled) return null;
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_jsx_runtime4.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("style", { children: exportStyles }),
     /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
       "button",
       {
+        ref: button,
         type: "button",
         className: "dshmore-markdown-export-button",
         disabled: busy,
@@ -1293,19 +1384,29 @@ function createTaskStarter(sessions) {
 }
 
 // src/patches/projectless-tasks/client/draft.ts
-function transferDraft(source, target) {
+function transferDraft(source, target, rebind) {
   const from = source.state.getSnapshot();
   const to = target.state.getSnapshot();
   if (from.phase !== "plain" || to.phase !== "plain") throw new Error("\u8F93\u5165\u6B63\u5728\u5904\u7406\u4E2D\uFF0C\u8BF7\u7A0D\u540E\u5207\u6362\u4EFB\u52A1\u76EE\u5F55\u3002");
   if (from.draft !== "" && to.draft !== "" && from.draft !== to.draft) {
     throw new Error("\u76EE\u6807\u4EFB\u52A1\u5DF2\u6709\u5176\u4ED6\u8349\u7A3F\uFF0C\u672C\u6B21\u5207\u6362\u5DF2\u505C\u6B62\uFF0C\u539F\u8349\u7A3F\u5DF2\u4FDD\u7559\u3002");
   }
-  if (from.imageIds.length > 0 && !target.addImages([...from.imageIds])) {
+  const ids = from.attachmentIds ?? from.imageIds;
+  const add = from.attachmentIds === void 0 ? target.addImages : target.addAttachments;
+  const remove = from.attachmentIds === void 0 ? source.removeImage : source.removeAttachment;
+  if (!Array.isArray(ids) || typeof add !== "function" || typeof remove !== "function") {
+    throw new Error("\u5F53\u524D DSH \u7248\u672C\u7684\u8349\u7A3F\u63A5\u53E3\u4E0D\u517C\u5BB9\uFF0C\u539F\u8349\u7A3F\u5DF2\u4FDD\u7559\u3002");
+  }
+  if (ids.length > 0 && !add.call(target, [...ids])) {
     throw new Error("\u6682\u65F6\u65E0\u6CD5\u8F6C\u79FB\u56FE\u7247\uFF0C\u539F\u8349\u7A3F\u5DF2\u4FDD\u7559\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002");
   }
+  if (ids.length > 0 && from.attachmentIds !== void 0) {
+    if (rebind === void 0) throw new Error("\u65E0\u6CD5\u8F6C\u79FB\u9644\u4EF6\u5F52\u5C5E\uFF0C\u539F\u8349\u7A3F\u5DF2\u4FDD\u7559\u3002");
+    rebind(ids);
+  }
   if (from.draft !== "") target.setDraft(from.draft);
   if (from.draft !== "") source.setDraft("");
-  from.imageIds.forEach((id) => source.removeImage(id));
+  ids.forEach((id) => remove.call(source, id));
 }
 function transferBeforeOpen(ctx, sourceId, targetId) {
   const value = ctx.sessions;
@@ -1320,7 +1421,12 @@ function transferBeforeOpen(ctx, sourceId, targetId) {
   const source = sessions.scope(sourceId);
   const target = sessions.scope(targetId);
   if (source === void 0 || target === void 0) throw new Error("\u4EFB\u52A1\u5C1A\u672A\u51C6\u5907\u597D\uFF0C\u539F\u8349\u7A3F\u5DF2\u4FDD\u7559\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002");
-  transferDraft(ctx.conversation.input.for(source), ctx.conversation.input.for(target));
+  const conversation = ctx.conversation;
+  transferDraft(
+    conversation.input.for(source),
+    conversation.input.for(target),
+    typeof conversation.rebindDraftFiles === "function" ? (ids) => conversation.rebindDraftFiles(targetId, ids) : void 0
+  );
   return true;
 }
 
@@ -1455,7 +1561,12 @@ function unlockComposer(owner, independent, block) {
   const { disabled: _disabled, onRequestWorkspace: _request, workspacePickerOpen: _picker, placeholder: _placeholder, ...rest } = owner;
   return { ...rest, ...block === void 0 ? {} : { blocked: block, placeholder: block.reason } };
 }
-function installConversationAdapter(ctx, activation) {
+var CONVERSATION_SLOTS = ["conversation", "main.conversation"];
+function conversationSlot(name) {
+  return name;
+}
+function installConversationAdapter(ctx, activation, name = "conversation") {
+  const slot = conversationSlot(name);
   const wrapped = /* @__PURE__ */ new Map();
   let live = true;
   const listeners = /* @__PURE__ */ new Set();
@@ -1466,7 +1577,7 @@ function installConversationAdapter(ctx, activation) {
     };
   };
   const sync = () => {
-    for (const entry of ctx.slots.entries("conversation")) {
+    for (const entry of ctx.slots.entries(slot)) {
       let ProjectlessConversation2 = function(props) {
         const active = (0, import_react8.useSyncExternalStore)(subscribeLifetime, () => live);
         const settings = (0, import_react8.useSyncExternalStore)(activation.subscribe, activation.getSnapshot);
@@ -1499,14 +1610,14 @@ function installConversationAdapter(ctx, activation) {
             if (starter.current === operation) setBusy(false);
           });
         };
-        const renderSlot = (name, owner, options) => {
-          if (name === "conversation.composer.bar" && isComposerOwner(owner)) {
+        const renderSlot = (name2, owner, options) => {
+          if (name2 === "conversation.composer.bar" && isComposerOwner(owner)) {
             return props.renderSlot("conversation.composer.bar", unlockComposer(owner, independent, block), options);
           }
-          if (enabled && name === "conversation.hero.workspace" && isWorkspaceOwner(owner)) {
+          if (enabled && name2 === "conversation.hero.workspace" && isWorkspaceOwner(owner)) {
             return /* @__PURE__ */ (0, import_jsx_runtime8.jsx)(WorkspaceChoice, { owner, state: { independent, busy, chooseIndependent }, error, children: props.renderSlot("conversation.hero.workspace", owner, options) });
           }
-          return props.renderSlot(name, owner, options);
+          return props.renderSlot(name2, owner, options);
         };
         return (0, import_react8.createElement)(original, { ...props, renderSlot });
       };
@@ -1517,10 +1628,10 @@ function installConversationAdapter(ctx, activation) {
       entry.component = ProjectlessConversation2;
     }
   };
-  const unsubscribe = ctx.slots.subscribe("conversation", sync);
+  const unsubscribe = ctx.slots.subscribe(slot, sync);
   sync();
-  const priorities = ctx.slots.entries("conversation").map((entry) => entry.options.priority ?? 0);
-  const fallback = ctx.slots.register({ name: "conversation", priority: Math.max(0, ...priorities) + 1 }, () => null);
+  const priorities = ctx.slots.entries(slot).map((entry) => entry.options.priority ?? 0);
+  const fallback = ctx.slots.register({ name: slot, priority: Math.max(0, ...priorities) + 1 }, () => null);
   return () => {
     live = false;
     listeners.forEach((listener) => listener());
@@ -1647,13 +1758,239 @@ function installNewSessionNavigation(ctx, activation) {
   });
 }
 
+// src/patches/projectless-tasks/client/groups.tsx
+var import_react9 = require("react");
+var import_dsh_client_ui_primitives6 = require("@deepseek-ai/dsh-client-ui-primitives");
+
+// src/patches/projectless-tasks/groups.ts
+var SESSION_GROUPS_NAMESPACE = "dsh-more-session-groups";
+var EMPTY_GROUPS = { assignments: {} };
+function decodeSessionGroups(value) {
+  if (typeof value !== "object" || value === null || !("assignments" in value)) return void 0;
+  const assignments = value.assignments;
+  if (typeof assignments !== "object" || assignments === null || Array.isArray(assignments) || !Object.values(assignments).every((id) => typeof id === "string")) return void 0;
+  return { assignments };
+}
+
+// src/patches/projectless-tasks/client/group-menu.ts
+var ATTRIBUTE = "data-dshmore-session-move";
+function installMoveMenu(onMove) {
+  const items = /* @__PURE__ */ new Map();
+  let frame;
+  const sync = () => {
+    frame = void 0;
+    for (const [source, item] of items) {
+      if (!source.isConnected || !item.isConnected) {
+        item.remove();
+        items.delete(source);
+      }
+    }
+    for (const source of document.querySelectorAll('button[role="menuitem"]')) {
+      const text = source.textContent?.trim();
+      if (text !== "\u5F52\u6863\u4F1A\u8BDD" && text !== "Archive session" || items.has(source)) continue;
+      if (document.querySelector('[class*="_sessionRow"][class*="_menuOpen"]') === null) continue;
+      const wrapper = source.parentElement;
+      if (wrapper === null) continue;
+      const item = wrapper.cloneNode(true);
+      const button = item.querySelector('button[role="menuitem"]');
+      if (button === null) continue;
+      const label = text === "\u5F52\u6863\u4F1A\u8BDD" ? "\u79FB\u52A8\u5230\u5DE5\u4F5C\u533A\u2026" : "Move to workspace\u2026";
+      const walker = document.createTreeWalker(button, NodeFilter.SHOW_TEXT);
+      for (let node = walker.nextNode(); node !== null; node = walker.nextNode()) {
+        if (node.nodeValue?.trim() === text) node.nodeValue = node.nodeValue.replace(text, label);
+      }
+      item.setAttribute(ATTRIBUTE, "");
+      button.setAttribute("aria-label", label);
+      button.addEventListener("click", (event) => {
+        event.preventDefault();
+        event.stopImmediatePropagation();
+        onMove(source);
+      });
+      items.set(source, item);
+      wrapper.before(item);
+    }
+  };
+  const observer = new MutationObserver(() => {
+    frame ??= requestAnimationFrame(sync);
+  });
+  sync();
+  observer.observe(document.body, { childList: true, subtree: true });
+  return () => {
+    observer.disconnect();
+    if (frame !== void 0) cancelAnimationFrame(frame);
+    items.forEach((item) => item.remove());
+    items.clear();
+  };
+}
+
+// src/patches/projectless-tasks/client/groups.tsx
+var import_jsx_runtime9 = require("react/jsx-runtime");
+function projectSessionGroups(workspaces, sessions, groups) {
+  const owned = new Set(workspaces.items.flatMap((item) => item.sessionIds));
+  const items = workspaces.items.map((workspace) => {
+    const added = Object.entries(groups.assignments).flatMap(([id, target]) => target === workspace.workspaceId && !owned.has(id) && sessions.byId[id]?.origin !== "subagent" && sessions.byId[id] !== void 0 ? [id] : []);
+    return added.length === 0 ? workspace : { ...workspace, sessionIds: [...added, ...workspace.sessionIds] };
+  });
+  return items.every((item, index) => item === workspaces.items[index]) ? workspaces : { ...workspaces, items };
+}
+var SIDEBAR_SLOT = "sidebar.workspaces";
+var ALWAYS_LIVE = { subscribe: () => () => {
+}, getSnapshot: () => true };
+function extendGroupedSidebar(original, activation, source, lifetime = ALWAYS_LIVE) {
+  return function GroupedSidebar(props) {
+    const settings = (0, import_react9.useSyncExternalStore)(activation.subscribe, activation.getSnapshot);
+    const binding = (0, import_react9.useMemo)(() => ({ subscribe: (listener) => source.subscribe(listener), getSnapshot: () => source.getSnapshot() }), []);
+    const saved = (0, import_react9.useSyncExternalStore)(binding.subscribe, binding.getSnapshot);
+    const native = props.useWorkspaces((value) => value);
+    const sessions = props.useSessions((value) => value);
+    const active = (0, import_react9.useSyncExternalStore)(lifetime.subscribe, lifetime.getSnapshot);
+    const enabled = active && settings[PROJECTLESS_TASKS_PATCH_ID];
+    const groups = saved.value ?? EMPTY_GROUPS;
+    const display = (0, import_react9.useMemo)(() => enabled ? projectSessionGroups(native, sessions, groups) : native, [enabled, native, sessions, groups]);
+    const [pending, setPending] = (0, import_react9.useState)();
+    const [destination, setDestination] = (0, import_react9.useState)("");
+    const [busy, setBusy] = (0, import_react9.useState)(false);
+    const [error, setError] = (0, import_react9.useState)();
+    const intent = (0, import_react9.useRef)(false);
+    const inFlight = (0, import_react9.useRef)(false);
+    const live = (0, import_react9.useRef)(true);
+    (0, import_react9.useEffect)(() => {
+      live.current = true;
+      return () => {
+        live.current = false;
+      };
+    }, []);
+    (0, import_react9.useEffect)(() => {
+      if (!enabled) {
+        setPending(void 0);
+        return;
+      }
+      return installMoveMenu((archive) => {
+        intent.current = true;
+        try {
+          archive.click();
+        } finally {
+          intent.current = false;
+        }
+      });
+    }, [enabled]);
+    const archiveSession = (id) => {
+      if (!intent.current) return props.archiveSession(id);
+      intent.current = false;
+      setPending(id);
+      setDestination(groups.assignments[id] ?? "");
+      setError(void 0);
+      return Promise.resolve();
+    };
+    const useWorkspaces = (select) => select(display);
+    const close = () => {
+      if (!inFlight.current) setPending(void 0);
+    };
+    const move = async () => {
+      if (pending === void 0 || inFlight.current) return;
+      inFlight.current = true;
+      setBusy(true);
+      setError(void 0);
+      try {
+        await callPatchApi(PROJECTLESS_TASKS_PATCH_ID, "move", { sessionId: pending, workspaceId: destination || null });
+        if (live.current) setPending(void 0);
+      } catch (reason) {
+        if (live.current) setError(apiErrorText(reason));
+      } finally {
+        inFlight.current = false;
+        if (live.current) setBusy(false);
+      }
+    };
+    const groupedNatively = pending !== void 0 && native.items.some((item) => item.sessionIds.includes(pending));
+    const subagent = pending !== void 0 && sessions.byId[pending]?.origin === "subagent";
+    const selectedMissing = destination !== "" && !native.items.some((item) => item.workspaceId === destination);
+    const unavailable = groupedNatively ? "\u8FD9\u6761\u4F1A\u8BDD\u5DF2\u6709\u539F\u751F\u5DE5\u4F5C\u533A\uFF0C\u53EA\u652F\u6301\u79FB\u52A8\u672A\u5206\u7EC4\u6216\u624B\u52A8\u5F52\u7EC4\u7684\u4F1A\u8BDD\u3002" : subagent ? "\u5B50\u4F1A\u8BDD\u8DDF\u968F\u4E3B\u4F1A\u8BDD\u5F52\u7EC4\uFF0C\u8BF7\u79FB\u52A8\u4E3B\u4F1A\u8BDD\u3002" : saved.status !== "ready" ? "\u5F52\u7EC4\u8BBE\u7F6E\u5C1A\u672A\u5C31\u7EEA\uFF0C\u8BF7\u786E\u8BA4\u5DF2\u91CD\u542F DSH \u540E\u53F0\u5E76\u5237\u65B0\u9875\u9762\u3002" : !saved.writable ? "\u5F53\u524D\u914D\u7F6E\u4E3A\u53EA\u8BFB\uFF0C\u65E0\u6CD5\u79FB\u52A8\u4F1A\u8BDD\u3002" : selectedMissing ? "\u76EE\u6807\u5DE5\u4F5C\u533A\u5DF2\u4E0D\u5B58\u5728\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9\u3002" : void 0;
+    return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_jsx_runtime9.Fragment, { children: [
+      (0, import_react9.createElement)(original, { ...props, useWorkspaces, archiveSession }),
+      enabled && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+        import_dsh_client_ui_primitives6.Modal,
+        {
+          open: pending !== void 0,
+          onClose: close,
+          title: "\u79FB\u52A8\u5230\u5DE5\u4F5C\u533A",
+          closeLabel: "\u5173\u95ED",
+          description: "\u4FDD\u7559\u4F1A\u8BDD\u5386\u53F2\u548C\u539F\u5DE5\u4F5C\u76EE\u5F55\uFF0C\u4EC5\u8C03\u6574\u5217\u8868\u5F52\u5C5E\u3002",
+          footer: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(import_jsx_runtime9.Fragment, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_dsh_client_ui_primitives6.Button, { variant: "ghost", disabled: busy, onClick: close, children: "\u53D6\u6D88" }),
+            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_dsh_client_ui_primitives6.Button, { variant: "primary", disabled: busy || unavailable !== void 0 || pending === void 0 || (groups.assignments[pending] ?? "") === destination, onClick: () => void move(), children: busy ? "\u6B63\u5728\u79FB\u52A8\u2026" : "\u79FB\u52A8" })
+          ] }),
+          children: /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { style: { display: "grid", gap: 12 }, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { children: pending === void 0 ? "" : sessions.byId[pending]?.displayTitle ?? pending }),
+            /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("label", { style: { display: "grid", gap: 8 }, children: [
+              "\u76EE\u6807\u5DE5\u4F5C\u533A",
+              /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
+                "select",
+                {
+                  "aria-label": "\u76EE\u6807\u5DE5\u4F5C\u533A",
+                  value: destination,
+                  disabled: busy || unavailable !== void 0 && !selectedMissing,
+                  onChange: (event) => setDestination(event.target.value),
+                  style: { width: "100%", minHeight: 40, borderRadius: 10, padding: "8px 12px", color: "var(--dsw-alias-label-primary)", background: "var(--dsw-alias-button-elevated-fill)", border: "1px solid var(--dsw-alias-border-l4)" },
+                  children: [
+                    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("option", { value: "", children: "\u672A\u5206\u7EC4" }),
+                    native.items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("option", { value: item.workspaceId, children: item.title || item.path }, item.workspaceId))
+                  ]
+                }
+              )
+            ] }),
+            (error ?? unavailable) !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { role: "alert", style: { color: "var(--dsw-alias-state-error-primary)" }, children: error ?? unavailable })
+          ] })
+        }
+      )
+    ] });
+  };
+}
+function installSessionGrouping(ctx, activation) {
+  const source = ctx.settingsScope.bind({ namespace: SESSION_GROUPS_NAMESPACE, decode: decodeSessionGroups });
+  ctx.slots.inject(SIDEBAR_SLOT, () => {
+    let live = true;
+    const listeners = /* @__PURE__ */ new Set();
+    const lifetime = { getSnapshot: () => live, subscribe: (fn) => {
+      listeners.add(fn);
+      return () => {
+        listeners.delete(fn);
+      };
+    } };
+    const wrapped = /* @__PURE__ */ new Map();
+    const sync = () => {
+      for (const entry of ctx.slots.entries(SIDEBAR_SLOT)) {
+        if (wrapped.has(entry) || entry.children?.["sidebar.workspaces.directoryFlow"] === void 0 || typeof entry.component !== "function") continue;
+        const original = entry.component;
+        const component = extendGroupedSidebar(original, activation, source, lifetime);
+        wrapped.set(entry, { original, component });
+        entry.component = component;
+      }
+    };
+    const unsubscribe = ctx.slots.subscribe(SIDEBAR_SLOT, sync);
+    sync();
+    const priorities = ctx.slots.entries(SIDEBAR_SLOT).map((entry) => entry.options.priority ?? 0);
+    const fallback = ctx.slots.register({ name: SIDEBAR_SLOT, priority: Math.max(0, ...priorities) + 1 }, () => null);
+    return () => {
+      live = false;
+      listeners.forEach((listener) => listener());
+      unsubscribe();
+      for (const [entry, patch] of wrapped) if (entry.component === patch.component) entry.component = patch.original;
+      wrapped.clear();
+      fallback();
+    };
+  });
+}
+
 // src/patches/projectless-tasks/client/index.tsx
 var clientPatch5 = {
   id: PROJECTLESS_TASKS_PATCH_ID,
   install: (ctx, activation) => {
+    installSessionGrouping(ctx, activation);
     ctx.inject(["conversation", "uiWorkspace"], (scope) => {
       scope.effect(() => installNewSessionNavigation(scope, activation));
-      scope.slots.inject("conversation", () => installConversationAdapter(scope, activation));
+      for (const name of CONVERSATION_SLOTS) {
+        scope.slots.inject(conversationSlot(name), () => installConversationAdapter(scope, activation, name));
+      }
       scope.slots.inject("conversation.hero.workspace", () => installPickerAdapter(scope));
     });
   }
@@ -1684,19 +2021,19 @@ var ClientPatchActivation = class {
 };
 
 // src/kernel/client/config-card.tsx
-var import_react9 = require("react");
-var import_dsh_client_ui_primitives6 = require("@deepseek-ai/dsh-client-ui-primitives");
-var import_jsx_runtime9 = require("react/jsx-runtime");
+var import_react10 = require("react");
+var import_dsh_client_ui_primitives7 = require("@deepseek-ai/dsh-client-ui-primitives");
+var import_jsx_runtime10 = require("react/jsx-runtime");
 function PatchConfigCard({ activation, initiallyOpen = false }) {
-  const scope = (0, import_react9.useSyncExternalStore)(
+  const scope = (0, import_react10.useSyncExternalStore)(
     activation.subscribe,
     activation.getSettingsSnapshot,
     activation.getSettingsSnapshot
   );
   const settings = activation.getSnapshot();
-  const [open, setOpen] = (0, import_react9.useState)(initiallyOpen);
-  const [busy, setBusy] = (0, import_react9.useState)(/* @__PURE__ */ new Set());
-  const [error, setError] = (0, import_react9.useState)(null);
+  const [open, setOpen] = (0, import_react10.useState)(initiallyOpen);
+  const [busy, setBusy] = (0, import_react10.useState)(/* @__PURE__ */ new Set());
+  const [error, setError] = (0, import_react10.useState)(null);
   if (scope.status === "unavailable") return null;
   const update = async (id, enabled) => {
     setBusy((current) => /* @__PURE__ */ new Set([...current, id]));
@@ -1713,9 +2050,9 @@ function PatchConfigCard({ activation, initiallyOpen = false }) {
       });
     }
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("li", { className: `dshmore-config-card${open ? " dshmore-config-card-open" : ""}`, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("style", { children: styles }),
-    /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("li", { className: `dshmore-config-card${open ? " dshmore-config-card-open" : ""}`, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("style", { children: styles }),
+    /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(
       "button",
       {
         type: "button",
@@ -1726,23 +2063,23 @@ function PatchConfigCard({ activation, initiallyOpen = false }) {
           setOpen((current) => !current);
         },
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("span", { className: "dshmore-config-heading-copy", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("strong", { children: "DSH More" }),
-            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { children: "\u52A8\u6001\u5F00\u542F\u6216\u5173\u95ED\u72EC\u7ACB\u8865\u4E01\uFF0C\u9ED8\u8BA4\u5168\u90E8\u5F00\u542F\u3002" })
+          /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { className: "dshmore-config-heading-copy", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("strong", { children: "DSH More" }),
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { children: "\u52A8\u6001\u5F00\u542F\u6216\u5173\u95ED\u72EC\u7ACB\u8865\u4E01\uFF0C\u9ED8\u8BA4\u5168\u90E8\u5F00\u542F\u3002" })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(import_dsh_client_ui_primitives6.IconChevronDownOutline14, { className: `dshmore-config-chevron${open ? " dshmore-config-chevron-open" : ""}` })
+          /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(import_dsh_client_ui_primitives7.IconChevronDownOutline14, { className: `dshmore-config-chevron${open ? " dshmore-config-chevron-open" : ""}` })
         ]
       }
     ),
-    open && /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("div", { className: "dshmore-config-body", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("div", { className: "dshmore-config-list", children: PATCH_CATALOG.map((patch) => {
+    open && /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("div", { className: "dshmore-config-body", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("div", { className: "dshmore-config-list", children: PATCH_CATALOG.map((patch) => {
         const waiting = busy.has(patch.id);
-        return /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("label", { className: "dshmore-config-row", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime9.jsxs)("span", { className: "dshmore-config-copy", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("strong", { children: patch.name }),
-            /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("span", { children: patch.description })
+        return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("label", { className: "dshmore-config-row", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)("span", { className: "dshmore-config-copy", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("strong", { children: patch.name }),
+            /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { children: patch.description })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
             "input",
             {
               type: "checkbox",
@@ -1757,9 +2094,9 @@ function PatchConfigCard({ activation, initiallyOpen = false }) {
           )
         ] }, patch.id);
       }) }),
-      scope.status === "loading" && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { className: "dshmore-config-note", children: "\u6B63\u5728\u8BFB\u53D6\u63D2\u4EF6\u914D\u7F6E\u2026" }),
-      scope.status === "ready" && !scope.writable && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { className: "dshmore-config-note", children: "\u5F53\u524D Settings \u5B58\u50A8\u4E3A\u53EA\u8BFB\u3002" }),
-      error !== null && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)("p", { className: "dshmore-config-error", children: error })
+      scope.status === "loading" && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("p", { className: "dshmore-config-note", children: "\u6B63\u5728\u8BFB\u53D6\u63D2\u4EF6\u914D\u7F6E\u2026" }),
+      scope.status === "ready" && !scope.writable && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("p", { className: "dshmore-config-note", children: "\u5F53\u524D Settings \u5B58\u50A8\u4E3A\u53EA\u8BFB\u3002" }),
+      error !== null && /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("p", { className: "dshmore-config-error", children: error })
     ] })
   ] });
 }
@@ -1768,14 +2105,14 @@ function installPatchConfigCard(ctx, activation) {
     name: "settings.plugin.item",
     key: PATCH_SETTINGS_NAMESPACE,
     priority: 90
-  }, (props) => /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(PatchConfigCard, { ...props, activation })));
+  }, (props) => /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(PatchConfigCard, { ...props, activation })));
 }
 
 // src/kernel/message-visibility.ts
 var MESSAGE_VISIBILITY_PROJECTION_KEY = "dshMoreMessageDelete";
 
 // src/platform/dsh/client/message-targets.tsx
-var import_react10 = require("react");
+var import_react11 = require("react");
 
 // src/platform/dsh/client/message-content.ts
 function contentText(content) {
@@ -1913,17 +2250,17 @@ function trajectorySourceSeq(row) {
   return Number.isSafeInteger(seq) && seq >= 0 ? seq : void 0;
 }
 function useMessageTargets(props, hiddenSeqs, hiddenTrajectoryKeys, active = true) {
-  const selector = (0, import_react10.useMemo)(() => createMessageSurfaceSelector(active), [active, props.sessionId]);
+  const selector = (0, import_react11.useMemo)(() => createMessageSurfaceSelector(active), [active, props.sessionId]);
   const surface = props.useChat(selector);
-  const surfaceRef = (0, import_react10.useRef)(surface);
-  const hiddenSeqsRef = (0, import_react10.useRef)(hiddenSeqs);
-  const hiddenTrajectoryKeysRef = (0, import_react10.useRef)(hiddenTrajectoryKeys);
+  const surfaceRef = (0, import_react11.useRef)(surface);
+  const hiddenSeqsRef = (0, import_react11.useRef)(hiddenSeqs);
+  const hiddenTrajectoryKeysRef = (0, import_react11.useRef)(hiddenTrajectoryKeys);
   surfaceRef.current = surface;
   hiddenSeqsRef.current = hiddenSeqs;
   hiddenTrajectoryKeysRef.current = hiddenTrajectoryKeys;
-  const [targets, setTargets] = (0, import_react10.useState)([]);
-  const requestFullScanRef = (0, import_react10.useRef)(null);
-  (0, import_react10.useLayoutEffect)(() => {
+  const [targets, setTargets] = (0, import_react11.useState)([]);
+  const requestFullScanRef = (0, import_react11.useRef)(null);
+  (0, import_react11.useLayoutEffect)(() => {
     if (!active) {
       setTargets((current) => current.length === 0 ? current : []);
       return;
@@ -2047,21 +2384,21 @@ function useMessageTargets(props, hiddenSeqs, hiddenTrajectoryKeys, active = tru
       for (const host of document.querySelectorAll("[data-dshmore-message-actions]")) host.remove();
     };
   }, [active, props.sessionId]);
-  (0, import_react10.useLayoutEffect)(() => {
+  (0, import_react11.useLayoutEffect)(() => {
     requestFullScanRef.current?.();
   }, [surface, hiddenSeqs, hiddenTrajectoryKeys]);
   return targets;
 }
 
 // src/client/index.tsx
-var import_jsx_runtime10 = require("react/jsx-runtime");
+var import_jsx_runtime11 = require("react/jsx-runtime");
 var inject = ["slots", "sessions", "workspaces", "settingsScope"];
 function MessageActionPatchController({ patch, props, targets, enabled }) {
   const actions = patch.useActions(props, enabled);
   const style = { "--dshmore-action-order": patch.order };
-  return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_jsx_runtime10.Fragment, { children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(import_jsx_runtime11.Fragment, { children: [
     enabled && targets.map((target) => (0, import_react_dom.createPortal)(
-      /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("span", { className: "dshmore-action-contribution", style, children: actions.renderAction(target) }),
+      /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("span", { className: "dshmore-action-contribution", style, children: actions.renderAction(target) }),
       target.host,
       `${patch.id}:${target.key}`
     )),
@@ -2069,15 +2406,15 @@ function MessageActionPatchController({ patch, props, targets, enabled }) {
   ] });
 }
 function MessageActionsController(props) {
-  const settings = (0, import_react11.useSyncExternalStore)(props.activation.subscribe, props.activation.getSnapshot);
+  const settings = (0, import_react12.useSyncExternalStore)(props.activation.subscribe, props.activation.getSnapshot);
   const projected = props.useProjection(MESSAGE_VISIBILITY_PROJECTION_KEY);
-  const hiddenSeqs = (0, import_react11.useMemo)(() => new Set(projected?.deletedSeqs ?? []), [projected]);
-  const hiddenTrajectoryKeys = (0, import_react11.useMemo)(() => new Set(projected?.hiddenTrajectoryKeys ?? []), [projected]);
+  const hiddenSeqs = (0, import_react12.useMemo)(() => new Set(projected?.deletedSeqs ?? []), [projected]);
+  const hiddenTrajectoryKeys = (0, import_react12.useMemo)(() => new Set(projected?.hiddenTrajectoryKeys ?? []), [projected]);
   const messageActionsEnabled = MESSAGE_ACTION_PATCHES.some((patch) => settings[patch.id]);
   const targets = useMessageTargets(props, hiddenSeqs, hiddenTrajectoryKeys, messageActionsEnabled);
-  return /* @__PURE__ */ (0, import_jsx_runtime10.jsxs)(import_jsx_runtime10.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime10.jsx)("style", { children: styles }),
-    MESSAGE_ACTION_PATCHES.map((patch) => /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime11.jsxs)(import_jsx_runtime11.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime11.jsx)("style", { children: styles }),
+    MESSAGE_ACTION_PATCHES.map((patch) => /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(
       MessageActionPatchController,
       {
         patch,
@@ -2100,7 +2437,7 @@ function apply(ctx) {
     name: "conversation.session.header.utilities",
     id: `${PLUGIN_NAME}-message-actions`,
     order: 90
-  }, (props) => /* @__PURE__ */ (0, import_jsx_runtime10.jsx)(MessageActionsController, { ...props, ctx, activation })));
+  }, (props) => /* @__PURE__ */ (0, import_jsx_runtime11.jsx)(MessageActionsController, { ...props, ctx, activation })));
   for (const patch of CLIENT_PATCHES) patch.install(ctx, activation);
 }
 return module.exports; } });

package/dist/index.js

@@ -519,10 +519,11 @@ function buildCleanSeed(source, selection) {
     }
     if (event.type === "assistant/message") {
       rebuilt.append("assistant/message", {
+        // Keep the durable stream and settlement metadata required by DSH 0.1.5.
+        // Only the reconstructed turn/step coordinates belong to the new log.
+        ...event.data,
         turn,
-        step,
-        message: event.data.message,
-        ...event.data.usage === void 0 ? {} : { usage: event.data.usage }
+        step
       }, { surfaceOp: "append" });
       assistantSeen = true;
       for (const call of event.data.message.content) {
@@ -664,15 +665,13 @@ var SESSION_DELETE_PATCH_ID = "session-delete";
 // src/patches/session-delete/host/live-session-handles.ts
 var TRACKER = /* @__PURE__ */ Symbol.for("dsh-more.session-delete.live-session-handles");
 function trackedHandle(tracker, handle) {
-  let disposed = false;
+  let disposal;
   const wrapped = {
     agent: handle.agent,
-    dispose: async () => {
-      if (disposed) return;
-      disposed = true;
-      if (tracker.handles.get(handle.agent.id) === wrapped) tracker.handles.delete(handle.agent.id);
+    dispose: () => disposal ??= Promise.resolve().then(async () => {
       await handle.dispose();
-    }
+      if (tracker.handles.get(handle.agent.id) === wrapped) tracker.handles.delete(handle.agent.id);
+    })
   };
   tracker.handles.set(handle.agent.id, wrapped);
   return wrapped;
@@ -682,26 +681,37 @@ function installLiveSessionHandleTracker(ctx) {
   const existing = registry[TRACKER];
   if (existing !== void 0) {
     existing.references += 1;
-    return () => {
-      existing.references -= 1;
-    };
+    return releaseTracker(registry, existing);
   }
   const originalCreate = registry.create;
   const originalResume = registry.resume;
   const tracker = { handles: /* @__PURE__ */ new Map() };
   tracker.originalCreate = originalCreate;
   tracker.originalResume = originalResume;
+  tracker.createDescriptor = Object.getOwnPropertyDescriptor(registry, "create");
+  tracker.resumeDescriptor = Object.getOwnPropertyDescriptor(registry, "resume");
   tracker.wrappedCreate = async (options) => trackedHandle(tracker, await originalCreate.call(registry, options));
   tracker.wrappedResume = async (options) => trackedHandle(tracker, await originalResume.call(registry, options));
   tracker.references = 1;
   registry[TRACKER] = tracker;
   registry.create = tracker.wrappedCreate;
   registry.resume = tracker.wrappedResume;
+  return releaseTracker(registry, tracker);
+}
+function releaseTracker(registry, tracker) {
+  let released = false;
   return () => {
+    if (released) return;
+    released = true;
     tracker.references -= 1;
     if (tracker.references > 0 || registry[TRACKER] !== tracker) return;
-    if (registry.create === tracker.wrappedCreate) registry.create = tracker.originalCreate;
-    if (registry.resume === tracker.wrappedResume) registry.resume = tracker.originalResume;
+    const restore = (key, installed, descriptor) => {
+      if (Object.getOwnPropertyDescriptor(registry, key)?.value !== installed) return;
+      if (descriptor === void 0) Reflect.deleteProperty(registry, key);
+      else Object.defineProperty(registry, key, descriptor);
+    };
+    restore("create", tracker.wrappedCreate, tracker.createDescriptor);
+    restore("resume", tracker.wrappedResume, tracker.resumeDescriptor);
     delete registry[TRACKER];
   };
 }
@@ -725,12 +735,16 @@ function detachInternal(registry, sessionId, label) {
 async function unloadLiveSession(ctx, sessionId) {
   const agent = ctx.agents.get(sessionId);
   const session = ctx.sessions.get(sessionId);
+  const handle = getLiveSessionHandle(ctx, sessionId);
+  const ownsWriter = "open" in ctx.sessionPersistence && typeof ctx.sessionPersistence.open === "function";
+  if (session !== void 0 && ownsWriter && handle === void 0) {
+    throw new DshMoreError("session-not-live", "\u65E0\u6CD5\u5B89\u5168\u5378\u8F7D\u8FD9\u6761\u5DF2\u52A0\u8F7D\u7684\u4F1A\u8BDD\uFF0C\u8BF7\u91CD\u542F DSH \u540E\u518D\u5220\u9664\u3002", 409);
+  }
   if (agent !== void 0) {
     agent.cancel({ kind: "disposed" });
     await agent.whenIdle();
   }
   if (session !== void 0) await ctx.sessions.flush(session);
-  const handle = getLiveSessionHandle(ctx, sessionId);
   if (handle !== void 0) {
     await handle.dispose();
   } else {
@@ -753,7 +767,8 @@ function sessionDirectoryFromLocation(locationPath) {
     throw new DshMoreError("internal", "\u5F53\u524D\u6301\u4E45\u5316\u540E\u7AEF\u6CA1\u6709\u8FD4\u56DE\u7EDD\u5BF9\u4F1A\u8BDD\u8DEF\u5F84\u3002", 409);
   }
   const artifact = basename(locationPath);
-  if (artifact !== "session.jsonl" && artifact !== "session.jsonl.zstd") {
+  const match = /^session(?:\.v([1-9][0-9]*))?\.jsonl(?:\.zstd)?$/.exec(artifact);
+  if (match === null || match[1] !== void 0 && !Number.isSafeInteger(Number(match[1]))) {
     throw new DshMoreError("internal", "\u6301\u4E45\u5316\u540E\u7AEF\u8FD4\u56DE\u4E86\u672A\u77E5\u7684\u4F1A\u8BDD\u6587\u4EF6\u5E03\u5C40\u3002", 500);
   }
   const sessionDir = dirname(locationPath);
@@ -765,9 +780,10 @@ function sessionDirectoryFromLocation(locationPath) {
 async function deleteSessionPermanently(ctx, rawSessionId) {
   const sessionId = SessionId6(rawSessionId);
   const live = ctx.sessions.get(sessionId);
-  const header2 = (await ctx.sessionPersistence.list()).find((candidate) => candidate.id === sessionId) ?? live?.header;
+  const stored = await ctx.sessionPersistence.list();
+  const header2 = stored.map((candidate) => "header" in candidate ? candidate.header : candidate).find((candidate) => candidate.id === sessionId) ?? live?.header;
   if (header2 === void 0) throw new DshMoreError("not-found", "\u4F1A\u8BDD\u8BB0\u5F55\u4E0D\u5B58\u5728\u3002", 404);
-  const location = ctx.sessionPersistence.locate(header2);
+  const location = typeof ctx.sessionPersistence.locate === "function" ? ctx.sessionPersistence.locate(header2) : void 0;
   if (location === void 0) {
     throw new DshMoreError("internal", "\u5F53\u524D\u6301\u4E45\u5316\u540E\u7AEF\u4E0D\u652F\u6301\u9010\u4F1A\u8BDD\u7269\u7406\u5220\u9664\u3002", 409);
   }
@@ -776,7 +792,10 @@ async function deleteSessionPermanently(ctx, rawSessionId) {
   }
   const sessionDir = sessionDirectoryFromLocation(location.path);
   await unloadLiveSession(ctx, sessionId);
-  const info = await stat(sessionDir).catch(() => void 0);
+  const info = await stat(sessionDir).catch((error) => {
+    if (typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT") return void 0;
+    throw error;
+  });
   if (info !== void 0) {
     if (!info.isDirectory()) throw new DshMoreError("internal", "\u4F1A\u8BDD\u6301\u4E45\u5316\u8DEF\u5F84\u4E0D\u662F\u76EE\u5F55\u3002", 500);
     await rm(sessionDir, { recursive: true, force: false });
@@ -1435,6 +1454,48 @@ import { join } from "node:path";
 var PROJECTLESS_TASKS_PATCH_ID = "projectless-tasks";
 var TASK_ID_PATTERN = /^task-[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
 
+// src/patches/projectless-tasks/groups.ts
+var SESSION_GROUPS_NAMESPACE = "dsh-more-session-groups";
+var EMPTY_GROUPS = { assignments: {} };
+function decodeSessionGroups(value) {
+  if (typeof value !== "object" || value === null || !("assignments" in value)) return void 0;
+  const assignments = value.assignments;
+  if (typeof assignments !== "object" || assignments === null || Array.isArray(assignments) || !Object.values(assignments).every((id) => typeof id === "string")) return void 0;
+  return { assignments };
+}
+
+// src/patches/projectless-tasks/host/groups.ts
+import z2 from "@deepseek-ai/schemastery";
+import { SessionId as SessionId7 } from "@deepseek-ai/dsh-session";
+import { WorkspaceId } from "@deepseek-ai/dsh-workspace";
+var SessionGroupsSchema = z2.object({ assignments: z2.dict(z2.string()).default({}) });
+async function moveSessionGroup(ctx, payload) {
+  const sessionId = SessionId7(requireString(payload, "sessionId"));
+  if (typeof payload !== "object" || payload === null || !("workspaceId" in payload) || !(payload.workspaceId === null || typeof payload.workspaceId === "string" && payload.workspaceId.length > 0)) {
+    throw new DshMoreError("bad-request", "\u8BF7\u9009\u62E9\u76EE\u6807\u5DE5\u4F5C\u533A\u3002");
+  }
+  const workspaceId = payload.workspaceId;
+  if (!ctx.settings.writable) throw new DshMoreError("forbidden", "\u5F53\u524D\u914D\u7F6E\u4E3A\u53EA\u8BFB\uFF0C\u65E0\u6CD5\u79FB\u52A8\u4F1A\u8BDD\u3002", 403);
+  if (workspaceId !== null && ctx.workspaceRegistry.get(WorkspaceId(workspaceId)) === void 0) {
+    throw new DshMoreError("not-found", "\u76EE\u6807\u5DE5\u4F5C\u533A\u5DF2\u4E0D\u5B58\u5728\uFF0C\u8BF7\u91CD\u65B0\u9009\u62E9\u3002", 404);
+  }
+  const storedHeaders = async () => {
+    const stored = await ctx.sessionPersistence.list();
+    return stored.map((item) => "header" in item ? item.header : item);
+  };
+  const header2 = ctx.sessions.get(sessionId)?.header ?? (await storedHeaders()).find((item) => item.id === sessionId);
+  if (header2 === void 0) throw new DshMoreError("not-found", "\u8BE5\u4F1A\u8BDD\u5DF2\u4E0D\u5B58\u5728\u3002", 404);
+  if (header2.origin === "subagent") throw new DshMoreError("bad-request", "\u5B50\u4F1A\u8BDD\u8DDF\u968F\u4E3B\u4F1A\u8BDD\u5F52\u7EC4\uFF0C\u8BF7\u79FB\u52A8\u4E3B\u4F1A\u8BDD\u3002");
+  if (ctx.workspaceRegistry.list().some((workspace) => workspace.sessionIds.includes(sessionId))) {
+    throw new DshMoreError("bad-request", "\u8FD9\u6761\u4F1A\u8BDD\u5DF2\u6709\u539F\u751F\u5DE5\u4F5C\u533A\uFF0C\u53EA\u652F\u6301\u79FB\u52A8\u672A\u5206\u7EC4\u6216\u624B\u52A8\u5F52\u7EC4\u7684\u4F1A\u8BDD\u3002");
+  }
+  const current = decodeSessionGroups(ctx.settings.get(SESSION_GROUPS_NAMESPACE)) ?? EMPTY_GROUPS;
+  const result = { sessionId, workspaceId };
+  if ((current.assignments[sessionId] ?? null) === workspaceId) return result;
+  await ctx.settings.mutate(SESSION_GROUPS_NAMESPACE, [workspaceId === null ? { op: "unset", path: ["assignments", sessionId] } : { op: "set", path: ["assignments", sessionId], value: workspaceId }]);
+  return result;
+}
+
 // src/patches/projectless-tasks/host/index.ts
 function prepareTask(payload, homeDirectory = homedir()) {
   if (typeof payload !== "object" || payload === null || Array.isArray(payload) || !("sessionId" in payload) || typeof payload.sessionId !== "string" || !TASK_ID_PATTERN.test(payload.sessionId) || Object.keys(payload).length !== 1) {
@@ -1444,7 +1505,15 @@ function prepareTask(payload, homeDirectory = homedir()) {
 }
 var hostPatch7 = {
   id: PROJECTLESS_TASKS_PATCH_ID,
-  routes: () => ({ prepare: (payload) => prepareTask(payload) })
+  setup: (ctx) => {
+    const fiber = ctx.inject(["settings"], (scope) => {
+      scope.settings.register(SESSION_GROUPS_NAMESPACE, SessionGroupsSchema);
+    });
+    return () => {
+      void fiber.dispose();
+    };
+  },
+  routes: ({ ctx }) => ({ prepare: (payload) => prepareTask(payload), move: (payload) => moveSessionGroup(ctx, payload) })
 };
 
 // src/generated/host-registry.ts
@@ -1495,15 +1564,15 @@ var HostPatchActivation = class {
 };
 
 // src/generated/host-settings-schema.ts
-import z2 from "@deepseek-ai/schemastery";
-var PatchSettingsSchema = z2.object({
-  "message-edit": z2.boolean().default(true),
-  "message-delete": z2.boolean().default(true),
-  "session-delete": z2.boolean().default(true),
-  "conversation-markdown-export": z2.boolean().default(true),
-  "model-capabilities": z2.boolean().default(true),
-  "session-auto-title": z2.boolean().default(true),
-  "projectless-tasks": z2.boolean().default(true)
+import z3 from "@deepseek-ai/schemastery";
+var PatchSettingsSchema = z3.object({
+  "message-edit": z3.boolean().default(true),
+  "message-delete": z3.boolean().default(true),
+  "session-delete": z3.boolean().default(true),
+  "conversation-markdown-export": z3.boolean().default(true),
+  "model-capabilities": z3.boolean().default(true),
+  "session-auto-title": z3.boolean().default(true),
+  "projectless-tasks": z3.boolean().default(true)
 });
 
 // src/kernel/host/settings.ts

package/dist/types/generated/patch-catalog.d.ts

@@ -43,7 +43,7 @@ export declare const PATCH_CATALOG: readonly [{
 }, {
     readonly id: "projectless-tasks";
     readonly name: "独立任务";
-    readonly description: "在工作区下拉框选择独立任务，或清除已选目录切换，保留草稿并自动使用独立目录";
+    readonly description: "在工作区下拉框创建独立任务并保留草稿，也可将未分组会话移入工作区列表";
     readonly defaultEnabled: true;
     readonly order: 700;
     readonly clientKind: "standalone";

package/dist/types/patches/conversation-markdown-export/client/menu.d.ts

@@ -0,0 +1,5 @@
+/** DSH 0.1.5 owns this menu inside session-log-export, without a child slot. */
+export declare function installMarkdownExportMenu(fallback: HTMLButtonElement, options: {
+    busy: boolean;
+    download: () => void;
+}): () => void;

package/dist/types/patches/projectless-tasks/client/adapter.d.ts

@@ -12,4 +12,6 @@ export declare function unlockComposer(owner: ComposerBarOwnerProps, independent
  * A dormant fallback registration invalidates the public slot subscription
  * on install/uninstall, including an already mounted Web client.
  */
-export declare function installConversationAdapter(ctx: Context, activation: PatchActivationSource): () => void;
+export declare const CONVERSATION_SLOTS: readonly ["conversation", "main.conversation"];
+export declare function conversationSlot(name: typeof CONVERSATION_SLOTS[number]): 'conversation';
+export declare function installConversationAdapter(ctx: Context, activation: PatchActivationSource, name?: typeof CONVERSATION_SLOTS[number]): () => void;

package/dist/types/patches/projectless-tasks/client/draft.d.ts

@@ -1,9 +1,23 @@
 import type { Context } from '@deepseek-ai/cordis';
-import type { SessionInput } from '@deepseek-ai/dsh-client-ui-conversation/client';
+import type { DraftAttachmentId } from '@deepseek-ai/dsh-client-ui-conversation/client';
 import type { SessionId } from '@deepseek-ai/dsh-session/types';
-type Draft = Pick<SessionInput, 'state' | 'setDraft' | 'addImages' | 'removeImage'>;
+interface Draft {
+    state: {
+        getSnapshot(): {
+            phase: string;
+            draft: string;
+            imageIds?: readonly DraftAttachmentId[];
+            attachmentIds?: readonly DraftAttachmentId[];
+        };
+    };
+    setDraft(text: string): void;
+    addImages?(ids: DraftAttachmentId[]): boolean;
+    removeImage?(id: DraftAttachmentId): unknown;
+    addAttachments?(ids: readonly DraftAttachmentId[]): boolean;
+    removeAttachment?(id: DraftAttachmentId): unknown;
+}
 /** Move only after all target admission checks pass; never overwrite another draft. */
-export declare function transferDraft(source: Draft, target: Draft): void;
+export declare function transferDraft(source: Draft, target: Draft, rebind?: (ids: readonly DraftAttachmentId[]) => void): void;
 /** Validate the Client-only service methods where Cordis Host types overlap. */
 export declare function transferBeforeOpen(ctx: Context, sourceId: SessionId | undefined, targetId: SessionId): boolean;
 export {};

package/dist/types/patches/projectless-tasks/client/group-menu.d.ts

@@ -0,0 +1,2 @@
+/** Extend the native session menu; the owning sidebar adapter supplies the exact id. */
+export declare function installMoveMenu(onMove: (archive: HTMLButtonElement) => void): () => void;

package/dist/types/patches/projectless-tasks/client/groups.d.ts

@@ -0,0 +1,21 @@
+import { type ComponentType } from 'react';
+import type { Context } from '@deepseek-ai/cordis';
+import type { SessionId } from '@deepseek-ai/dsh-session/types';
+import type { SessionListState } from '@deepseek-ai/dsh-api-session-controller/client';
+import type { WorkspaceSnapshot } from '@deepseek-ai/dsh-api-workspace-controller/client';
+import type { PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
+import type { SettingsScope } from '@deepseek-ai/dsh-client-ui-settings/client';
+import type { PatchActivationSource } from '../../../kernel/client/activation.js';
+import { type SessionGroups } from '../groups.js';
+/** Only the sidebar receives grouping metadata; execution and workspace selection use native cwd. */
+export declare function projectSessionGroups(workspaces: WorkspaceSnapshot, sessions: SessionListState, groups: SessionGroups): WorkspaceSnapshot;
+type SidebarProps = PropsRuntime<'sidebar'> & {
+    archiveSession(id: SessionId): Promise<void>;
+};
+interface Lifetime {
+    subscribe(listener: () => void): () => void;
+    getSnapshot(): boolean;
+}
+export declare function extendGroupedSidebar(original: ComponentType<SidebarProps>, activation: PatchActivationSource, source: SettingsScope<SessionGroups>, lifetime?: Lifetime): ComponentType<SidebarProps>;
+export declare function installSessionGrouping(ctx: Context, activation: PatchActivationSource): void;
+export {};

package/dist/types/patches/projectless-tasks/groups.d.ts

@@ -0,0 +1,6 @@
+export declare const SESSION_GROUPS_NAMESPACE = "dsh-more-session-groups";
+export interface SessionGroups {
+    assignments: Record<string, string>;
+}
+export declare const EMPTY_GROUPS: SessionGroups;
+export declare function decodeSessionGroups(value: unknown): SessionGroups | undefined;

package/dist/types/patches/projectless-tasks/host/groups.d.ts

@@ -0,0 +1,9 @@
+import type { Context } from '@deepseek-ai/cordis';
+import z from '@deepseek-ai/schemastery';
+import { type SessionGroups } from '../groups.js';
+export declare const SessionGroupsSchema: z<SessionGroups>;
+/** Persist presentation membership only. Immutable cwd and native accounts stay authoritative. */
+export declare function moveSessionGroup(ctx: Context, payload: unknown): Promise<{
+    sessionId: string;
+    workspaceId: string | null;
+}>;

package/dsh.plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-more",
   "description": "Practical patches for missing DSH Web context and history controls",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "entry": {
     "name": "dsh-more",
     "inject": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-more",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Practical patches for missing DeepSeek Harness Web context and history controls.",
   "type": "module",
   "license": "MIT",