@rexvane/piweb 0.3.25 → 0.3.26

package/src/components/composer/ComposerImages.tsx

@@ -14,6 +14,7 @@
  */
 import { useEffect, useRef, useState } from "react";
 import { createPortal } from "react-dom";
+import { ImageViewer } from "@/components/ImageViewer";
 import { useI18n } from "@/i18n";
 import type { ImageAttachment } from "@/lib/types";
 
@@ -255,82 +256,3 @@ export function ComposerImages({ images, disabled, onRemove, onClear }: { images
 		</>
 	);
 }
-
-/** 放大预览：手机上没法用本机程序打开图片，应用内看最实在 */
-function ImageViewer({
-	images,
-	index,
-	disabled,
-	onIndex,
-	onRemove,
-	onClose,
-}: {
-	images: ImageAttachment[];
-	index: number;
-	disabled?: boolean;
-	onIndex: (index: number) => void;
-	onRemove: (index: number) => void;
-	onClose: () => void;
-}) {
-	const { t } = useI18n();
-	const dialogRef = useRef<HTMLDivElement>(null);
-	const closeRef = useRef<HTMLButtonElement>(null);
-	const count = images.length;
-	const go = (delta: number) => onIndex((index + delta + count) % count);
-
-	// 打开时把焦点移进来，关掉时还给原来那个元素（还在页面上的话）
-	useEffect(() => {
-		const opener = document.activeElement instanceof HTMLElement ? document.activeElement : null;
-		closeRef.current?.focus();
-		return () => {
-			if (opener?.isConnected) opener.focus();
-		};
-	}, []);
-
-	// 捕获阶段处理：Esc / 方向键不再传给页面上其它监听 document 的面板；Tab 只在预览里转
-	useEffect(() => {
-		const onKey = (event: KeyboardEvent) => {
-			if (event.key === "Escape") onClose();
-			else if (event.key === "ArrowLeft" && count > 1) go(-1);
-			else if (event.key === "ArrowRight" && count > 1) go(1);
-			else if (event.key === "Tab") {
-				const focusable = [...(dialogRef.current?.querySelectorAll<HTMLElement>("button:not(:disabled)") ?? [])];
-				if (!focusable.length) return;
-				const at = focusable.indexOf(document.activeElement as HTMLElement);
-				const next = event.shiftKey ? (at <= 0 ? focusable.length - 1 : at - 1) : at === focusable.length - 1 ? 0 : at + 1;
-				focusable[next].focus();
-			} else return;
-			event.preventDefault();
-			event.stopPropagation();
-		};
-		document.addEventListener("keydown", onKey, true);
-		return () => document.removeEventListener("keydown", onKey, true);
-		// onClose / onIndex 来自父组件的 setState 包装，语义不变；只随张数和当前张重绑
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [count, index]);
-
-	return (
-		<div ref={dialogRef} className="pw-lightbox" role="dialog" aria-modal="true" aria-label={t.imageViewer} onClick={onClose}>
-			<div className="pw-lightbox-bar" onClick={(event) => event.stopPropagation()}>
-				<span className="pw-lightbox-count">{count > 1 ? `${index + 1} / ${count}` : ""}</span>
-				<button type="button" className="pw-lightbox-btn" disabled={disabled} onClick={() => onRemove(index)}>
-					{t.delete}
-				</button>
-				<button ref={closeRef} type="button" className="pw-lightbox-btn" aria-label={t.close} onClick={onClose}>
-					✕
-				</button>
-			</div>
-			<img src={srcOf(images[index])} alt="" className="pw-lightbox-image" onClick={(event) => event.stopPropagation()} />
-			{count > 1 ? (
-				<>
-					<button type="button" className="pw-lightbox-nav" data-side="prev" aria-label={t.imagePrev} onClick={(event) => { event.stopPropagation(); go(-1); }}>
-						‹
-					</button>
-					<button type="button" className="pw-lightbox-nav" data-side="next" aria-label={t.imageNext} onClick={(event) => { event.stopPropagation(); go(1); }}>
-						›
-					</button>
-				</>
-			) : null}
-		</div>
-	);
-}

package/src/hooks/usePiWeb.ts

@@ -44,6 +44,17 @@ export interface ExtensionDialog {
 	ts: number;
 }
 
+/** 右下角的短通知：扩展 notify，或 PiWeb 自己的提示（带 code，渲染时按语言取文案） */
+export interface PiWebNotice {
+	id: string;
+	message: string;
+	type: "info" | "warning" | "error";
+	ts: number;
+	/** external_reload：终端写了这个会话，已从磁盘重载；external_write：正在跑时终端也在写 */
+	code?: "external_reload" | "external_write";
+	count?: number;
+}
+
 export interface PiWebState {
 	snapshot: WebSnapshot | null;
 	messages: WebMessage[];
@@ -57,7 +68,7 @@ export interface PiWebState {
 	/** 扩展对话框队列（按到达顺序，一次显示一个） */
 	extensionDialogs: ExtensionDialog[];
 	/** 扩展通知（notify），显示几秒后消失 */
-	extensionNotices: { id: string; message: string; type: "info" | "warning" | "error"; ts: number }[];
+	extensionNotices: PiWebNotice[];
 	/** 扩展设的页脚状态文本（setStatus） */
 	extensionStatuses: Record<string, string>;
 	/** 扩展覆盖的「工作中」文案（setWorkingMessage） */
@@ -176,6 +187,17 @@ export const foldPiWebEvent = (state: PiWebState, evt: WebEvent): PiWebState =>
 			return s;
 		case "compaction":
 			s.compaction = { phase: evt.phase, errorMessage: evt.errorMessage, ts: evt.ts };
+			if (evt.marker) {
+				// 已显示的消息全部保留；分隔卡插到保留下来的第一条前面，和刷新后的快照位置一致
+				const marker = evt.marker;
+				const msgs = s.messages.filter((message) => !(marker.id && message.id === marker.id));
+				const at = msgs.findIndex((message) =>
+					(!!evt.beforeId && message.id === evt.beforeId) ||
+					(!!evt.beforeStreamId && message.streamId === evt.beforeStreamId));
+				if (at >= 0) msgs.splice(at, 0, marker);
+				else msgs.push(marker);
+				s.messages = msgs;
+			}
 			return s;
 		case "traj": {
 			if (s.snapshot) {
@@ -236,6 +258,12 @@ export const foldPiWebEvent = (state: PiWebState, evt: WebEvent): PiWebState =>
 		case "extension_ui_resolved":
 			s.extensionDialogs = s.extensionDialogs.filter((dialog) => dialog.id !== evt.id);
 			return s;
+		case "external_write":
+			s.extensionNotices = [
+				...s.extensionNotices.filter((notice) => notice.code !== "external_write").slice(-4),
+				{ id: `external-write-${evt.ts}`, message: "", type: "warning", ts: evt.ts, code: "external_write", count: evt.entries },
+			];
+			return s;
 		case "status":
 			if (s.snapshot) s.snapshot = { ...s.snapshot, isStreaming: evt.isStreaming };
 			if (!evt.isStreaming) {
@@ -366,6 +394,7 @@ export function usePiWeb() {
 	const [snapshotEpoch, setSnapshotEpoch] = useState(0);
 	const esRef = useRef<{ close(): void } | null>(null);
 	const promptRequestsRef = useRef(new Set<string>());
+	const shownReloadsRef = useRef(new Set<string>());
 	const presetRestoreAttemptRef = useRef<string | null>(null);
 	const presetRestorePromiseRef = useRef<Promise<void> | null>(null);
 	const activeSessionRef = useRef(currentId);
@@ -689,6 +718,14 @@ export function usePiWeb() {
 			: { ...emptyState(savedToolPreset()), connected: false });
 		let retryDelayMs = 2000;
 		const eventsUrl = `/api/agent/${currentId}/events`;
+		// 同一次重载既有 external_reload 事件、又会出现在随后若干快照里：按重载时间只提示一次
+		const reloadNotice = (reload?: { entries: number; at: number }): PiWebNotice | null => {
+			if (!reload) return null;
+			const key = `${currentId}:${reload.at}`;
+			if (shownReloadsRef.current.has(key)) return null;
+			shownReloadsRef.current.add(key);
+			return { id: `external-reload-${reload.at}`, message: "", type: "info", ts: Date.now(), code: "external_reload", count: reload.entries };
+		};
 		const connect = () => {
 			// 流式事件按帧合并：token 速率再高也只每 16ms 渲染一次（见 event-batcher）
 			const batcher = createEventBatcher<WebEvent>({
@@ -707,11 +744,19 @@ export function usePiWeb() {
 					// 单帧损坏（代理截断等）只丢弃该帧，不能让 EventSource 回调抛异常
 					return;
 				}
+				if (parsed.type === "external_reload") {
+					// 服务端发现终端写过这个会话、已从磁盘重载，旧流随即关闭：不等 EventSource 2 秒后自己重连，马上换新连接拿快照
+					const notice = reloadNotice(parsed);
+					if (notice) setState((s) => ({ ...s, extensionNotices: [...s.extensionNotices.slice(-4), notice] }));
+					setResyncNonce((n) => n + 1);
+					return;
+				}
 				if (parsed.type === "snapshot" && parsed.snapshot) {
 					// 快照是权威状态：之前缓冲的增量已经过时，直接丢弃
 					batcher.cancel();
 					retryDelayMs = 2000;
 					const snap = parsed.snapshot as WebSnapshot;
+					const notice = reloadNotice(snap.externalReload);
 					setSnapshotEpoch((epoch) => epoch + 1);
 					setState((prev) => ({
 						snapshot: snap,
@@ -724,7 +769,7 @@ export function usePiWeb() {
 						retryNotice: null,
 						// 服务器当前 pending 集合是权威来源，刷新可恢复、已答请求不能复活。
 						extensionDialogs: extensionDialogsFromSnapshot(snap, prev.extensionDialogs),
-						extensionNotices: prev.extensionNotices,
+						extensionNotices: notice ? [...prev.extensionNotices.slice(-4), notice] : prev.extensionNotices,
 						extensionStatuses: snap.extensionStatuses ?? {},
 						workingMessage: null,
 						// 重连的快照不带生长账本；连接期间已收到的步保留，useGrowth 会按 seq 与拉取结果去重

package/src/i18n.tsx

@@ -34,6 +34,15 @@ const zh = {
 	compacting: "正在压缩上下文…",
 	compactionComplete: "上下文压缩完成",
 	compactionFailed: "上下文压缩失败",
+	compactedTitle: "上下文已压缩",
+	compactedTitleTokens: "上下文已压缩 · 压缩前约 {tokens} tokens",
+	compactedHint: "以上内容模型只看得到摘要",
+	branchSummaryTitle: "分支摘要",
+	branchSummaryHint: "切换分支时，离开的那条分支以摘要形式发给模型",
+	showSummary: "查看摘要",
+	hideSummary: "收起摘要",
+	externalSessionReloaded: "终端在这个会话里写了 {n} 条新内容，已重新载入",
+	externalSessionWriting: "终端也在写这个会话（{n} 条）。两边同时写会分叉，这一轮结束后自动重新载入",
 	pickWorkspaceFirst: "请先选择工作区",
 	capacityFields: "容量",
 	contextWindowLabel: "上下文窗口",
@@ -215,6 +224,8 @@ const zh = {
 	archiveSession: "归档会话",
 	unarchiveSession: "取消归档",
 	archivedSessions: "已归档",
+	archiveRetentionHint: "归档满 30 天自动删除",
+	archiveRetentionDetail: "归档的会话从归档那天起保留 30 天，之后自动删除；归档后又用过的，从最后一次使用起算。打开中的会话不会被删。",
 	deleteAllSessions: "删除全部会话",
 	deleteAllConfirm: "删除此工作区的全部会话？不可恢复。",
 	contextInject: "上下文注入",
@@ -645,6 +656,7 @@ const zh = {
 	uninstall: "卸载",
 	confirmUninstallPackage: "确定卸载“{source}”吗？",
 	update: "更新",
+	updateNeedsEnable: "已停用的插件要先启用才能更新",
 	pluginConfig: "插件配置",
 	pluginList: "插件列表",
 	pluginPageDesc: "配置和查看本部署已安装的插件。",
@@ -772,6 +784,15 @@ const en: Dict = {
 	compacting: "Compacting context…",
 	compactionComplete: "Context compaction complete",
 	compactionFailed: "Context compaction failed",
+	compactedTitle: "Context compacted",
+	compactedTitleTokens: "Context compacted · about {tokens} tokens before",
+	compactedHint: "The model only sees a summary of everything above",
+	branchSummaryTitle: "Branch summary",
+	branchSummaryHint: "The branch you left is sent to the model as a summary",
+	showSummary: "Show summary",
+	hideSummary: "Hide summary",
+	externalSessionReloaded: "The terminal added {n} new entries to this session — reloaded",
+	externalSessionWriting: "The terminal is also writing to this session ({n} entries). Writing from both sides forks it; it reloads after this turn",
 	pickWorkspaceFirst: "Select a workspace first",
 	capacityFields: "Capacities",
 	contextWindowLabel: "Context window",
@@ -953,6 +974,8 @@ const en: Dict = {
 	archiveSession: "Archive session",
 	unarchiveSession: "Unarchive",
 	archivedSessions: "Archived",
+	archiveRetentionHint: "Deleted 30 days after archiving",
+	archiveRetentionDetail: "Archived sessions are kept for 30 days from the day they were archived, then deleted automatically. If you use one after archiving, the 30 days restart from its last use. Open sessions are never deleted.",
 	deleteAllSessions: "Delete all sessions",
 	deleteAllConfirm: "Delete ALL sessions in this workspace? This cannot be undone.",
 	contextInject: "Context",
@@ -1376,6 +1399,7 @@ const en: Dict = {
 	uninstall: "Uninstall",
 	confirmUninstallPackage: "Uninstall \"{source}\"?",
 	update: "Update",
+	updateNeedsEnable: "Enable this plugin before updating it",
 	pluginConfig: "Plugin config",
 	pluginList: "Plugin list",
 	pluginPageDesc: "Configure and view installed plugins for this deployment.",