dsh-vscode-mode 0.14.13 → 0.15.2

package/lib/index.js

@@ -18681,6 +18681,46 @@ var SvnUpdateJobs = class {
 	}
 };
 //#endregion
+//#region src/svnResolve.ts
+/** @public @author ddj 2026年10月14号 @param value Requested strategy. @returns Whether SVN accepts this explicit strategy. */
+function validAccept(value) {
+	return value === "mine-full" || value === "theirs-full" || value === "working";
+}
+/** @public @author ddj 2026年10月14号 @param value Untrusted relative target. @returns Whether the path names exactly one non-root workspace target. */
+function validTarget(value) {
+	if (typeof value !== "string" || !value || /[\u0000-\u001f]/.test(value) || /^[A-Za-z]:|^[\\/]/.test(value)) return false;
+	return value.replace(/\\/g, "/").split("/").every((part) => Boolean(part) && part !== "." && part !== ".." && part.toLowerCase() !== ".svn");
+}
+/** @public @author ddj 2026年10月14号 @param path Exact relative target. @returns Peg-safe SVN argument. */
+function pegTarget(path) {
+	return path.includes("@") ? path + "@" : path;
+}
+/** @public @author ddj 2026年10月14号 @param xml Verbose depth-empty status. @param path Client target identity. @returns Confirmed conflict evidence. @throws Missing or incomplete status evidence. */
+function conflictOf(xml, path) {
+	if (!/^\s*(?:<\?xml[^>]*>\s*)?<status\b/.test(xml) || !/<\/status>\s*$/.test(xml)) throw new Error("SVN 冲突状态输出为空或不完整，状态未确认");
+	const statuses = [...scanXmlTags(xml, ["wc-status"])].filter((hit) => !hit.closing);
+	if (statuses.length !== 1) throw new Error("SVN 未返回唯一目标状态，状态未确认");
+	const attrs = statuses[0].attrs;
+	const item = attrOf(attrs, "item");
+	if (!item) throw new Error("SVN 目标状态缺失，状态未确认");
+	return {
+		path,
+		text: item === "conflicted",
+		props: attrOf(attrs, "props") === "conflicted",
+		tree: attrOf(attrs, "tree-conflicted") === "true",
+		versioned: ![
+			"unversioned",
+			"ignored",
+			"external",
+			"none"
+		].includes(item)
+	};
+}
+/** @public @author ddj 2026年10月14号 @param state Confirmed target evidence. @returns Whether any conflict remains. */
+function hasConflict(state) {
+	return state.text || state.props || state.tree;
+}
+//#endregion
 //#region src/shared/svnExplorer.ts
 const ICON_KIND = {
 	normal: "clean",
@@ -19694,6 +19734,18 @@ function createSvnRpc(deps) {
 	const now = deps.now ?? (() => Date.now());
 	const findRoot = deps.findRoot ?? ((cwd) => findSvnRoot(cwd));
 	const findTortoise = deps.findTortoise ?? ((dir) => findTortoiseProc(dir));
+	const conflictWrites = /* @__PURE__ */ new Set();
+	/** @private @author ddj 2026年10月14号 @param root WC root. @returns Canonical lock identity across sessions. */
+	const writeKey = (root) => (deps.platform ?? process.platform) === "win32" ? root.toLowerCase() : root;
+	/** @private @author ddj 2026年10月14号 @param root WC root. @returns Whether a live update or conflict write owns the WC. */
+	const writeBusy = (root) => {
+		const job = updateJobs.active(root);
+		return conflictWrites.has(writeKey(root)) || Boolean(job && [
+			"starting",
+			"running",
+			"cancelling"
+		].includes(job.phase));
+	};
 	const statusCache = /* @__PURE__ */ new Map();
 	/** 运行中更新按会话目录复用工作副本根；TTL 到期才重新扫描 .svn。 */
 	const updateRootCache = /* @__PURE__ */ new Map();
@@ -19833,7 +19885,7 @@ function createSvnRpc(deps) {
 	* @param stdoutCap stdout 收集上限（缺省 1MB；大载荷场景如日志拉取需显式放大）
 	* @returns 退出码与输出
 	*/
-	const runSvn = async (cwd, argv, graceMs, stdoutCap = OUTPUT_CAP) => {
+	const runSvn = async (cwd, argv, graceMs, stdoutCap = OUTPUT_CAP, allowFallback = true) => {
 		const spawn = subprocess();
 		if (!spawn) throw new Error("缺少 subprocess 服务");
 		const fs = ctx.get("fs");
@@ -19868,7 +19920,8 @@ function createSvnRpc(deps) {
 				stdout,
 				stderr
 			};
-		} catch {
+		} catch (error) {
+			if (!allowFallback) throw error;
 			const outcome = await attempt("inherit").done;
 			return {
 				code: outcome?.exitCode ?? outcome?.code ?? null,
@@ -19877,6 +19930,22 @@ function createSvnRpc(deps) {
 			};
 		}
 	};
+	/** @private @author ddj 2026年10月14号 @param cwd Session workspace. @param root WC root. @param path Validated target. @returns Exact conflict evidence without recursive scanning. */
+	const readConflict = async (cwd, root, path) => {
+		const target = svnPathOf(cwd, root, path);
+		if (!target) throw new Error("目标不在 SVN 工作副本内");
+		const result = await runSvn(root, [
+			"status",
+			"--xml",
+			"--verbose",
+			"--depth",
+			"empty",
+			"--",
+			pegTarget(target)
+		], READ_GRACE_MS, OUTPUT_CAP, false);
+		if (result.code !== 0) throw new Error(result.stderr || result.stdout || "SVN 状态读取失败");
+		return conflictOf(result.stdout, path);
+	};
 	/** 发射 TortoiseProc（GUI 长驻：不 await done，no-op catch 防未处理 rejection）。 */
 	const launchTortoise = (exe, action, absPath) => {
 		const spawn = subprocess();
@@ -19976,11 +20045,16 @@ function createSvnRpc(deps) {
 			error: "svn 命令不可用（可在设置页配置 svn 路径）"
 		};
 		try {
+			const targets = rels.map((path) => svnPathOf(sc.cwd, status.wcRoot, path));
+			if (targets.some((path) => path === null)) return {
+				ok: false,
+				error: "目标不在 SVN 工作副本内"
+			};
 			const outcome = await runSvn(status.wcRoot, [
 				...verbArgs,
 				"--",
-				...rels
-			], MUTATE_GRACE_MS);
+				...targets.map((path) => pegTarget(path))
+			], MUTATE_GRACE_MS, OUTPUT_CAP, !verbArgs.includes("--depth"));
 			const result = batchResultOf(outcome.stdout, outcome.stderr, outcome.code, verb);
 			changesCache.delete(status.wcRoot);
 			if (outcome.code !== 0) return {
@@ -20498,8 +20572,142 @@ function createSvnRpc(deps) {
 					};
 				}
 			},
+			"svn.conflictStatus": async (args) => {
+				const scope = await updateScope(args.sessionId, true);
+				if ("err" in scope) return {
+					ok: false,
+					error: scope.err
+				};
+				if (!scope.cli) return {
+					ok: false,
+					error: "svn 命令不可用"
+				};
+				if (!Array.isArray(args.paths) || args.paths.length > 64) return {
+					ok: false,
+					error: "冲突路径列表不合法或超限"
+				};
+				if (!args.paths.every(validTarget)) return {
+					ok: false,
+					error: "路径不合法"
+				};
+				const paths = [...new Set(args.paths.map(safeRel))];
+				if (paths.some((path) => !path)) return {
+					ok: false,
+					error: "路径不合法"
+				};
+				try {
+					const states = [];
+					for (const path of paths) states.push(await readConflict(scope.cwd, scope.root, path));
+					return {
+						ok: true,
+						states
+					};
+				} catch (error) {
+					return {
+						ok: false,
+						error: String(error)
+					};
+				}
+			},
+			"svn.resolve": async (args) => {
+				if (!validAccept(args.accept)) return {
+					ok: false,
+					error: "解决策略不合法"
+				};
+				if (!validTarget(args.path)) return {
+					ok: false,
+					error: "路径不合法"
+				};
+				const path = safeRel(args.path);
+				if (!path) return {
+					ok: false,
+					error: "路径不合法"
+				};
+				const scope = await updateScope(args.sessionId, true);
+				if ("err" in scope) return {
+					ok: false,
+					error: scope.err
+				};
+				if (!scope.cli) return {
+					ok: false,
+					error: "svn 命令不可用"
+				};
+				if (writeBusy(scope.root)) return {
+					ok: false,
+					error: "工作副本正在更新或解决冲突，请等待完成"
+				};
+				conflictWrites.add(writeKey(scope.root));
+				try {
+					const evidence = await readConflict(scope.cwd, scope.root, path);
+					if (!hasConflict(evidence)) return {
+						ok: false,
+						error: "目标已无冲突，请刷新状态"
+					};
+					if (evidence.tree && args.accept !== "working") return {
+						ok: false,
+						error: "树冲突不支持通用完整版本选择，请针对性处理"
+					};
+					const target = svnPathOf(scope.cwd, scope.root, path);
+					const outcome = await runSvn(scope.root, [
+						"resolve",
+						"--accept",
+						args.accept,
+						"--depth",
+						"empty",
+						"--",
+						pegTarget(target)
+					], MUTATE_GRACE_MS, OUTPUT_CAP, false);
+					if (outcome.code !== 0) return {
+						ok: false,
+						error: outcome.stderr || outcome.stdout || "SVN 解决冲突失败"
+					};
+					return {
+						ok: true,
+						summary: "SVN 解决命令已执行，请核对剩余冲突",
+						output: outcome.stdout
+					};
+				} catch (error) {
+					return {
+						ok: false,
+						error: String(error)
+					};
+				} finally {
+					conflictWrites.delete(writeKey(scope.root));
+					changesCache.delete(scope.root);
+					explorerCache.clear();
+				}
+			},
 			"svn.revert": async (args) => {
-				return mutate("还原", ["revert", "-R"], args.sessionId, args.paths);
+				if (args.depth === void 0) return mutate("还原", ["revert", "-R"], args.sessionId, args.paths);
+				if (args.depth !== "empty") return {
+					ok: false,
+					error: "还原深度不合法"
+				};
+				if (!Array.isArray(args.paths) || !args.paths.length || !args.paths.every(validTarget)) return {
+					ok: false,
+					error: "路径不合法"
+				};
+				const scope = await updateScope(args.sessionId, true);
+				if ("err" in scope) return {
+					ok: false,
+					error: scope.err
+				};
+				if (writeBusy(scope.root)) return {
+					ok: false,
+					error: "工作副本正在更新或解决冲突，请等待完成"
+				};
+				conflictWrites.add(writeKey(scope.root));
+				try {
+					return await mutate("还原", [
+						"revert",
+						"--depth",
+						"empty"
+					], args.sessionId, args.paths);
+				} finally {
+					conflictWrites.delete(writeKey(scope.root));
+					changesCache.delete(scope.root);
+					explorerCache.clear();
+				}
 			},
 			"svn.add": async (args) => {
 				return mutate("加入版本控制", ["add"], args.sessionId, args.paths);
@@ -21354,6 +21562,10 @@ function createSvnRpc(deps) {
 				try {
 					const fs = ctx.get("fs");
 					const cwd = fs?.resolve && fs?.processPath ? fs.processPath(await fs.resolve(scope.cwd, {})) : scope.cwd;
+					if (conflictWrites.has(writeKey(scope.root))) return {
+						ok: false,
+						error: "工作副本正在解决冲突，请等待完成"
+					};
 					return {
 						ok: true,
 						...updateJobs.start({