dsh-taskboard 0.2.2 → 0.4.0

package/lib/host/routes.js

@@ -1,8 +1,45 @@
-import { asStatus, asUrgency, canTransition, newCommentId, newTaskId, normalizeBody, normalizeExecution, normalizeModel, normalizePrompt, normalizeTitle, summarize, syncClaim } from "../shared/protocol.js";
+import { asIsolation, asStatus, asUrgency, canTransition, checklistFromTexts, newCommentId, newTaskId, normalizeBody, normalizeChecklist, normalizeExecution, normalizeModel, normalizePrompt, normalizeTitle, summarize, syncClaim, validateLedgerImport } from "../shared/protocol.js";
+import { WORKTREE_DIR, worktreePathOf } from "./git.js";
 import { ROUTE_PREFIX, SSE_PATH } from "../shared/api.js";
+import { join } from "node:path";
+import { readdir, rm } from "node:fs/promises";
 //#region src/host/routes.ts
 /** Heartbeat cadence for the SSE stream. */
 const HEARTBEAT_MS = 2e4;
+/** How long a workspace git-detection result stays cached (fail-soft). */
+const GIT_DETECT_TTL_MS = 6e4;
+/** Validate a template's task spec (routes-side, unknown → invalid_input). */
+function normalizeTemplateSpec(raw) {
+	if (typeof raw !== "object" || raw === null) throw new Error("Error: invalid_input: task must be an object");
+	const e = raw;
+	const spec = {};
+	const str = (key) => {
+		const v = e[key];
+		if (v === void 0) return void 0;
+		if (typeof v !== "string") throw new Error(`Error: invalid_input: task.${key} must be a string`);
+		return v;
+	};
+	const title = str("title");
+	const description = str("description");
+	const prompt = str("prompt");
+	const urgency = str("urgency");
+	const isolation = str("isolation");
+	const presetId = str("presetId");
+	if (title !== void 0) spec.title = normalizeTitle(title);
+	if (description !== void 0) spec.description = description;
+	if (prompt !== void 0) spec.prompt = normalizePrompt(prompt);
+	if (urgency !== void 0) spec.urgency = asUrgency(urgency);
+	if (isolation !== void 0) spec.isolation = asIsolation(isolation);
+	if (presetId !== void 0 && presetId.trim().length > 0) spec.presetId = presetId.trim();
+	if (e.execution !== void 0) spec.execution = normalizeExecution(e.execution, Date.now());
+	if (e.model !== void 0) spec.model = normalizeModel(e.model);
+	if (e.checklist !== void 0) {
+		if (!Array.isArray(e.checklist) || e.checklist.some((c) => typeof c !== "string")) throw new Error("Error: invalid_input: task.checklist must be an array of strings");
+		checklistFromTexts(e.checklist);
+		spec.checklist = e.checklist;
+	}
+	return spec;
+}
 /** Validate a pinned model: structural check always, provider route when known. */
 function checkModel(raw, modelProviders) {
 	const model = normalizeModel(raw);
@@ -55,6 +92,11 @@ function num(body, key) {
 	if (v === void 0) return void 0;
 	return typeof v === "number" && Number.isFinite(v) ? v : null;
 }
+/** Normalize an agent preset id: trimmed, non-empty; empty string → undefined. */
+function normalizePresetId(raw) {
+	const t = (raw ?? "").trim();
+	return t.length === 0 ? void 0 : t;
+}
 /** Map a thrown domain error to the envelope. */
 function toFail(error) {
 	const message = error instanceof Error ? error.message : String(error);
@@ -89,9 +131,72 @@ function registerTaskboardRoutes(ctx, options) {
 		for (const res of subscribers) res.write(frame);
 	};
 	store.subscribe(broadcast);
+	const gitCache = /* @__PURE__ */ new Map();
+	const gitHinted = /* @__PURE__ */ new Set();
+	/** Whether <root>/.gitignore (missing file counts as missing) ignores our worktree dir. */
+	const gitignoreMissing = async (path) => {
+		try {
+			const { readFile } = await import("node:fs/promises");
+			return !(await readFile(join(path, ".gitignore"), "utf8")).split("\n").some((l) => {
+				const t = l.trim().replace(/\/+$/, "");
+				return t === ".dsh-worktrees" || t === `/.dsh-worktrees`;
+			});
+		} catch {
+			return true;
+		}
+	};
+	const gitAvailable = async (path) => {
+		if (options.git === void 0) return false;
+		const hit = gitCache.get(path);
+		if (hit !== void 0 && options.now() - hit.at < GIT_DETECT_TTL_MS) return hit.value;
+		let value = false;
+		try {
+			value = await options.git.detect(path);
+		} catch {}
+		gitCache.set(path, {
+			value,
+			at: options.now()
+		});
+		if (value && !gitHinted.has(path)) {
+			gitHinted.add(path);
+			if (await gitignoreMissing(path)) console.info(`[dsh-taskboard] 建议在 ${path}/.gitignore 加入一行 ${WORKTREE_DIR}/ 以隐藏任务 worktree 目录（不会自动修改）`);
+		}
+		return value;
+	};
+	/** List orphan worktree dirs: entries under <ws>/.dsh-worktrees owned by no ledger task. */
+	const listOrphanWorktrees = async () => {
+		const orphans = [];
+		const known = new Set(store.snapshot().tasks.map((t) => t.id));
+		for (const ws of workspaces.list()) {
+			let entries = [];
+			try {
+				entries = (await readdir(join(ws.path, WORKTREE_DIR), { withFileTypes: true })).filter((e) => e.isDirectory()).map((e) => e.name);
+			} catch {}
+			for (const taskId of entries) if (!known.has(taskId)) orphans.push({
+				workspaceId: ws.id,
+				workspacePath: ws.path,
+				taskId,
+				path: worktreePathOf(ws.path, taskId)
+			});
+		}
+		return orphans;
+	};
+	/** Git-enabled workspaces whose .gitignore does not cover the worktree dir. */
+	const listGitignoreSuggestions = async () => {
+		const suggestions = [];
+		for (const ws of workspaces.list()) {
+			if (!await gitAvailable(ws.path)) continue;
+			if (await gitignoreMissing(ws.path)) suggestions.push({
+				workspaceId: ws.id,
+				workspacePath: ws.path
+			});
+		}
+		return suggestions;
+	};
 	const handler = async (req, res) => {
 		try {
-			const pathname = new URL(req.url ?? "/", "http://x").pathname;
+			const url = new URL(req.url ?? "/", "http://x");
+			const pathname = url.pathname;
 			if (req.method === "GET") {
 				if (pathname === `/dsh-taskboard/state`) {
 					await store.load();
@@ -102,9 +207,74 @@ function registerTaskboardRoutes(ctx, options) {
 					return;
 				}
 				if (pathname === `/dsh-taskboard/workspaces`) {
+					const list = workspaces.list();
+					const flags = await Promise.all(list.map((ws) => gitAvailable(ws.path)));
 					json(res, {
 						ok: true,
-						value: workspaces.list()
+						value: list.map((ws, i) => ({
+							...ws,
+							sessionCount: 0,
+							gitAvailable: flags[i]
+						}))
+					});
+					return;
+				}
+				if (pathname === `/dsh-taskboard/diagnostics`) {
+					const ledger = store.snapshot();
+					let staleRunning = 0;
+					for (const t of ledger.tasks) for (const e of t.executions) if (e.outcome === "running") staleRunning += 1;
+					json(res, {
+						ok: true,
+						value: {
+							revision: ledger.revision,
+							tasks: ledger.tasks.length,
+							staleRunning,
+							orphanWorktrees: await listOrphanWorktrees(),
+							gitIgnoreSuggestions: await listGitignoreSuggestions()
+						}
+					});
+					return;
+				}
+				const diffMatch = pathname.match(new RegExp(`^${ROUTE_PREFIX}/tasks/([^/]+)/diff$`));
+				if (diffMatch !== null) {
+					try {
+						if (options.git === void 0) {
+							json(res, fail("invalid_input", "git integration unavailable").res, 501);
+							return;
+						}
+						const task = store.get(diffMatch[1]);
+						if (task === void 0) throw new Error("Error: not_found: no such task");
+						const execution = task.executions.find((e) => e.id === url.searchParams.get("execution"));
+						if (execution === void 0) throw new Error("Error: not_found: no such execution");
+						const commit = url.searchParams.get("commit");
+						const filePath = url.searchParams.get("path");
+						const ws = workspaces.get(task.workspaceId);
+						if (ws === void 0) throw new Error("Error: not_found: unknown workspace");
+						const cwd = execution.worktreePath ?? ws.path;
+						let result = commit !== null ? await options.git.showCommit(cwd, commit) : filePath !== null ? await options.git.showPathDiff(cwd, filePath, execution.baseCommit) : void 0;
+						if (result === void 0 && execution.worktreePath !== void 0 && cwd !== ws.path) result = commit !== null ? await options.git.showCommit(ws.path, commit) : filePath !== null && execution.baseCommit !== void 0 ? await options.git.showPathDiff(ws.path, filePath, execution.baseCommit) : void 0;
+						if (result === void 0) throw new Error("Error: invalid_input: 无法获取 diff（git 报错、对象不存在，或仅存于已删除的 worktree 且无基线）");
+						json(res, {
+							ok: true,
+							value: {
+								diff: result.text,
+								truncated: result.truncated
+							}
+						});
+					} catch (error) {
+						const f = toFail(error);
+						json(res, f.res, f.status);
+					}
+					return;
+				}
+				if (pathname === `/dsh-taskboard/templates`) {
+					if (options.templates === void 0) {
+						json(res, fail("invalid_input", "template store unavailable").res, 501);
+						return;
+					}
+					json(res, {
+						ok: true,
+						value: { templates: await options.templates.list() }
 					});
 					return;
 				}
@@ -149,6 +319,15 @@ function registerTaskboardRoutes(ctx, options) {
 					const status = str(body, "status") === null ? "todo" : asStatus(str(body, "status"));
 					const execution = normalizeExecution(body.execution ?? {}, options.now());
 					const model = body.model === void 0 ? void 0 : checkModel(body.model, options.modelProviders);
+					const isolationRaw = str(body, "isolation");
+					const isolation = isolationRaw === null ? void 0 : asIsolation(isolationRaw);
+					const presetId = normalizePresetId(str(body, "presetId"));
+					let checklist = void 0;
+					if (body.checklist !== void 0) {
+						if (!Array.isArray(body.checklist) || body.checklist.some((c) => typeof c !== "string")) throw new Error("Error: invalid_input: checklist must be an array of strings");
+						const texts = body.checklist.map((c) => c.trim()).filter((c) => c.length > 0);
+						if (texts.length > 0) checklist = checklistFromTexts(texts);
+					}
 					const now = options.now();
 					const task = {
 						id: newTaskId(),
@@ -161,6 +340,9 @@ function registerTaskboardRoutes(ctx, options) {
 						blocked: false,
 						execution,
 						model,
+						...isolation !== void 0 ? { isolation } : {},
+						...presetId !== void 0 ? { presetId } : {},
+						...checklist !== void 0 ? { checklist } : {},
 						version: 1,
 						createdAt: now,
 						updatedAt: now,
@@ -183,7 +365,7 @@ function registerTaskboardRoutes(ctx, options) {
 				}
 				return;
 			}
-			const actionMatch = pathname.match(new RegExp(`^${ROUTE_PREFIX}/tasks/([^/]+)/(\\w+)$`));
+			const actionMatch = pathname.match(new RegExp(`^${ROUTE_PREFIX}/tasks/([^/]+)/([\\w-]+)$`));
 			if (actionMatch !== null) {
 				const id = actionMatch[1];
 				const action = actionMatch[2];
@@ -212,6 +394,19 @@ function registerTaskboardRoutes(ctx, options) {
 						if (body.execution !== void 0) next.execution = normalizeExecution(body.execution, options.now());
 						if (body.model === null) next.model = void 0;
 						else if (body.model !== void 0) next.model = checkModel(body.model, options.modelProviders);
+						const isolationRaw = str(body, "isolation");
+						if (isolationRaw !== null) {
+							if (task.executions.length > 0 || task.status === "in_progress") throw new Error("Error: invalid_input: isolation 已锁定（任务已有执行记录），不可修改");
+							next.isolation = asIsolation(isolationRaw);
+						}
+						if (body.presetId === null) delete next.presetId;
+						else if (body.presetId !== void 0) next.presetId = normalizePresetId(str(body, "presetId"));
+						if (body.checklist === null) delete next.checklist;
+						else if (body.checklist !== void 0) {
+							const items = normalizeChecklist(body.checklist);
+							if (items.length > 0) next.checklist = items;
+							else delete next.checklist;
+						}
 						next.version = task.version + 1;
 						next.updatedAt = options.now();
 						next.updatedBy = { kind: "user" };
@@ -306,6 +501,26 @@ function registerTaskboardRoutes(ctx, options) {
 					if (action === "delete") {
 						if (body.purge === true) {
 							if (task.trashedAt === void 0) throw new Error("Error: invalid_input: purge requires a trashed task (soft-delete first)");
+							if (options.git !== void 0) {
+								const ws = workspaces.get(task.workspaceId);
+								if (ws !== void 0) {
+									const path = worktreePathOf(ws.path, id);
+									try {
+										await options.git.removeWorktree(ws.path, path);
+									} catch (error) {
+										const message = error instanceof Error ? error.message : String(error);
+										if (message.includes("未提交修改")) throw new Error(`Error: invalid_input: ${message}；请先处理这些改动（提交、续跑或手动保存）再物理清除任务`);
+										if (/not a working tree|not a working-tree/i.test(message)) await rm(path, {
+											recursive: true,
+											force: true
+										});
+										else throw new Error(`Error: invalid_input: ${message}`);
+									}
+									if (task.branch !== void 0) try {
+										await options.git.deleteBranch(ws.path, task.branch);
+									} catch {}
+								}
+							}
 							await store.mutate("task-deleted", (ledger) => {
 								ledger.tasks = ledger.tasks.filter((t) => t.id !== id);
 								return [];
@@ -338,7 +553,8 @@ function registerTaskboardRoutes(ctx, options) {
 							json(res, fail("invalid_input", "execution service unavailable").res, 501);
 							return;
 						}
-						const result = await options.run(id);
+						const runOptions = body.reuse === true ? { reuseWorktree: true } : void 0;
+						const result = await options.run(id, runOptions);
 						if (result.ok) json(res, {
 							ok: true,
 							value: result
@@ -368,6 +584,92 @@ function registerTaskboardRoutes(ctx, options) {
 						}
 						return;
 					}
+					if (action === "merge") {
+						if (options.git === void 0) {
+							json(res, fail("invalid_input", "git integration unavailable").res, 501);
+							return;
+						}
+						if (task.branch === void 0) throw new Error("Error: invalid_input: 该任务还没有 worktree 分支（未隔离执行过）");
+						if (task.status === "in_progress") throw new Error("Error: invalid_input: 任务执行中，不能合并");
+						if (task.executions.some((e) => e.outcome === "running")) throw new Error("Error: invalid_input: 任务执行中，不能合并");
+						const ws = workspaces.get(task.workspaceId);
+						if (ws === void 0) throw new Error("Error: not_found: unknown workspace");
+						let noop = false;
+						try {
+							noop = await options.git.isAncestor(ws.path, task.branch);
+						} catch {}
+						if (noop) {
+							json(res, {
+								ok: true,
+								value: {
+									merged: false,
+									noop: true,
+									branch: task.branch
+								}
+							});
+							return;
+						}
+						try {
+							await options.git.merge(ws.path, task.branch);
+						} catch (error) {
+							throw new Error(`Error: invalid_input: ${error instanceof Error ? error.message : String(error)}`);
+						}
+						const mergedComment = {
+							id: newCommentId(),
+							body: normalizeBody(`[系统] 分支 ${task.branch} 已合并到主工作区（--no-ff）。`),
+							version: 1,
+							createdAt: options.now()
+						};
+						const next = structuredClone(task);
+						next.comments.push(mergedComment);
+						next.version = task.version + 1;
+						next.updatedAt = options.now();
+						await store.mutate("comment-added", (ledger) => {
+							const i = ledger.tasks.findIndex((t) => t.id === id);
+							ledger.tasks[i] = next;
+							return [next];
+						});
+						json(res, {
+							ok: true,
+							value: {
+								merged: true,
+								branch: task.branch
+							}
+						});
+						return;
+					}
+					if (action === "worktree-remove") {
+						if (options.git === void 0) {
+							json(res, fail("invalid_input", "git integration unavailable").res, 501);
+							return;
+						}
+						if (task.executions.some((e) => e.outcome === "running")) throw new Error("Error: invalid_input: 任务执行中，不能删除 worktree");
+						const ws = workspaces.get(task.workspaceId);
+						if (ws === void 0) throw new Error("Error: not_found: unknown workspace");
+						const path = worktreePathOf(ws.path, id);
+						try {
+							await options.git.removeWorktree(ws.path, path);
+						} catch (error) {
+							throw new Error(`Error: invalid_input: ${error instanceof Error ? error.message : String(error)}`);
+						}
+						let branchDeleted = false;
+						let branchError;
+						if (body.deleteBranch === true && task.branch !== void 0) try {
+							await options.git.deleteBranch(ws.path, task.branch);
+							branchDeleted = true;
+						} catch (error) {
+							branchError = error instanceof Error ? error.message : String(error);
+						}
+						json(res, {
+							ok: true,
+							value: {
+								removed: true,
+								branchDeleted,
+								...branchError !== void 0 ? { branchError } : {}
+							}
+						});
+						return;
+					}
 					const f = fail("not_found", `unknown action ${action}`);
 					json(res, f.res, f.status);
 				} catch (error) {
@@ -376,6 +678,134 @@ function registerTaskboardRoutes(ctx, options) {
 				}
 				return;
 			}
+			if (pathname === `/dsh-taskboard/worktree-cleanup`) {
+				try {
+					if (options.git === void 0) {
+						json(res, fail("invalid_input", "git integration unavailable").res, 501);
+						return;
+					}
+					const workspaceId = str(body, "workspaceId") ?? "";
+					const taskId = str(body, "taskId") ?? "";
+					const ws = workspaces.get(workspaceId);
+					if (ws === void 0) throw new Error("Error: not_found: unknown workspace");
+					if (store.get(taskId) !== void 0) throw new Error("Error: invalid_input: 任务仍在看板中，请从任务详情页删除其 worktree");
+					const path = worktreePathOf(ws.path, taskId);
+					try {
+						await options.git.removeWorktree(ws.path, path);
+					} catch (error) {
+						const message = error instanceof Error ? error.message : String(error);
+						if (/not a working tree|not a working-tree/i.test(message)) await rm(path, {
+							recursive: true,
+							force: true
+						});
+						else throw new Error(`Error: invalid_input: ${message}`);
+					}
+					json(res, {
+						ok: true,
+						value: {
+							cleaned: true,
+							path
+						}
+					});
+				} catch (error) {
+					const f = toFail(error);
+					json(res, f.res, f.status);
+				}
+				return;
+			}
+			if (pathname === `/dsh-taskboard/import/preview`) {
+				try {
+					const plan = validateLedgerImport(body, new Set(store.snapshot().tasks.map((t) => t.id)), options.now());
+					json(res, {
+						ok: true,
+						value: { plan: {
+							create: plan.create.map((t) => ({
+								id: t.id,
+								title: t.title,
+								status: t.status
+							})),
+							overwrite: plan.overwrite.map((t) => ({
+								id: t.id,
+								title: t.title,
+								status: t.status
+							})),
+							invalid: plan.invalid
+						} }
+					});
+				} catch (error) {
+					const f = toFail(error);
+					json(res, f.res, f.status);
+				}
+				return;
+			}
+			if (pathname === `/dsh-taskboard/import`) {
+				try {
+					const mode = str(body, "mode") === "replace" ? "replace" : "merge";
+					const raw = body.ledger;
+					const plan = validateLedgerImport(raw, new Set(store.snapshot().tasks.map((t) => t.id)), options.now());
+					const imported = [...plan.create, ...plan.overwrite];
+					if (mode === "replace" && imported.length === 0) throw new Error("Error: invalid_input: 导入文件没有可导入的任务，已拒绝整册替换");
+					let backupFile;
+					if (mode === "replace" && store.snapshot().tasks.length > 0) backupFile = await store.backup();
+					let replacedTotal;
+					await store.mutate("task-created", (ledger) => {
+						if (mode === "replace") {
+							replacedTotal = ledger.tasks.length;
+							ledger.tasks = structuredClone(imported);
+							return ledger.tasks;
+						}
+						const byId = new Map(ledger.tasks.map((t) => [t.id, t]));
+						for (const task of imported) byId.set(task.id, structuredClone(task));
+						ledger.tasks = [...byId.values()];
+						return structuredClone(imported);
+					});
+					json(res, {
+						ok: true,
+						value: {
+							mode,
+							created: plan.create.length,
+							overwritten: plan.overwrite.length,
+							...mode === "replace" ? { replacedTotal } : {},
+							...backupFile !== void 0 ? { backupFile } : {}
+						}
+					});
+				} catch (error) {
+					const f = toFail(error);
+					json(res, f.res, f.status);
+				}
+				return;
+			}
+			if (pathname === `/dsh-taskboard/templates` || pathname === `/dsh-taskboard/templates/delete`) {
+				try {
+					if (options.templates === void 0) {
+						json(res, fail("invalid_input", "template store unavailable").res, 501);
+						return;
+					}
+					if (pathname.endsWith("/delete")) {
+						const id = str(body, "id") ?? "";
+						if (id.length === 0) throw new Error("Error: invalid_input: id required");
+						json(res, {
+							ok: true,
+							value: { deleted: await options.templates.remove(id) }
+						});
+						return;
+					}
+					const name = str(body, "name") ?? "";
+					if (name.trim().length === 0) throw new Error("Error: invalid_input: name required");
+					json(res, {
+						ok: true,
+						value: await options.templates.upsert({
+							id: str(body, "id") ?? void 0,
+							name,
+							task: normalizeTemplateSpec(body.task)
+						})
+					}, 201);
+				} catch (error) {
+					const f = toFail(error);
+					json(res, f.res, f.status);
+				}
+				return;
+			}
 			res.writeHead(404);
 			res.end();
 		} catch (error) {