dsh-composer-plus 0.7.0 → 0.9.0

package/README.md

@@ -4,7 +4,7 @@
 [![test](https://github.com/furkancak1r/dsh-composer-plus/actions/workflows/test.yml/badge.svg)](https://github.com/furkancak1r/dsh-composer-plus/actions/workflows/test.yml)
 [![license: MIT](https://img.shields.io/badge/license-MIT-blue)](LICENSE)
 
-Codex-style quality-of-life features for the [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) (dsh) desktop and web UI: a Changes panel, input history, a plan-mode shortcut, one-click Continue, queue drag-and-drop, session deeplinks, per-chat Auto Review grants and background notifications.
+Codex-style quality-of-life features for the [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) (dsh) desktop and web UI: a Changes panel, project status in the sidebar, input history, a plan-mode shortcut, one-click Continue, queue drag-and-drop, session deeplinks, per-chat Auto Review grants and background notifications.
 
 Unofficial community plugin. No external network calls.
 
@@ -21,7 +21,7 @@ dsh plugin --profile web add dsh-composer-plus
 
 Then restart dsh. (The CLI can't install into the desktop profile; the app manages it.)
 
-> dsh's pnpm skips versions younger than 24 hours. Right after a release, add the version: `dsh-composer-plus@0.7.0`.
+> dsh's pnpm skips versions younger than 24 hours. Right after a release, add the version: `dsh-composer-plus@0.9.0`.
 
 ## Features
 
@@ -34,6 +34,8 @@ Then restart dsh. (The CLI can't install into the desktop profile; the app manag
 | **Queue drag-and-drop** | Queued messages get a grip (⠿). Drag to reorder, or focus the grip and press `↑` / `↓`. `Esc` cancels. |
 | **Copy deeplink** | Right-click a chat in the sidebar → **Copy deeplink**. Paste the `dsh-session:…` link into another chat to attach that chat as read-only context. |
 | **Allow for this chat** | When Auto Review asks you, the approval card gets **Allow for this chat**: the same tool in the same chat is allowed from then on, with any arguments. A header chip lists the grants and revokes them. Grants survive a restart. |
+| **Project status** | A project row in the sidebar shows the same spinner / waiting / done marker as its chats, so a collapsed project still tells you a chat inside is working or needs you. Hover it for details. |
+| **Active projects first** | When a chat starts running or needs you, its project moves to the top of the sidebar with dsh's own row animation (the same move as dragging it there). Finished projects stay where they are; drag them anywhere as usual. |
 | **Background notifications** | While dsh is in the background you get a notification when a turn finishes (first line of the reply), or when a chat needs an approval (tool name), an answer (the question) or a plan review. The Dock/taskbar badge counts waiting chats. Clicking opens that chat. |
 
 All text — buttons, tooltips, notices, notifications and the Continue message — follows the language selected in dsh (English or Chinese, the two languages dsh ships). Switching the language in dsh settings updates it live.
@@ -62,14 +64,15 @@ Tested on dsh `0.2.0-rc.2` (desktop and web) and `0.2.1-alpha.2` (web). CI runs
 ## Troubleshooting
 
 - **No notifications on macOS:** System Settings → Notifications → DeepSeek Harness → allow. Choose **Alerts** to keep them on screen.
-- **▶, queue grips, Allow for this chat or right-click missing after a dsh update:** these attach to dsh's current HTML because dsh has no slot for them yet. If dsh changes that markup they hide themselves; nothing else breaks. Please open an [issue](https://github.com/furkancak1r/dsh-composer-plus/issues).
-- **Install fails right after a release:** add the version (`dsh-composer-plus@0.7.0`), see the install note above.
+- **▶, queue grips, project status, Allow for this chat or right-click missing after a dsh update:** these attach to dsh's current HTML because dsh has no slot for them yet. If dsh changes that markup they hide themselves; nothing else breaks. Please open an [issue](https://github.com/furkancak1r/dsh-composer-plus/issues).
+- **Install fails right after a release:** add the version (`dsh-composer-plus@0.9.0`), see the install note above.
 
 ## Limits
 
 - dsh's queue has no `move` action, so a reorder rewrites the affected rows' text. If the agent picks up a row mid-move, the move is undone and nothing is lost. Messages with images or files can't be moved.
 - A deeplink works inside chats; clicking it does not open the chat.
 - A notification sent before a restart only brings dsh to the front when clicked.
+- Active projects are moved with dsh's saved project order, so the new order is kept after a restart. Chats outside any project ("Ungrouped") can't be moved; dsh always lists them last.
 - Built-in support is requested upstream: queue `move` in [#773](https://github.com/deepseek-ai/deepseek-harness/discussions/773), a Continue state in [#9269](https://github.com/deepseek-ai/deepseek-harness/discussions/9269).
 
 ## Development

package/client.js

@@ -584,6 +584,128 @@ window.__ModuleLoader__.load({
       const start = lines.findIndex((l) => l.startsWith('@@'));
       return start === -1 ? [] : lines.slice(start).filter((l, i, all) => !(i === all.length - 1 && l === ''));
     }
+    /** One project's status from its visible chats, with dsh's session-row precedence: a pending question/approval/
+     * plan review wins, then running (a chat or its subagents), then unread completion. Archived and blank chats
+     * never show status in dsh, so they don't count here either. */
+    function projectStatus(sessionIds, list, statuses, archived) {
+      let pending; let running = 0; let done = 0;
+      for (const id of sessionIds) {
+        const summary = list.byId[id];
+        if (summary === undefined || summary.blank || summary.origin === 'subagent' || archived.has(id)) continue;
+        const status = statuses.get(id);
+        const kind = status?.pendingInteraction?.kind;
+        if (pending === undefined && (kind === 'approval' || kind === 'plan-review' || kind === 'question')) pending = kind;
+        const children = list.projectionsBySession?.[id]?.values?.subagentCatalog ?? [];
+        if ((status?.running ?? summary.running) === true
+          || children.some((child) => (statuses.get(child.id)?.running ?? list.byId[child.id]?.running) === true)) running += 1;
+        if (status?.completionUnread === true) done += 1;
+      }
+      if (pending !== undefined) return { state: 'warning', pending, running };
+      if (running > 0) return { state: 'ongoing', running };
+      if (done > 0) return { state: 'done' };
+      return null;
+    }
+    /** Moves that bring active projects (running or waiting for the user) to the top, keeping their relative order:
+     * each active project that sits below an idle one goes before the first idle project. */
+    function activeFirstMoves(items, active) {
+      const firstIdle = items.findIndex((item) => !active.has(item.workspaceId));
+      if (firstIdle === -1) return [];
+      const anchor = items[firstIdle].workspaceId;
+      return items.slice(firstIdle + 1).filter((item) => active.has(item.workspaceId)).map((item) => [item.workspaceId, anchor]);
+    }
+    /** Keeps active projects at the top of the sidebar with dsh's own reorder (the same move as dragging a project,
+     * so dsh animates the rows). Projects are only ever moved up; finished ones stay where they are. */
+    function watchActiveProjects(workspaces, sessionsList, status) {
+      let moving = false; let again = false;
+      const run = async () => {
+        if (moving) { again = true; return; }
+        moving = true;
+        try {
+          do {
+            again = false;
+            const snapshot = workspaces.list.getSnapshot();
+            const list = sessionsList.getSnapshot();
+            const statuses = status.getSnapshot();
+            if (snapshot?.items === undefined || list === undefined || statuses === undefined) break;
+            const archived = new Set(snapshot.archivedSessionIds ?? []);
+            const active = new Set(snapshot.items.filter((item) => {
+              const state = projectStatus(item.sessionIds, list, statuses, archived);
+              return state !== null && state.state !== 'done';
+            }).map((item) => item.workspaceId));
+            for (const [id, before] of activeFirstMoves(snapshot.items, active)) await workspaces.insertBefore(id, before);
+          } while (again);
+        } catch (error) {
+          console.warn('dsh-composer-plus: project reorder rejected', error);
+        } finally {
+          moving = false;
+        }
+      };
+      const schedule = () => { queueMicrotask(run); };
+      const stops = [workspaces.list.subscribe(schedule), sessionsList.subscribe(schedule), status.subscribe(schedule)];
+      schedule();
+      return () => { for (const stop of stops) stop(); };
+    }
+    const PROJECT_STATUS = 'data-composer-plus-project-status';
+    /** Shows the session status (spinner / waiting / done dot) on each project row, so a collapsed project still says
+     * that one of its chats is working. dsh has no project-row slot.
+     * shortcut: portals into rows found by `data-row-key="workspace:<id>"`; if dsh changes that markup the marker just
+     * stops appearing. Upgrade when dsh adds a project-row slot. */
+    function ProjectStatusMarkers({ useWorkspaces, useSessions, useSessionStatus, t }) {
+      const workspaces = useWorkspaces((state) => state);
+      const list = useSessions((state) => state);
+      const statuses = useSessionStatus((state) => state);
+      const byKey = React.useMemo(() => {
+        const archived = new Set(workspaces?.archivedSessionIds ?? []);
+        const out = new Map();
+        for (const workspace of workspaces?.items ?? []) {
+          const status = list === undefined || statuses === undefined ? null : projectStatus(workspace.sessionIds, list, statuses, archived);
+          if (status !== null) out.set(workspace.workspaceId, status);
+        }
+        return out;
+      }, [workspaces, list, statuses]);
+      const [hosts, setHosts] = React.useState(new Map());
+      React.useLayoutEffect(() => {
+        if (createPortal === undefined) return undefined;
+        const scan = () => {
+          const next = new Map();
+          for (const row of document.querySelectorAll('[data-row-key^="workspace:"]')) {
+            const key = row.getAttribute('data-row-key').slice('workspace:'.length);
+            let host = row.querySelector(`:scope > [${PROJECT_STATUS}]`);
+            if (host === null) {
+              host = document.createElement('span');
+              host.setAttribute(PROJECT_STATUS, '');
+              host.style.cssText = 'display:inline-flex;align-items:center;gap:4px;flex:none;margin-left:4px';
+              // Before the hover actions, so the marker sits where a session row shows its status.
+              const actions = [...row.children].find((child) => child.querySelector('button') !== null);
+              row.insertBefore(host, actions ?? null);
+            }
+            next.set(key, host);
+          }
+          setHosts((prev) => (prev.size === next.size && [...next].every(([k, h]) => prev.get(k) === h) ? prev : next));
+        };
+        scan();
+        const observer = new MutationObserver(scan);
+        observer.observe(document.body, { childList: true, subtree: true });
+        return () => {
+          observer.disconnect();
+          for (const host of document.querySelectorAll(`[${PROJECT_STATUS}]`)) host.remove();
+        };
+      }, []);
+      if (createPortal === undefined || primitives.StateDot === undefined) return null;
+      const portals = [];
+      for (const [key, host] of hosts) {
+        const status = byKey.get(key);
+        if (status === undefined || !host.isConnected) continue;
+        const label = status.state === 'warning' ? t(`project.${status.pending}`)
+          : status.state === 'ongoing' ? t('project.running', { count: String(status.running) }) : t('project.done');
+        portals.push(createPortal(React.createElement('span', { title: label, style: { display: 'inline-flex', alignItems: 'center', gap: 4 } },
+          React.createElement(primitives.StateDot, { state: status.state }),
+          React.createElement('span', { style: { position: 'absolute', width: 1, height: 1, overflow: 'hidden', clip: 'rect(0 0 0 0)', whiteSpace: 'nowrap' } }, label)),
+        host, key));
+      }
+      return React.createElement(React.Fragment, null, ...portals);
+    }
+
     function ChangesDiff({ sessionId, mode, file, t }) {
       const [state, setState] = React.useState({ status: 'loading' });
       React.useEffect(() => {
@@ -719,6 +841,11 @@ window.__ModuleLoader__.load({
         }, ContinueButton));
         if (ctx.locale !== undefined) ctx.effect(() => ctx.locale.register(LOCALE_NS, {
           en: {
+            'project.running': '{count} chat(s) running',
+            'project.approval': 'A chat is waiting for approval',
+            'project.plan-review': 'A plan is waiting for review',
+            'project.question': 'A chat is waiting for your answer',
+            'project.done': 'A chat finished',
             'continue.label': 'Continue',
             'continue.message': 'continue',
             'queue.drag': 'Drag to reorder (or ↑/↓)',
@@ -759,6 +886,11 @@ window.__ModuleLoader__.load({
             'changes.refresh': 'Refresh',
           },
           zh: {
+            'project.running': '{count} 个对话进行中',
+            'project.approval': '有对话等待审批',
+            'project.plan-review': '有计划等待审阅',
+            'project.question': '有对话等待回答',
+            'project.done': '有对话已完成',
             'continue.label': '继续',
             'continue.message': '继续',
             'queue.drag': '拖动以排序（或按 ↑/↓）',
@@ -799,6 +931,11 @@ window.__ModuleLoader__.load({
             'changes.refresh': '刷新',
           },
         }), 'dsh-composer-plus: dictionaries');
+        ctx.slots.inject('shell.overlay', () => ctx.slots.register({
+          name: 'shell.overlay',
+          id: 'project-status',
+          locale: LOCALE_NS,
+        }, ProjectStatusMarkers));
         ctx.slots.inject('conversation.session.header.utilities', () => ctx.slots.register({
           name: 'conversation.session.header.utilities',
           id: 'chat-tool-grants',
@@ -812,6 +949,10 @@ window.__ModuleLoader__.load({
           // First use asks the OS once; a denied permission stays denied (re-enable it in System Settings).
           if (typeof Notification !== 'undefined' && Notification.permission === 'default') Notification.requestPermission().catch(() => {});
         });
+        if (ctx.inject !== undefined) ctx.inject(['workspaces', 'uiSession', 'sessions'], (scope) => {
+          scope.effect(() => watchActiveProjects(scope.workspaces, scope.sessions.list, scope.uiSession.sessionStatus),
+            'dsh-composer-plus: active projects first');
+        });
         if (ctx.inject !== undefined) ctx.inject(['sidebarRight', 'sidebarRightTabs'], (scope) => {
           const t = ctx.locale.bind(LOCALE_NS);
           scope.effect(() => scope.sidebarRightTabs.register({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-composer-plus",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "DeepSeek Harness helpers: Codex-style Changes panel, input history, Shift+Tab /plan, one-click Continue, queue drag-and-drop, Copy deeplink, Auto Review allow-for-chat, background notifications",
   "license": "MIT",
   "type": "module",
@@ -25,7 +25,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "node test/continue.test.mjs && node test/queue-drag.test.mjs && node test/plan-toggle.test.mjs && node test/deeplink.test.mjs && node test/chat-grant.test.mjs && node test/notify.test.mjs && node test/changes.test.mjs"
+    "test": "node test/continue.test.mjs && node test/queue-drag.test.mjs && node test/plan-toggle.test.mjs && node test/deeplink.test.mjs && node test/chat-grant.test.mjs && node test/notify.test.mjs && node test/changes.test.mjs && node test/project-status.test.mjs"
   },
   "dsh": {
     "bundle": {
@@ -38,6 +38,8 @@
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-conversation",
         "@deepseek-ai/dsh-client-ui-workspace",
+        "@deepseek-ai/dsh-client-ui-layout",
+        "@deepseek-ai/dsh-api-workspace-controller",
         "@deepseek-ai/dsh-client-ui-sidebar-right",
         "@deepseek-ai/dsh-client-ui-session",
         "@deepseek-ai/dsh-api-remotes",