dsh-composer-plus 0.6.2 → 0.8.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.6.2`.
+> dsh's pnpm skips versions younger than 24 hours. Right after a release, add the version: `dsh-composer-plus@0.8.0`.
 
 ## Features
 
@@ -30,13 +30,14 @@ Then restart dsh. (The CLI can't install into the desktop profile; the app manag
 | **Changes panel** | Right sidebar → `+` → **Changes**. Pick **Uncommitted**, **Unstaged**, **Staged** or **Branch** to see changed files with `+/-` counts; click a file for its diff. **Last Turn** opens dsh's own review of the latest turn. |
 | **Input history** | In an empty composer, press `↑` / `↓` to walk through messages you sent, like a terminal. |
 | **Plan mode shortcut** | `Shift+Tab` adds `/plan ` to the start of the draft (press again to remove it). If the chat is already in plan mode, `Shift+Tab` leaves it. |
-| **One-click Continue** | When a turn has stopped and the composer is empty, Send turns into **▶**. One click sends `continue`. |
+| **One-click Continue** | When a turn has stopped and the composer is empty, Send turns into **▶**. One click sends “continue” in dsh's language (`continue` / `继续`). |
 | **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. |
 | **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. |
 
-Labels follow dsh's language (English or Chinese).
+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.
 
 ## Keyboard shortcuts
 
@@ -62,8 +63,8 @@ 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.6.2`), 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.8.0`), see the install note above.
 
 ## Limits
 

package/client.js

@@ -196,7 +196,6 @@ window.__ModuleLoader__.load({
       return React.createElement('span', { ref: anchor, hidden: true });
     }
 
-    const CONTINUE_TEXT = 'continue';
     /** Dictionary namespace for this plugin's menu copy; dsh ships `en` and `zh`. */
     const LOCALE_NS = 'dsh-composer-plus';
     let createPortal;
@@ -212,7 +211,7 @@ window.__ModuleLoader__.load({
      * Send turns into a play button that submits "continue". Send is not a slot, so the play button is
      * portaled into Send's row with Send's own class and Send is hidden meanwhile.
      * Hidden on a blank chat, while running, in subagent views, or as soon as the user types or attaches. */
-    function ContinueButton({ useSession, useInput, inputActions }) {
+    function ContinueButton({ useSession, useInput, inputActions, t }) {
       const show = useSession((s) => s !== undefined && !s.blank && !s.running && s.subagent === null && !s.removed);
       const idle = useInput((s) => s !== undefined && s.phase === 'plain' && s.draft.trim() === '' && s.attachmentIds.length === 0);
       const visible = show && idle && inputActions !== undefined;
@@ -228,15 +227,17 @@ window.__ModuleLoader__.load({
       const anchor = React.createElement('span', { ref: anchorRef, hidden: true, 'aria-hidden': true });
       if (!visible || host === null) return anchor;
       const onClick = () => {
-        if (React.flushSync !== undefined) React.flushSync(() => inputActions.setDraft(CONTINUE_TEXT));
-        else inputActions.setDraft(CONTINUE_TEXT);
+        // The sent message follows dsh's language, so the model reads it in the user's own language.
+        const text = t('continue.message');
+        if (React.flushSync !== undefined) React.flushSync(() => inputActions.setDraft(text));
+        else inputActions.setDraft(text);
         inputActions.submit();
       };
       const button = React.createElement('button', {
         type: 'button',
         className: host.className,
-        title: 'Continue',
-        'aria-label': 'Continue',
+        title: t('continue.label'),
+        'aria-label': t('continue.label'),
         onMouseDown: (event) => event.preventDefault(),
         onClick,
       }, React.createElement('svg', { viewBox: '0 0 16 16', width: 16, height: 16, 'aria-hidden': true },
@@ -255,7 +256,7 @@ window.__ModuleLoader__.load({
      * so nothing is lost or duplicated.
      * shortcut: grips are portaled into QueueDock rows found in the DOM; if a dsh update changes that markup the
      * grips just stop appearing — upgrade when dsh exposes a queue row slot or a native move action. */
-    function QueueReorder({ useSession, useProjection, updateQueue, notify }) {
+    function QueueReorder({ useSession, useProjection, updateQueue, notify, t }) {
       const inbox = useProjection('inbox');
       const pending = useSession((s) => (s === undefined ? undefined : s.pendingSubmissions));
       const mutable = useSession((s) => s !== undefined && (s.subagent === null || s.subagent.address.mode === 'continuable'));
@@ -320,7 +321,7 @@ window.__ModuleLoader__.load({
           }
         } catch {
           for (const change of done.reverse()) await edit(change.row, change.prev).catch(() => undefined);
-          notify('error', 'Reorder failed: a message may have already started sending.');
+          notify('error', t('queue.failed'));
         } finally {
           setBusy(false);
         }
@@ -375,8 +376,8 @@ window.__ModuleLoader__.load({
         const draggable = texts[index] !== null && !busy;
         const grip = React.createElement('button', {
           type: 'button',
-          title: draggable ? 'Drag to reorder (or ↑/↓)' : 'Messages with images/files cannot be moved',
-          'aria-label': 'Reorder queued message',
+          title: draggable ? t('queue.drag') : t('queue.locked'),
+          'aria-label': t('queue.grip'),
           disabled: !draggable,
           onPointerDown: (event) => startDrag(index, event),
           onKeyDown: (event) => {
@@ -583,6 +584,88 @@ 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;
+    }
+    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(() => {
@@ -683,6 +766,7 @@ window.__ModuleLoader__.load({
           name: 'conversation.input.dock',
           id: 'queue-reorder',
           order: 21,
+          locale: LOCALE_NS,
           inject: (sessionId) => {
             const actx = ctx.sessions.scope(sessionId);
             const conversation = actx === undefined ? undefined : actx.get('conversation');
@@ -713,9 +797,21 @@ window.__ModuleLoader__.load({
           name: 'conversation.input.right',
           id: 'composer-continue',
           order: 1000,
+          locale: LOCALE_NS,
         }, 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 ↑/↓)',
+            'queue.locked': 'Messages with images/files cannot be moved',
+            'queue.grip': 'Reorder queued message',
+            'queue.failed': 'Reorder failed: a message may have already started sending.',
             copyDeeplink: 'Copy deeplink',
             allowChat: 'Allow for this chat',
             allowChatTitle: 'Allow {toolName} without asking for the rest of this chat, with any arguments. If the tool can write, that includes any write.',
@@ -750,6 +846,17 @@ 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': '拖动以排序（或按 ↑/↓）',
+            'queue.locked': '含图片或文件的消息无法移动',
+            'queue.grip': '调整排队消息顺序',
+            'queue.failed': '排序失败：某条消息可能已开始发送。',
             copyDeeplink: '复制深层链接',
             allowChat: '本对话内允许',
             allowChatTitle: '本对话剩余时间内，{toolName} 的任何参数调用都无需再询问。若该工具可写入，也包括任何写入操作。',
@@ -784,6 +891,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',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-composer-plus",
-  "version": "0.6.2",
+  "version": "0.8.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,7 @@
         "@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-client-ui-sidebar-right",
         "@deepseek-ai/dsh-client-ui-session",
         "@deepseek-ai/dsh-api-remotes",