dsh-git-worktree 0.3.2 → 0.4.0

package/lib/client.js

@@ -4696,6 +4696,33 @@ const capabilitiesSchema = strict({
 	retryCleanup: boolean(),
 	beginNextIteration: boolean()
 });
+const acceptanceBlockerSchema = strict({
+	checkoutId: checkoutIdSchema,
+	ownerSessionId: sessionIdSchema,
+	state: _enum([
+		"preview_active",
+		"preview_detached",
+		"finalized",
+		"retained",
+		"working",
+		"ready_for_review",
+		"delivered"
+	])
+});
+const deliveryProofSchema = strict({
+	localBranch: string().nullable(),
+	localHeadBefore: oidSchema,
+	localHeadAfter: oidSchema,
+	changedFiles: array(string()),
+	validationStatus: _enum([
+		"passed",
+		"failed",
+		"partial",
+		"not_run"
+	]).optional(),
+	validationSummary: string().optional(),
+	commitInLocalHistory: boolean().nullable()
+});
 const targetSummarySchema = strict({
 	project: projectSchema,
 	checkoutId: checkoutIdSchema.nullable(),
@@ -4723,9 +4750,11 @@ const targetSummarySchema = strict({
 	retainedAt: number().finite().optional(),
 	expiresAt: number().finite().nullable().optional(),
 	cleanupMessage: string().optional(),
+	deliveryProof: deliveryProofSchema.optional(),
 	review: reviewSchema.optional(),
 	reviewSlot: _enum(["available", "waiting"]).optional(),
 	reviewSlotOwnerSessionId: sessionIdSchema.optional(),
+	reviewSlotHolder: acceptanceBlockerSchema.optional(),
 	previewRecovery: strict({
 		reason: _enum(["stale_local", "preview_modified"]),
 		attemptedAction: _enum([
@@ -4738,6 +4767,7 @@ const targetSummarySchema = strict({
 });
 const targetDetailsSchema = targetSummarySchema.extend({
 	managedRoot: string().min(1).nullable(),
+	sourceRoot: string().min(1).nullable(),
 	sourceOid: oidSchema,
 	currentBranch: string().nullable()
 }).strict();
@@ -4830,12 +4860,14 @@ const preflightSchema = union([
 			"not_owner",
 			"not_ready_for_review",
 			"stale_target",
+			"stale_local",
 			"stale_isolated",
 			"project_acceptance_busy",
 			"checkout_unavailable",
 			"git_error"
 		]),
-		message: string()
+		message: string(),
+		blocker: acceptanceBlockerSchema.optional()
 	})
 ]);
 const preflightResponseSchema = strict({ preflight: preflightSchema });
@@ -4958,8 +4990,61 @@ var remote_default = WORKTREE_CONSOLE_REMOTE;
 
 //#endregion
 //#region src/client/actions.ts
+function samePath(left, right) {
+	const normalize = (value) => value.replace(/[\\/]+$/u, "").replaceAll("\\", "/");
+	const normalizedLeft = normalize(left);
+	const normalizedRight = normalize(right);
+	return /^[A-Za-z]:\//u.test(normalizedLeft) || /^[A-Za-z]:\//u.test(normalizedRight) ? normalizedLeft.toLowerCase() === normalizedRight.toLowerCase() : normalizedLeft === normalizedRight;
+}
+/** Open a Session only when the Harness list proves both its identity and cwd. */
+function openExistingSession(services, sessionId, expectedCwd) {
+	const summary = services.sessions.list.getSnapshot().byId[sessionId];
+	if (summary?.cwd === void 0 || !samePath(summary.cwd, expectedCwd)) return false;
+	services.sessions.open(sessionId);
+	return true;
+}
+async function waitForProjectedSessionPath(services, sessionId, expectedCwd, isActive) {
+	return new Promise((resolvePromise, rejectPromise) => {
+		let settled = false;
+		let unsubscribe = () => {};
+		const settle = (result, error) => {
+			if (settled) return;
+			settled = true;
+			globalThis.clearTimeout(timer);
+			unsubscribe();
+			if (error) rejectPromise(error);
+			else resolvePromise(result);
+		};
+		const inspect = () => {
+			if (!isActive()) {
+				settle(false);
+				return;
+			}
+			const summary = services.sessions.list.getSnapshot().byId[sessionId];
+			if (summary?.cwd === void 0) return;
+			if (!samePath(summary.cwd, expectedCwd)) {
+				settle(false, /* @__PURE__ */ new Error(`Harness 新建 Session ${sessionId} 的 cwd 与 Host 记录不一致。`));
+				return;
+			}
+			settle(true);
+		};
+		const timer = globalThis.setTimeout(() => {
+			settle(false, /* @__PURE__ */ new Error(`Harness 未投影新建 Session ${sessionId} 的可信 cwd。`));
+		}, 2e3);
+		const dispose = services.sessions.list.subscribe(inspect);
+		unsubscribe = dispose;
+		if (settled) dispose();
+		else inspect();
+	});
+}
 /** Idempotently register the managed root, create the preallocated Session, and navigate. */
 async function openIsolatedTarget(services, payload, isActive = () => true) {
+	if (!isActive()) return;
+	if (services.sessions.list.getSnapshot().byId[payload.targetSessionId] !== void 0) {
+		if (!isActive()) return;
+		if (!openExistingSession(services, payload.targetSessionId, payload.managedRoot)) throw new Error(`Harness 现有 Session ${payload.targetSessionId} 的 cwd 与 Host 记录不一致。`);
+		return;
+	}
 	const workspace = await services.workspaces.create({ path: payload.managedRoot });
 	if (!isActive()) return;
 	if (workspace.path !== payload.managedRoot) throw new Error(`Harness 注册的工作目录与 Host 记录不一致：${workspace.path}`);
@@ -4968,9 +5053,38 @@ async function openIsolatedTarget(services, payload, isActive = () => true) {
 		sessionId: payload.targetSessionId
 	});
 	if (sessionId !== payload.targetSessionId) throw new Error(`Harness 创建了非预期 Session ${sessionId}；应为 ${payload.targetSessionId}`);
+	if (!await waitForProjectedSessionPath(services, sessionId, payload.managedRoot, isActive)) return;
 	if (!isActive()) return;
 	services.sessions.open(sessionId);
 }
+/**
+* Inspect a path-free Host authorization, verify exact checkout/owner identity,
+* then reuse the cwd-validated Session navigation path.
+*/
+async function openAuthorizedWorktreeTarget(adapter, services, callerSessionId, expected, isActive = () => true) {
+	const outcome = await adapter.inspect({
+		sessionId: callerSessionId,
+		checkoutId: expected.checkoutId
+	});
+	if (!isActive()) return;
+	if (!outcome.ok) throw new Error(`${outcome.error.code}: ${outcome.error.message}`);
+	const target = outcome.value.target;
+	if (!target.capabilities.inspect || !target.capabilities.open) throw new Error("最新 Host 状态已不允许打开该 Worktree。");
+	if (target.checkoutId !== expected.checkoutId || target.ownerSessionId !== expected.ownerSessionId || target.targetSessionId !== expected.ownerSessionId) throw new Error("Host 检查结果中的 Worktree 身份不一致。");
+	if (target.managedRoot === null) throw new Error("Host 未提供可验证的 Worktree 路径。");
+	if (!isActive()) return;
+	await openIsolatedTarget(services, {
+		managedRoot: target.managedRoot,
+		targetSessionId: expected.ownerSessionId
+	}, isActive);
+}
+/** Prefill a visible recovery request. This never invokes command/send/followup. */
+function prefillSessionDraft(services, sessionId, text) {
+	const binding = services.sessions.binding(sessionId);
+	if (binding?.ctx === void 0 || services.conversation === void 0) return false;
+	services.conversation.input.for(binding.ctx).setDraft(text);
+	return true;
+}
 
 //#endregion
 //#region src/client/model.ts
@@ -5209,6 +5323,256 @@ function requestWorktreeReviewRefresh(sessionId) {
 	window.dispatchEvent(new CustomEvent(WORKTREE_REVIEW_REFRESH_EVENT, { detail: { sessionId } }));
 }
 
+//#endregion
+//#region src/client/review-console/DeliveryProof.tsx
+function shortOid$2(value) {
+	return value.slice(0, 8);
+}
+function validationLabel$1(status) {
+	if (status === "passed") return "验证通过";
+	if (status === "failed") return "验证失败";
+	if (status === "partial") return "部分验证";
+	if (status === "not_run") return "未运行验证";
+	return "无验证摘要";
+}
+function DeliveryProof({ target, compact = false }) {
+	const proof = target.deliveryProof;
+	if (!proof) return null;
+	const lifecycle$1 = target.state === "delivered" ? "环境已清理" : target.state === "retained" ? `环境已保留${target.expiresAt ? `至 ${new Date(target.expiresAt).toLocaleString()}` : ""}` : target.state === "cleanup_pending" ? "Commit 已创建，环境清理待完成" : "交付证据已记录";
+	if (compact) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+		className: "dsh-wt-delivery-proof dsh-wt-delivery-proof-compact",
+		children: [
+			"Commit ",
+			target.commitOid ? shortOid$2(target.commitOid) : "无新增 Commit",
+			" · ",
+			proof.localBranch ?? "detached",
+			"@",
+			shortOid$2(proof.localHeadAfter),
+			" · ",
+			proof.changedFiles.length,
+			" 个文件 · ",
+			lifecycle$1
+		]
+	});
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+		className: "dsh-wt-delivery-proof",
+		"aria-label": "交付证明",
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("header", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: "Delivery Proof" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: lifecycle$1 })] }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("dl", { children: [
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: "Commit" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("dd", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: target.commitOid ?? "无新增 Commit" }) })] }),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: "Local" }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("dd", { children: [
+				proof.localBranch ?? "detached",
+				" · ",
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: shortOid$2(proof.localHeadBefore) }),
+				" → ",
+				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: shortOid$2(proof.localHeadAfter) })
+			] })] }),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: "文件" }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("dd", { children: [proof.changedFiles.length, " 个"] })] }),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: "验证" }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("dd", { children: [validationLabel$1(proof.validationStatus), proof.validationSummary ? ` · ${proof.validationSummary}` : ""] })] }),
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: "Local 历史" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("dd", { children: proof.commitInLocalHistory === true ? "Commit 仍在 Local 历史中" : proof.commitInLocalHistory === false ? "Commit 已不在当前 Local 历史中" : "当前无法确认" })] })
+		] })]
+	});
+}
+
+//#endregion
+//#region src/client/review-console/PreflightStatus.tsx
+function shortOid$1(value) {
+	return value.slice(0, 8);
+}
+function statusLabel(preflight) {
+	switch (preflight.status) {
+		case "ready": return "同步条件已确认";
+		case "local_advanced": return "Local 已前进，可安全合并";
+		case "already_in_local": return "本轮内容已在 Local";
+		case "conflict": return `发现 ${preflight.conflictingFiles.length} 个冲突文件`;
+		case "blocked": return preflight.message;
+	}
+}
+function PreflightStatus({ snapshot, target, compact = false, onRefresh, onResume, onOpenHolder, busy }) {
+	if (snapshot.status === "idle") return null;
+	if (snapshot.status === "loading") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+		className: "dsh-wt-preflight",
+		"data-preflight": "loading",
+		children: "正在执行只读同步预检… Local 不会被修改。"
+	});
+	if (snapshot.status === "error") return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "dsh-wt-preflight",
+		"data-preflight": "error",
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: ["预检失败：", snapshot.error.message] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+			type: "button",
+			className: "dsh-wt-inline-action",
+			disabled: busy,
+			onClick: onRefresh,
+			children: "重新检查"
+		})]
+	});
+	const preflight = snapshot.preflight;
+	const blocked = preflight.status === "blocked";
+	const stale = blocked && (preflight.reason === "stale_isolated" || preflight.reason === "stale_target");
+	const holder = blocked && preflight.reason === "project_acceptance_busy" ? preflight.blocker ?? target?.reviewSlotHolder : void 0;
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		className: "dsh-wt-preflight",
+		"data-preflight": preflight.status,
+		children: [
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "dsh-wt-preflight-head",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: statusLabel(preflight) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "只读检查 · Local 未修改" })]
+			}),
+			!compact && preflight.status !== "blocked" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("dl", {
+				className: "dsh-wt-preflight-facts",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: "Local" }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("dd", { children: [
+						preflight.localBranch ?? "detached",
+						" · ",
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: shortOid$1(preflight.localHeadOid) })
+					] })] }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: "Worktree" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("dd", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: shortOid$1(preflight.isolatedHeadOid) }) })] }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: "Effective base" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("dd", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: shortOid$1(preflight.effectiveBaseOid) }) })] }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("dt", { children: "变更" }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("dd", { children: [preflight.changedFiles.length, " 个文件"] })] })
+				]
+			}) : null,
+			!compact && preflight.status === "conflict" && preflight.conflictingFiles.length > 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
+				className: "dsh-wt-conflict-list",
+				"aria-label": "冲突文件",
+				children: preflight.conflictingFiles.map((path) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", { children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("code", { children: path }) }, path))
+			}) : null,
+			holder ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", { children: [
+				"占用任务：",
+				holder.checkoutId.slice(0, 8),
+				" · Session ",
+				holder.ownerSessionId.slice(0, 8),
+				" · ",
+				holder.state
+			] }) : null,
+			preflight.status === "conflict" || blocked ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "dsh-wt-recovery-actions",
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						type: "button",
+						className: "dsh-wt-inline-action",
+						disabled: busy,
+						onClick: onRefresh,
+						children: "重新检查"
+					}),
+					stale || preflight.status === "conflict" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						type: "button",
+						className: "dsh-wt-inline-action",
+						disabled: busy || !target?.capabilities.resumeRevision,
+						onClick: onResume,
+						children: "返回 Worktree 重新生成验收稿"
+					}) : null,
+					holder ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						type: "button",
+						className: "dsh-wt-inline-action",
+						disabled: busy,
+						onClick: onOpenHolder,
+						children: "打开占用任务"
+					}) : null
+				]
+			}) : null
+		]
+	});
+}
+
+//#endregion
+//#region src/client/review-console/preflight-cache.ts
+const IDLE = { status: "idle" };
+const caches = /* @__PURE__ */ new WeakMap();
+function identityKey(identity) {
+	return [
+		identity.sessionId,
+		identity.checkoutId,
+		identity.expectedRevision,
+		identity.expectedReviewId
+	].join("\0");
+}
+function cacheFor(adapter) {
+	let cache = caches.get(adapter);
+	if (!cache) {
+		cache = /* @__PURE__ */ new Map();
+		caches.set(adapter, cache);
+	}
+	return cache;
+}
+function entryFor(adapter, identity) {
+	const cache = cacheFor(adapter);
+	const key = identityKey(identity);
+	let entry = cache.get(key);
+	if (!entry) {
+		entry = {
+			snapshot: IDLE,
+			listeners: /* @__PURE__ */ new Set()
+		};
+		cache.set(key, entry);
+	}
+	return entry;
+}
+function publish(entry, snapshot) {
+	entry.snapshot = snapshot;
+	for (const listener of entry.listeners) listener();
+}
+/** Shared read-only request. `force` bypasses cached success and is mandatory before writes. */
+async function readReviewPreflight(adapter, identity, force = false) {
+	const entry = entryFor(adapter, identity);
+	if (entry.promise) return entry.promise;
+	if (!force && entry.snapshot.status === "success") return entry.snapshot;
+	publish(entry, { status: "loading" });
+	const promise = adapter.preflight(identity).then((outcome) => {
+		const snapshot = outcome.ok ? {
+			status: "success",
+			preflight: outcome.value.preflight
+		} : {
+			status: "error",
+			error: outcome.error
+		};
+		publish(entry, snapshot);
+		return snapshot;
+	}, (reason) => {
+		const snapshot = {
+			status: "error",
+			error: {
+				code: "transport_unavailable",
+				message: reason instanceof Error ? reason.message : String(reason)
+			}
+		};
+		publish(entry, snapshot);
+		return snapshot;
+	}).finally(() => {
+		entry.promise = void 0;
+	});
+	entry.promise = promise;
+	return promise;
+}
+function useReviewPreflight(adapter, identity, enabled) {
+	const key = identity ? identityKey(identity) : "";
+	const subscribe = (0, react.useCallback)((listener) => {
+		if (!adapter || !identity) return () => void 0;
+		const entry = entryFor(adapter, identity);
+		entry.listeners.add(listener);
+		return () => {
+			entry.listeners.delete(listener);
+		};
+	}, [adapter, key]);
+	const getSnapshot = (0, react.useCallback)(() => {
+		if (!adapter || !identity) return IDLE;
+		return entryFor(adapter, identity).snapshot;
+	}, [adapter, key]);
+	const snapshot = (0, react.useSyncExternalStore)(subscribe, getSnapshot, getSnapshot);
+	(0, react.useEffect)(() => {
+		if (adapter && identity && enabled) readReviewPreflight(adapter, identity);
+	}, [
+		adapter,
+		enabled,
+		key
+	]);
+	return {
+		snapshot,
+		refresh: (0, react.useCallback)(async () => {
+			if (!adapter || !identity) return IDLE;
+			return readReviewPreflight(adapter, identity, true);
+		}, [adapter, key])
+	};
+}
+
 //#endregion
 //#region src/client/review-console/ReviewActions.tsx
 function isStale(error) {
@@ -5222,7 +5586,7 @@ function preflightMessage(preflight) {
 	if (preflight.status === "blocked") return `同步暂时阻塞：${preflight.message}`;
 	return "同步预检完成；Local 未修改。";
 }
-function ReviewActions({ review, adapter, identity, target, disabled, unavailableMessage, focusReview, onStale, onTargetChange }) {
+function ReviewActions({ review, adapter, services, identity, target, disabled, unavailableMessage, focusReview, isActive = () => true, onStale, onTargetChange }) {
 	const formId = (0, react.useId)();
 	const [submitting, setSubmitting] = (0, react.useState)(null);
 	const [commitMode, setCommitMode] = (0, react.useState)(null);
@@ -5232,14 +5596,14 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 	const [retention, setRetention] = (0, react.useState)("retain_24h");
 	const [message, setMessage] = (0, react.useState)(null);
 	const [error, setError] = (0, react.useState)(null);
-	const [preflight, setPreflight] = (0, react.useState)(null);
 	const mutationLock = (0, react.useRef)(false);
 	const observedTargetRevision = (0, react.useRef)(target?.revision);
+	const { snapshot: preflightSnapshot, refresh: refreshPreflight } = useReviewPreflight(adapter, identity, Boolean(adapter && identity && !disabled && target?.state === "ready_for_review" && target.capabilities.preflight));
+	const safeReadyPreflight = preflightSnapshot.status === "success" && preflightSnapshot.preflight.status !== "blocked" && preflightSnapshot.preflight.status !== "conflict";
 	(0, react.useEffect)(() => {
 		setCommitMessage(review.suggestedCommitMessage);
 		setRetainEnvironment(false);
 		setRetention("retain_24h");
-		setPreflight(null);
 	}, [review.reviewId, review.suggestedCommitMessage]);
 	(0, react.useEffect)(() => {
 		const revision = target?.revision;
@@ -5248,7 +5612,6 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 		if (submitting !== null) return;
 		setMessage(null);
 		setError(null);
-		setPreflight(null);
 	}, [submitting, target?.revision]);
 	const begin = (mutation) => {
 		if (disabled || !adapter || !identity || !target || mutationLock.current) return false;
@@ -5264,28 +5627,44 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 	};
 	const finishError = (nextError) => {
 		setError(nextError);
-		if (isStale(nextError)) onStale(nextError);
+		if (nextError.code === "stale_target") onStale(nextError);
+		if (nextError.code === "stale_local" || nextError.code === "stale_isolated") {
+			setMessage("状态在写入前发生变化；已停止操作，请按最新只读预检恢复。");
+			refreshPreflight();
+		}
 		finish();
 	};
 	const applyTarget = (nextTarget) => {
+		if (!isActive()) return;
 		observedTargetRevision.current = nextTarget.revision;
 		onTargetChange(nextTarget);
 		if (identity) requestWorktreeReviewRefresh(identity.sessionId);
 	};
 	const previewLocal = async () => {
 		if (!begin("preview") || !adapter || !identity) return;
-		const inspected = await adapter.preflight(identity);
-		if (!inspected.ok) {
+		const inspected = await readReviewPreflight(adapter, identity, true);
+		if (!isActive()) {
+			finish();
+			return;
+		}
+		if (inspected.status === "error") {
 			finishError(inspected.error);
 			return;
 		}
-		setPreflight(inspected.value.preflight);
-		setMessage(preflightMessage(inspected.value.preflight));
-		if (inspected.value.preflight.status === "conflict" || inspected.value.preflight.status === "blocked") {
+		if (inspected.status !== "success") {
+			finish();
+			return;
+		}
+		setMessage(preflightMessage(inspected.preflight));
+		if (inspected.preflight.status === "conflict" || inspected.preflight.status === "blocked") {
 			finish();
 			return;
 		}
 		const outcome = await adapter.preview(identity);
+		if (!isActive()) {
+			finish();
+			return;
+		}
 		if (!outcome.ok) {
 			finishError(outcome.error);
 			return;
@@ -5297,12 +5676,16 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 	const resumeRevision = async () => {
 		if (!begin("resume_revision") || !adapter || !identity) return;
 		const outcome = await adapter.resumeRevision(identity);
+		if (!isActive()) {
+			finish();
+			return;
+		}
 		if (!outcome.ok) {
 			finishError(outcome.error);
 			return;
 		}
 		applyTarget(outcome.value.target);
-		setMessage("已恢复编辑；继续发送修改要求即可。Local 未受影响。");
+		setMessage((services ? prefillSessionDraft(services, identity.sessionId, "请重新检查当前 Worktree 的修改，重新运行必要验证，并重新生成验收稿。") : false) ? "已恢复编辑并预填重新验收请求；Local 未受影响。" : "已恢复编辑；请重新检查、验证并生成新的验收稿。Local 未受影响。");
 		finish();
 	};
 	const rollbackPreview = async (resumeRevision$1 = false) => {
@@ -5311,6 +5694,10 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 			...identity,
 			resumeRevision: resumeRevision$1
 		});
+		if (!isActive()) {
+			finish();
+			return;
+		}
 		if (!outcome.ok) {
 			finishError(outcome.error);
 			return;
@@ -5329,7 +5716,27 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 			commitMessage: value,
 			retention: selectedRetention
 		};
+		if (mode === "finish") {
+			const inspected = await readReviewPreflight(adapter, identity, true);
+			if (!isActive()) {
+				finish();
+				return;
+			}
+			if (inspected.status === "error") {
+				finishError(inspected.error);
+				return;
+			}
+			if (inspected.status !== "success" || inspected.preflight.status === "blocked" || inspected.preflight.status === "conflict") {
+				setMessage(inspected.status === "success" ? preflightMessage(inspected.preflight) : "同步预检未完成。");
+				finish();
+				return;
+			}
+		}
 		const outcome = mode === "finalize_preview" ? await adapter.finalizePreview(request) : await adapter.finalize(request);
+		if (!isActive()) {
+			finish();
+			return;
+		}
 		if (!outcome.ok) {
 			finishError(outcome.error);
 			return;
@@ -5349,6 +5756,10 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 			confirmDirty: true,
 			...target.state === "preview_active" || target.capabilities.rollbackPreview ? { rollbackPreview: true } : {}
 		});
+		if (!isActive()) {
+			finish();
+			return;
+		}
 		if (!outcome.ok) {
 			finishError(outcome.error);
 			return;
@@ -5365,6 +5776,10 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 			checkoutId: identity.checkoutId,
 			expectedRevision: identity.expectedRevision
 		});
+		if (!isActive()) {
+			finish();
+			return;
+		}
 		if (!outcome.ok) {
 			finishError(outcome.error);
 			return;
@@ -5373,6 +5788,23 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 		setMessage(outcome.value.target.state === "delivered" ? "Worktree 环境已清理。" : "清理仍未完成，已保留恢复信息。");
 		finish();
 	};
+	const openHolder = async () => {
+		const holder = preflightSnapshot.status === "success" && preflightSnapshot.preflight.status === "blocked" && preflightSnapshot.preflight.reason === "project_acceptance_busy" ? preflightSnapshot.preflight.blocker ?? target?.reviewSlotHolder : target?.reviewSlotHolder;
+		if (!holder || !adapter || !identity || !services || mutationLock.current) return;
+		mutationLock.current = true;
+		setSubmitting("open_holder");
+		setError(null);
+		try {
+			await openAuthorizedWorktreeTarget(adapter, services, identity.sessionId, holder, isActive);
+		} catch (reason) {
+			setError({
+				code: "checkout_mismatch",
+				message: reason instanceof Error ? reason.message : String(reason)
+			});
+		} finally {
+			finish();
+		}
+	};
 	const live = Boolean(adapter && identity && target);
 	const allDisabled = disabled || submitting !== null || !live;
 	const ready = target?.state === "ready_for_review";
@@ -5391,7 +5823,7 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 	const primary = ready ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 		type: "button",
 		className: "dsh-wt-button dsh-wt-primary",
-		disabled: allDisabled || !target.capabilities.preview,
+		disabled: allDisabled || !target.capabilities.preview || !safeReadyPreflight,
 		onClick: () => {
 			previewLocal();
 		},
@@ -5466,7 +5898,7 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 								type: "button",
 								role: "menuitem",
 								className: "dsh-wt-more-item",
-								disabled: allDisabled || !target.capabilities.finalize,
+								disabled: allDisabled || !target.capabilities.finalize || !safeReadyPreflight,
 								onClick: (event) => {
 									setCommitMode("finish");
 									event.currentTarget.closest("details")?.removeAttribute("open");
@@ -5600,11 +6032,21 @@ function ReviewActions({ review, adapter, identity, target, disabled, unavailabl
 					})]
 				})
 			}),
-			preflight ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-				className: "dsh-wt-preflight",
-				"data-preflight": preflight.status,
-				children: preflightMessage(preflight)
+			ready ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(PreflightStatus, {
+				snapshot: preflightSnapshot,
+				target,
+				onRefresh: () => {
+					refreshPreflight();
+				},
+				onResume: () => {
+					resumeRevision();
+				},
+				onOpenHolder: () => {
+					openHolder();
+				},
+				busy: submitting !== null
 			}) : null,
+			target && (target.state === "cleanup_pending" || terminal) ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DeliveryProof, { target }) : null,
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "dsh-wt-action-status",
 				"aria-live": "polite",
@@ -5653,8 +6095,16 @@ function reviewIsStale(target, identity, review) {
 	const expectedRevision = identity?.expectedRevision ?? review.revision;
 	return !target.review || target.revision !== expectedRevision || target.review.reviewId !== review.reviewId;
 }
-function WorktreeReviewPanel({ review, adapter, identity, target, onRefresh, onTargetChange, unavailableMessage = "实时 Worktree Console 未连接；连接后即可执行验收操作。" }) {
+function WorktreeReviewPanel({ review, adapter, services, identity, target, onRefresh, onTargetChange, unavailableMessage = "实时 Worktree Console 未连接；连接后即可执行验收操作。" }) {
 	const panelId = (0, react.useId)();
+	const actionScope = identity ? [
+		identity.sessionId,
+		identity.checkoutId,
+		identity.expectedRevision,
+		identity.expectedReviewId
+	].join("\0") : "";
+	const activeActionScope = (0, react.useRef)(actionScope);
+	activeActionScope.current = actionScope;
 	const targetKey = target ? [
 		target.checkoutId,
 		target.revision,
@@ -5663,6 +6113,16 @@ function WorktreeReviewPanel({ review, adapter, identity, target, onRefresh, onT
 		target.commitOid,
 		target.retention,
 		target.cleanupMessage,
+		target.deliveryProof?.localHeadAfter,
+		target.deliveryProof?.commitInLocalHistory,
+		target.deliveryProof?.validationStatus,
+		target.deliveryProof?.validationSummary,
+		target.reviewSlot,
+		target.reviewSlotHolder?.checkoutId,
+		target.reviewSlotHolder?.ownerSessionId,
+		target.reviewSlotHolder?.state,
+		target.capabilities.preflight,
+		target.capabilities.preview,
 		target.capabilities.finalize,
 		target.capabilities.discard
 	].join("\0") : "";
@@ -5698,7 +6158,8 @@ function WorktreeReviewPanel({ review, adapter, identity, target, onRefresh, onT
 		"preview_detached",
 		"cleanup_pending",
 		"recovery_required",
-		"retained"
+		"retained",
+		"delivered"
 	].includes(currentTarget.state) && !invalidReason);
 	const hasValidationDetails = Boolean(review.validationSummary || review.tests.length > 0);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
@@ -5791,10 +6252,12 @@ function WorktreeReviewPanel({ review, adapter, identity, target, onRefresh, onT
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ReviewActions, {
 				review,
 				adapter,
+				services,
 				identity,
 				target: currentTarget,
 				disabled: !liveReady,
 				unavailableMessage,
+				isActive: () => activeActionScope.current === actionScope,
 				onStale: handleStale,
 				onTargetChange: handleTargetChange
 			})
@@ -5804,7 +6267,7 @@ function WorktreeReviewPanel({ review, adapter, identity, target, onRefresh, onT
 
 //#endregion
 //#region src/client/WorktreeReviewRow.tsx
-function WorktreeReviewRow({ block, sessionId, adapter }) {
+function WorktreeReviewRow({ block, sessionId, adapter, services }) {
 	const model = parseReviewTool(block);
 	const payload = model.payload;
 	const args = model.args;
@@ -5869,6 +6332,7 @@ function WorktreeReviewRow({ block, sessionId, adapter }) {
 		children: [review ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(WorktreeReviewPanel, {
 			review,
 			adapter,
+			services,
 			identity,
 			target: liveTarget,
 			unavailableMessage,
@@ -5960,16 +6424,40 @@ const REVIEW_CONSOLE_STYLES = String.raw`
 .dsh-wt-retention-check { display:flex; align-items:center; gap:8px; border:1px solid var(--wt-line); border-radius:8px; padding:8px 9px; font-size:12px; }
 .dsh-wt-retention-select { display:grid; gap:5px; padding:9px; border-radius:8px; background:var(--wt-panel); font-size:11px; }
 .dsh-wt-retention-select select { min-height:32px; border:1px solid var(--wt-line); border-radius:7px; padding:0 8px; background:Canvas; color:inherit; }
-.dsh-wt-preflight { margin-top:7px; padding:7px 9px; border-radius:8px; background:var(--wt-panel); color:var(--wt-muted); font-size:11px; }
+.dsh-wt-preflight { display:grid; gap:7px; margin-top:7px; padding:8px 9px; border-radius:8px; background:var(--wt-panel); color:var(--wt-muted); font-size:11px; }
 .dsh-wt-preflight[data-preflight="conflict"],
-.dsh-wt-preflight[data-preflight="blocked"] { color:var(--wt-amber); }
+.dsh-wt-preflight[data-preflight="blocked"],
+.dsh-wt-preflight[data-preflight="error"] { color:var(--wt-amber); }
+.dsh-wt-preflight-head { display:flex; align-items:center; justify-content:space-between; gap:8px; }
+.dsh-wt-preflight-head strong { color:var(--wt-ink); }
+.dsh-wt-preflight-facts,
+.dsh-wt-delivery-proof dl { display:grid; grid-template-columns:repeat(2, minmax(0, 1fr)); gap:6px 12px; margin:0; }
+.dsh-wt-preflight-facts > div,
+.dsh-wt-delivery-proof dl > div { display:grid; grid-template-columns:auto minmax(0, 1fr); gap:5px; min-width:0; }
+.dsh-wt-preflight-facts dt,
+.dsh-wt-delivery-proof dt { color:var(--wt-muted); }
+.dsh-wt-preflight-facts dd,
+.dsh-wt-delivery-proof dd { min-width:0; margin:0; overflow-wrap:anywhere; }
+.dsh-wt-conflict-list { display:grid; gap:3px; max-height:116px; margin:0; padding-left:18px; overflow:auto; }
+.dsh-wt-recovery-actions { display:flex; flex-wrap:wrap; gap:6px; }
+.dsh-wt-inline-action { border:0; padding:0; background:transparent; color:inherit; font:inherit; text-decoration:underline; cursor:pointer; }
+.dsh-wt-inline-action:disabled { opacity:.5; cursor:not-allowed; }
+.dsh-wt-delivery-proof { display:grid; gap:7px; margin-top:8px; padding:8px 9px; border:1px solid color-mix(in srgb, var(--wt-green) 26%, transparent); border-radius:8px; background:color-mix(in srgb, var(--wt-green) 6%, transparent); font-size:11px; }
+.dsh-wt-delivery-proof header { display:flex; align-items:center; justify-content:space-between; gap:8px; }
+.dsh-wt-delivery-proof header span { color:var(--wt-muted); }
+.dsh-wt-delivery-proof-compact { display:block; margin:1px 0 0; padding:0; border:0; background:transparent; color:var(--wt-muted); overflow:hidden; text-overflow:ellipsis; white-space:nowrap; }
 .dsh-wt-action-status { min-height:1.35em; margin-top:7px; color:var(--wt-muted); font-size:11px; }
 .dsh-wt-review-dock { box-sizing:border-box; display:flex; flex:none; align-items:center; gap:9px; width:calc(100% - 2 * var(--dsh-composer-side-clearance, 16px) - 2 * var(--dsh-composer-dock-inset, 0px)); max-width:calc(var(--dsh-composer-card-max-width, 780px) - 2 * var(--dsh-composer-dock-inset, 0px)); margin:0 auto 8px; padding:7px 9px; border:1px solid color-mix(in srgb, #3275db 22%, transparent); border-radius:9px; background:color-mix(in srgb, #3275db 6%, transparent); color:var(--wt-ink); font-size:12px; }
 .dsh-wt-review-dock-copy { display:grid; min-width:0; flex:1; gap:1px; }
 .dsh-wt-review-dock-copy strong { overflow:hidden; text-overflow:ellipsis; white-space:nowrap; }
 .dsh-wt-review-dock-copy span { color:var(--wt-muted); font-size:10px; }
 .dsh-wt-review-dock .dsh-wt-review-actions { padding:0; }
-.dsh-wt-review-dock .dsh-wt-action-status { display:none; }
+.dsh-wt-review-dock .dsh-wt-action-status,
+.dsh-wt-review-dock .dsh-wt-preflight-facts,
+.dsh-wt-review-dock .dsh-wt-conflict-list,
+.dsh-wt-review-dock .dsh-wt-delivery-proof:not(.dsh-wt-delivery-proof-compact) { display:none; }
+.dsh-wt-review-dock .dsh-wt-preflight { margin:0; padding:4px 6px; }
+.dsh-wt-review-dock .dsh-wt-preflight-head > span { display:none; }
 .dsh-wt-review-dock .dsh-wt-button { padding:5px 9px; font-size:11px; }
 .dsh-wt-review-dock .dsh-wt-more-trigger { width:29px; height:27px; }
 @media (max-width: 620px) {
@@ -6363,11 +6851,11 @@ function registerPreSessionWorktree(ctx, adapter, services) {
 }
 
 //#endregion
-//#region src/client/target-console/TargetStatusAction.tsx
-const STATE_LABELS = {
+//#region src/client/target-console/WorktreeConsoleView.tsx
+const STATE_LABELS$1 = {
 	local: "Local",
 	creating: "创建中…",
-	working: "Worktree",
+	working: "修改中",
 	ready_for_review: "待验收",
 	preview_active: "Local 验收中",
 	preview_detached: "预览待恢复",
@@ -6376,51 +6864,747 @@ const STATE_LABELS = {
 	recovery_required: "需要恢复",
 	delivered: "已交付"
 };
-/** Read-only Session Target capsule. The Harness header slot exposes no public view-switch action. */
-function TargetStatusAction({ sessionId, adapter }) {
-	const [state, setState] = (0, react.useState)("loading");
-	const [target, setTarget] = (0, react.useState)(null);
+function errorText(error) {
+	const next = {
+		refresh: "请刷新以读取最新 Host 状态。",
+		confirm_dirty: "请明确确认脏 Worktree 后重试。",
+		open_recovery: "再次操作前请先查看恢复信息。",
+		retry: "临时故障消失后可以重试。",
+		none: "当前 Session 无权完成此操作。"
+	}[worktreeConsoleErrorMeta(error.code).recovery];
+	return `${error.code}: ${error.message} ${next}`;
+}
+function retentionLabel(retention) {
+	if (retention === "retain_24h") return "保留 24 小时";
+	if (retention === "retain_3d") return "保留 3 天";
+	return "手动清理";
+}
+function TargetState({ target }) {
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+		className: "dsh-wtc-state",
+		"data-target-state": target.state,
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+			className: "dsh-wtc-state-dot",
+			"aria-hidden": true
+		}), STATE_LABELS$1[target.state]]
+	});
+}
+const ATTENTION_RANK = {
+	recovery_required: 0,
+	preview_detached: 1,
+	cleanup_pending: 2,
+	ready_for_review: 3,
+	preview_active: 4,
+	retained: 5,
+	working: 6,
+	creating: 7,
+	delivered: 8,
+	local: 9
+};
+/** Source-linked Worktree management surface backed only by WorktreeConsoleAdapter. */
+function WorktreeConsoleView({ sessionId, adapter, services, focusCheckoutId, onTargetChange }) {
+	const mounted = (0, react.useRef)(true);
+	const request = (0, react.useRef)(0);
+	const sessionGeneration = (0, react.useRef)(0);
+	const [snapshot, setSnapshot] = (0, react.useState)(null);
+	const [loading, setLoading] = (0, react.useState)(true);
+	const [error, setError] = (0, react.useState)(null);
+	const [pendingAction, setPendingAction] = (0, react.useState)(null);
+	const [confirmTarget, setConfirmTarget] = (0, react.useState)(null);
+	const confirmButton = (0, react.useRef)(null);
+	const visibleSnapshot = snapshot?.sessionId === sessionId ? snapshot : null;
 	(0, react.useLayoutEffect)(() => {
-		let active = true;
-		setState("loading");
-		setTarget(null);
-		adapter.current({ sessionId }).then((outcome) => {
-			if (!active) return;
-			if (outcome.ok) {
-				setTarget(outcome.value.target);
-				setState(outcome.value.target.state);
-			} else setState("error");
-		}, () => {
-			if (active) setState("error");
-		});
+		mounted.current = true;
 		return () => {
-			active = false;
+			mounted.current = false;
 		};
+	}, []);
+	(0, react.useLayoutEffect)(() => {
+		sessionGeneration.current += 1;
+		request.current += 1;
+		setSnapshot(null);
+		setConfirmTarget(null);
+		setPendingAction(null);
+		setError(null);
+		setLoading(true);
+	}, [sessionId]);
+	const isActive = (generation) => mounted.current && sessionGeneration.current === generation;
+	const refresh = (0, react.useCallback)(async (clearError = true) => {
+		const generation = sessionGeneration.current;
+		const token = ++request.current;
+		setLoading(true);
+		if (clearError) setError(null);
+		try {
+			const [current, list] = await Promise.all([adapter.current({ sessionId }), adapter.list({ sessionId })]);
+			if (!isActive(generation) || token !== request.current) return;
+			if (!current.ok) {
+				setError(errorText(current.error));
+				return;
+			}
+			if (!list.ok) {
+				setError(errorText(list.error));
+				return;
+			}
+			setSnapshot({
+				sessionId,
+				current: current.value.target,
+				list: list.value
+			});
+		} catch (reason) {
+			if (isActive(generation) && token === request.current) setError(reason instanceof Error ? reason.message : String(reason));
+		} finally {
+			if (isActive(generation) && token === request.current) setLoading(false);
+		}
 	}, [adapter, sessionId]);
-	const label = state === "loading" ? "加载中…" : state === "error" ? "不可用" : STATE_LABELS[state];
-	const expiry = state === "retained" && target?.expiresAt ? new Date(target.expiresAt).toLocaleDateString() : null;
-	const accessibleLabel = expiry === null ? `Session Target：${label}` : `Session Target：${label}，到期 ${expiry}`;
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-		className: "dsh-wtc-target-chip",
-		"data-target-state": state,
+	(0, react.useEffect)(() => {
+		refresh();
+	}, [refresh]);
+	(0, react.useEffect)(() => {
+		if (confirmTarget !== null) confirmButton.current?.focus();
+	}, [confirmTarget]);
+	const applyMutation = (response, generation) => {
+		if (!isActive(generation)) return;
+		setSnapshot((current) => {
+			if (current === null || current.sessionId !== sessionId) return current;
+			const target = response.target;
+			return {
+				sessionId,
+				current: current.current.checkoutId === target.checkoutId ? {
+					...current.current,
+					...target
+				} : current.current,
+				list: {
+					...current.list,
+					worktrees: current.list.worktrees.map((row) => row.checkoutId === target.checkoutId ? target : row)
+				}
+			};
+		});
+		onTargetChange?.();
+	};
+	const mutationError = (code, message, generation) => {
+		if (!isActive(generation)) return;
+		setError(errorText({
+			code,
+			message
+		}));
+		if (code === "stale_target" || code === "stale_local" || code === "stale_isolated") refresh(false);
+	};
+	const createTarget = async () => {
+		if (pendingAction !== null || visibleSnapshot?.current.capabilities.create !== true) return;
+		const generation = sessionGeneration.current;
+		const sourceProjectId = visibleSnapshot.current.project.id;
+		setPendingAction("create");
+		setError(null);
+		try {
+			const outcome = await adapter.create({ sourceSessionId: sessionId });
+			if (!isActive(generation)) return;
+			if (!outcome.ok) {
+				setError(errorText(outcome.error));
+				return;
+			}
+			const { target, targetSessionId, managedRoot } = outcome.value;
+			if (target.sourceSessionId !== sessionId) throw new Error("Host 返回了属于其他 source Session 的目标。");
+			if (targetSessionId === sessionId) throw new Error("Host 错误地把 source Session 作为 isolated target Session 返回。");
+			if (target.checkoutId === null || target.targetSessionId !== targetSessionId || target.ownerSessionId !== targetSessionId || target.managedRoot !== managedRoot || target.project.id !== sourceProjectId || !target.capabilities.open) throw new Error("Host 返回的 target Session 身份不一致。");
+			await openIsolatedTarget(services, {
+				targetSessionId,
+				managedRoot
+			}, () => isActive(generation));
+			if (!isActive(generation)) return;
+			setSnapshot((current) => current === null || current.sessionId !== sessionId ? current : {
+				sessionId,
+				current: target,
+				list: {
+					...current.list,
+					worktrees: [...current.list.worktrees.filter((row) => row.checkoutId !== target.checkoutId), (() => {
+						const { managedRoot: _root, sourceRoot: _sourceRoot, sourceOid: _source, currentBranch: _branch, ...summary } = target;
+						return summary;
+					})()]
+				}
+			});
+			onTargetChange?.();
+			refresh();
+		} catch (reason) {
+			if (isActive(generation)) {
+				setError(reason instanceof Error ? reason.message : String(reason));
+				refresh(false);
+			}
+		} finally {
+			if (isActive(generation)) setPendingAction(null);
+		}
+	};
+	const discardTarget = async (target, confirmDirty) => {
+		if (pendingAction !== null || target.checkoutId === null || !target.capabilities.discard) return;
+		const generation = sessionGeneration.current;
+		setConfirmTarget(null);
+		setPendingAction(`discard:${target.checkoutId}`);
+		setError(null);
+		try {
+			const outcome = await adapter.discard({
+				sessionId,
+				checkoutId: target.checkoutId,
+				expectedRevision: target.revision,
+				confirmDirty,
+				...target.state === "preview_active" || target.capabilities.rollbackPreview ? { rollbackPreview: true } : {}
+			});
+			if (!isActive(generation)) return;
+			if (!outcome.ok) {
+				mutationError(outcome.error.code, outcome.error.message, generation);
+				return;
+			}
+			applyMutation(outcome.value, generation);
+			refresh();
+		} catch (reason) {
+			if (isActive(generation)) setError(reason instanceof Error ? reason.message : String(reason));
+		} finally {
+			if (isActive(generation)) setPendingAction(null);
+		}
+	};
+	const retryCleanup = async (target) => {
+		if (pendingAction !== null || target.checkoutId === null || !target.capabilities.retryCleanup) return;
+		const generation = sessionGeneration.current;
+		setPendingAction(`cleanup:${target.checkoutId}`);
+		setError(null);
+		try {
+			const outcome = await adapter.retryCleanup({
+				sessionId,
+				checkoutId: target.checkoutId,
+				expectedRevision: target.revision
+			});
+			if (!isActive(generation)) return;
+			if (!outcome.ok) {
+				mutationError(outcome.error.code, outcome.error.message, generation);
+				return;
+			}
+			applyMutation(outcome.value, generation);
+			refresh();
+		} catch (reason) {
+			if (isActive(generation)) setError(reason instanceof Error ? reason.message : String(reason));
+		} finally {
+			if (isActive(generation)) setPendingAction(null);
+		}
+	};
+	const openListedTarget = async (target) => {
+		if (pendingAction !== null || target.checkoutId === null || !target.capabilities.open || !target.capabilities.inspect) return;
+		const generation = sessionGeneration.current;
+		setPendingAction(`open:${target.checkoutId}`);
+		setError(null);
+		try {
+			await openAuthorizedWorktreeTarget(adapter, services, sessionId, {
+				checkoutId: target.checkoutId,
+				ownerSessionId: target.ownerSessionId
+			}, () => isActive(generation));
+		} catch (reason) {
+			if (isActive(generation)) {
+				setError(reason instanceof Error ? reason.message : String(reason));
+				refresh(false);
+			}
+		} finally {
+			if (isActive(generation)) setPendingAction(null);
+		}
+	};
+	const orderedWorktrees = visibleSnapshot === null ? [] : [...visibleSnapshot.list.worktrees].sort((left, right) => {
+		const focusedLeft = left.checkoutId === focusCheckoutId ? 0 : 1;
+		const focusedRight = right.checkoutId === focusCheckoutId ? 0 : 1;
+		if (focusedLeft !== focusedRight) return focusedLeft - focusedRight;
+		const rank = ATTENTION_RANK[left.state] - ATTENTION_RANK[right.state];
+		return rank !== 0 ? rank : right.iteration - left.iteration;
+	});
+	if (loading && visibleSnapshot === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+		className: "dsh-wtc-loading",
 		role: "status",
 		"aria-live": "polite",
-		"aria-label": accessibleLabel,
-		title: "Session Target 状态",
+		children: "正在加载 Worktree 控制台…"
+	});
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+		className: "dsh-wtc-console",
+		"aria-label": "Worktree 控制台",
 		children: [
-			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-				className: "dsh-wtc-target-dot",
-				"aria-hidden": true
+			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("header", {
+				className: "dsh-wtc-console-head",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: "dsh-wtc-kicker",
+					children: "SESSION TARGET"
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("h2", { children: "关联 Worktrees" })] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					type: "button",
+					className: "dsh-wtc-button",
+					disabled: loading,
+					onClick: () => {
+						refresh();
+					},
+					children: loading ? "刷新中…" : "刷新"
+				})]
 			}),
-			label,
-			expiry ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
-				className: "dsh-wtc-target-expiry",
-				children: ["· ", expiry]
+			error ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+				className: "dsh-wtc-error",
+				role: "alert",
+				children: error
+			}) : null,
+			visibleSnapshot ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+				className: "dsh-wtc-current",
+				"aria-label": "当前目标",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: "dsh-wtc-label",
+					children: "当前目标"
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: visibleSnapshot.current.project.name })] }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "dsh-wtc-current-actions",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(TargetState, { target: visibleSnapshot.current }), visibleSnapshot.current.state !== "recovery_required" && visibleSnapshot.current.capabilities.create ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+						type: "button",
+						className: "dsh-wtc-button dsh-wtc-primary",
+						disabled: pendingAction !== null,
+						onClick: () => {
+							createTarget();
+						},
+						children: pendingAction === "create" ? "创建中…" : "创建 Worktree"
+					}) : null]
+				})]
+			}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+				className: "dsh-wtc-list-section",
+				"aria-label": "关联 Worktrees",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+					className: "dsh-wtc-section-head",
+					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-wtc-label",
+						children: "逻辑关联"
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: visibleSnapshot.list.project.name })] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-wtc-count",
+						children: visibleSnapshot.list.worktrees.length
+					})]
+				}), visibleSnapshot.list.worktrees.length === 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "dsh-wtc-empty",
+					children: "这个项目还没有受管 Worktree。"
+				}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ul", {
+					className: "dsh-wtc-list",
+					children: orderedWorktrees.map((target) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
+						className: "dsh-wtc-row",
+						"data-current-target": target.checkoutId === visibleSnapshot.current.checkoutId || void 0,
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "dsh-wtc-row-main",
+							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dsh-wtc-row-title",
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)(TargetState, { target }),
+									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-wtc-row-id",
+										children: target.checkoutId ?? "Local source"
+									}),
+									target.checkoutId === visibleSnapshot.current.checkoutId ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-wtc-relation",
+										children: "当前"
+									}) : null,
+									sessionId === target.sourceSessionId && sessionId !== target.ownerSessionId ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-wtc-relation",
+										children: "来源"
+									}) : null,
+									sessionId !== target.sourceSessionId && sessionId !== target.ownerSessionId ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-wtc-relation",
+										children: "关联任务"
+									}) : null
+								]
+							}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+								className: "dsh-wtc-facts",
+								children: [
+									/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [
+										"第 ",
+										target.iteration,
+										" 轮"
+									] }),
+									target.dirty ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "有未提交修改" }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "干净" }),
+									target.retention ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: ["保留方式：", retentionLabel(target.retention)] }) : null,
+									target.expiresAt ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: ["到期时间：", new Date(target.expiresAt).toLocaleString()] }) : null,
+									target.cleanupMessage ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+										className: "dsh-wtc-recovery-message",
+										children: target.cleanupMessage
+									}) : null
+								]
+							})]
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+							className: "dsh-wtc-row-actions",
+							children: [
+								/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+									className: "dsh-wtc-revision",
+									children: ["r", target.revision]
+								}),
+								target.capabilities.open && target.capabilities.inspect && target.checkoutId !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: "dsh-wtc-button",
+									"aria-label": `打开 ${target.checkoutId}`,
+									disabled: pendingAction !== null,
+									onClick: () => {
+										openListedTarget(target);
+									},
+									children: pendingAction === `open:${target.checkoutId}` ? "打开中…" : "打开"
+								}) : null,
+								target.capabilities.discard && target.checkoutId !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: "dsh-wtc-button dsh-wtc-danger",
+									"aria-label": `放弃 ${target.checkoutId}`,
+									disabled: pendingAction !== null,
+									onClick: () => {
+										if (target.dirty) setConfirmTarget(target);
+										else discardTarget(target, false);
+									},
+									children: pendingAction === `discard:${target.checkoutId}` ? "放弃中…" : "放弃"
+								}) : null,
+								target.capabilities.retryCleanup && target.checkoutId !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+									type: "button",
+									className: "dsh-wtc-button",
+									"aria-label": `重试清理 ${target.checkoutId}`,
+									disabled: pendingAction !== null,
+									onClick: () => {
+										retryCleanup(target);
+									},
+									children: pendingAction === `cleanup:${target.checkoutId}` ? "重试中…" : "重试清理"
+								}) : null
+							]
+						})]
+					}, target.checkoutId ?? `local:${target.sourceSessionId}`))
+				})]
+			})] }) : null,
+			confirmTarget !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "dsh-wtc-confirm",
+				role: "alertdialog",
+				"aria-modal": "true",
+				"aria-label": "放弃有修改的 Worktree？",
+				onKeyDown: (event) => {
+					if (event.key !== "Escape") return;
+					event.preventDefault();
+					setConfirmTarget(null);
+				},
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: "放弃有修改的 Worktree？" }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: sessionId === confirmTarget.sourceSessionId && sessionId !== confirmTarget.ownerSessionId ? `Local source 将放弃预留目标 ${confirmTarget.checkoutId} 及其全部未提交修改。` : confirmTarget.state === "preview_active" || confirmTarget.capabilities.rollbackPreview ? `将先安全撤回 ${confirmTarget.checkoutId} 的 Local Preview；只有撤回成功后才会删除 Worktree。` : `当前 Session 将放弃 Worktree ${confirmTarget.checkoutId} 及其全部未提交修改。` }),
+					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+						className: "dsh-wtc-confirm-actions",
+						children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							type: "button",
+							className: "dsh-wtc-button",
+							onClick: () => {
+								setConfirmTarget(null);
+							},
+							children: "取消"
+						}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+							ref: confirmButton,
+							type: "button",
+							className: "dsh-wtc-button dsh-wtc-danger",
+							onClick: () => {
+								discardTarget(confirmTarget, true);
+							},
+							children: "确认放弃修改"
+						})]
+					})
+				]
 			}) : null
 		]
 	});
 }
 
+//#endregion
+//#region src/client/target-console/WorktreeManagerModal.tsx
+/** Session-local entry point for the source-linked Worktree management surface. */
+function WorktreeManagerModal({ open, sessionId, adapter, services, focusCheckoutId, onClose, onTargetChange }) {
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__deepseek_ai_dsh_client_ui_primitives.Modal, {
+		open,
+		onClose,
+		title: "关联 Worktrees",
+		closeLabel: "关闭关联 Worktrees",
+		description: "由插件 registry 维护的 source/target 逻辑关联；DSH 仍按各自 cwd 显示独立 Workspace。",
+		className: "dsh-wtc-manager-dialog",
+		contentClassName: "dsh-wtc-manager-content",
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(WorktreeConsoleView, {
+			sessionId,
+			adapter,
+			services,
+			focusCheckoutId,
+			onTargetChange
+		})
+	});
+}
+
+//#endregion
+//#region src/client/target-console/TargetStatusAction.tsx
+const STATE_LABELS = {
+	local: "Local",
+	creating: "创建中…",
+	working: "修改中",
+	ready_for_review: "待验收",
+	preview_active: "Local 验收中",
+	preview_detached: "预览待恢复",
+	retained: "已保留",
+	cleanup_pending: "清理中",
+	recovery_required: "需要恢复",
+	delivered: "已交付"
+};
+function shortOid(value) {
+	return value === "unversioned" ? value : value.slice(0, 7);
+}
+/** Interactive Session Target capsule with source-linked management actions. */
+function TargetStatusAction({ sessionId, adapter, services }) {
+	const [target, setTarget] = (0, react.useState)(null);
+	const [loading, setLoading] = (0, react.useState)(true);
+	const [error, setError] = (0, react.useState)(null);
+	const [menuOpen, setMenuOpen] = (0, react.useState)(false);
+	const [managerOpen, setManagerOpen] = (0, react.useState)(false);
+	const [cleanupConfirmOpen, setCleanupConfirmOpen] = (0, react.useState)(false);
+	const [pendingAction, setPendingAction] = (0, react.useState)(null);
+	const mounted = (0, react.useRef)(true);
+	const request = (0, react.useRef)(0);
+	(0, react.useEffect)(() => {
+		mounted.current = true;
+		return () => {
+			mounted.current = false;
+		};
+	}, []);
+	const refresh = (0, react.useCallback)(async () => {
+		const token = ++request.current;
+		try {
+			const outcome = await adapter.current({ sessionId });
+			if (!mounted.current || token !== request.current) return;
+			if (outcome.ok) {
+				setTarget(outcome.value.target);
+				setError(null);
+			} else setError(outcome.error.message);
+		} catch (reason) {
+			if (mounted.current && token === request.current) setError(reason instanceof Error ? reason.message : String(reason));
+		} finally {
+			if (mounted.current && token === request.current) setLoading(false);
+		}
+	}, [adapter, sessionId]);
+	(0, react.useEffect)(() => {
+		request.current += 1;
+		setTarget(null);
+		setLoading(true);
+		setMenuOpen(false);
+		setManagerOpen(false);
+		setCleanupConfirmOpen(false);
+		setPendingAction(null);
+		refresh();
+		const listener = (event) => {
+			if (event.detail?.sessionId === sessionId) refresh();
+		};
+		const timer = window.setInterval(() => {
+			refresh();
+		}, 5e3);
+		window.addEventListener(WORKTREE_REVIEW_REFRESH_EVENT, listener);
+		return () => {
+			window.clearInterval(timer);
+			window.removeEventListener(WORKTREE_REVIEW_REFRESH_EVENT, listener);
+		};
+	}, [refresh, sessionId]);
+	const state = target?.state ?? (loading ? "loading" : "error");
+	const stateLabel = state === "loading" ? "加载中…" : state === "error" ? "不可用" : STATE_LABELS[state];
+	const triggerLabel = target?.state === "local" ? "Local" : target ? `Worktree · ${stateLabel}` : stateLabel;
+	const expiry = target?.state === "retained" && target.expiresAt ? new Date(target.expiresAt).toLocaleDateString() : null;
+	const accessibleLabel = expiry === null ? `Session Target：${triggerLabel}` : `Session Target：${triggerLabel}，到期 ${expiry}`;
+	const reveal = () => {
+		if (!target?.managedRoot) return;
+		setMenuOpen(false);
+		services.workspaces.openPath(target.managedRoot).catch((reason) => {
+			if (mounted.current) setError(reason instanceof Error ? reason.message : String(reason));
+		});
+	};
+	const openSource = () => {
+		if (!target || target.sourceSessionId === sessionId) return;
+		setMenuOpen(false);
+		if (target.sourceRoot === null || !openExistingSession(services, target.sourceSessionId, target.sourceRoot)) setError("来源 Session 的 cwd 无法与 Host 记录的 Local root 匹配。");
+	};
+	const retryCleanup = async () => {
+		if (!target?.checkoutId || !target.capabilities.retryCleanup || pendingAction !== null) return;
+		setMenuOpen(false);
+		setPendingAction("retry_cleanup");
+		setError(null);
+		try {
+			const outcome = await adapter.retryCleanup({
+				sessionId,
+				checkoutId: target.checkoutId,
+				expectedRevision: target.revision
+			});
+			if (!mounted.current) return;
+			if (!outcome.ok) {
+				setError(outcome.error.message);
+				if (outcome.error.code === "stale_target") refresh();
+				return;
+			}
+			setTarget((current) => current ? {
+				...current,
+				...outcome.value.target,
+				...outcome.value.target.phase === "discarded" ? { managedRoot: null } : {}
+			} : current);
+			requestWorktreeReviewRefresh(sessionId);
+		} catch (reason) {
+			if (mounted.current) setError(reason instanceof Error ? reason.message : String(reason));
+		} finally {
+			if (mounted.current) setPendingAction(null);
+		}
+	};
+	const discard = async () => {
+		if (!target?.checkoutId || !target.capabilities.discard || pendingAction !== null) return;
+		setCleanupConfirmOpen(false);
+		setPendingAction("discard");
+		setError(null);
+		try {
+			const outcome = await adapter.discard({
+				sessionId,
+				checkoutId: target.checkoutId,
+				expectedRevision: target.revision,
+				confirmDirty: true,
+				...target.state === "preview_active" || target.capabilities.rollbackPreview ? { rollbackPreview: true } : {}
+			});
+			if (!mounted.current) return;
+			if (!outcome.ok) {
+				setError(outcome.error.message);
+				if (outcome.error.code === "stale_target") refresh();
+				return;
+			}
+			setTarget((current) => current ? {
+				...current,
+				...outcome.value.target,
+				...outcome.value.target.phase === "discarded" ? { managedRoot: null } : {}
+			} : current);
+			requestWorktreeReviewRefresh(sessionId);
+		} catch (reason) {
+			if (mounted.current) setError(reason instanceof Error ? reason.message : String(reason));
+		} finally {
+			if (mounted.current) setPendingAction(null);
+		}
+	};
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__deepseek_ai_dsh_client_ui_primitives.Menu, {
+			open: menuOpen,
+			align: "end",
+			portal: true,
+			compact: true,
+			onClose: () => setMenuOpen(false),
+			items: [
+				{
+					id: "summary",
+					label: target ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+						className: "dsh-wtc-menu-summary",
+						children: [
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: triggerLabel }),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: target.project.name }),
+							/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: [
+								"来源 ",
+								shortOid(target.sourceOid),
+								" · 当前 ",
+								shortOid(target.currentOid),
+								" · Iteration ",
+								target.iteration
+							] }),
+							expiry ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", { children: ["保留至 ", expiry] }) : null,
+							error ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+								className: "dsh-wtc-menu-error",
+								children: error
+							}) : null
+						]
+					}) : error ?? triggerLabel,
+					disabled: true
+				},
+				{
+					type: "separator",
+					id: "summary-separator"
+				},
+				...target?.managedRoot && target.capabilities.open ? [{
+					id: "reveal",
+					label: "打开当前工作位置"
+				}] : [],
+				...target && target.sourceSessionId !== sessionId ? [{
+					id: "source",
+					label: "返回来源 Session"
+				}] : [],
+				...target ? [{
+					id: "manager",
+					label: "管理关联 Worktrees"
+				}] : []
+			],
+			footer: target?.capabilities.retryCleanup ? [{
+				id: "retry_cleanup",
+				label: pendingAction === "retry_cleanup" ? "处理中…" : "重试清理环境",
+				disabled: pendingAction !== null
+			}] : target?.capabilities.discard ? [{
+				id: "discard",
+				label: pendingAction === "discard" ? "处理中…" : target.state === "preview_active" ? "撤回验收并清理 Worktree" : "放弃任务并清理 Worktree",
+				danger: true,
+				disabled: pendingAction !== null
+			}] : [],
+			onSelect: (id) => {
+				if (id === "reveal") reveal();
+				if (id === "source") openSource();
+				if (id === "manager") {
+					setMenuOpen(false);
+					setManagerOpen(true);
+				}
+				if (id === "retry_cleanup") retryCleanup();
+				if (id === "discard") {
+					setMenuOpen(false);
+					setCleanupConfirmOpen(true);
+				}
+			},
+			anchor: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+				type: "button",
+				className: "dsh-wtc-target-chip",
+				"data-target-state": state,
+				"aria-expanded": menuOpen,
+				"aria-haspopup": "menu",
+				"aria-label": accessibleLabel,
+				title: "Session Target 与关联 Worktrees",
+				onClick: () => setMenuOpen((current) => !current),
+				children: [
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-wtc-target-dot",
+						"aria-hidden": true
+					}),
+					target?.state === "local" || !target ? triggerLabel : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: ["Worktree · ", /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: stateLabel })] }),
+					expiry ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+						className: "dsh-wtc-target-expiry",
+						children: ["· ", expiry]
+					}) : null,
+					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-wtc-target-chevron",
+						"aria-hidden": true
+					})
+				]
+			})
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)(WorktreeManagerModal, {
+			open: managerOpen,
+			sessionId,
+			adapter,
+			services,
+			focusCheckoutId: target?.checkoutId,
+			onClose: () => setManagerOpen(false),
+			onTargetChange: () => {
+				requestWorktreeReviewRefresh(sessionId);
+				refresh();
+			}
+		}),
+		/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__deepseek_ai_dsh_client_ui_primitives.Modal, {
+			open: cleanupConfirmOpen,
+			onClose: () => setCleanupConfirmOpen(false),
+			title: target?.state === "preview_active" ? "撤回验收并清理 Worktree？" : "放弃任务并清理 Worktree？",
+			closeLabel: "取消清理 Worktree",
+			description: target?.state === "preview_active" ? "Host 会先安全撤回 Local Preview；无法证明可无损撤回时会停止并保留恢复现场。" : "Worktree 中尚未交付的修改会永久丢弃；Local Checkout 不会被静默覆盖。",
+			footer: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
+				className: "dsh-wtc-confirm-actions",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					type: "button",
+					className: "dsh-wtc-button",
+					onClick: () => setCleanupConfirmOpen(false),
+					children: "取消"
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					type: "button",
+					className: "dsh-wtc-button dsh-wtc-danger",
+					disabled: pendingAction !== null,
+					onClick: () => {
+						discard();
+					},
+					children: "确认清理 Worktree"
+				})]
+			})
+		})
+	] });
+}
+
 //#endregion
 //#region src/client/review-console/index.ts
 /** Project one persisted review into the shared compact card/dock evidence shape. */
@@ -6445,13 +7629,16 @@ function reviewIdentityFromTarget(sessionId, target) {
 //#endregion
 //#region src/client/target-console/WorktreeReviewStatus.tsx
 /** Domi-style compact delivery status above the native Harness composer. */
-function WorktreeReviewStatus({ session, adapter }) {
+function WorktreeReviewStatus({ session, adapter, services }) {
 	const sessionId = session.sessionId;
 	const [target, setTarget] = (0, react.useState)(null);
 	const [error, setError] = (0, react.useState)(null);
 	const [startingIteration, setStartingIteration] = (0, react.useState)(false);
 	const mounted = (0, react.useRef)(true);
-	const refreshing = (0, react.useRef)(false);
+	const requestToken = (0, react.useRef)(0);
+	const sessionGeneration = (0, react.useRef)(0);
+	const currentSessionId = (0, react.useRef)(sessionId);
+	currentSessionId.current = sessionId;
 	(0, react.useEffect)(() => {
 		mounted.current = true;
 		return () => {
@@ -6459,22 +7646,23 @@ function WorktreeReviewStatus({ session, adapter }) {
 		};
 	}, []);
 	const refresh = (0, react.useCallback)(async () => {
-		if (refreshing.current) return;
-		refreshing.current = true;
+		const token = ++requestToken.current;
 		try {
 			const outcome = await adapter.current({ sessionId });
-			if (!mounted.current) return;
+			if (!mounted.current || currentSessionId.current !== sessionId || token !== requestToken.current) return;
 			if (outcome.ok) {
 				setTarget(outcome.value.target);
 				setError(null);
 			} else setError(outcome.error.message);
 		} catch (reason) {
-			if (mounted.current) setError(reason instanceof Error ? reason.message : String(reason));
-		} finally {
-			refreshing.current = false;
+			if (mounted.current && currentSessionId.current === sessionId && token === requestToken.current) setError(reason instanceof Error ? reason.message : String(reason));
 		}
 	}, [adapter, sessionId]);
 	(0, react.useEffect)(() => {
+		sessionGeneration.current += 1;
+		requestToken.current += 1;
+		setTarget(null);
+		setError(null);
 		refresh();
 		const listener = (event) => {
 			if (event.detail?.sessionId === sessionId) refresh();
@@ -6491,6 +7679,7 @@ function WorktreeReviewStatus({ session, adapter }) {
 	if (target?.state === "delivered" && target.checkoutId !== null && target.capabilities.beginNextIteration) {
 		const beginNextIteration = async () => {
 			if (startingIteration) return;
+			const generation = sessionGeneration.current;
 			setStartingIteration(true);
 			setError(null);
 			try {
@@ -6499,7 +7688,7 @@ function WorktreeReviewStatus({ session, adapter }) {
 					checkoutId: target.checkoutId,
 					expectedRevision: target.revision
 				});
-				if (!mounted.current) return;
+				if (!mounted.current || currentSessionId.current !== sessionId || generation !== sessionGeneration.current) return;
 				if (!outcome.ok) {
 					setError(outcome.error.message);
 					if (outcome.error.code === "stale_target") refresh();
@@ -6510,9 +7699,9 @@ function WorktreeReviewStatus({ session, adapter }) {
 					...outcome.value.target
 				} : current);
 			} catch (reason) {
-				if (mounted.current) setError(reason instanceof Error ? reason.message : String(reason));
+				if (mounted.current && currentSessionId.current === sessionId && generation === sessionGeneration.current) setError(reason instanceof Error ? reason.message : String(reason));
 			} finally {
-				if (mounted.current) setStartingIteration(false);
+				if (mounted.current && currentSessionId.current === sessionId && generation === sessionGeneration.current) setStartingIteration(false);
 			}
 		};
 		return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
@@ -6527,7 +7716,14 @@ function WorktreeReviewStatus({ session, adapter }) {
 				}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("span", {
 					className: "dsh-wt-review-dock-copy",
-					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: "本轮已交付，可在原会话继续下一轮修改" }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "将安全重建已清理的 Worktree 路径，并保留当前对话。" })]
+					children: [
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("strong", { children: "本轮已交付，可在原会话继续下一轮修改" }),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: "将安全重建已清理的 Worktree 路径，并保留当前对话。" }),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)(DeliveryProof, {
+							target,
+							compact: true
+						})
+					]
 				}),
 				error ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 					className: "dsh-wt-error",
@@ -6556,6 +7752,7 @@ function WorktreeReviewStatus({ session, adapter }) {
 	const review = reviewEvidenceFromTarget(target);
 	const identity = reviewIdentityFromTarget(sessionId, target);
 	if (!review || !identity) return null;
+	const actionGeneration = sessionGeneration.current;
 	const focusReview = () => {
 		document.querySelector(`[data-worktree-review-id="${CSS.escape(review.reviewId)}"]`)?.scrollIntoView({
 			behavior: "smooth",
@@ -6592,11 +7789,13 @@ function WorktreeReviewStatus({ session, adapter }) {
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ReviewActions, {
 				review,
 				adapter,
+				services,
 				identity,
 				target,
 				disabled: false,
 				unavailableMessage: "实时 Worktree Console 未连接。",
 				focusReview,
+				isActive: () => mounted.current && currentSessionId.current === sessionId && sessionGeneration.current === actionGeneration,
 				onStale: () => {
 					refresh();
 				},
@@ -6609,14 +7808,16 @@ function WorktreeReviewStatus({ session, adapter }) {
 //#endregion
 //#region src/client/target-console/index.ts
 /** Register the Harness-native Session Target contributions against an injected adapter seam. */
-function registerTargetConsole(ctx, adapter, _services) {
+function registerTargetConsole(ctx, adapter, services) {
 	const HeaderAction = ({ sessionId }) => (0, react.createElement)(TargetStatusAction, {
 		sessionId,
-		adapter
+		adapter,
+		services
 	});
 	const ReviewStatus = ({ session }) => (0, react.createElement)(WorktreeReviewStatus, {
 		session,
-		adapter
+		adapter,
+		services
 	});
 	ctx.slots.inject("conversation.session.header.actions", () => ctx.slots.register({
 		name: "conversation.session.header.actions",
@@ -6649,7 +7850,24 @@ const TARGET_CONSOLE_STYLES = String.raw`
   font-weight: 650;
   line-height: 1;
   white-space: nowrap;
+  cursor: pointer;
 }
+.dsh-wtc-target-chip:hover { background: color-mix(in srgb, var(--wtc-state) 15%, transparent); }
+.dsh-wtc-target-chip:focus-visible { outline: 2px solid #5b8fe8; outline-offset: 2px; }
+.dsh-wtc-target-chevron {
+  width: 6px;
+  height: 6px;
+  margin: -3px 1px 0 2px;
+  flex: 0 0 auto;
+  border-right: 1.5px solid currentColor;
+  border-bottom: 1.5px solid currentColor;
+  opacity: .58;
+  transform: rotate(45deg);
+}
+.dsh-wtc-menu-summary { display: grid; gap: 3px; min-width: 250px; text-align: left; white-space: normal; }
+.dsh-wtc-menu-summary strong { font-size: 12px; color: inherit; }
+.dsh-wtc-menu-summary span { color: color-mix(in srgb, currentColor 64%, transparent); font-size: 11px; line-height: 1.35; }
+.dsh-wtc-menu-summary .dsh-wtc-menu-error { color: #c44747; }
 .dsh-wtc-target-dot, .dsh-wtc-state-dot {
   width: 7px;
   height: 7px;
@@ -6719,9 +7937,11 @@ const TARGET_CONSOLE_STYLES = String.raw`
 .dsh-wtc-list { list-style: none; margin: 0; padding: 0; }
 .dsh-wtc-row { position: relative; gap: 14px; min-width: 0; padding: 12px 14px; border-bottom: 1px solid var(--wtc-line); }
 .dsh-wtc-row:last-child { border-bottom: 0; }
+.dsh-wtc-row[data-current-target="true"] { background: color-mix(in srgb, var(--wtc-blue) 6%, transparent); }
 .dsh-wtc-row-main { min-width: 0; display: grid; gap: 6px; }
 .dsh-wtc-row-title { min-width: 0; gap: 10px; }
 .dsh-wtc-row-id { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font: 600 12px ui-monospace, SFMono-Regular, Menlo, Consolas, monospace; }
+.dsh-wtc-relation { flex: 0 0 auto; padding: 2px 6px; border-radius: 999px; background: var(--wtc-panel); color: var(--wtc-muted); font-size: 10px; font-weight: 650; }
 .dsh-wtc-state { --wtc-state: #728096; display: inline-flex; align-items: center; gap: 6px; flex: 0 0 auto; font-size: 12px; font-weight: 680; }
 .dsh-wtc-state[data-target-state="creating"], .dsh-wtc-state[data-target-state="cleanup_pending"] { --wtc-state: #c47a1c; }
 .dsh-wtc-state[data-target-state="working"] { --wtc-state: #2676dc; }
@@ -6751,15 +7971,15 @@ const TARGET_CONSOLE_STYLES = String.raw`
 .dsh-wtc-danger { color: var(--wtc-red); }
 .dsh-wtc-empty, .dsh-wtc-loading { padding: 24px 14px; color: var(--wtc-muted); text-align: center; }
 .dsh-wtc-error { padding: 10px 12px; border: 1px solid color-mix(in srgb, var(--wtc-red) 35%, transparent); border-radius: 10px; background: color-mix(in srgb, var(--wtc-red) 8%, transparent); color: var(--wtc-red); overflow-wrap: anywhere; }
-.dsh-wtc-inspect { flex: 1 0 100%; display: grid; grid-template-columns: minmax(110px, .25fr) minmax(0, 1fr); gap: 5px 12px; min-width: 0; padding: 9px 10px; border-radius: 9px; background: var(--wtc-panel); }
-.dsh-wtc-inspect code { min-width: 0; overflow-wrap: anywhere; font-size: 11px; }
 .dsh-wtc-confirm { position: absolute; z-index: 2; inset: 12px; align-self: start; display: grid; gap: 10px; max-width: 520px; margin: 64px auto 0; padding: 18px; border: 1px solid color-mix(in srgb, var(--wtc-red) 35%, var(--wtc-line)); border-radius: 14px; background: Canvas; color: CanvasText; box-shadow: 0 20px 60px rgba(0,0,0,.24); }
 .dsh-wtc-confirm p { margin: 0; color: color-mix(in srgb, currentColor 68%, transparent); line-height: 1.5; }
 .dsh-wtc-confirm-actions { display: flex; justify-content: flex-end; gap: 8px; flex-wrap: wrap; }
+.dsh-wtc-manager-dialog { width: min(960px, calc(100vw - 32px)); max-width: 960px; max-height: min(86vh, 900px); }
+.dsh-wtc-manager-content { overflow: auto; min-height: 0; }
+.dsh-wtc-manager-content .dsh-wtc-console { padding: 4px 0 8px; }
 @media (max-width: 620px) {
   .dsh-wtc-current, .dsh-wtc-row { align-items: flex-start; flex-direction: column; }
   .dsh-wtc-current-actions, .dsh-wtc-row-actions { width: 100%; justify-content: flex-start; }
-  .dsh-wtc-inspect { grid-template-columns: 1fr; }
 }
 `;