dsh-composer-plus 1.0.0 → 1.0.2

package/README.md

@@ -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@1.0.0`.
+> dsh's pnpm skips versions younger than 24 hours. Right after a release, add the version: `dsh-composer-plus@1.0.2`.
 
 ## Features
 
@@ -30,12 +30,12 @@ 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” in dsh's language (`continue` / `继续`). |
+| **One-click Continue** | When the last turn was stopped, failed or cut off and the composer is empty, Send turns into **▶**. One click sends “continue” in dsh's language (`continue` / `继续`). A turn that finished normally keeps the regular Send button. |
 | **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. |
+| **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. Moves are saved to dsh's project order, so turning this off keeps the current order. |
 | **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.
@@ -69,7 +69,7 @@ Tested on dsh `0.2.0-rc.2` (desktop and web) and `0.2.1-alpha.2` (web). CI runs
 
 - **No notifications on macOS:** System Settings → Notifications → DeepSeek Harness → allow. Choose **Alerts** to keep them on screen.
 - **▶, 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@1.0.0`), see the install note above.
+- **Install fails right after a release:** add the version (`dsh-composer-plus@1.0.2`), see the install note above.
 
 ## Limits
 

package/client.js

@@ -207,12 +207,25 @@ window.__ModuleLoader__.load({
       const buttons = [...seat.querySelectorAll('button')].filter((b) => /(^|\s)\w+_primary(\s|$)/.test(b.className));
       return buttons.length === 0 ? null : buttons[buttons.length - 1];
     }
-    /** Codex-style resume: when the turn has stopped, the composer is empty and the chat has history,
-     * 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, t }) {
-      const show = useSession((s) => s !== undefined && !s.blank && !s.running && s.subagent === null && !s.removed);
+    /** True when the newest turn in the loaded window did not finish normally: stopped, failed, cut by a token
+     * limit, or still open without a running agent (lost connection). A completed turn needs no resume. */
+    function needsResume(entries) {
+      for (let i = entries.length - 1; i >= 0; i--) {
+        const event = entries[i].event;
+        if (event.type === 'turn/end') return event.data?.reason?.kind !== 'completed';
+        if (event.type === 'turn/start') return true;
+      }
+      return false;
+    }
+    /** Codex-style resume: when the last turn was stopped or failed, the composer is empty and the chat has
+     * history, Send turns into a play button that submits "continue". A normally completed turn keeps dsh's
+     * own Send. 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, useTurnEnd, inputActions, t }) {
+      const ended = typeof useTurnEnd === 'function' ? useTurnEnd((window) => window !== undefined && needsResume(window.entries)) : false;
+      const failed = useSession((s) => s !== undefined && (s.lastAgentError != null || s.promptError != null));
+      const show = useSession((s) => s !== undefined && !s.blank && !s.running && s.subagent === null && !s.removed) && (ended || failed);
       const idle = useInput((s) => s !== undefined && s.phase === 'plain' && s.draft.trim() === '' && s.attachmentIds.length === 0);
       const visible = show && idle && inputActions !== undefined;
       const anchorRef = React.useRef(null);
@@ -877,6 +890,11 @@ window.__ModuleLoader__.load({
           id: 'composer-continue',
           order: 1000,
           locale: LOCALE_NS,
+          inject: (sessionId) => {
+            // The session's loaded event window; its newest turn/end says how the last turn finished.
+            const source = ctx.sessions?.binding?.(sessionId)?.eventSource;
+            return source === undefined ? {} : { hooks: { turnEnd: source } };
+          },
         }, ContinueButton))]);
         if (ctx.locale !== undefined) ctx.effect(() => ctx.locale.register(LOCALE_NS, {
           en: {
@@ -887,13 +905,13 @@ window.__ModuleLoader__.load({
             'feature.projectStatus': 'Project status',
             'feature.projectStatus.description': 'Show the running / waiting / done marker of a project\'s chats on the project row.',
             'feature.activeProjectsFirst': 'Active projects first',
-            'feature.activeProjectsFirst.description': 'Move a project to the top of the sidebar when one of its chats runs or needs you.',
+            'feature.activeProjectsFirst.description': 'Move a project to the top of the sidebar when one of its chats runs or needs you. Moves are saved; turning this off keeps the current order.',
             'feature.notifications': 'Background notifications',
             'feature.notifications.description': 'Notify when a chat finishes or needs you while dsh is in the background, with a Dock badge.',
             'feature.allowForChat': 'Allow for this chat',
             'feature.allowForChat.description': 'Add “Allow for this chat” to Auto Review approvals and auto-allow granted tools.',
             'feature.continueButton': 'One-click Continue',
-            'feature.continueButton.description': 'Turn Send into ▶ after a stopped turn; one click sends “continue”.',
+            'feature.continueButton.description': 'Turn Send into ▶ after a stopped or failed turn; one click sends “continue”.',
             'feature.inputHistory': 'Input history',
             'feature.inputHistory.description': 'Use ↑ / ↓ in an empty composer to reuse messages you sent.',
             'feature.planToggle': 'Shift+Tab plan mode',
@@ -954,13 +972,13 @@ window.__ModuleLoader__.load({
             'feature.projectStatus': '项目状态',
             'feature.projectStatus.description': '在项目行上显示其对话的进行中 / 等待 / 完成标记。',
             'feature.activeProjectsFirst': '活跃项目置顶',
-            'feature.activeProjectsFirst.description': '当项目中的对话正在运行或需要你处理时，将该项目移到侧边栏顶部。',
+            'feature.activeProjectsFirst.description': '当项目中的对话正在运行或需要你处理时，将该项目移到侧边栏顶部。移动会被保存；关闭此项后保留当前顺序。',
             'feature.notifications': '后台通知',
             'feature.notifications.description': 'dsh 在后台时，对话完成或需要你处理时发出通知，并显示程序坞角标。',
             'feature.allowForChat': '本对话内允许',
             'feature.allowForChat.description': '在 Auto Review 审批中添加“本对话内允许”，并自动允许已授权的工具。',
             'feature.continueButton': '一键继续',
-            'feature.continueButton.description': '回合停止后，发送按钮变为 ▶，点击即发送“继续”。',
+            'feature.continueButton.description': '回合被停止或出错后，发送按钮变为 ▶，点击即发送“继续”。',
             'feature.inputHistory': '输入历史',
             'feature.inputHistory.description': '在空输入框中按 ↑ / ↓ 复用已发送的消息。',
             'feature.planToggle': 'Shift+Tab 计划模式',
@@ -1019,7 +1037,12 @@ window.__ModuleLoader__.load({
           id: 'project-status',
           locale: LOCALE_NS,
         }, ProjectStatusMarkers))]);
-        const injectScope = (deps, setup) => (ctx.inject === undefined ? [] : [ctx.inject(deps, setup)]);
+        // ctx.inject returns a Cordis fiber, not a disposer.
+        const injectScope = (deps, setup) => {
+          if (ctx.inject === undefined) return [];
+          const fiber = ctx.inject(deps, setup);
+          return [() => fiber.dispose()];
+        };
         feature('notifications', () => injectScope(['uiSession', 'uiWorkspace', 'sessions'], (scope) => {
           const t = ctx.locale.bind(LOCALE_NS);
           scope.effect(() => watchAttention(scope.uiSession.sessionStatus, scope.sessions.list, t,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-composer-plus",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "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",