dsh-taskboard 0.2.2 → 0.3.3

package/lib/client.js

@@ -37,8 +37,15 @@ window.__ModuleLoader__.load({
 				reject: (id, body) => post(`/dsh-taskboard/tasks/${encodeURIComponent(id)}/reject`, body),
 				comment: (id, bodyText) => post(`/dsh-taskboard/tasks/${encodeURIComponent(id)}/comment`, { body: bodyText }),
 				remove: (id, body) => post(`/dsh-taskboard/tasks/${encodeURIComponent(id)}/delete`, body),
-				run: (id) => post(`/dsh-taskboard/tasks/${encodeURIComponent(id)}/run`, {}),
+				run: (id, body) => post(`/dsh-taskboard/tasks/${encodeURIComponent(id)}/run`, body ?? {}),
 				cancel: (id) => post(`/dsh-taskboard/tasks/${encodeURIComponent(id)}/cancel`, {}),
+				mergeBranch: (id) => post(`/dsh-taskboard/tasks/${encodeURIComponent(id)}/merge`, {}),
+				worktreeRemove: (id, body) => post(`/dsh-taskboard/tasks/${encodeURIComponent(id)}/worktree-remove`, body),
+				diagnostics: () => unwrap(fetch("/dsh-taskboard/diagnostics")),
+				worktreeCleanup: (workspaceId, taskId) => post("/dsh-taskboard/worktree-cleanup", {
+					workspaceId,
+					taskId
+				}),
 				stream(onChange, onGap) {
 					const es = new EventSource("/dsh-taskboard/events");
 					let revision;
@@ -209,6 +216,22 @@ window.__ModuleLoader__.load({
 		//#region src/client/controller.ts
 		/** localStorage key for persisted view state (filters + sort). */
 		const VIEW_KEY = "dsh-taskboard-view-v1";
+		/** localStorage key for the remembered isolation toggle choice (0.3.0). */
+		const ISOLATION_KEY = "dsh-taskboard-isolation-v1";
+		/** Load the remembered default isolation (worktree unless explicitly turned off). */
+		function loadDefaultIsolation() {
+			try {
+				return localStorage.getItem(ISOLATION_KEY) === "none" ? "none" : "worktree";
+			} catch {
+				return "worktree";
+			}
+		}
+		/** Remember the isolation toggle choice across forms (best effort). */
+		function saveDefaultIsolation(mode) {
+			try {
+				localStorage.setItem(ISOLATION_KEY, mode);
+			} catch {}
+		}
 		/** Load the persisted view state (never throws; fresh on any parse error). */
 		function loadView() {
 			try {
@@ -245,7 +268,8 @@ window.__ModuleLoader__.load({
 				search: "",
 				sortBy: view.sortBy,
 				composerOpen: false,
-				secondaryOpen: false
+				secondaryOpen: false,
+				diagOpen: false
 			};
 		}
 		/**
@@ -403,6 +427,11 @@ window.__ModuleLoader__.load({
 			toggleSecondary() {
 				this.setState({ secondaryOpen: !this.state.secondaryOpen });
 			}
+			/** Whether a workspace passed git detection (form toggle enablement). */
+			gitAvailable(workspaceId) {
+				if (workspaceId === void 0) return true;
+				return this.state.workspaces.find((w) => w.id === workspaceId)?.gitAvailable === true;
+			}
 			/**
 			* Install the session-jump bridge (built from the runtime sessions service
 			* by the client entry). Without it openSession reports 'unavailable'.
@@ -517,10 +546,10 @@ window.__ModuleLoader__.load({
 					this.setState({ error: error instanceof Error ? error.message : String(error) });
 				}
 			}
-			/** Trigger a manual run (fresh in-project session, pinned model). */
-			async run(id) {
+			/** Trigger a manual run (fresh in-project session, pinned model); `reuse` = 续跑. */
+			async run(id, reuse = false) {
 				try {
-					await this.client.run(id);
+					await this.client.run(id, reuse ? { reuse: true } : {});
 					await this.refresh();
 				} catch (error) {
 					this.setState({ error: error instanceof Error ? error.message : String(error) });
@@ -535,6 +564,66 @@ window.__ModuleLoader__.load({
 					this.setState({ error: error instanceof Error ? error.message : String(error) });
 				}
 			}
+			/**
+			* ⇥ 合并 (detail page): merge the task branch into the main worktree.
+			* @returns the outcome; `noop` means the branch had no new commits (nothing merged).
+			*/
+			async mergeBranch(id) {
+				try {
+					const value = await this.client.mergeBranch(id);
+					await this.refresh();
+					return value.noop === true ? {
+						ok: true,
+						noop: true
+					} : { ok: true };
+				} catch (error) {
+					return {
+						ok: false,
+						error: error instanceof Error ? error.message : String(error)
+					};
+				}
+			}
+			/**
+			* 🗑 删除 worktree (detail page), optionally deleting the task branch too.
+			* @returns the outcome; failures carry the git message for an alert.
+			*/
+			async removeWorktree(id, deleteBranch) {
+				try {
+					const value = await this.client.worktreeRemove(id, { deleteBranch });
+					await this.refresh();
+					return value.branchError !== void 0 ? {
+						ok: true,
+						branchError: value.branchError
+					} : { ok: true };
+				} catch (error) {
+					return {
+						ok: false,
+						error: error instanceof Error ? error.message : String(error)
+					};
+				}
+			}
+			/** Open the ⚙ diagnostics panel and fetch a fresh snapshot. */
+			openDiagnostics() {
+				this.setState({ diagOpen: true });
+				this.client.diagnostics().then((diagnostics) => this.setState({ diagnostics })).catch((error) => this.setState({ error: error instanceof Error ? error.message : String(error) }));
+			}
+			/** Close the ⚙ diagnostics panel. */
+			closeDiagnostics() {
+				this.setState({ diagOpen: false });
+			}
+			/** Clean one orphan worktree (⚙ panel); refreshes the diagnostics payload. */
+			async cleanupOrphan(workspaceId, taskId) {
+				try {
+					await this.client.worktreeCleanup(workspaceId, taskId);
+					const diagnostics = await this.client.diagnostics();
+					this.setState({
+						diagnostics,
+						error: void 0
+					});
+				} catch (error) {
+					this.setState({ error: error instanceof Error ? error.message : String(error) });
+				}
+			}
 			/** Soft-delete (agent parity) then optional purge. */
 			async remove(id, ifVersion, purge) {
 				try {
@@ -545,7 +634,7 @@ window.__ModuleLoader__.load({
 					this.setState({ error: error instanceof Error ? error.message : String(error) });
 				}
 			}
-			/** Duplicate a task into a fresh todo card (same project/urgency/prompt/execution/model). */
+			/** Duplicate a task into a fresh todo card (same project/urgency/prompt/execution/model/isolation). */
 			async duplicate(task) {
 				try {
 					await this.client.create({
@@ -558,7 +647,9 @@ window.__ModuleLoader__.load({
 							mode: "scheduled",
 							cron: task.execution.cron
 						} : { mode: "claim" },
-						model: task.model
+						model: task.model,
+						isolation: task.isolation,
+						...task.presetId !== void 0 ? { presetId: task.presetId } : {}
 					});
 					await this.refresh();
 				} catch (error) {
@@ -1105,6 +1196,51 @@ window.__ModuleLoader__.load({
 		  color: var(--dsw-alias-label-primary, inherit);
 		}
 		.dsh-atb-alert .dsh-atb-btn { padding: 6px 28px; font-size: 13px; }
+
+		/* ---------- 0.3.0 isolation ---------- */
+		.dsh-atb-isolation-note { display: block; margin-top: 6px; font-size: 11px; color: var(--dsw-alias-label-tertiary, gray); }
+		.dsh-atb-mode-picker[data-disabled="true"] .dsh-atb-mode-opt { cursor: not-allowed; opacity: .55; }
+		.dsh-atb-iso-none { font-size: 12.5px; color: var(--dsw-alias-label-secondary, inherit); }
+		.dsh-atb-iso-facts { display: flex; flex-wrap: wrap; gap: 6px 12px; margin-bottom: 8px; }
+		.dsh-atb-iso-fact { font-size: 11.5px; color: var(--dsw-alias-label-secondary, inherit); }
+		.dsh-atb-iso-fact b { font-weight: 600; color: var(--dsw-alias-state-business-primary, #3e63dd); }
+		.dsh-atb-iso-commits { display: flex; flex-direction: column; gap: 3px; margin-bottom: 8px; }
+		.dsh-atb-iso-commit { display: flex; gap: 8px; font-size: 11.5px; align-items: baseline; }
+		.dsh-atb-iso-commit code {
+		  font-family: ui-monospace, Consolas, monospace; font-size: 10.5px;
+		  color: var(--dsh-alias-state-business-primary, #3e63dd); flex-shrink: 0;
+		}
+		.dsh-atb-iso-commit span { word-break: break-all; color: var(--dsw-alias-label-secondary, inherit); }
+		.dsh-atb-iso-more { font-size: 11px; color: var(--dsw-alias-label-tertiary, gray); }
+		.dsh-atb-iso-nocommit { font-size: 11.5px; color: var(--dsw-alias-label-tertiary, gray); margin-bottom: 8px; }
+		.dsh-atb-iso-dirty {
+		  font-size: 11.5px; color: var(--dsw-alias-state-error-primary, #e5484d);
+		  background: rgba(229,72,77,.09); border: 1px solid rgba(229,72,77,.35);
+		  border-radius: 8px; padding: 6px 10px; margin-bottom: 8px;
+		}
+		.dsh-atb-iso-actions { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
+		.dsh-atb-iso-hint { font-size: 11px; color: var(--dsw-alias-label-tertiary, gray); }
+
+		/* ---------- 0.3.0 diagnostics ---------- */
+		.dsh-atb-diag { max-width: 520px; width: min(520px, 92vw); }
+		.dsh-atb-diag-grid { display: grid; grid-template-columns: repeat(4, 1fr); gap: 8px; margin-bottom: 14px; }
+		.dsh-atb-diag-item {
+		  display: flex; flex-direction: column; align-items: center; gap: 2px;
+		  padding: 10px 6px; border-radius: 10px;
+		  border: 1px solid var(--dsw-alias-border-l2, rgba(128,128,128,.25));
+		  background: var(--dsw-alias-bg-layer-1, rgba(128,128,128,.04));
+		}
+		.dsh-atb-diag-item b { font-size: 18px; font-weight: 700; }
+		.dsh-atb-diag-item span { font-size: 10.5px; color: var(--dsw-alias-label-tertiary, gray); }
+		.dsh-atb-diag-item[data-bad="true"] b { color: var(--dsw-alias-state-error-primary, #e5484d); }
+		.dsh-atb-diag-sec h4 { margin: 0 0 8px; font-size: 12.5px; }
+		.dsh-atb-diag-orphans { display: flex; flex-direction: column; gap: 6px; }
+		.dsh-atb-diag-orphan {
+		  display: flex; align-items: center; gap: 10px; justify-content: space-between;
+		  padding: 7px 10px; border-radius: 8px;
+		  border: 1px solid var(--dsw-alias-border-l2, rgba(128,128,128,.25));
+		}
+		.dsh-atb-diag-orphan-path { font-size: 11.5px; font-family: ui-monospace, Consolas, monospace; word-break: break-all; }
 		`;
 		let injected = false;
 		/** Inject the stylesheet once (idempotent). */
@@ -1349,7 +1485,7 @@ window.__ModuleLoader__.load({
 		* @module dsh-taskboard/shared/version
 		*/
 		/** The package version (must equal package.json "version"). */
-		const PLUGIN_VERSION = "0.2.2";
+		const PLUGIN_VERSION = "0.3.3";
 
 		//#endregion
 		//#region src/client/board/TaskCard.tsx
@@ -1669,6 +1805,215 @@ window.__ModuleLoader__.load({
 				}), children]
 			});
 		}
+		/** The most recent execution carrying isolation facts, newest first. */
+		function latestIsolated(task) {
+			return [...task.executions].reverse().find((e) => e.isolation !== void 0 || e.worktreePath !== void 0 || e.isolationNote !== void 0);
+		}
+		/** Short commit hash for display. */
+		function shortHash(hash) {
+			return hash === void 0 ? "" : hash.slice(0, 8);
+		}
+		/**
+		* The 0.3.0 isolation block: branch / baseline→head commits / change stats /
+		* uncommitted-changes warning, plus the user-only git actions (merge /
+		* remove worktree — plan §3.3).
+		*/
+		function IsolationBlock({ task, controller }) {
+			const { alert: showAlert, el: alertEl } = useAlert();
+			const [confirmMerge, setConfirmMerge] = (0, react.useState)(false);
+			const [confirmRemove, setConfirmRemove] = (0, react.useState)(null);
+			const [busy, setBusy] = (0, react.useState)(false);
+			const execution = latestIsolated(task);
+			const running = task.executions.some((e) => e.outcome === "running");
+			if (execution === void 0) return null;
+			const doMerge = () => {
+				setBusy(true);
+				controller.mergeBranch(task.id).then((result) => {
+					setBusy(false);
+					setConfirmMerge(false);
+					if (!result.ok) showAlert(`合并失败：${result.error}`);
+					else if (result.noop === true) showAlert("该分支没有领先主工作区的新提交，无需合并（可退回续跑或直接清理）");
+				});
+			};
+			const doRemove = (deleteBranch) => {
+				setBusy(true);
+				controller.removeWorktree(task.id, deleteBranch).then((result) => {
+					setBusy(false);
+					setConfirmRemove(null);
+					if (!result.ok) showAlert(`删除失败：${result.error}`);
+					else if (result.branchError !== void 0) showAlert(`worktree 已删除，但分支删除失败：${result.branchError}`);
+				});
+			};
+			if (execution.isolation !== "worktree" || execution.worktreePath === void 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "dsh-atb-fieldcard",
+				"data-kind": "isolation",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: "dsh-atb-fieldcard-label",
+						children: "执行隔离"
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "dsh-atb-iso-none",
+						children: ["📁 原目录执行", execution.isolationNote !== void 0 ? ` · ${execution.isolationNote}` : ""]
+					}),
+					alertEl
+				]
+			});
+			const commits = execution.commits ?? [];
+			const commitTotal = execution.commitsTotal ?? commits.length;
+			const dirty = execution.dirtyFiles ?? [];
+			const dirtyTotal = execution.dirtyFilesTotal ?? dirty.length;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "dsh-atb-fieldcard",
+				"data-kind": "isolation",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: "dsh-atb-fieldcard-label",
+						children: "执行隔离 · Worktree"
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "dsh-atb-iso-facts",
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "dsh-atb-iso-fact",
+								title: execution.worktreePath,
+								children: ["🌿 分支 ", /* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: execution.branch ?? task.branch })]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "dsh-atb-iso-fact",
+								children: [
+									"基线 ",
+									shortHash(execution.baseCommit),
+									" → ",
+									shortHash(execution.headCommit)
+								]
+							}),
+							execution.changedFiles !== void 0 && execution.changedFiles > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "dsh-atb-iso-fact",
+								children: [
+									"改动 ",
+									execution.changedFiles,
+									" 个文件"
+								]
+							}),
+							execution.diffStat !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "dsh-atb-iso-fact",
+								title: execution.diffStat,
+								children: execution.diffStat
+							})
+						]
+					}),
+					commits.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "dsh-atb-iso-commits",
+						children: [commits.slice(0, 10).map((c) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "dsh-atb-iso-commit",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: shortHash(c.hash) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: c.subject })]
+						}, c.hash)), commitTotal > 10 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "dsh-atb-iso-more",
+							children: [
+								"… 共 ",
+								commitTotal,
+								" 个提交"
+							]
+						})]
+					}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: "dsh-atb-iso-nocommit",
+						children: "该次执行没有产生提交（改动可能未提交，见下方警告）"
+					}),
+					dirtyTotal > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "dsh-atb-iso-dirty",
+						title: dirty.join("\n"),
+						children: [
+							"⚠ 有 ",
+							dirtyTotal,
+							" 处未提交修改（合并前请让 agent 提交，或手动处理）"
+						]
+					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "dsh-atb-iso-actions",
+						children: [
+							running ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "dsh-atb-iso-hint",
+								children: "执行中 — 结束后可合并或清理"
+							}) : confirmMerge ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "dsh-atb-confirm",
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-atb-confirm-label",
+										children: "将分支以 --no-ff 合并到主工作区？"
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "dsh-atb-btn",
+										"data-primary": "true",
+										disabled: busy,
+										onClick: doMerge,
+										children: "确认合并"
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "dsh-atb-btn",
+										onClick: () => setConfirmMerge(false),
+										children: "取消"
+									})
+								]
+							}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: "dsh-atb-btn",
+								disabled: busy,
+								title: "在主工作区 git merge --no-ff 该任务分支（要求主区干净；冲突会原样报告）",
+								onClick: () => setConfirmMerge(true),
+								children: "⇥ 合并到主工作区"
+							}),
+							!running && (confirmRemove === null ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: "dsh-atb-btn",
+								"data-danger": "true",
+								disabled: busy,
+								title: "git worktree remove（有未提交修改时拒绝）",
+								onClick: () => setConfirmRemove("wt"),
+								children: "🗑 删除 worktree"
+							}), task.branch !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: "dsh-atb-btn",
+								"data-danger": "true",
+								disabled: busy,
+								title: "删除 worktree 并删除任务分支（有未提交修改时拒绝）",
+								onClick: () => setConfirmRemove("wtb"),
+								children: "🗑 删 worktree + 分支"
+							})] }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+								className: "dsh-atb-confirm",
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-atb-confirm-label",
+										children: confirmRemove === "wtb" ? "删除 worktree 并删除分支？" : "删除 worktree 目录？"
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "dsh-atb-btn",
+										"data-danger": "true",
+										disabled: busy,
+										onClick: () => doRemove(confirmRemove === "wtb"),
+										children: "确认删除"
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										type: "button",
+										className: "dsh-atb-btn",
+										onClick: () => setConfirmRemove(null),
+										children: "取消"
+									})
+								]
+							})),
+							!running && confirmRemove === null && !confirmMerge && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "dsh-atb-iso-hint",
+								children: "分支与 worktree 保留中 — 可退回继续修改"
+							})
+						]
+					}),
+					alertEl
+				]
+			});
+		}
 		/**
 		* The detail view.
 		* @param task - the task record.
@@ -1726,6 +2071,10 @@ window.__ModuleLoader__.load({
 											icon: "✦",
 											children: task.model.model
 										}),
+										task.presetId !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Chip, {
+											icon: "🎛",
+											children: task.presetId
+										}),
 										task.execution.mode === "scheduled" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Chip, {
 											icon: "⏰",
 											children: [
@@ -1739,6 +2088,15 @@ window.__ModuleLoader__.load({
 											tone: "urgent",
 											children: "受阻"
 										}),
+										task.branch !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Chip, {
+											icon: "🌿",
+											tone: void 0,
+											children: ["Worktree · ", task.branch.length > 28 ? `${task.branch.slice(0, 28)}…` : task.branch]
+										}),
+										(task.isolation === void 0 || task.isolation === "worktree") && task.branch === void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Chip, {
+											icon: "🌿",
+											children: "Worktree 隔离"
+										}),
 										holder !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Chip, {
 											icon: stale ? "⏱" : "🔑",
 											tone: stale ? "urgent" : void 0,
@@ -1782,6 +2140,13 @@ window.__ModuleLoader__.load({
 									onClick: () => void controller.duplicate(task),
 									children: "⧉ 复制"
 								}),
+								canRun && task.branch !== void 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: "dsh-atb-detail-run",
+									title: "续跑：保留现有 worktree 与分支（上次的改动和提交都在原处），在其上继续执行；默认「立即执行」会重置为全新基线",
+									onClick: () => void controller.run(task.id, true),
+									children: "↻ 续跑"
+								}),
 								canRun && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 									type: "button",
 									className: "dsh-atb-detail-run",
@@ -1852,6 +2217,10 @@ window.__ModuleLoader__.load({
 							children: task.prompt
 						})]
 					}),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)(IsolationBlock, {
+						task,
+						controller
+					}),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: "dsh-atb-detail-actions",
 						children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -2154,6 +2523,10 @@ window.__ModuleLoader__.load({
 			const [cron, setCron] = (0, react.useState)(task?.execution.cron ?? "0 9 * * *");
 			const [catalog, setCatalog] = (0, react.useState)([]);
 			const [model, setModel] = (0, react.useState)(task?.model !== void 0 ? JSON.stringify(task.model) : "");
+			const [presetId, setPresetId] = (0, react.useState)(task?.presetId ?? "");
+			const [presets, setPresets] = (0, react.useState)([]);
+			const [presetDefault, setPresetDefault] = (0, react.useState)(void 0);
+			const [isolation, setIsolation] = (0, react.useState)(task?.isolation ?? loadDefaultIsolation());
 			const titleRef = (0, react.useRef)(null);
 			(0, react.useEffect)(() => {
 				titleRef.current?.focus();
@@ -2168,14 +2541,36 @@ window.__ModuleLoader__.load({
 				if (face === void 0) return;
 				face().then(setCatalog).catch(() => setCatalog([]));
 			}, [controller]);
+			(0, react.useEffect)(() => {
+				const face = controller.presetCatalog;
+				if (face === void 0) return;
+				face().then((roster) => {
+					setPresets(roster.presets);
+					setPresetDefault(roster.defaultId);
+					if (task?.presetId === void 0 && roster.defaultId !== void 0) setPresetId(roster.defaultId);
+				}).catch(() => setPresets([]));
+			}, [controller, task?.presetId]);
 			const cronMatch = mode === "scheduled" ? parseCron(cron.trim()) : null;
 			const nextRun = cronMatch !== null ? nextCronTime(cronMatch, Date.now()) : null;
 			const cronBad = mode === "scheduled" && (cronMatch === null || nextRun === null);
 			const valid = title.trim().length > 0 && workspaceId !== "" && !cronBad;
 			const runBlocked = editing && task.status === "in_progress";
+			const isolationLocked = editing && ((task.executions?.length ?? 0) > 0 || task.status === "in_progress");
+			const gitOk = controller.gitAvailable(workspaceId);
+			const isolationDisabled = isolationLocked || !gitOk;
+			/** Isolation payload for submit: undefined keeps the default (degrades naturally). */
+			const isolationPayload = () => {
+				if (!gitOk) return void 0;
+				if (!editing) saveDefaultIsolation(isolation);
+				return isolation;
+			};
+			/** Preset payload: '' = follow the deployment default (submit omits). */
+			const presetPayload = () => presetId.trim().length > 0 ? presetId.trim() : void 0;
 			const submit = () => {
 				if (!valid) return;
 				const picked = model !== "" ? JSON.parse(model) : void 0;
+				const isolationOut = isolationPayload();
+				const presetOut = presetPayload();
 				if (editing) controller.update(task.id, task.version, {
 					title,
 					description,
@@ -2186,7 +2581,9 @@ window.__ModuleLoader__.load({
 						mode,
 						cron: cron.trim()
 					} : { mode },
-					model: picked ?? null
+					model: picked ?? null,
+					...isolationOut !== void 0 && !isolationLocked ? { isolation: isolationOut } : {},
+					presetId: presetOut ?? null
 				});
 				else controller.create({
 					title,
@@ -2198,13 +2595,17 @@ window.__ModuleLoader__.load({
 						mode,
 						cron: cron.trim()
 					} : { mode },
-					model: picked
+					model: picked,
+					...isolationOut !== void 0 ? { isolation: isolationOut } : {},
+					...presetOut !== void 0 ? { presetId: presetOut } : {}
 				});
 			};
 			/** Save the form, then immediately trigger a manual run of the task. */
 			const submitAndRun = () => {
 				if (!valid || runBlocked) return;
 				const picked = model !== "" ? JSON.parse(model) : void 0;
+				const isolationOut = isolationPayload();
+				const presetOut = presetPayload();
 				if (editing) (async () => {
 					if (await controller.update(task.id, task.version, {
 						title,
@@ -2216,7 +2617,9 @@ window.__ModuleLoader__.load({
 							mode,
 							cron: cron.trim()
 						} : { mode },
-						model: picked ?? null
+						model: picked ?? null,
+						...isolationOut !== void 0 && !isolationLocked ? { isolation: isolationOut } : {},
+						presetId: presetOut ?? null
 					})) await controller.run(task.id);
 				})();
 				else (async () => {
@@ -2230,7 +2633,9 @@ window.__ModuleLoader__.load({
 							mode,
 							cron: cron.trim()
 						} : { mode },
-						model: picked
+						model: picked,
+						...isolationOut !== void 0 ? { isolation: isolationOut } : {},
+						...presetOut !== void 0 ? { presetId: presetOut } : {}
 					});
 					if (id !== void 0) await controller.run(id);
 				})();
@@ -2317,6 +2722,21 @@ window.__ModuleLoader__.load({
 										}, `${m.provider}/${m.model}`))]
 									})
 								}),
+								presets.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
+									label: "执行模式（preset）",
+									children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("select", {
+										value: presetId,
+										onChange: (e) => setPresetId(e.target.value),
+										title: "执行会话按该 preset 组合（决定工具集与人设）；默认 = 部署默认 preset",
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("option", {
+											value: "",
+											children: ["跟随部署默认", presetDefault !== void 0 ? `（当前：${presets.find((p) => p.id === presetDefault)?.name ?? presetDefault}）` : ""]
+										}), presets.map((p) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("option", {
+											value: p.id,
+											children: [p.name ?? p.id, p.id === presetDefault ? "（部署默认）" : ""]
+										}, p.id))]
+									})
+								}),
 								/* @__PURE__ */ (0, react_jsx_runtime.jsx)(Field, {
 									label: "紧急度",
 									full: true,
@@ -2414,6 +2834,46 @@ window.__ModuleLoader__.load({
 											children: ["下次 ", fmtTime(nextRun)]
 										})]
 									})]
+								}),
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)(Field, {
+									label: "执行隔离",
+									full: true,
+									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "dsh-atb-mode-picker",
+										"data-disabled": isolationDisabled ? "true" : void 0,
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+											type: "button",
+											className: "dsh-atb-mode-opt",
+											"data-on": isolation === "worktree",
+											disabled: isolationDisabled,
+											title: isolationLocked ? "任务已有执行记录，隔离方式已锁定" : !gitOk ? "当前项目非 git 仓库" : "每次执行在独立 worktree 分支上进行",
+											onClick: () => setIsolation("worktree"),
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "dsh-atb-mode-name",
+												children: "🌿 Worktree 隔离"
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "dsh-atb-mode-hint",
+												children: isolationLocked ? "已锁定（执行开始后不可更改）" : !gitOk ? "当前项目非 git 仓库" : "独立分支 task/标题+ID，互不污染"
+											})]
+										}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+											type: "button",
+											className: "dsh-atb-mode-opt",
+											"data-on": isolation === "none",
+											disabled: isolationDisabled,
+											title: isolationLocked ? "任务已有执行记录，隔离方式已锁定" : "直接在项目目录执行（不使用 git）",
+											onClick: () => setIsolation("none"),
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "dsh-atb-mode-name",
+												children: "📁 原目录执行"
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+												className: "dsh-atb-mode-hint",
+												children: isolationLocked ? "已锁定（执行开始后不可更改）" : !gitOk ? "当前项目非 git 仓库，将在原目录执行" : "不使用 git，直接在项目目录工作"
+											})]
+										})]
+									}), !gitOk && !isolationLocked && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-atb-isolation-note",
+										children: "当前项目非 git 仓库，将在原目录执行（任务仍按默认配置创建，运行时自动降级）"
+									})]
 								})
 							]
 						}),
@@ -2614,6 +3074,13 @@ window.__ModuleLoader__.load({
 								onClick: () => controller.toggleSecondary(),
 								children: state.secondaryOpen ? "返回看板" : "其它任务"
 							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: "dsh-atb-btn",
+								title: "健康诊断：遗留 worktree、台账基本项",
+								onClick: () => controller.openDiagnostics(),
+								children: "⚙ 诊断"
+							}),
 							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 								type: "button",
 								className: "dsh-atb-btn",
@@ -2714,10 +3181,138 @@ window.__ModuleLoader__.load({
 						controller,
 						task: state.editingId === void 0 ? void 0 : state.ledger.tasks.find((t) => t.id === state.editingId)
 					}),
+					state.diagOpen && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DiagnosticsPanel, { controller }),
 					alertEl
 				]
 			});
 		}
+		/** ⚙ Health-diagnostics panel (plan §3.6): ledger basics + orphan worktrees + one-click cleanup. */
+		function DiagnosticsPanel({ controller }) {
+			const state = controller.getSnapshot();
+			const diag = state.diagnostics;
+			const wsName = (id) => {
+				const ws = state.workspaces.find((w) => w.id === id);
+				return ws?.title ?? ws?.path ?? id.slice(0, 8);
+			};
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: "dsh-atb-modal-backdrop",
+				onClick: (e) => {
+					if (e.target === e.currentTarget) controller.closeDiagnostics();
+				},
+				children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "dsh-atb-modal dsh-atb-diag",
+					role: "dialog",
+					"aria-modal": "true",
+					"aria-label": "健康诊断",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "dsh-atb-modal-head",
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "dsh-atb-modal-headicon",
+								children: "⚙"
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dsh-atb-modal-headtext",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: "健康诊断" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: "台账基本项与 worktree 遗留清理" })]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+								type: "button",
+								className: "dsh-atb-modal-close",
+								"aria-label": "关闭",
+								onClick: () => controller.closeDiagnostics(),
+								children: "✕"
+							})
+						]
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+						className: "dsh-atb-modal-body",
+						children: diag === void 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+							className: "dsh-atb-empty2",
+							children: "读取中…"
+						}) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dsh-atb-diag-grid",
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "dsh-atb-diag-item",
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: diag.revision }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "台账修订号" })]
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "dsh-atb-diag-item",
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: diag.tasks }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "任务总数" })]
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "dsh-atb-diag-item",
+										"data-bad": diag.staleRunning > 0 ? "true" : void 0,
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: diag.staleRunning }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "执行中" })]
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+										className: "dsh-atb-diag-item",
+										"data-bad": diag.orphanWorktrees.length > 0 ? "true" : void 0,
+										children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("b", { children: diag.orphanWorktrees.length }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "遗留 worktree" })]
+									})
+								]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dsh-atb-diag-sec",
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", { children: "遗留 worktree（台账无主但目录存在）" }),
+									diag.orphanWorktrees.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+										className: "dsh-atb-empty2",
+										children: "无遗留 — 各项目 .dsh-worktrees 目录干净"
+									}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+										className: "dsh-atb-diag-orphans",
+										children: diag.orphanWorktrees.map((o) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+											className: "dsh-atb-diag-orphan",
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+												className: "dsh-atb-diag-orphan-path",
+												title: o.path,
+												children: [
+													wsName(o.workspaceId),
+													" · ",
+													o.taskId
+												]
+											}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+												type: "button",
+												className: "dsh-atb-btn",
+												"data-danger": "true",
+												onClick: () => void controller.cleanupOrphan(o.workspaceId, o.taskId),
+												children: "清理"
+											})]
+										}, o.path))
+									}),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+										className: "dsh-atb-empty2",
+										children: "提示：有未提交修改的遗留目录会被拒绝清理，请先手动处理其内容。live 任务的 worktree 请在任务详情页删除。"
+									})
+								]
+							}),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dsh-atb-diag-sec",
+								children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", { children: "gitignore 建议" }), (diag.gitIgnoreSuggestions ?? []).length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									className: "dsh-atb-empty2",
+									children: "无待办 — 各 git 项目已忽略 .dsh-worktrees 目录"
+								}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									className: "dsh-atb-diag-orphans",
+									children: diag.gitIgnoreSuggestions.map((s) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+										className: "dsh-atb-diag-orphan",
+										children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+											className: "dsh-atb-diag-orphan-path",
+											title: s.workspacePath,
+											children: [
+												wsName(s.workspaceId),
+												" · 建议在 .gitignore 加入一行 ",
+												/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: ".dsh-worktrees/" }),
+												"（不会自动修改）"
+											]
+										})
+									}, s.workspaceId))
+								})]
+							})
+						] })
+					})]
+				})
+			});
+		}
 		/** Secondary tab: tasks grouped into canceled / archived / trashed columns. */
 		function SecondaryTab({ controller, tasks }) {
 			const trashed = tasks.filter((t) => t.trashedAt !== void 0);
@@ -2920,17 +3515,34 @@ window.__ModuleLoader__.load({
 				injectStyles();
 				const controller = new BoardController(createClient());
 				const connection = ctx.get?.("connection");
-				if (connection !== void 0) controller.modelCatalog = async () => {
-					const response = await connection.api.llm.models({});
-					if (!response.result.ok) return [];
-					const out = [];
-					for (const group of response.result.value.groups) for (const model of group.models) out.push({
-						provider: group.id,
-						model: model.id,
-						name: model.name
-					});
-					return out;
-				};
+				if (connection !== void 0) {
+					controller.modelCatalog = async () => {
+						const response = await connection.api.llm.models({});
+						if (!response.result.ok) return [];
+						const out = [];
+						for (const group of response.result.value.groups) for (const model of group.models) out.push({
+							provider: group.id,
+							model: model.id,
+							name: model.name
+						});
+						return out;
+					};
+					controller.presetCatalog = async () => {
+						const list = connection.api.agentPresets;
+						if (list === void 0) return { presets: [] };
+						const response = await list.list({});
+						if (!response.result.ok) return { presets: [] };
+						const presets = response.result.value.presets.map((p) => ({
+							id: p.id,
+							name: p.name
+						}));
+						const def = response.result.value.presets.find((p) => p.isDefault);
+						return {
+							presets,
+							...def !== void 0 ? { defaultId: def.id } : {}
+						};
+					};
+				}
 				controller.installSessionJumper(createSessionJumper({
 					getSessions: () => ctx.get?.("sessions"),
 					getWorkspaces: () => ctx.get?.("workspaces")