@norman-else/dsh-claude 0.1.5 → 0.1.6

package/lib/client.d.ts

@@ -34,6 +34,8 @@ window.__ModuleLoader__.load({
 		  readonly securityBody: "Claude tool permissions are decided through the DSH approval UI. This version does not claim kernel-level write isolation for ~/.claude or paths outside the workspace.";
 		  readonly tasks: "Tasks";
 		  readonly tasksPanel: "Background tasks";
+		  readonly tasksPanelTurn: "Tasks for this run";
+		  readonly tasksTurnNumber: "Turn {turn}";
 		  readonly tasksEmpty: "No subagents or background tasks";
 		  readonly tasksOpen: "Show background tasks";
 		  readonly tasksClose: "Close tasks panel";
@@ -44,6 +46,9 @@ window.__ModuleLoader__.load({
 		  readonly tasksViewActivity: "View activity";
 		  readonly tasksHideActivity: "Hide activity";
 		  readonly tasksRunningCount: "{count} running task(s)";
+		  readonly tasksTurnRunning: "{count} task(s) running";
+		  readonly tasksTurnCompleted: "{count} task(s) completed";
+		  readonly tasksTurnFailed: "{failed} failed, {completed} completed";
 		  readonly tasksToolUses: "{count} tool use(s)";
 		  readonly tasksCompleted: "Completed";
 		  readonly tasksFailed: "Failed";

package/lib/client.js

@@ -3,12 +3,9 @@ window.__ModuleLoader__.load({
 	factory: (require) => {
 		var module = { exports: {} };
 		module.exports;
-		var { useCallback, useEffect, useMemo, useState, useSyncExternalStore } = require("react");
+		var { useCallback, useEffect, useMemo, useState } = require("react");
 		var { Fragment, jsx, jsxs } = require("react/jsx-runtime");
 		var { DisclosureRow, IconApiOutline14, IconThinkOutline14, StateDot } = require("@deepseek-ai/dsh-client-ui-primitives");
-		function isClaudeProvider(value) {
-			return value === "claude" || value === "claude-code-cli";
-		}
 		/** Claude's subagent dispatch tools; rendered as plugin-owned group cards
 		*  gathering subagent activity instead of native tool cards. */
 		const TASK_TOOL_NAMES = /* @__PURE__ */ new Set(["Task", "Agent"]);
@@ -58,6 +55,7 @@ window.__ModuleLoader__.load({
 				let id;
 				if ((isTaskActivity(value) || updatesExistingTask) && existingTaskId !== void 0) id = existingTaskId;
 				else if (value.kind === "subagent" && value.parentToolUseId !== void 0) id = `task-${value.parentToolUseId}`;
+				else if (value.kind === "subagent" && value.taskId !== void 0) id = `subagent-task-${value.taskId}`;
 				else if (value.kind === "subagent" && value.toolUseId !== void 0) id = `call-${value.toolUseId}`;
 				else id = `act-${value.turn}-${value.step}-${value.ordinal}`;
 				const index = byId.get(id);
@@ -126,7 +124,7 @@ window.__ModuleLoader__.load({
 					id: `${event.data.turn}:${event.data.step}`,
 					role: "start"
 				};
-				if (event.type !== "assistant/message" || !isClaudeProvider(event.data.message.source.provider)) return null;
+				if (event.type !== "assistant/message" || event.data.message.source.provider !== "claude") return null;
 				return {
 					id: `${event.data.turn}:${event.data.step}`,
 					role: "update"
@@ -172,7 +170,7 @@ window.__ModuleLoader__.load({
 					id: String(event.data.turn),
 					role: "start"
 				};
-				if (event.type !== "assistant/message" || !isClaudeProvider(event.data.message.source.provider)) return null;
+				if (event.type !== "assistant/message" || event.data.message.source.provider !== "claude") return null;
 				return {
 					id: String(event.data.turn),
 					role: "update"
@@ -294,11 +292,19 @@ window.__ModuleLoader__.load({
 			borderBottom: "1px solid var(--dsw-alias-border-l2)"
 		};
 		const tasksHeading = {
+			display: "block",
 			color: "var(--dsw-alias-label-primary)",
 			fontSize: 14,
 			lineHeight: "20px",
 			fontWeight: 600
 		};
+		const tasksTurnMeta = {
+			display: "block",
+			marginTop: 1,
+			color: "var(--dsw-alias-label-tertiary)",
+			fontSize: 11,
+			lineHeight: "16px"
+		};
 		const tasksClose = {
 			width: 26,
 			height: 26,
@@ -510,47 +516,7 @@ window.__ModuleLoader__.load({
 			color: "var(--dsw-static-blue-450)",
 			fontSize: 9
 		};
-		const tasksTriggerHoverCss = [
-			".dsh-claude-tasks-trigger:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover)}",
-			".dsh-claude-tasks-trigger:focus:not(:focus-visible){outline:none;border-color:var(--dsw-alias-border-l2)}",
-			".dsh-claude-tasks-trigger[aria-pressed=\"true\"]:focus:not(:focus-visible){border-color:var(--dsw-alias-border-l3)}",
-			".dsh-claude-tasks-trigger>span,.dsh-claude-tasks-trigger>svg{flex:none}"
-		].join("");
-		const tasksHeaderButton = {
-			minWidth: 111,
-			height: 32,
-			display: "inline-flex",
-			alignItems: "center",
-			justifyContent: "center",
-			gap: 4,
-			padding: "6px 12px",
-			border: "1px solid var(--dsw-alias-border-l2)",
-			borderRadius: 18,
-			color: "var(--dsw-alias-label-primary)",
-			fontFamily: "var(--dsw-font-family)",
-			fontSize: 13,
-			fontWeight: 400,
-			lineHeight: "20px",
-			whiteSpace: "nowrap",
-			cursor: "pointer"
-		};
-		const tasksHeaderButtonActive = {
-			borderColor: "var(--dsw-alias-border-l3)",
-			background: "var(--dsw-alias-interactive-bg-hover)"
-		};
-		const tasksBadgeInline = {
-			minWidth: 14,
-			height: 14,
-			display: "grid",
-			placeItems: "center",
-			padding: "0 3px",
-			borderRadius: 999,
-			background: "var(--dsw-static-blue-450)",
-			color: "var(--dsw-alias-label-on-accent, #fff)",
-			fontSize: 9,
-			lineHeight: "1",
-			fontWeight: 600
-		};
+		const tasksTurnLauncherDone = { color: "var(--dsw-alias-state-success-primary, var(--dsw-alias-label-tertiary))" };
 		//#endregion
 		//#region src/client/token-format.ts
 		function formatTokenCount(tokens) {
@@ -576,8 +542,21 @@ window.__ModuleLoader__.load({
 		function activitiesForTask(activities, taskId) {
 			return activities.filter((activity) => activity.taskId === taskId);
 		}
-		function runningTasksForTurn(tasks, turn) {
-			return tasks.filter((task) => task.status === "running" && task.originTurn === turn);
+		function tasksForTurn(tasks, turn) {
+			return tasks.filter((task) => task.originTurn === turn);
+		}
+		function summarizeTurnTasks(tasks) {
+			if (tasks.length === 0) return void 0;
+			const running = tasks.filter((task) => task.status === "running").length;
+			const failed = tasks.filter((task) => task.status === "failed" || task.status === "stopped" || task.status === "killed").length;
+			const completed = tasks.filter((task) => task.status === "completed").length;
+			return {
+				state: running > 0 ? "running" : failed > 0 ? "failed" : "completed",
+				count: tasks.length,
+				running,
+				failed,
+				completed
+			};
 		}
 		function statusGlyph(status) {
 			if (status === "running") return "●";
@@ -732,12 +711,16 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
-		function ClaudeTasksPanel({ useClaudeProjection, t, closeDetails }) {
+		function ClaudeTasksPanel({ useClaudeProjection, t, closeDetails, turn }) {
 			const projection = useClaudeProjection((value) => value);
+			const tasks = useMemo(() => tasksForTurn(projection.tasks?.tasks ?? [], turn), [projection.tasks, turn]);
 			useEffect(() => {
-				if (!projection.owned) closeDetails();
-			}, [closeDetails, projection.owned]);
-			const tasks = projection.tasks?.tasks ?? [];
+				if (!projection.owned || tasks.length === 0) closeDetails();
+			}, [
+				closeDetails,
+				projection.owned,
+				tasks.length
+			]);
 			const [finishedCollapsed, setFinishedCollapsed] = useState(false);
 			const [dismissedSettledIds, setDismissedSettledIds] = useState(() => /* @__PURE__ */ new Set());
 			const groups = useMemo(() => visibleTaskGroups(tasks, dismissedSettledIds), [tasks, dismissedSettledIds]);
@@ -748,10 +731,13 @@ window.__ModuleLoader__.load({
 				style: tasksPanel,
 				children: [/* @__PURE__ */ jsxs("div", {
 					style: tasksHeader,
-					children: [/* @__PURE__ */ jsx("span", {
+					children: [/* @__PURE__ */ jsxs("div", { children: [/* @__PURE__ */ jsx("span", {
 						style: tasksHeading,
-						children: t("tasksPanel")
-					}), /* @__PURE__ */ jsx("button", {
+						children: t("tasksPanelTurn")
+					}), /* @__PURE__ */ jsx("span", {
+						style: tasksTurnMeta,
+						children: t("tasksTurnNumber", { turn })
+					})] }), /* @__PURE__ */ jsx("button", {
 						type: "button",
 						style: tasksClose,
 						"aria-label": t("tasksClose"),
@@ -800,74 +786,35 @@ window.__ModuleLoader__.load({
 				})]
 			});
 		}
-		function ClaudeTasksHeaderButton({ useClaudeProjection, t, isOpen, toggle, subscribe }) {
-			const open = useSyncExternalStore(subscribe, isOpen, isOpen);
-			const projection = useClaudeProjection((value) => value);
-			if (!projection.owned) return null;
-			const runningCount = projection.tasks?.tasks.filter((task) => task.status === "running").length ?? 0;
-			return /* @__PURE__ */ jsxs("button", {
-				type: "button",
-				className: "dsh-claude-tasks-trigger",
-				style: {
-					...tasksHeaderButton,
-					...open ? tasksHeaderButtonActive : {}
-				},
-				"aria-label": t("tasksOpen"),
-				"aria-pressed": open,
-				onClick: (event) => {
-					toggle();
-					event.currentTarget.blur();
-				},
-				children: [
-					/* @__PURE__ */ jsx("style", { children: tasksTriggerHoverCss }),
-					/* @__PURE__ */ jsxs("svg", {
-						width: "14",
-						height: "14",
-						viewBox: "0 0 24 24",
-						fill: "none",
-						stroke: "currentColor",
-						strokeWidth: "2",
-						strokeLinecap: "round",
-						strokeLinejoin: "round",
-						"aria-hidden": "true",
-						children: [
-							/* @__PURE__ */ jsx("path", { d: "m3 17 2 2 4-4" }),
-							/* @__PURE__ */ jsx("path", { d: "m3 7 2 2 4-4" }),
-							/* @__PURE__ */ jsx("path", { d: "M13 6h8" }),
-							/* @__PURE__ */ jsx("path", { d: "M13 12h8" }),
-							/* @__PURE__ */ jsx("path", { d: "M13 18h8" })
-						]
-					}),
-					/* @__PURE__ */ jsx("span", { children: t("tasks") }),
-					runningCount === 0 ? null : /* @__PURE__ */ jsx("span", {
-						className: "dsh-claude-act-running",
-						style: tasksBadgeInline,
-						"aria-hidden": "true",
-						children: runningCount
-					})
-				]
-			});
-		}
 		//#endregion
 		//#region src/client/ClaudeActivityTail.tsx
 		function ClaudeActivityTail({ matched, useClaudeProjection, t, openTasks }) {
 			const projection = useClaudeProjection((value) => value);
-			const runningTasks = useMemo(() => runningTasksForTurn(projection.tasks?.tasks ?? [], matched.turn), [projection.tasks, matched.turn]);
-			if (runningTasks.length === 0) return null;
+			const summary = useMemo(() => summarizeTurnTasks(tasksForTurn(projection.tasks?.tasks ?? [], matched.turn)), [projection.tasks, matched.turn]);
+			if (summary === void 0) return null;
+			const label = summary.state === "running" ? t("tasksTurnRunning", { count: summary.running }) : summary.state === "failed" ? t("tasksTurnFailed", {
+				failed: summary.failed,
+				completed: summary.completed
+			}) : t("tasksTurnCompleted", { count: summary.completed });
+			const glyph = summary.state === "running" ? "●" : summary.state === "failed" ? "×" : "✓";
 			return /* @__PURE__ */ jsx("div", {
 				"data-claude-activity-tail": matched.turn,
-				children: runningTasks.length === 0 ? null : /* @__PURE__ */ jsxs("button", {
+				children: /* @__PURE__ */ jsxs("button", {
 					type: "button",
 					style: tasksTurnLauncher,
-					onClick: openTasks,
+					onClick: () => openTasks(matched.turn),
 					children: [
 						/* @__PURE__ */ jsx("span", {
-							className: "dsh-claude-act-running",
-							style: tasksTurnLauncherDot,
+							className: summary.state === "running" ? "dsh-claude-act-running" : void 0,
+							style: {
+								...tasksTurnLauncherDot,
+								...summary.state === "failed" ? iconChipError : {},
+								...summary.state === "completed" ? tasksTurnLauncherDone : {}
+							},
 							"aria-hidden": "true",
-							children: "●"
+							children: glyph
 						}),
-						/* @__PURE__ */ jsx("span", { children: t("tasksRunningCount", { count: runningTasks.length }) }),
+						/* @__PURE__ */ jsx("span", { children: label }),
 						/* @__PURE__ */ jsx("span", {
 							"aria-hidden": "true",
 							children: "›"
@@ -1219,6 +1166,8 @@ window.__ModuleLoader__.load({
 			securityBody: "Claude 工具权限通过 DSH 审批界面决定；当前版本不宣称对 ~/.claude 与工作区之外路径提供内核级写入隔离。",
 			tasks: "任务",
 			tasksPanel: "后台任务",
+			tasksPanelTurn: "本次执行的任务",
+			tasksTurnNumber: "第 {turn} 轮",
 			tasksEmpty: "当前没有子代理或后台任务",
 			tasksOpen: "查看后台任务",
 			tasksClose: "关闭任务面板",
@@ -1229,6 +1178,9 @@ window.__ModuleLoader__.load({
 			tasksViewActivity: "查看活动",
 			tasksHideActivity: "收起活动",
 			tasksRunningCount: "{count} 个运行中任务",
+			tasksTurnRunning: "{count} 个任务执行中",
+			tasksTurnCompleted: "{count} 个任务已完成",
+			tasksTurnFailed: "{failed} 个任务失败，{completed} 个已完成",
 			tasksToolUses: "{count} 次工具调用",
 			tasksCompleted: "已完成",
 			tasksFailed: "失败",
@@ -1266,6 +1218,8 @@ window.__ModuleLoader__.load({
 			securityBody: "Claude tool permissions are decided through the DSH approval UI. This version does not claim kernel-level write isolation for ~/.claude or paths outside the workspace.",
 			tasks: "Tasks",
 			tasksPanel: "Background tasks",
+			tasksPanelTurn: "Tasks for this run",
+			tasksTurnNumber: "Turn {turn}",
 			tasksEmpty: "No subagents or background tasks",
 			tasksOpen: "Show background tasks",
 			tasksClose: "Close tasks panel",
@@ -1276,6 +1230,9 @@ window.__ModuleLoader__.load({
 			tasksViewActivity: "View activity",
 			tasksHideActivity: "Hide activity",
 			tasksRunningCount: "{count} running task(s)",
+			tasksTurnRunning: "{count} task(s) running",
+			tasksTurnCompleted: "{count} task(s) completed",
+			tasksTurnFailed: "{failed} failed, {completed} completed",
 			tasksToolUses: "{count} tool use(s)",
 			tasksCompleted: "Completed",
 			tasksFailed: "Failed",
@@ -1315,21 +1272,16 @@ window.__ModuleLoader__.load({
 				locale: namespace
 			}, ClaudeActivityNode));
 			const layout = ctx.get("layout");
-			const tasksPanelListeners = /* @__PURE__ */ new Set();
 			let disposeTasksDetails;
-			let tasksPanelSession;
-			const notifyTasksPanel = () => {
-				for (const fn of [...tasksPanelListeners]) fn();
-			};
+			let tasksPanelTarget;
 			const closeTasksPanel = () => {
 				if (disposeTasksDetails === void 0) return;
 				disposeTasksDetails();
 				disposeTasksDetails = void 0;
-				tasksPanelSession = void 0;
+				tasksPanelTarget = void 0;
 				layout?.closeDetails();
-				notifyTasksPanel();
 			};
-			const openTasksPanel = (sessionId) => {
+			const openTasksPanel = (sessionId, turn) => {
 				closeTasksPanel();
 				try {
 					disposeTasksDetails = ctx.slots.register({
@@ -1338,24 +1290,23 @@ window.__ModuleLoader__.load({
 						locale: namespace,
 						inject: () => ({
 							t,
+							turn,
 							closeDetails: closeTasksPanel
 						})
 					}, ClaudeTasksPanel);
 				} catch {
 					return;
 				}
-				tasksPanelSession = sessionId;
+				tasksPanelTarget = {
+					sessionId,
+					turn
+				};
 				layout?.openDetails();
-				notifyTasksPanel();
-			};
-			const toggleTasksPanel = (sessionId) => {
-				if (tasksPanelSession === sessionId) closeTasksPanel();
-				else openTasksPanel(sessionId);
 			};
 			ctx.effect(() => {
 				if (typeof document === "undefined" || typeof MutationObserver === "undefined") return () => closeTasksPanel();
 				const observer = new MutationObserver(() => {
-					if (tasksPanelSession !== void 0 && document.querySelector("[data-details-collapsed]") !== null) closeTasksPanel();
+					if (tasksPanelTarget !== void 0 && document.querySelector("[data-details-collapsed]") !== null) closeTasksPanel();
 				});
 				observer.observe(document.body, {
 					attributes: true,
@@ -1367,37 +1318,17 @@ window.__ModuleLoader__.load({
 					closeTasksPanel();
 				};
 			}, "dsh-claude: tasks panel lifecycle");
-			const tasksLauncher = (sessionId) => ({
-				isOpen: () => tasksPanelSession === sessionId,
-				toggle: () => toggleTasksPanel(sessionId),
-				subscribe: (fn) => {
-					tasksPanelListeners.add(fn);
-					return () => {
-						tasksPanelListeners.delete(fn);
-					};
-				}
-			});
 			ctx.slots.inject("conversation.chat.turnTail", () => ctx.slots.register({
 				name: "conversation.chat.turnTail",
 				select: selectClaudeTurn,
 				inject: (sessionId) => ({
 					t,
-					openTasks: () => openTasksPanel(sessionId)
+					openTasks: (turn) => openTasksPanel(sessionId, turn)
 				})
 			}, ClaudeActivityTail));
 			if (sessions !== void 0) ctx.effect(() => sessions.list.subscribe(() => {
-				if (tasksPanelSession !== void 0 && sessions.list.getSnapshot().current !== tasksPanelSession) closeTasksPanel();
+				if (tasksPanelTarget !== void 0 && sessions.list.getSnapshot().current !== tasksPanelTarget.sessionId) closeTasksPanel();
 			}), "dsh-claude: tasks panel session tracking");
-			ctx.slots.inject("conversation.session.header.utilities", () => ctx.slots.register({
-				name: "conversation.session.header.utilities",
-				id: "claude-tasks",
-				order: -10,
-				label: () => t("tasksOpen"),
-				inject: (sessionId) => ({
-					t,
-					...tasksLauncher(sessionId)
-				})
-			}, ClaudeTasksHeaderButton));
 			ctx.slots.inject("settings.section", () => ctx.slots.register({
 				name: "settings.section",
 				id: "claude-code",