dsh-taskboard 0.6.2 → 0.6.3

package/lib/host/routes.js

@@ -1,5 +1,7 @@
-import { asBoardSettings, asIsolation, asPermission, asStatus, asUrgency, canTransition, checklistFromTexts, defaultIsolationOf, defaultPermissionOf, newCommentId, newTaskId, normalizeBody, normalizeChecklist, normalizeExecution, normalizeModel, normalizePrompt, normalizeTitle, summarize, syncClaim, validateLedgerImport } from "../shared/protocol.js";
+import { asBoardSettings, asIsolation, asPermission, asStatus, asUrgency, canTransition, checklistFromTexts, defaultIsolationOf, defaultPermissionOf, isValidRelRepoPath, newCommentId, newTaskId, normalizeBody, normalizeChecklist, normalizeExecution, normalizeModel, normalizePrompt, normalizeTitle, summarize, syncClaim, validateLedgerImport } from "../shared/protocol.js";
 import { WORKTREE_DIR, worktreePathOf } from "./git.js";
+import { removeMirror, repoMainPath } from "./isolation.js";
+import { createRepoScanner } from "./repos.js";
 import { ROUTE_PREFIX, SSE_PATH } from "../shared/api.js";
 import { ERR, ToolError } from "./tools.js";
 import { join, resolve, sep } from "node:path";
@@ -189,23 +191,58 @@ function registerTaskboardRoutes(ctx, options) {
 			return true;
 		}
 	};
-	const gitAvailable = async (path) => {
-		if (options.git === void 0) return false;
+	const sharedScanner = options.scanner ?? createRepoScanner();
+	/**
+	* Whether the workspace root itself is a git repo (the .gitignore-suggestion
+	* gate — a plain container has no repo that could ignore anything).
+	*/
+	const rootIsRepo = async (path) => {
+		try {
+			return await options.git?.detect(path) ?? false;
+		} catch {}
+	};
+	/**
+	* Workspace repo facts for the form (0.6.3): `gitAvailable` gates the
+	* worktree option, `repoCount` feeds the mirror badge. Availability now
+	* covers PARALLEL MULTI-REPO workspaces too: a root repo qualifies as
+	* before, and a workspace whose root is NOT a repo still qualifies when
+	* the scanner finds nested repos — prepareMirror isolates exactly that
+	* container shape (mirror root = plain dir, one worktree per nested repo),
+	* so the form must not lock the capability away.
+	*/
+	const workspaceRepos = async (path) => {
+		if (options.git === void 0) return {
+			gitAvailable: false,
+			repoCount: 0
+		};
 		const hit = gitCache.get(path);
-		if (hit !== void 0 && options.now() - hit.at < GIT_DETECT_TTL_MS) return hit.value;
-		let value = false;
+		if (hit !== void 0 && options.now() - hit.at < GIT_DETECT_TTL_MS) return {
+			gitAvailable: hit.value,
+			repoCount: hit.repoCount ?? (hit.value ? 1 : 0)
+		};
+		let rootRepo = false;
 		try {
-			value = await options.git.detect(path);
+			rootRepo = await options.git.detect(path);
 		} catch {}
-		gitCache.set(path, {
-			value,
-			at: options.now()
-		});
-		if (value && !gitHinted.has(path)) {
+		if (rootRepo && !gitHinted.has(path)) {
 			gitHinted.add(path);
 			if (await gitignoreMissing(path)) console.info(`[dsh-taskboard] 建议在 ${path}/.gitignore 加入一行 ${WORKTREE_DIR}/ 以隐藏任务 worktree 目录（不会自动修改）`);
 		}
-		return value;
+		let nestedCount = 0;
+		try {
+			nestedCount = (await sharedScanner.findNestedRepos(path)).length;
+		} catch {}
+		const value = rootRepo || nestedCount > 0;
+		const repoCount = (rootRepo ? 1 : 0) + nestedCount;
+		gitCache.set(path, {
+			value,
+			at: options.now(),
+			repoCount
+		});
+		return {
+			gitAvailable: value,
+			repoCount
+		};
 	};
 	/** List orphan worktree dirs: entries under <ws>/.dsh-worktrees owned by no ledger task. */
 	const listOrphanWorktrees = async () => {
@@ -229,7 +266,7 @@ function registerTaskboardRoutes(ctx, options) {
 	const listGitignoreSuggestions = async () => {
 		const suggestions = [];
 		for (const ws of workspaces.list()) {
-			if (!await gitAvailable(ws.path)) continue;
+			if (!await rootIsRepo(ws.path)) continue;
 			if (await gitignoreMissing(ws.path)) suggestions.push({
 				workspaceId: ws.id,
 				workspacePath: ws.path
@@ -252,13 +289,14 @@ function registerTaskboardRoutes(ctx, options) {
 				}
 				if (pathname === `/dsh-taskboard/workspaces`) {
 					const list = workspaces.list();
-					const flags = await Promise.all(list.map((ws) => gitAvailable(ws.path)));
+					const info = await Promise.all(list.map((ws) => workspaceRepos(ws.path)));
 					json(res, {
 						ok: true,
 						value: list.map((ws, i) => ({
 							...ws,
 							sessionCount: 0,
-							gitAvailable: flags[i]
+							gitAvailable: info[i].gitAvailable,
+							repoCount: info[i].repoCount
 						}))
 					});
 					return;
@@ -294,9 +332,19 @@ function registerTaskboardRoutes(ctx, options) {
 						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;
+						const repoParam = url.searchParams.get("repo");
+						let cwd = execution.worktreePath ?? ws.path;
+						let mainRepo = ws.path;
+						let baseCommit = execution.baseCommit;
+						if (repoParam !== null) {
+							const entry = execution.repos?.find((r) => r.repo === repoParam);
+							if (entry === void 0) throw new Error("Error: invalid_input: 该执行没有此仓库的镜像记录");
+							cwd = entry.worktreePath;
+							mainRepo = repoMainPath(ws.path, entry.repo);
+							baseCommit = entry.baseCommit;
+						}
+						let result = commit !== null ? await options.git.showCommit(cwd, commit) : filePath !== null ? await options.git.showPathDiff(cwd, filePath, baseCommit) : void 0;
+						if (result === void 0 && cwd !== mainRepo) result = commit !== null ? await options.git.showCommit(mainRepo, commit) : filePath !== null && baseCommit !== void 0 ? await options.git.showPathDiff(mainRepo, filePath, baseCommit) : void 0;
 						if (result === void 0) throw new Error("Error: invalid_input: 无法获取 diff（git 报错、对象不存在，或仅存于已删除的 worktree 且无基线）");
 						json(res, {
 							ok: true,
@@ -599,17 +647,33 @@ function registerTaskboardRoutes(ctx, options) {
 									const path = worktreePathOf(ws.path, id);
 									if (!insideWorktreeScope(ws.path, path)) throw new Error("Error: invalid_input: 非法的清除路径（不在任务工作目录范围内）");
 									try {
-										if (await options.git.removeWorktree(ws.path, path) === "unregistered") await rm(path, {
+										await removeMirror({
+											git: options.git,
+											scanner: options.scanner ?? createRepoScanner()
+										}, {
+											workspacePath: ws.path,
+											taskId: id
+										});
+										await rm(path, {
 											recursive: true,
 											force: true
 										});
 									} catch (error) {
 										const message = error instanceof Error ? error.message : String(error);
-										if (error.code === "dirty-worktree" || message.includes("未提交修改")) throw new Error(`Error: invalid_input: ${message}；请先处理这些改动（提交、续跑或手动保存）再物理清除任务`);
+										if (error.code === "dirty-worktree" || error.code === "dirty-mirror" || message.includes("未提交修改")) throw new Error(`Error: invalid_input: ${message}；请先处理这些改动（提交、续跑或手动保存）再物理清除任务`);
 										throw new Error(`Error: invalid_input: ${message}`);
 									}
-									if (task.branch !== void 0) try {
-										await options.git.deleteBranch(ws.path, task.branch);
+									const branchTargets = [];
+									if (task.branches !== void 0) for (const [repo, branch] of Object.entries(task.branches)) branchTargets.push({
+										repo,
+										branch
+									});
+									if (task.branch !== void 0 && !branchTargets.some((t) => t.repo === "")) branchTargets.push({
+										repo: "",
+										branch: task.branch
+									});
+									for (const target of branchTargets) try {
+										await options.git.deleteBranch(repoMainPath(ws.path, target.repo), target.branch);
 									} catch {}
 								}
 							}
@@ -685,51 +749,103 @@ function registerTaskboardRoutes(ctx, options) {
 							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 targets = [];
+						if (task.branches !== void 0) for (const [repo, branch] of Object.entries(task.branches)) targets.push({
+							repo,
+							branch
+						});
+						if (task.branch !== void 0 && !targets.some((t) => t.repo === "")) targets.unshift({
+							repo: "",
+							branch: task.branch
+						});
+						if (targets.length === 0) throw new Error("Error: invalid_input: 该任务还没有 worktree 分支（未隔离执行过）");
+						const multi = task.branches !== void 0;
+						const results = [];
+						for (const target of targets) {
+							if (!isValidRelRepoPath(target.repo)) throw new Error("Error: invalid_input: 非法的仓库路径");
+							const repoRoot = repoMainPath(ws.path, target.repo);
+							let noop = false;
+							try {
+								noop = await options.git.isAncestor(repoRoot, target.branch);
+							} catch {}
+							if (noop) {
+								results.push({
+									repo: target.repo,
+									branch: target.branch,
+									outcome: "noop"
+								});
+								continue;
+							}
+							try {
+								const exempt = target.repo === "" ? await (options.scanner ?? createRepoScanner()).findNestedRepos(ws.path).then((rs) => rs.map((r) => r.relPath)) : void 0;
+								await options.git.merge(repoRoot, target.branch, exempt);
+								results.push({
+									repo: target.repo,
+									branch: target.branch,
+									outcome: "merged"
+								});
+							} catch (error) {
+								results.push({
+									repo: target.repo,
+									branch: target.branch,
+									outcome: "failed",
+									error: error instanceof Error ? error.message : String(error)
+								});
+							}
 						}
-						const mergedComment = {
-							id: newCommentId(),
-							body: normalizeBody(`[系统] 分支 ${task.branch} 已合并到主工作区（--no-ff）。`),
-							version: 1,
-							createdAt: options.now()
-						};
-						await store.mutate("comment-added", (ledger) => {
+						const pushComment = (body) => store.mutate("comment-added", (ledger) => {
 							const { index, task: fresh } = liveTaskAt(ledger, id);
 							const next = structuredClone(fresh);
-							next.comments.push(mergedComment);
+							next.comments.push({
+								id: newCommentId(),
+								body: normalizeBody(body),
+								version: 1,
+								createdAt: options.now()
+							});
 							next.version = fresh.version + 1;
 							next.updatedAt = options.now();
 							ledger.tasks[index] = next;
 							return [next];
-						});
+						}).then(() => void 0);
+						if (!multi) {
+							const root = results.find((r) => r.repo === "");
+							if (root === void 0) throw new Error("Error: invalid_input: 该任务还没有 worktree 分支（未隔离执行过）");
+							if (root.outcome === "noop") {
+								json(res, {
+									ok: true,
+									value: {
+										merged: false,
+										noop: true,
+										branch: root.branch
+									}
+								});
+								return;
+							}
+							if (root.outcome === "failed") throw new Error(`Error: invalid_input: ${root.error ?? "合并失败"}`);
+							await pushComment(`[系统] 分支 ${root.branch} 已合并到主工作区（--no-ff）。`);
+							json(res, {
+								ok: true,
+								value: {
+									merged: true,
+									branch: root.branch
+								}
+							});
+							return;
+						}
+						const labelOf = (repo) => repo === "" ? "根仓库" : repo;
+						const mergedCount = results.filter((r) => r.outcome === "merged").length;
+						const failedCount = results.filter((r) => r.outcome === "failed").length;
+						await pushComment(`[系统] 分支已按仓库合并（--no-ff）：${results.map((r) => r.outcome === "merged" ? `${labelOf(r.repo)} ✓ 已合并` : r.outcome === "noop" ? `${labelOf(r.repo)} ⟲ 无新提交` : `${labelOf(r.repo)} ✗ ${(r.error ?? "合并失败").slice(0, 150)}`).join("；")}`);
 						json(res, {
 							ok: true,
 							value: {
-								merged: true,
-								branch: task.branch
+								merged: mergedCount > 0,
+								...mergedCount === 0 && failedCount === 0 ? { noop: true } : {},
+								results
 							}
 						});
 						return;
@@ -745,7 +861,14 @@ function registerTaskboardRoutes(ctx, options) {
 						const path = worktreePathOf(ws.path, id);
 						if (!insideWorktreeScope(ws.path, path)) throw new Error("Error: invalid_input: 非法的清除路径（不在任务工作目录范围内）");
 						try {
-							if (await options.git.removeWorktree(ws.path, path) === "unregistered") await rm(path, {
+							await removeMirror({
+								git: options.git,
+								scanner: options.scanner ?? createRepoScanner()
+							}, {
+								workspacePath: ws.path,
+								taskId: id
+							});
+							await rm(path, {
 								recursive: true,
 								force: true
 							});
@@ -754,11 +877,24 @@ function registerTaskboardRoutes(ctx, options) {
 						}
 						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);
+						if (body.deleteBranch === true) {
+							const branchTargets = [];
+							if (task.branches !== void 0) for (const [repo, branch] of Object.entries(task.branches)) branchTargets.push({
+								repo,
+								branch
+							});
+							if (task.branch !== void 0 && !branchTargets.some((t) => t.repo === "")) branchTargets.push({
+								repo: "",
+								branch: task.branch
+							});
+							let failures = 0;
+							for (const target of branchTargets) try {
+								await options.git.deleteBranch(repoMainPath(ws.path, target.repo), target.branch);
+							} catch (error) {
+								failures += 1;
+								branchError = `${target.repo === "" ? "根仓库" : target.repo}：${error instanceof Error ? error.message : String(error)}`;
+							}
+							branchDeleted = failures === 0;
 						}
 						json(res, {
 							ok: true,
@@ -792,7 +928,14 @@ function registerTaskboardRoutes(ctx, options) {
 					const path = worktreePathOf(ws.path, taskId);
 					if (!insideWorktreeScope(ws.path, path)) throw new Error("Error: invalid_input: 非法的清除路径（不在任务工作目录范围内）");
 					try {
-						if (await options.git.removeWorktree(ws.path, path) === "unregistered") await rm(path, {
+						await removeMirror({
+							git: options.git,
+							scanner: options.scanner ?? createRepoScanner()
+						}, {
+							workspacePath: ws.path,
+							taskId
+						});
+						await rm(path, {
 							recursive: true,
 							force: true
 						});