claude-task-worker 0.28.0 → 0.29.1

package/README.md

@@ -312,7 +312,7 @@ claude-task-worker exec-issue --project app-a --epic 100 --label priority-high
 
 `mode: "herdr"` のときの1タスクの流れ:
 
-1. worktree を作成し、`ctw:<プロジェクト名>:#<Issue/PR番号>` ラベルのタブで claude を TUI 起動する（`HERDR_DISABLE_SOUND=1` を設定するため通知音は鳴らない）
+1. worktree を作成し、`ctw:<プロジェクト名>:#<Issue/PR番号>` ラベルのタブで claude を TUI 起動する
 2. herdr が持つ agent ステータスを監視し、`working` → `idle` の遷移をタスク完了とみなす
 3. 完了したらペインの内容を回収して通知に使い、タブを閉じてラベル・worktree を後片付けする
 
@@ -321,6 +321,15 @@ claude-task-worker exec-issue --project app-a --epic 100 --label priority-high
 - タブは `--project` で起動した場合そのプロジェクトのワークスペース内に作られる（herdrが各ペインへ注入する `HERDR_WORKSPACE_ID` を利用する）
 - `blocked`（claudeが入力待ち）になってもタスクは自動失敗にせず待機し続ける。ステータステーブルに `running:blocked` と表示されるので、herdrのタブを開いて直接対応できる
 - `mode: "herdr"` でherdrが未インストール・未起動の場合、ワーカーは起動時にエラー終了する（`"default"` へ勝手にフォールバックしない）
+- **タスク完了時の通知音はワーカー側から止められない**。herdr のエージェント状態遷移音を再生するのは herdr サーバープロセスで、`HERDR_DISABLE_SOUND` もそのプロセスの環境変数として読まれるため、タスクペインへ渡しても効かない（socket API にもペイン単位のミュートは無い）。無音にしたい場合は herdr 側の設定で行う:
+
+  ```toml
+  # ~/.config/herdr/config.toml
+  [ui.sound]
+  enabled = false
+  ```
+
+  適用は `herdr server reload-config`。この設定は herdr サーバー全体に効くため、ワーカー以外の対話セッションの完了音も鳴らなくなる（`[ui.sound.agents] claude = "off"` でも実質同じ範囲）。ワーカーだけを無音にしたい場合は、`HERDR_DISABLE_SOUND=1 herdr --session <name>` で別セッションを起動し、その中でディスパッチャーを動かす
 
 ### exec-issue
 

package/dist/index.js

@@ -75,6 +75,7 @@ __export(herdr_exports, {
   tabRename: () => tabRename,
   workspaceClose: () => workspaceClose,
   workspaceCreate: () => workspaceCreate,
+  workspaceFocus: () => workspaceFocus,
   workspaceList: () => workspaceList
 });
 import { createRequire as createRequire2 } from "node:module";
@@ -210,12 +211,16 @@ async function workspaceList() {
   }
   return result.workspaces.map((workspace) => ({
     workspaceId: workspace.workspace_id,
-    label: workspace.label ?? ""
+    label: workspace.label ?? "",
+    focused: workspace.focused === true
   }));
 }
 async function workspaceClose(workspaceId) {
   await execHerdr(["workspace", "close", workspaceId]);
 }
+async function workspaceFocus(workspaceId) {
+  await execHerdr(["workspace", "focus", workspaceId]);
+}
 async function agentStart({
   name,
   cwd,
@@ -244,7 +249,7 @@ async function agentStart({
   return { paneId, tabId };
 }
 function toAgentStatus(value) {
-  return value === "working" || value === "idle" || value === "blocked" ? value : "unknown";
+  return value === "working" || value === "idle" || value === "blocked" || value === "done" ? value : "unknown";
 }
 async function agentGet(target) {
   const result = await execHerdr(["agent", "get", target]);
@@ -394,6 +399,9 @@ function observeAgentStatus(tracker, status) {
   if (status === "working") {
     return { tracker: { ...tracker, seenWorking: true }, decision: "running" };
   }
+  if (status === "done") {
+    return { tracker, decision: "completed" };
+  }
   if (status === "blocked") {
     if (tracker.warnedBlocked) return { tracker, decision: "running" };
     return { tracker: { ...tracker, warnedBlocked: true }, decision: "blocked-first-seen" };
@@ -585,6 +593,7 @@ __export(dispatcher_exports, {
   WORKER_STARTUP_POLL_INTERVAL_MS: () => WORKER_STARTUP_POLL_INTERVAL_MS,
   WORKER_STARTUP_TIMEOUT_MS: () => WORKER_STARTUP_TIMEOUT_MS,
   createDispatcherShutdownHandler: () => createDispatcherShutdownHandler,
+  focusedWorkspaceId: () => focusedWorkspaceId,
   formatUptime: () => formatUptime,
   isShellProcess: () => isShellProcess,
   isWorkerProcess: () => isWorkerProcess,
@@ -592,6 +601,7 @@ __export(dispatcher_exports, {
   pollOnce: () => pollOnce,
   removeSession: () => removeSession,
   renderSessionTable: () => renderSessionTable,
+  restoreWorkspaceFocus: () => restoreWorkspaceFocus,
   runDispatcher: () => runDispatcher,
   shutdownDispatcher: () => shutdownDispatcher,
   startWorkerInPane: () => startWorkerInPane,
@@ -608,6 +618,25 @@ async function loadTable() {
 function workspaceLabelFor(projectName) {
   return `${LABEL_PREFIX}${projectName}`;
 }
+async function focusedWorkspaceId(herdr) {
+  try {
+    const workspaces = await herdr.workspaceList();
+    return workspaces.find((workspace) => workspace.focused)?.workspaceId;
+  } catch (error) {
+    console.error(`[dispatcher] failed to read the focused workspace: ${error}`);
+    return void 0;
+  }
+}
+async function restoreWorkspaceFocus(herdr, previousWorkspaceId, closingWorkspaceIds) {
+  if (!previousWorkspaceId || closingWorkspaceIds.has(previousWorkspaceId)) return;
+  const currentWorkspaceId = await focusedWorkspaceId(herdr);
+  if (currentWorkspaceId === previousWorkspaceId) return;
+  try {
+    await herdr.workspaceFocus(previousWorkspaceId);
+  } catch (error) {
+    console.error(`[dispatcher] failed to restore focus to workspace "${previousWorkspaceId}": ${error}`);
+  }
+}
 function sleep2(ms) {
   return new Promise((resolve3) => setTimeout(resolve3, ms));
 }
@@ -719,23 +748,27 @@ async function runDispatcher(projects, forwardedCommand, timing) {
       console.error(`[dispatcher] failed to dispatch project "${project.name}": ${error}`);
       sessions.delete(project.name);
       if (createdWorkspaceId !== void 0) {
+        const focusedBefore = await focusedWorkspaceId(herdr);
         try {
           await workspaceClose2(createdWorkspaceId);
         } catch (closeError) {
           console.error(`[dispatcher] failed to close dangling workspace for project "${project.name}": ${closeError}`);
         }
+        await restoreWorkspaceFocus(herdr, focusedBefore, /* @__PURE__ */ new Set([createdWorkspaceId]));
       }
     }
   }
   return sessions;
 }
-async function removeSession(sessions, name, { closeWorkspace }) {
+async function removeSession(sessions, name, { closeWorkspace }, herdrModule) {
   const session = sessions.get(name);
   if (!session) return;
   sessions.delete(name);
   if (closeWorkspace) {
-    const { workspaceClose: workspaceClose2 } = await loadHerdr2();
-    await workspaceClose2(session.workspaceId);
+    const herdr = herdrModule ?? await loadHerdr2();
+    const focusedBefore = await focusedWorkspaceId(herdr);
+    await herdr.workspaceClose(session.workspaceId);
+    await restoreWorkspaceFocus(herdr, focusedBefore, /* @__PURE__ */ new Set([session.workspaceId]));
   }
 }
 async function pollOnce(sessions, herdr) {
@@ -743,11 +776,11 @@ async function pollOnce(sessions, herdr) {
     try {
       const { foregroundProcesses } = await herdr.paneProcessInfo(session.paneId);
       if (!foregroundProcesses.some(isWorkerProcess)) {
-        await removeSession(sessions, name, { closeWorkspace: true });
+        await removeSession(sessions, name, { closeWorkspace: true }, herdr);
       }
     } catch (error) {
       if (error instanceof herdr.HerdrError && error.code === "pane_not_found") {
-        await removeSession(sessions, name, { closeWorkspace: false });
+        await removeSession(sessions, name, { closeWorkspace: false }, herdr);
         continue;
       }
       console.error(`[dispatcher] failed to poll session "${name}": ${error}`);
@@ -845,6 +878,8 @@ async function waitUntilSessionsEmpty(sessions, herdr, pollIntervalMs, timeoutMs
   return true;
 }
 async function closeRemainingWorkspaces(sessions, herdr, timeoutMs) {
+  const closingWorkspaceIds = new Set([...sessions.values()].map((session) => session.workspaceId));
+  const focusedBefore = await focusedWorkspaceId(herdr);
   const results = await Promise.all(
     [...sessions.values()].map(async (session) => {
       try {
@@ -863,6 +898,7 @@ async function closeRemainingWorkspaces(sessions, herdr, timeoutMs) {
       }
     })
   );
+  await restoreWorkspaceFocus(herdr, focusedBefore, closingWorkspaceIds);
   return results.every((closed) => closed);
 }
 async function forceKillAllSessions(sessions, herdr, workspaceCloseTimeoutMs) {
@@ -1273,8 +1309,7 @@ function buildClaudeArgs({ mode, prompt, model, effort }) {
 function buildClaudeEnv(mode) {
   if (mode === "herdr") {
     return {
-      CLAUDE_CODE_DISABLE_BACKGROUND_TASKS: CLAUDE_SPAWN_ENV.CLAUDE_CODE_DISABLE_BACKGROUND_TASKS,
-      HERDR_DISABLE_SOUND: "1"
+      CLAUDE_CODE_DISABLE_BACKGROUND_TASKS: CLAUDE_SPAWN_ENV.CLAUDE_CODE_DISABLE_BACKGROUND_TASKS
     };
   }
   return { ...CLAUDE_SPAWN_ENV };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-task-worker",
-  "version": "0.28.0",
+  "version": "0.29.1",
   "description": "CLI tool that polls GitHub Issues/PRs and delegates work to Claude CLI",
   "type": "module",
   "main": "dist/index.js",