@rexvane/piweb 0.3.9 → 0.3.10

package/src/app/api/workspaces/route.ts

@@ -11,6 +11,7 @@ import {
 	setAlias,
 } from "@/lib/workspace-store";
 import { encodeSessionId } from "@/lib/pi";
+import { disposeSessionPath } from "@/lib/agent-manager";
 import { BoundaryError, resolveSessionPath, resolveWorkspacePath } from "@/lib/path-security";
 
 export const dynamic = "force-dynamic";
@@ -53,6 +54,9 @@ export async function POST(req: Request) {
 		if (body.action === "archiveSession") {
 			if (!body.path) return NextResponse.json({ success: false, error: "missing path" }, { status: 400 });
 			const sessionPath = await resolveSessionPath(encodeSessionId(body.path), { allowPending: true });
+			// 归档即收工：会话随即从工作区消失，不能让它继续在后台跑（看不见却仍消耗 token）。
+			// 只影响这一个会话，其它运行中的会话不受影响。
+			await disposeSessionPath(sessionPath);
 			const archivedSessions = await archiveSession(sessionPath);
 			return NextResponse.json({ success: true, data: { archivedSessions } });
 		}

package/src/components/AppShell.tsx

@@ -14,8 +14,11 @@ import { SessionSidebar } from "@/components/SessionSidebar";
 
 // 首屏不需要的重组件按需加载（设置面板含供应商配置与代码高亮，轨迹/文件只在打开时才用）
 const SettingsPanel = dynamic(() => import("@/components/SettingsPanel").then((m) => m.SettingsPanel), { ssr: false });
-const TrajectoryView = dynamic(() => import("@/components/TrajectoryView").then((m) => m.TrajectoryView), { ssr: false });
 const TrajInspector = dynamic(() => import("@/components/TrajectoryView").then((m) => m.TrajInspector), { ssr: false });
+
+/** 会话/工作区路径比较（Windows 大小写与分隔符差异不该影响判断） */
+const samePath = (a: string, b: string): boolean =>
+	a.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase() === b.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
 const ProjectPanel = dynamic(() => import("@/components/ProjectPanel").then((m) => m.ProjectPanel), { ssr: false });
 const FileViewer = dynamic(() => import("@/components/FileViewer").then((m) => m.FileViewer), { ssr: false });
 const GitPanel = dynamic(() => import("@/components/GitPanel").then((m) => m.GitPanel), { ssr: false });
@@ -132,7 +135,6 @@ export function AppShell() {
 	const saveHeroDraft = useCallback((update: ChatDraftUpdate) => updateDraft(heroDraftKey, update), [heroDraftKey, updateDraft]);
 	const [dragging, setDragging] = useState<"sidebar" | "details" | "project" | null>(null);
 	const [settingsOpen, setSettingsOpen] = useState(false);
-	const [tab, setTab] = useState<"chat" | "traj">("chat");
 	const [selected, setSelected] = useState<TrajEntry | null>(null);
 	const [gitDetailsOpen, setGitDetailsOpen] = useState(false);
 	const [heroCwd, setHeroCwd] = useState("");
@@ -342,17 +344,49 @@ export function AppShell() {
 		[currentPath, currentId, sendCommand, openSession, resync],
 	);
 
+	/**
+	 * 原地编辑用户消息后重新发送：服务端在同一会话文件内回到该消息（navigateTree），
+	 * 再用新文本重新提问——被编辑消息之后的分支作废，模型从这里重新回答。
+	 * 旧的插话（steering）撤回/编辑/发送不变。
+	 */
+	const doEditMessage = useCallback(
+		async (entryId: string, text: string) => {
+			if (!currentId) return;
+			if (isStreaming) {
+				setError(t.editWhileRunning);
+				return;
+			}
+			const moved = await sendCommand({ cmd: "navigate", entryId });
+			if (!moved?.success || moved.data?.cancelled) {
+				setError(moved?.error ?? t.editMessageFailed);
+				return;
+			}
+			// 被编辑消息之后的尾部要立刻从视图里消失，再发新提问
+			resync();
+			const sent = await sendCommand({ cmd: "prompt", text });
+			if (!sent?.success) setError(sent?.error ?? t.editMessageFailed);
+		},
+		[currentId, isStreaming, resync, sendCommand, setError, t.editMessageFailed, t.editWhileRunning],
+	);
+
 	const doArchiveSession = useCallback(
 		async (path: string) => {
 			try {
-				// dsh 合同：归档不关会话——当前会话被归档后保持打开且在主列表可见
-				// （usePiWeb 的可见性规则对 currentPath 豁免），继续可聊。
 				await archiveSession(path);
 			} catch {
 				// usePiWeb exposes the request failure in the shared error banner.
 			}
+			// 归档后会话立刻离开工作区列表（服务端同时让它收工）。正在看的会话被归档时
+			// 必须切走：先取同一工作区的另一个可见会话，没有就回到空态（工作区仍留在侧栏）。
+			if (!currentPath || !samePath(path, currentPath)) return;
+			const cwd = sessions.find((s) => samePath(s.path, currentPath))?.cwd;
+			const next =
+				sessions.find((s) => !samePath(s.path, path) && cwd && samePath(s.cwd, cwd)) ??
+				sessions.find((s) => !samePath(s.path, path));
+			if (next) openSession(next.path);
+			else closeSession();
 		},
-		[archiveSession],
+		[archiveSession, closeSession, currentPath, openSession, sessions],
 	);
 	const doUnarchiveSession = useCallback(
 		async (path: string) => {
@@ -444,7 +478,6 @@ export function AppShell() {
 			if (name === "compact") void sendCommand({ cmd: "compact", instructions: args || undefined });
 			else if (name === "export" && currentId) window.open(`/api/sessions/${currentId}/export?format=jsonl`, "_blank");
 			else if (name === "new") {
-				setTab("chat");
 				closeSession();
 			} else if (name === "fork" && currentId) {
 				void sendCommand({ cmd: "fork" }).then((r) => {
@@ -646,14 +679,12 @@ export function AppShell() {
 					}}
 					onNew={() => {
 						// 对齐 dsh startSession：新会话默认落在当前会话的工作区（无则取最近工作区）
-						setTab("chat");
 						const cur = sessions.find((s) => s.path === currentPath)?.cwd;
 						setHeroCwd(cur || heroCwd || knownCwds[0] || "");
 						closeSession();
 					}}
 					onNewInWorkspace={(cwd) => {
 						// dsh 惰性新建：只预选工作区进草稿态，发送第一条消息才真正创建会话
-						setTab("chat");
 						setHeroCwd(cwd);
 						closeSession();
 					}}
@@ -757,26 +788,11 @@ export function AppShell() {
 									)}
 								</div>
 							)}
-							<div className="mt-1.5 flex items-center gap-5">
-								<button className="tab-underline" data-active={tab === "chat"} onClick={() => setTab("chat")}>
-									{t.tabChat}
-								</button>
-								<button
-									className="tab-underline"
-									data-active={tab === "traj"}
-									onClick={() => {
-										setTab("traj");
-										void sendCommand({ cmd: "prepare" });
-									}}
-								>
-									{t.tabTrajectory}
-								</button>
-							</div>
+							{/* 轨迹页签已移除：轨迹按需查看（对话里的工具行 → 轨迹详情），不再占用主区域 */}
 						</div>
 
-						{/* 内容 */}
-						{tab === "chat" ? (
-							!snapshot ? (
+						{/* 内容：只有对话区，轨迹按需在详情栏查看 */}
+						{!snapshot ? (
 								// 切换会话时快照未到：居中加载指示，避免空白/占位符闪现
 								<div className="flex min-h-0 flex-1 items-center justify-center">
 									<span
@@ -813,6 +829,7 @@ export function AppShell() {
 									onOpenTrajectory={openToolTrajectory}
 									onOpenFile={openInEditor}
 									onFork={handleFork}
+									onEditMessage={doEditMessage}
 								/>
 								<div className="px-4 pb-3 pt-2">
 									<div className="mx-auto w-full" style={{ maxWidth: "var(--dsh-composer-card-max-width)" }}>
@@ -861,22 +878,11 @@ export function AppShell() {
 												{Object.entries(state.extensionStatuses).map(([k, v]) => <span key={k}>{v}</span>)}
 											</div>
 										)}
-									</div>
+										</div>
 								</div>
-							</div>
-							)
-						) : (
-							<div className="min-h-0 flex-1">
-								<TrajectoryView
-									entries={snapshot?.trajectory ?? []}
-									selected={selected}
-									onSelect={(entry) => {
-									setSelected(entry);
-									setGitDetailsOpen(false);
-									}}
-								/>
-							</div>
-						)}
+								</div>
+								)
+						}
 					</>
 				)}
 			</div>

package/src/components/ChatWindow.tsx

@@ -193,6 +193,7 @@ function TurnMetaPill({ durationMs, usage, t }: { durationMs: number; usage?: Tr
 function MessageActions({
 	text,
 	onFork,
+	onEdit,
 	durationMs,
 	usage,
 	time,
@@ -200,6 +201,8 @@ function MessageActions({
 }: {
 	text: string;
 	onFork?: () => void | Promise<unknown>;
+	/** 用户消息：原地编辑后重新发送（模型从这条消息重新回答） */
+	onEdit?: () => void;
 	/** 回合墙钟耗时（最终回答时间戳 − 回合首条用户消息时间戳），dsh runMs 的对应物 */
 	durationMs?: number;
 	usage?: TrajTokens & { cost?: { total?: number } };
@@ -235,6 +238,11 @@ function MessageActions({
 				{copied ? <IconCheckOutline14 size={14} /> : <IconCopyOutline16 size={14} />}
 			</button>
 			{copyFailed && <span role="alert" style={{ fontSize: 11, color: "var(--dsw-danger)" }}>{t.copyFailed}</span>}
+			{onEdit && (
+				<button className="icon-btn" title={t.editMessage} aria-label={t.editMessage} onClick={onEdit}>
+					<IconEditOutline16 size={14} />
+				</button>
+			)}
 			{onFork && (
 				<button
 					className="icon-btn"
@@ -456,7 +464,8 @@ const ToolStep = memo(function ToolStep({
 	const output = state?.result ?? state?.partialResult ?? "";
 	const isWriteTool = name.toLowerCase() === "write";
 	const diff = useMemo(() => {
-		if (kind !== "write" || !state || state.state !== "done" || state.isError) return null;
+		// 失败的编辑同样渲染 diff：出错信息单独展示，不因为失败就把红绿藏掉
+		if (kind !== "write" || !state || state.state !== "done") return null;
 		const parsed = parseUnifiedDiff(state.patch || output);
 		if (parsed) return parsed;
 		// pi 的 write 工具不带 patch：新文件按新增行展示（全绿 +），与 edit 的 diff 口径一致
@@ -483,11 +492,13 @@ const ToolStep = memo(function ToolStep({
 	// 删除文件的命令：完成后给红色标记（内容级 diff 不强求）
 	const deletedTarget = kind === "cmd" && !running && !failed && isDeleteCommand(fullCommand) ? deleteTargetOf(fullCommand) : "";
 	const preview = state ? toolPreview(kind, state, tt, cwd) : { lines: [], hidden: 0 };
-	const hasDiff = Boolean(diff && diff.length) && !failed;
+	const hasDiff = Boolean(diff && diff.length);
 	const hasOutput = Boolean(output || state?.encodingLoss);
 	const canExpand = hasOutput && !hasDiff && !running;
 	const duration = state?.startedAt && state?.endedAt ? state.endedAt - state.startedAt : 0;
 	const showPreview = Boolean(preview.head) || preview.lines.length > 0;
+	// 失败且有 diff 时，出错信息要完整可见（此时 diff 占用了展开位）
+	const showFullOutput = hasOutput && (open && canExpand || (failed && hasDiff));
 	const diffLines = hasDiff && diff ? (open ? diff : diff.slice(0, DIFF_PREVIEW)) : null;
 	const diffHidden = diff && diffLines && !open ? diff.length - diffLines.length : 0;
 	const diffStat = hasDiff && diff
@@ -586,7 +597,7 @@ const ToolStep = memo(function ToolStep({
 					)}
 				</div>
 			)}
-			{open && canExpand && (
+			{showFullOutput && (
 				<div className="pw-output">
 					{fullCommand && <div className="cmdline">{fullCommand}</div>}
 					{state?.encodingLoss && <p className="mb-2 whitespace-normal" style={{ color: "var(--dsw-warn)" }}>{t.encodingLossWarning}</p>}
@@ -892,12 +903,56 @@ const FinalAnswer = memo(function FinalAnswer({
 });
 
 /** 行级 memo：流式期间只有最后一条消息变化，历史行全部跳过重渲染 */
-const UserMessage = memo(function UserMessage({ message }: { message: WebMessage }) {
+const UserMessage = memo(function UserMessage({ message, onEditMessage }: { message: WebMessage; onEditMessage?: (entryId: string, text: string) => void }) {
+	const { t } = useI18n();
 	const text = message.content
 		.filter((c): c is { type: "text"; text: string } => c.type === "text")
 		.map((c) => c.text)
 		.join("\n");
 	const images = message.content.filter((content) => content.type === "image");
+	const [editing, setEditing] = useState(false);
+	const [draft, setDraft] = useState(text);
+	const canEdit = Boolean(onEditMessage && message.id && text);
+	if (editing) {
+		return (
+			<div className="group mt-7 flex w-full flex-col items-end first:mt-0" data-role="user">
+				<div className="msg-user-bubble w-full">
+					<textarea
+						className="w-full resize-none bg-transparent outline-none"
+						style={{ minHeight: 68, font: "inherit", color: "inherit" }}
+						value={draft}
+						aria-label={t.editMessage}
+						autoFocus
+						onChange={(e) => setDraft(e.target.value)}
+						onKeyDown={(e) => {
+							if (e.key === "Escape") { e.preventDefault(); setEditing(false); }
+							if (e.key === "Enter" && !e.shiftKey) { e.preventDefault(); submit(); }
+						}}
+					/>
+				</div>
+				<div className="mt-1.5 flex items-center gap-2">
+					<button type="button" className="btn-outline" style={{ height: 26, padding: "0 10px", fontSize: 12 }} onClick={() => setEditing(false)}>
+						{t.cancel}
+					</button>
+					<button
+						type="button"
+						className="btn-primary-white"
+						style={{ height: 26, padding: "0 12px", fontSize: 12 }}
+						disabled={!draft.trim() || draft.trim() === text.trim()}
+						onClick={submit}
+					>
+						{t.sendEdit}
+					</button>
+				</div>
+			</div>
+		);
+	}
+	function submit() {
+		const next = draft.trim();
+		if (!next || next === text.trim() || !onEditMessage || !message.id) return;
+		setEditing(false);
+		onEditMessage(message.id, next);
+	}
 	return (
 		// 回合边界：用户消息前留 28px（比回合内 8px 大得多），长对话里一眼找到“这一轮从哪开始”
 		<div className="group mt-7 flex w-full flex-col items-end first:mt-0" data-role="user">
@@ -916,8 +971,15 @@ const UserMessage = memo(function UserMessage({ message }: { message: WebMessage
 			)}
 			{/* 用户消息也走 Markdown：贴进来的代码块/列表不再是一坨纯文本 */}
 			{text && <div className="msg-user-bubble"><Markdown text={text} /></div>}
-			{/* 用户消息只有复制操作，不提供分支；时钟在图标左侧（dsh clock=start） */}
-			{text && <MessageActions text={text} clockStart={message.timestamp !== undefined} time={message.timestamp} />}
+			{/* 用户消息：复制 + 原地编辑重发（编辑后模型从这条消息重新回答）；时钟在图标左侧（dsh clock=start） */}
+			{text && (
+				<MessageActions
+					text={text}
+					clockStart={message.timestamp !== undefined}
+					time={message.timestamp}
+					onEdit={canEdit ? () => { setDraft(text); setEditing(true); } : undefined}
+				/>
+			)}
 		</div>
 	);
 });
@@ -967,6 +1029,7 @@ function TurnBlock({
 	outputTokens,
 	workingMessage,
 	onFork,
+	onEditMessage,
 	onInspectTool,
 	onOpenFile,
 }: {
@@ -984,6 +1047,8 @@ function TurnBlock({
 	outputTokens?: number;
 	workingMessage?: string | null;
 	onFork?: (entryId: string) => void;
+	/** 编辑该回合的用户消息并重新发送（模型从这条消息重新回答） */
+	onEditMessage?: (entryId: string, text: string) => void;
 	onInspectTool?: (toolCallId: string) => void;
 	onOpenFile?: (path: string) => void;
 }) {
@@ -1035,7 +1100,7 @@ function TurnBlock({
 
 	return (
 		<>
-			{user && <UserMessage message={user} />}
+			{user && <UserMessage message={user} onEditMessage={onEditMessage} />}
 			{showProcess && (
 				<div className="pw-turn">
 					{contextFiles?.map((resource, i) => (
@@ -1136,6 +1201,7 @@ export function ChatWindow({
 	contextFiles,
 	cwd,
 	onFork,
+	onEditMessage,
 	isStreaming = false,
 	error,
 	connected = true,
@@ -1171,6 +1237,7 @@ export function ChatWindow({
 	trajectory?: TrajEntry[];
 	onOpenTrajectory?: (toolCallId: string) => void;
 	/** 在本机编辑器打开工具行涉及的文件 */
+	onEditMessage?: (entryId: string, text: string) => void;
 	onOpenFile?: (path: string) => void;
 }) {
 	const scrollRef = useRef<HTMLDivElement>(null);
@@ -1254,6 +1321,7 @@ export function ChatWindow({
 							outputTokens={stats?.tokens.output}
 							workingMessage={workingMessage}
 							onFork={onFork}
+							onEditMessage={onEditMessage}
 							onInspectTool={onOpenTrajectory}
 							onOpenFile={onOpenFile}
 						/>

package/src/hooks/usePiWeb.ts

@@ -242,9 +242,15 @@ export const foldPiWebEvent = (state: PiWebState, evt: WebEvent): PiWebState =>
 		case "growth_error":
 			s.growth = { ...s.growth, pending: [], error: evt.message };
 			return s;
+		case "retry":
+			// 只保留最后一次尝试：重试过程在界面上是「重试 3/5」这一条，而不是五行报错
+			s.retryNotice = evt.maxAttempts
+				? `重试 ${evt.attempt}/${evt.maxAttempts}${evt.message ? `：${evt.message}` : ""}`
+				: `重试 ${evt.attempt}${evt.message ? `：${evt.message}` : ""}`;
+			return s;
 		case "error":
-			// 自动重试属流程内通知：随消息流显示、流结束清除，不走 6 秒错误条
-			if (/^自动重试/.test(evt.message)) s.retryNotice = evt.message;
+			// 旧服务端把自动重试塞在 error 里：同样按通知处理，不占错误条
+			if (/^(自动重试|重试)/.test(evt.message)) s.retryNotice = evt.message;
 			else s.error = evt.message;
 			return s;
 		default:
@@ -847,18 +853,16 @@ export function usePiWeb() {
 		presetRestorePromiseRef.current = restore;
 	}, [currentId, snapshotEpoch, state.connected, state.snapshot, sendCommand]);
 
-	// 会话可见性规则：当前会话豁免归档过滤——归档当前会话不关闭、
-	// 主列表保持可见可聊，已归档区也不显示它（取消归档前菜单按真实归档态切换）。
+	// 会话可见性规则：归档即离开工作区列表——包括当前会话（归档后切到相邻会话或空态），
+	// 归档区显示全部已归档会话。
 	const visibleSessions = useMemo(() => {
 		const set = new Set(archivedSessionPaths.map(pathKey));
-		const currentKey = currentPath ? pathKey(currentPath) : null;
-		return sessions.filter((s) => !set.has(pathKey(s.path)) || (currentKey != null && pathKey(s.path) === currentKey));
-	}, [sessions, archivedSessionPaths, currentPath]);
+		return sessions.filter((s) => !set.has(pathKey(s.path)));
+	}, [sessions, archivedSessionPaths]);
 	const archivedSessions = useMemo(() => {
 		const set = new Set(archivedSessionPaths.map(pathKey));
-		const currentKey = currentPath ? pathKey(currentPath) : null;
-		return sessions.filter((s) => set.has(pathKey(s.path)) && !(currentKey != null && pathKey(s.path) === currentKey));
-	}, [sessions, archivedSessionPaths, currentPath]);
+		return sessions.filter((s) => set.has(pathKey(s.path)));
+	}, [sessions, archivedSessionPaths]);
 
 	return {
 		sessions: visibleSessions,

package/src/i18n.tsx

@@ -19,6 +19,10 @@ const zh = {
 	error: "出错",
 	copy: "复制",
 	copyFailed: "复制失败",
+	editMessage: "编辑这条消息",
+	sendEdit: "重新发送",
+	editWhileRunning: "会话正在运行，先停止再编辑",
+	editMessageFailed: "编辑重发失败",
 	export: "导出",
 	settings: "设置",
 	// 侧栏
@@ -551,6 +555,10 @@ const en: Dict = {
 	error: "Error",
 	copy: "Copy",
 	copyFailed: "Copy failed",
+	editMessage: "Edit this message",
+	sendEdit: "Send again",
+	editWhileRunning: "This session is running; stop it before editing",
+	editMessageFailed: "Edit and resend failed",
 	export: "Export",
 	settings: "Settings",
 	newChat: "New session",

package/src/lib/agent-manager.ts

@@ -2,9 +2,11 @@
  * agent-manager：AgentSession 池 + pi 事件 → Web 事件翻译 + SSE 订阅管理。
  * 打开会话即惰性冷启动（createAgentSession），空闲回收，事件先快照后增量。
  */
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync, statSync } from "node:fs";
 import { randomUUID } from "node:crypto";
+import path from "node:path";
 import type { AgentSession, AgentSessionEvent } from "@earendil-works/pi-coding-agent";
+import { generateUnifiedPatch } from "@earendil-works/pi-coding-agent";
 import {
 	getResourceLoader,
 	createSessionResourceLoader,
@@ -182,6 +184,51 @@ function patchOf(details: unknown): string | undefined {
 	return typeof patch === "string" && patch.trim() ? patch.slice(0, 60_000) : undefined;
 }
 
+/**
+ * write 工具不产 patch（SDK 的 write.js 里没有 patch 字段），覆盖已有文件时前端只能把
+ * 全部内容当新增行——删掉的行永远不会标红。这里在工具开始执行（文件还没被写）时读一份
+ * 旧内容，结束时用 SDK 的 generateUnifiedPatch 生成和 edit 同格式的 patch，
+ * 于是「新增绿 / 删除红」在两条写入路径上一致。新文件没有旧内容，仍按新增行展示。
+ */
+const WRITE_BASE_MAX_BYTES = 512 * 1024;
+const writeBases = new Map<string, string>();
+
+function writeArgsOf(args: unknown): { target: string; content: string | undefined } {
+	const a = args as { path?: unknown; file_path?: unknown; content?: unknown } | undefined;
+	const target = typeof a?.path === "string" ? a.path : typeof a?.file_path === "string" ? a.file_path : "";
+	return { target, content: typeof a?.content === "string" ? a.content : undefined };
+}
+
+export function captureWriteBase(cwd: string, sessionPath: string, toolCallId: string, args: unknown): void {
+	const { target } = writeArgsOf(args);
+	if (!target) return;
+	try {
+		const abs = path.isAbsolute(target) ? target : path.resolve(cwd, target);
+		const stat = statSync(abs);
+		if (!stat.isFile() || stat.size > WRITE_BASE_MAX_BYTES) return;
+		const previous = readFileSync(abs, "utf8");
+		if (previous.includes("\u0000")) return; // 二进制不做行级 diff
+		if (writeBases.size > 256) writeBases.clear();
+		writeBases.set(`${sessionPath}\u0000${toolCallId}`, previous);
+	} catch {
+		/* 新文件或读不到：没有旧内容，走全绿兜底 */
+	}
+}
+
+export function takeWritePatch(cwd: string, sessionPath: string, toolCallId: string, args: unknown): string | undefined {
+	const key = `${sessionPath}\u0000${toolCallId}`;
+	const previous = writeBases.get(key);
+	writeBases.delete(key);
+	if (previous === undefined) return undefined;
+	const { target, content } = writeArgsOf(args);
+	if (content === undefined || content === previous) return undefined;
+	try {
+		return generateUnifiedPatch(target, previous, content).slice(0, 60_000);
+	} catch {
+		return undefined;
+	}
+}
+
 function coercePartial(p: unknown): string | undefined {
 	if (p == null) return undefined;
 	if (typeof p === "string") return p.slice(-4000);
@@ -426,6 +473,8 @@ function translate(m: Managed, evt: AgentSessionEvent): void {
 			break;
 		}
 		case "tool_execution_start":
+			// write 覆盖前先留一份旧内容，结束时才能给出真实的新增/删除 diff
+			if (evt.toolName?.toLowerCase() === "write") captureWriteBase(m.cwd, m.sessionPath, evt.toolCallId, evt.args);
 			publish(m, {
 				type: "tool",
 				id: evt.toolCallId,
@@ -460,7 +509,7 @@ function translate(m: Managed, evt: AgentSessionEvent): void {
 				result: result.text || undefined,
 				isError: evt.isError,
 				encodingLoss: result.encodingLoss || undefined,
-				patch: patchOf((evt as any).result?.details),
+				patch: patchOf((evt as any).result?.details) ?? (evt.toolName?.toLowerCase() === "write" ? takeWritePatch(m.cwd, m.sessionPath, evt.toolCallId, (evt as any).args) : undefined),
 				ts: now,
 			});
 			publishUsage(m);
@@ -514,7 +563,15 @@ function translate(m: Managed, evt: AgentSessionEvent): void {
 			else publish(m, { type: "model", thinkingLevel: (evt as any).level, ts: now });
 			break;
 		case "auto_retry_start":
-			publish(m, { type: "error", message: `自动重试 ${(evt as any).attempt}/${(evt as any).maxAttempts}：${(evt as any).errorMessage ?? ""}`, ts: now });
+			// 重试是流程内通知：发一条结构化 retry 事件（界面聚合成「重试 n/max」一行），
+			// 不再走 error 通道，免得每次尝试都多出一条报错。
+			publish(m, {
+				type: "retry",
+				attempt: Number((evt as any).attempt) || 0,
+				maxAttempts: Number((evt as any).maxAttempts) || 0,
+				message: String((evt as any).errorMessage ?? ""),
+				ts: now,
+			});
 			break;
 		default:
 			break;
@@ -881,6 +938,11 @@ export function disposeSession(m: Managed): void {
 	sessions.delete(m.sessionPath);
 }
 
+/**
+ * 让某个会话立刻收工：中断正在跑的回合并回收 agent。
+ * 归档用它——归档后会话从工作区消失，若它的回合还在后台跑，用户看不见却仍在消耗 token。
+ * 只影响这一个会话，其它会话的运行不受影响（LRU/空闲回收同样跳过 busy 的会话）。
+ */
 export async function disposeSessionPath(sessionPath: string): Promise<void> {
 	const m = sessions.get(sessionPath);
 	if (!m) return;

package/src/lib/process-format.ts

@@ -99,21 +99,38 @@ export function classifyMessageChars(
 	return out;
 }
 
-/** bash/PowerShell 删除文件的命令判定：rm / Remove-Item / del / trash 等，且至少带一个非选项参数 */
+/** 删除文件的命令：rm / Remove-Item / del / trash 等，且至少带一个非选项参数 */
+const DELETE_COMMANDS = new Set(["rm", "remove-item", "ri", "del", "erase", "unlink", "trash"]);
+
+/**
+ * 单条命令是否是删除。只看该段的第一个词，所以必须按 ; && || 先切段——
+ * `cd src && rm main.py` 这种链式写法以前整条都判不出来。
+ */
+function isDeleteSegment(segment: string): boolean {
+	const tokens = segment.trim().split(/\s+/).filter(Boolean);
+	if (!tokens.length) return false;
+	const base = (tokens[0].split(/[\\/]/).pop() ?? tokens[0]).toLowerCase().replace(/\.(exe|ps1|bat|cmd)$/, "");
+	// git rm <path>：删除动作在第二个词
+	if (base === "git") return tokens[1]?.toLowerCase() === "rm" && tokens.slice(2).some((tok) => !tok.startsWith("-"));
+	if (!DELETE_COMMANDS.has(base)) return false;
+	return tokens.slice(1).some((tok) => !tok.startsWith("-"));
+}
+
+/** bash/PowerShell 删除文件的命令判定（支持链式命令，逐段判断，避免误判整条） */
 export function isDeleteCommand(command: string): boolean {
-	const first = command.trim().split(/\s+/)[0] ?? "";
-	const base = first.split(/[\\/]/).pop() ?? first;
-	const name = base.toLowerCase().replace(/\.(exe|ps1|bat|cmd)$/, "");
-	if (!["rm", "remove-item", "ri", "del", "erase", "unlink", "trash"].includes(name)) return false;
-	const rest = command.trim().split(/\s+/).slice(1);
-	return rest.some((tok) => !tok.startsWith("-"));
+	return splitTopLevel(command).some(isDeleteSegment);
 }
 
 /** 从删除命令里提取第一个目标路径（去引号；相对路径解析交给展示层） */
 export function deleteTargetOf(command: string): string {
-	const tokens = command.trim().match(/"[^"]*"|'[^']*'|\S+/g) ?? [];
-	const target = tokens.slice(1).find((tok) => !tok.startsWith("-"));
-	return target ? target.replace(/^["']|["']$/g, "") : "";
+	for (const segment of splitTopLevel(command)) {
+		if (!isDeleteSegment(segment)) continue;
+		const tokens = segment.trim().match(/"[^"]*"|'[^']*'|\S+/g) ?? [];
+		const skip = tokens[0]?.toLowerCase() === "git" ? 2 : 1;
+		const target = tokens.slice(skip).find((tok) => !tok.startsWith("-"));
+		if (target) return target.replace(/^["']|["']$/g, "");
+	}
+	return "";
 }
 
 /** 按顶层的 ; && || 切分（引号内不切） */

package/src/lib/types.ts

@@ -142,6 +142,8 @@ export type WebEvent =
 	  }
 	| { type: "extension_ui_resolved"; id: string; ts: number }
 	| { type: "error"; message: string; ts: number }
+	/** 自动重试：流程内通知，界面聚合成一条「重试 n/max」，不作为错误条目累积 */
+	| { type: "retry"; attempt: number; maxAttempts: number; message: string; ts: number }
 	/** 项目生长：记录了一步（工具结束 / 回合结束 / 外部修改 / 会话基线） */
 	| { type: "growth"; step: GrowthStep; ts: number }
 	/** 项目生长：改盘类工具运行期间目录监听看到的新路径（累计；空数组 = 清空） */