@rexvane/piweb 0.3.10 → 0.3.12

package/src/components/SettingsPanel.tsx

@@ -35,7 +35,8 @@ import { useI18n } from "@/i18n";
 import { applyPebrelTheme, loadPebrelTheme, loadThemeMode, type PebrelTheme, type ThemeMode } from "@/lib/theme";
 import { modelDraftFromConfig, serializeProviderDraft, validateModelDrafts, type ModelDraft } from "@/lib/model-draft";
 import { customApiOptions } from "@/lib/provider-display";
-import type { ProviderUsage, ProviderView } from "@/lib/models-service";
+import { quotaWindowKind, supportsUsageProbe, type BalanceAmount, type BalanceDetailKey, type ProviderUsage, type QuotaWindow, type XaiUsage } from "@/lib/provider-usage";
+import type { ProviderView } from "@/lib/models-service";
 import type { ToolPreset } from "@/lib/types";
 
 type Section = "general" | "models" | "tools" | "skills" | "plugins";
@@ -886,7 +887,7 @@ function ModelsSection() {
 	}, [oauthProvider, load]);
 
 	// xAI 订阅配额（x-ratelimit-* 响应头；后端 5 分钟缓存，force 跳过）
-	const [xaiUsage, setXaiUsage] = useState<ProviderUsage | null>(null);
+	const [xaiUsage, setXaiUsage] = useState<XaiUsage | null>(null);
 	const [usageBusy, setUsageBusy] = useState(false);
 	const [usageError, setUsageError] = useState(false);
 	const fetchUsage = useCallback(async (force: boolean) => {
@@ -904,6 +905,106 @@ function ModelsSection() {
 		}
 	}, []);
 
+	// 窗口制/余额制配额：各提供商走各自的只读端点（后端 5 分钟缓存，force 跳过）
+	const [providerUsages, setProviderUsages] = useState<Record<string, ProviderUsage | null>>({});
+	const [usageBusyId, setUsageBusyId] = useState<string | null>(null);
+	const [usageFailedIds, setUsageFailedIds] = useState<Record<string, boolean>>({});
+	const fetchProviderUsage = useCallback(async (providerId: string, force: boolean) => {
+		setUsageBusyId(providerId);
+		setUsageFailedIds((prev) => ({ ...prev, [providerId]: false }));
+		try {
+			const r = await fetch("/api/models", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ action: "providerUsage", providerId, force }) });
+			const j = await r.json();
+			if (!r.ok || !j.success) throw new Error(j.error || "usage probe failed");
+			setProviderUsages((prev) => ({ ...prev, [providerId]: j.data.usage ?? null }));
+		} catch {
+			setUsageFailedIds((prev) => ({ ...prev, [providerId]: true }));
+		} finally {
+			setUsageBusyId((current) => (current === providerId ? null : current));
+		}
+	}, []);
+
+	// 这些端点都是只读探测、不消耗额度，登录后自动取一次；xAI 那条会发一次可能计费的请求，仍然只手动触发
+	const requestedUsage = useRef(new Set<string>());
+	useEffect(() => {
+		for (const p of providers) {
+			if (!p.authReady || !supportsUsageProbe(p.id) || p.id === "xai" || requestedUsage.current.has(p.id)) continue;
+			requestedUsage.current.add(p.id);
+			void fetchProviderUsage(p.id, false);
+		}
+	}, [providers, fetchProviderUsage]);
+
+	// 窗口时长 → 标签：7 天叫「周限」、30 天叫「月限」，更短的按小时/天如实标注
+	const quotaWindowLabel = (seconds: number): string => {
+		const kind = quotaWindowKind(seconds);
+		if (kind === "weekly") return t.usageWindowWeekly;
+		if (kind === "monthly") return t.usageWindowMonthly;
+		return (kind === "hours" ? t.usageWindowHours : t.usageWindowDays).replace("{n}", String(Math.round(seconds / (kind === "hours" ? 3600 : 86400))));
+	};
+	// 服务端不给周期时（Copilot 的额度类别、OpenCode 的 rolling）按名字标注
+	const quotaWindowName = (name: string): string => {
+		if (name === "premium") return t.usageWindowPremium;
+		if (name === "chat") return t.usageWindowChat;
+		if (name === "completions") return t.usageWindowCompletions;
+		if (name === "rolling") return t.usageWindowRolling;
+		return titleCase(name);
+	};
+	const quotaVariantLabel = (variant: string): string => {
+		if (variant === "opus") return t.usageVariantOpus;
+		if (variant === "code") return t.usageVariantCode;
+		return titleCase(variant);
+	};
+	const quotaWindowHeading = (w: QuotaWindow): string => {
+		if (w.limitWindowSeconds !== undefined) return `${quotaWindowLabel(w.limitWindowSeconds)}${w.variant ? ` (${quotaVariantLabel(w.variant)})` : ""}`;
+		return w.name ? quotaWindowName(w.name) : "";
+	};
+
+	// 余额明细项的标签由界面翻译，服务端只给语义 key
+	const balanceDetailLabel = (key: BalanceDetailKey): string => {
+		if (key === "granted") return t.usageBalanceGranted;
+		if (key === "toppedUp") return t.usageBalanceToppedUp;
+		if (key === "voucher") return t.usageBalanceVoucher;
+		if (key === "cash") return t.usageBalanceCash;
+		if (key === "used") return t.usageBalanceUsed;
+		return t.usageBalanceLimit;
+	};
+	const fmtAmount = (value: BalanceAmount): string => `${value.currency === "USD" ? "$" : value.currency === "CNY" ? "¥" : ""}${value.amount}${value.currency && value.currency !== "USD" && value.currency !== "CNY" ? ` ${value.currency}` : ""}`;
+
+	// 一个提供商的配额行：窗口制显示每个窗口的剩余与重置，余额制显示主余额与明细
+	const renderProviderUsage = (providerId: string) => {
+		const usage = providerUsages[providerId];
+		const busy = usageBusyId === providerId;
+		const failed = usageFailedIds[providerId];
+		return (
+			<>
+				<div className="flex items-center gap-2">
+					{!usage && <span>{failed ? t.usageProbeFailed : busy ? t.queryingQuota : t.usageReadOnlyDisclosure}</span>}
+					{usage?.kind === "quota" && usage.planType && <span>{t.usagePlan} {titleCase(usage.planType)}</span>}
+					{usage?.kind === "balance" && usage.primary && (
+						<span>{usage.primaryKey === "used" ? t.usageBalanceUsed : t.usageQuotaRemaining} <span style={{ color: "var(--dsw-label-secondary)" }}>{fmtAmount(usage.primary)}</span></span>
+					)}
+					<button type="button" className="pw-chip" disabled={busy} title={t.usageReadOnlyDisclosure} onClick={() => void fetchProviderUsage(providerId, true)}>
+						{busy ? t.usageProbing : usage ? t.usageRefresh : t.usageProbe}
+					</button>
+				</div>
+				{usage?.kind === "balance" && usage.details.length > 0 && (
+					<span>{usage.details.map((detail) => `${balanceDetailLabel(detail.key)} ${fmtAmount(detail)}`).join(" · ")}</span>
+				)}
+				{usage?.kind === "quota" && usage.windows.length === 0 && <span>{t.usageQuotaRemaining} —</span>}
+				{usage?.kind === "quota" && usage.windows.map((w, index) => (
+					<div key={`${w.limitWindowSeconds ?? w.name ?? "window"}-${w.variant ?? ""}-${index}`} className="flex items-center gap-2">
+						<span style={{ width: 84, flex: "none" }}>{quotaWindowHeading(w)}</span>
+						<span style={{ width: 92, flex: "none" }}>{t.usageQuotaRemaining} {w.remainingPercent}%</span>
+						<span>{t.usageReset} {fmtQuotaReset(w.resetAt)}</span>
+						<div className="h-1 overflow-hidden rounded-full" style={{ width: 120, flex: "none", background: "var(--dsw-border-l2)" }}>
+							<div className="h-full rounded-full" style={{ width: `${w.remainingPercent}%`, background: quotaToneColor(w.remainingPercent) }} />
+						</div>
+					</div>
+				))}
+			</>
+		);
+	};
+
 	const notify = (ok: boolean, msg?: string) => {
 		setToast({ ok, msg: msg ?? (ok ? t.toastSaved : t.toastError) });
 		setTimeout(() => setToast(null), 2400);
@@ -1129,69 +1230,71 @@ function ModelsSection() {
 					const editingThis = editing === p.id;
 					return (
 						<div key={p.id}>
-							<div className="flex items-center gap-3 rounded-2xl px-4 py-3" style={{ border: "0.5px solid var(--dsw-border-l2)" }}>
-								<ProviderBrand id={p.id} name={providerName(p.id)} size={34} />
-								<div className="min-w-0 flex-1">
-									<div className="truncate" style={{ fontSize: 14, fontWeight: 500 }}>{providerName(p.id)}</div>
-									<div className="truncate" style={{ fontSize: 11.5, color: "var(--dsw-label-caption)" }}>
-										{p.id}{p.baseUrl ? ` · ${p.baseUrl}` : ""}
+							{/* 卡片：身份/操作行在上，额度显示放在同一个框内的第二段（分隔线区分） */}
+							<div className="flex flex-col rounded-2xl px-4 py-3" style={{ border: "0.5px solid var(--dsw-border-l2)" }}>
+								<div className="flex items-center gap-3">
+									<ProviderBrand id={p.id} name={providerName(p.id)} size={34} />
+									<div className="min-w-0 flex-1">
+										<div className="truncate" style={{ fontSize: 14, fontWeight: 500 }}>{providerName(p.id)}</div>
+										<div className="truncate" style={{ fontSize: 11.5, color: "var(--dsw-label-caption)" }}>
+											{p.id}{p.baseUrl ? ` · ${p.baseUrl}` : ""}
+										</div>
 									</div>
-								</div>
-								{isCustom && (
+									{isCustom && (
+										<span
+											className="rounded-md px-1.5 py-0.5"
+											style={{ fontSize: 10.5, border: "0.5px solid var(--dsw-border-l3)", color: "var(--dsw-label-tertiary)" }}
+										>
+											{t.customBadge}
+										</span>
+									)}
+									<span
+										className="inline-block h-2 w-2 rounded-full"
+										style={{ background: p.authReady ? "var(--dsw-success)" : "var(--dsw-danger)" }}
+										title={p.authError || (p.authReady ? t.providerReady : t.authUnavailable)}
+									/>
 									<span
 										className="rounded-md px-1.5 py-0.5"
 										style={{ fontSize: 10.5, border: "0.5px solid var(--dsw-border-l3)", color: "var(--dsw-label-tertiary)" }}
 									>
-										{t.customBadge}
+										{t.credentialSource.replace("{source}", credentialSource(p))}
 									</span>
-								)}
-								<span
-									className="inline-block h-2 w-2 rounded-full"
-									style={{ background: p.authReady ? "var(--dsw-success)" : "var(--dsw-danger)" }}
-									title={p.authError || (p.authReady ? t.providerReady : t.authUnavailable)}
-								/>
-								<span
-									className="rounded-md px-1.5 py-0.5"
-									style={{ fontSize: 10.5, border: "0.5px solid var(--dsw-border-l3)", color: "var(--dsw-label-tertiary)" }}
-								>
-									{t.credentialSource.replace("{source}", credentialSource(p))}
-								</span>
-								<button className="btn-outline" style={{ height: 28, padding: "0 12px", fontSize: 12 }} onClick={() => startEdit(p.id)}>
-									{t.edit}
-								</button>
-								{p.storedAuthType === "oauth" && (
-									<button
-										style={{ height: 28, padding: "0 12px", fontSize: 12, color: "var(--dsw-danger)" }}
-										onClick={async () => {
-											if (!window.confirm(t.confirmRemoveOAuth.replace("{name}", providerName(p.id)))) return;
-											await call({ action: "removeKey", providerId: p.id });
-										}}
-									>
-										{t.removeOAuth}
-									</button>
-								)}
-								{p.authTypes?.includes("oauth") && (
-									<button
-										className="btn-outline"
-										style={{ height: 28, padding: "0 12px", fontSize: 12 }}
-										onClick={() => {
-											setOauthDone(null);
-											void call({ action: "loginStart", providerId: p.id });
-											setOauthProvider(p.id);
-										}}
-									>
-										{t.oauthLogin}
+									<button className="btn-outline" style={{ height: 28, padding: "0 12px", fontSize: 12 }} onClick={() => startEdit(p.id)}>
+										{t.edit}
 									</button>
-								)}
-								{customIds.has(p.id) && (
-									<button style={{ fontSize: 12.5, color: "var(--dsw-danger)" }} onClick={() => deleteCustom(p.id)}>
-										{t.delete}
-									</button>
-								)}
+									{p.storedAuthType === "oauth" && (
+										<button
+											style={{ height: 28, padding: "0 12px", fontSize: 12, color: "var(--dsw-danger)" }}
+											onClick={async () => {
+												if (!window.confirm(t.confirmRemoveOAuth.replace("{name}", providerName(p.id)))) return;
+												await call({ action: "removeKey", providerId: p.id });
+											}}
+										>
+											{t.removeOAuth}
+										</button>
+									)}
+									{p.authTypes?.includes("oauth") && (
+										<button
+											className="btn-outline"
+											style={{ height: 28, padding: "0 12px", fontSize: 12 }}
+											onClick={() => {
+												setOauthDone(null);
+												void call({ action: "loginStart", providerId: p.id });
+												setOauthProvider(p.id);
+											}}
+										>
+											{t.oauthLogin}
+										</button>
+									)}
+									{customIds.has(p.id) && (
+										<button style={{ fontSize: 12.5, color: "var(--dsw-danger)" }} onClick={() => deleteCustom(p.id)}>
+											{t.delete}
+										</button>
+									)}
 							</div>
 
 							{p.id === "xai" && p.authReady && (
-								<div className="mt-1.5 flex items-center gap-2 px-4" style={{ fontSize: 11.5, color: "var(--dsw-label-tertiary)" }}>
+								<div className="mt-3 flex items-center gap-2 pt-3" style={{ borderTop: "0.5px solid var(--dsw-border-l2)", fontSize: 11.5, color: "var(--dsw-label-tertiary)" }}>
 									{xaiUsage ? (
 										<span>{t.usageQuotaLabel} · {xaiUsage.model} · {t.usageRequests} {xaiUsage.requestRemaining.toLocaleString()}/{xaiUsage.requestLimit.toLocaleString()} · Tokens {fmtQuotaTokens(xaiUsage.tokenRemaining)}/{fmtQuotaTokens(xaiUsage.tokenLimit)}</span>
 									) : <span>{usageError ? t.usageProbeFailed : t.usageProbeDisclosure}</span>}
@@ -1201,6 +1304,13 @@ function ModelsSection() {
 								</div>
 							)}
 
+							{supportsUsageProbe(p.id) && p.id !== "xai" && p.authReady && (
+								<div className="mt-3 flex flex-col gap-1.5 pt-3" style={{ borderTop: "0.5px solid var(--dsw-border-l2)", fontSize: 11.5, color: "var(--dsw-label-tertiary)" }}>
+									{renderProviderUsage(p.id)}
+								</div>
+							)}
+							</div>
+
 							{editingThis && (
 								<div className="mt-2 rounded-2xl p-4" style={{ border: "0.5px solid var(--dsw-border-l2)" }}>
 									{isCustom ? (
@@ -1501,6 +1611,24 @@ function fmtQuotaTokens(value: number): string {
 	return value.toLocaleString();
 }
 
+/** 套餐值来自服务端声明（如 "pro"/"plus"），首字母大写后直接跟在标签后显示。 */
+function titleCase(value: string): string {
+	return value.length === 0 ? value : value[0].toUpperCase() + value.slice(1);
+}
+
+function fmtQuotaReset(value: string | undefined): string {
+	if (!value) return "—";
+	const date = new Date(value);
+	return Number.isNaN(date.getTime()) ? "—" : date.toLocaleString();
+}
+
+/** 剩余越少越警示：<30% 红、≤60% 黄、其余常规。 */
+function quotaToneColor(percent: number): string {
+	if (percent < 30) return "var(--dsw-danger)";
+	if (percent <= 60) return "var(--dsw-warning)";
+	return "var(--dsw-success)";
+}
+
 function Field({ label, children }: { label: string; children: React.ReactNode }) {
 	return (
 		<div>

package/src/hooks/usePiWeb.ts

@@ -4,6 +4,7 @@
  * 中央状态：会话列表轮询、当前会话 SSE 订阅、事件折叠（快照→增量）、命令发送。
  */
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { createEventBatcher, type EventBatcher } from "@/lib/event-batcher";
 import type {
 	GrowthStep,
 	SessionSummary,
@@ -334,6 +335,8 @@ export function usePiWeb() {
 	const [currentId, setCurrentId] = useState<string | null>(null);
 	const [currentPath, setCurrentPath] = useState<string | null>(null);
 	const [state, setState] = useState<PiWebState>(emptyState);
+	/** 当前 SSE 连接的增量批量器：按帧合并事件，避免每个 token 一次整树渲染 */
+	const batcherRef = useRef<EventBatcher<WebEvent> | null>(null);
 	const [models, setModels] = useState<{ providers: any[]; models: any[] } | null>(null);
 	const [addedWorkspaces, setAddedWorkspaces] = useState<string[]>([]);
 	const [removedWorkspaces, setRemovedWorkspaces] = useState<string[]>([]);
@@ -637,6 +640,11 @@ export function usePiWeb() {
 					if (esRef.current === null) connect();
 				}, delay);
 			};
+			// 流式事件按帧合并：token 速率再高也只每 16ms 渲染一次（见 event-batcher）
+			const batcher = createEventBatcher<WebEvent>({
+				flush: (events) => setState((s) => events.reduce((acc, evt) => foldPiWebEvent(acc, evt), s)),
+			});
+			batcherRef.current = batcher;
 			es.onmessage = (e) => {
 				let parsed: any;
 				try {
@@ -646,6 +654,8 @@ export function usePiWeb() {
 					return;
 				}
 				if (parsed.type === "snapshot" && parsed.snapshot) {
+					// 快照是权威状态：之前缓冲的增量已经过时，直接丢弃
+					batcher.cancel();
 					retryDelayMs = 2000;
 					const snap = parsed.snapshot as WebSnapshot;
 					setSnapshotEpoch((epoch) => epoch + 1);
@@ -667,13 +677,15 @@ export function usePiWeb() {
 						growth: { ...prev.growth, error: snap.growthError ?? null },
 					}));
 				} else {
-					setState((s) => foldPiWebEvent(s, parsed as WebEvent));
+					batcher.push(parsed as WebEvent);
 				}
 			};
 		};
 		let retryTimer: ReturnType<typeof setTimeout> | undefined;
 		connect();
 		return () => {
+			batcherRef.current?.cancel();
+			batcherRef.current = null;
 			if (retryTimer) clearTimeout(retryTimer);
 			esRef.current?.close();
 			esRef.current = null;

package/src/i18n.tsx

@@ -21,7 +21,6 @@ const zh = {
 	copyFailed: "复制失败",
 	editMessage: "编辑这条消息",
 	sendEdit: "重新发送",
-	editWhileRunning: "会话正在运行，先停止再编辑",
 	editMessageFailed: "编辑重发失败",
 	export: "导出",
 	settings: "设置",
@@ -210,6 +209,27 @@ const zh = {
 	usageProbing: "检测中…",
 	usageProbeDisclosure: "检测会向 xAI 发送一次可能计费的最小请求。",
 	usageProbeFailed: "配额检测失败，未获得用量信息。",
+	usagePlan: "套餐",
+	usageQuotaRemaining: "额度剩余",
+	queryingQuota: "正在查询额度…",
+	usageReadOnlyDisclosure: "读取提供商的只读用量端点，不消耗额度。",
+	usageReset: "刷新时间",
+	usageWindowWeekly: "周限",
+	usageWindowMonthly: "月限",
+	usageWindowHours: "{n} 小时",
+	usageWindowDays: "{n} 天",
+	usageWindowRolling: "滚动窗口",
+	usageWindowChat: "对话",
+	usageWindowCompletions: "补全",
+	usageWindowPremium: "高级请求",
+	usageVariantOpus: "Opus",
+	usageVariantCode: "代码",
+	usageBalanceGranted: "赠金",
+	usageBalanceToppedUp: "充值",
+	usageBalanceVoucher: "代金券",
+	usageBalanceCash: "现金",
+	usageBalanceUsed: "已用",
+	usageBalanceLimit: "上限",
 	oauthWait: "等待授权…",
 	oauthCancel: "取消登录",
 	noSessions: "暂无会话",
@@ -264,6 +284,25 @@ const zh = {
 	contextSystem: "系统提示词",
 	contextMessages: "对话消息",
 	contextTools: "工具",
+	promptPanel: "提示词来源",
+	promptRefresh: "刷新",
+	promptLoading: "加载中…",
+	promptColdHint: "会话尚未启动：先列出磁盘上的提示词文件；打开会话后才会出现「组装后的系统提示词」与工具定义。",
+	promptOriginProject: "项目",
+	promptOriginAgent: "个人",
+	promptOriginPackage: "包",
+	promptOriginExtension: "扩展",
+	promptKindSystem: "系统提示词文件",
+	promptKindAppend: "追加提示词",
+	promptKindAgents: "项目记忆（AGENTS.md）",
+	promptKindSkill: "技能提示词",
+	promptKindTemplate: "提示模板",
+	promptKindTool: "工具提示词",
+	promptKindAssembled: "组装后的系统提示词",
+	promptAssembledKey: "当前生效的完整系统提示词",
+	promptToolBuiltin: "内置",
+	promptToolExtension: "扩展",
+	copySuccess: "已复制",
 	contextSystemPrompt: "System Prompt",
 	contextSystemTools: "System Tools",
 	contextCustomTools: "Custom Tools",
@@ -557,7 +596,6 @@ const en: Dict = {
 	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",
@@ -745,6 +783,27 @@ const en: Dict = {
 	usageProbing: "Checking…",
 	usageProbeDisclosure: "Checking sends one minimal request to xAI that may be billed.",
 	usageProbeFailed: "Quota check failed; no usage data was returned.",
+	usagePlan: "Plan",
+	usageQuotaRemaining: "Remaining quota",
+	queryingQuota: "Querying quota…",
+	usageReadOnlyDisclosure: "Reads the provider's read-only usage endpoint; consumes no quota.",
+	usageReset: "Resets",
+	usageWindowWeekly: "Weekly",
+	usageWindowMonthly: "Monthly",
+	usageWindowHours: "{n}h",
+	usageWindowDays: "{n}d",
+	usageWindowRolling: "Rolling",
+	usageWindowChat: "Chat",
+	usageWindowCompletions: "Completions",
+	usageWindowPremium: "Premium requests",
+	usageVariantOpus: "Opus",
+	usageVariantCode: "Code",
+	usageBalanceGranted: "Granted",
+	usageBalanceToppedUp: "Topped up",
+	usageBalanceVoucher: "Voucher",
+	usageBalanceCash: "Cash",
+	usageBalanceUsed: "Used",
+	usageBalanceLimit: "Limit",
 	oauthWait: "Waiting for authorization…",
 	oauthCancel: "Cancel login",
 	noSessions: "No sessions yet",
@@ -797,6 +856,25 @@ const en: Dict = {
 	contextSystem: "System prompt",
 	contextMessages: "Messages",
 	contextTools: "Tools",
+	promptPanel: "Prompt sources",
+	promptRefresh: "Refresh",
+	promptLoading: "Loading…",
+	promptColdHint: "Session not started yet: disk files are listed now; the assembled system prompt and tool definitions appear once the session is running.",
+	promptOriginProject: "project",
+	promptOriginAgent: "user",
+	promptOriginPackage: "package",
+	promptOriginExtension: "extension",
+	promptKindSystem: "System prompt file",
+	promptKindAppend: "Appended prompt",
+	promptKindAgents: "Project memory (AGENTS.md)",
+	promptKindSkill: "Skill prompts",
+	promptKindTemplate: "Prompt templates",
+	promptKindTool: "Tool prompts",
+	promptKindAssembled: "Assembled system prompt",
+	promptAssembledKey: "Effective system prompt for this session",
+	promptToolBuiltin: "builtin",
+	promptToolExtension: "extension",
+	copySuccess: "Copied",
 	contextSystemPrompt: "System Prompt",
 	contextSystemTools: "System Tools",
 	contextCustomTools: "Custom Tools",

package/src/lib/agent-manager.ts

@@ -30,6 +30,7 @@ import { createExtensionUiBridge, type ExtensionUiBridge } from "./extension-ui"
 import { createGrowthTracker, GROWTH_TRACKER_VERSION, type GrowthTracker } from "./growth-tracker";
 import { userTurnsFromEntries } from "./growth-turns";
 import { TrajLedger, buildTrajectoryFromEntries, toTrajTokens } from "./trajectory";
+import { startArchivedSessionRetention } from "./session-retention";
 import { sanitizeToolOutput } from "./text-sanitize";
 import { BoundaryError } from "./path-security";
 import { estimateTokensOf } from "./process-format";
@@ -683,17 +684,15 @@ async function buildContextBreakdown(
 		// Memory：AGENTS.md 等注入文件（contextResources 的 project 部分）
 		const memoryText = resources.filter((r) => r.source === "project").map((r) => r.content).join("\n\n");
 		breakdown.memory = estimateTokensOf(memoryText);
-		// Skills：从资源加载器取技能清单，按 system-prompt.js 的 formatSkillsForPrompt 段落定位
+		// Skills：从资源加载器取技能清单，按 SDK 的 formatSkillsForPrompt 段落定位。
+		// 该段落没有 Markdown 标题（原文以 "The following skills provide specialized instructions…" 开头，
+		// 结尾是 </available_skills>），以前按 "## Skills" 找永远找不到，技能段一直是 0。
 		try {
 			const { skills } = session.resourceLoader.getSkills();
 			if (skills.length && prompt) {
-				const header = prompt.indexOf("## Skills");
-				if (header >= 0) {
-					// skills 段之后是工具列表段（## Available Tools 等）；找不到就取到结尾
-					const next = prompt.slice(header + 1).search(/^## /m);
-					const section = next >= 0 ? prompt.slice(header, header + 1 + next) : prompt.slice(header);
-					breakdown.skills = estimateTokensOf(section);
-				}
+				const start = prompt.indexOf("The following skills provide specialized instructions");
+				const end = prompt.indexOf("</available_skills>");
+				if (start >= 0 && end > start) breakdown.skills = estimateTokensOf(prompt.slice(start, end + "</available_skills>".length));
 			}
 		} catch {
 			/* loader 不可用则跳过 */
@@ -969,6 +968,17 @@ export function reap(): void {
 
 setInterval(reap, 60_000).unref?.();
 
+/** 归档会话的保留期清理：只删「已归档且长期无活动」的会话；正在使用的会话一律跳过 */
+function isSessionInUse(sessionPath: string): boolean {
+	const key = process.platform === "win32" ? sessionPath.toLowerCase() : sessionPath;
+	for (const managed of sessions.keys()) {
+		if ((process.platform === "win32" ? managed.toLowerCase() : managed) === key) return true;
+	}
+	return false;
+}
+
+startArchivedSessionRetention({ isActive: isSessionInUse, log: (message) => console.log(message) });
+
 // ---------- 资源清单（技能 / 提示模板 / 扩展命令 / 信任 / 诊断） ----------
 
 type ResourceBundle = Pick<WebSnapshot, "skills" | "promptTemplates" | "extensionCommands" | "projectTrust" | "resourceDiagnostics">;
@@ -1430,6 +1440,35 @@ export async function execute(m: Managed, cmd: AgentCommand): Promise<CommandRes
 				const r = await session.navigateTree(entryId);
 				return { ok: !r?.cancelled, data: { cancelled: r?.cancelled === true, editorText: r?.editorText } };
 			}
+			case "editAndResend": {
+				// 编辑用户消息并重发：先停在跑的回合（用户改口即表示不要这一轮的输出），
+				// 再回到该消息之前用新文本重新提问。放在服务端串行做，避免客户端"先 abort 再发"的竞态。
+				const entryId = String((cmd as any).entryId ?? "");
+				const text = (cmd.text ?? "").trim();
+				if (!entryId) return { ok: false, error: "missing entryId" };
+				if (!text) return { ok: false, error: "empty prompt" };
+				if (m.promptSubmitting || m.resourceReloading) return { ok: false, error: "session is busy accepting another command" };
+				m.promptSubmitting = true;
+				try {
+					const session = await ensureSession(m);
+					if (m.disposed) throw new Error("session is disposed");
+					if (session.isStreaming || m.runActive) {
+						await session.abort().catch(() => undefined);
+						// 等 SDK 真正回到空闲（abort 是异步的；最多等 5 秒，超时就按当前状态继续）
+						for (let i = 0; i < 50 && !m.disposed && (session.isStreaming || m.runActive); i += 1) {
+							await new Promise((resolve) => setTimeout(resolve, 100));
+						}
+					}
+					if (m.disposed) throw new Error("session is disposed");
+					const moved = await session.navigateTree(entryId);
+					if (moved?.cancelled) return { ok: false, error: "edit cancelled" };
+					await growthOf(m).prepare().catch(() => undefined);
+					await session.prompt(text);
+					return { ok: true };
+				} finally {
+					m.promptSubmitting = false;
+				}
+			}
 			case "rename": {
 				const name = (cmd.text ?? "").trim();
 				if (m.session) m.session.setSessionName(name);

package/src/lib/clipboard.ts

@@ -0,0 +1,27 @@
+/**
+ * 剪贴板工具：优先用异步 Clipboard API，非安全上下文（局域网 http）退回 textarea + execCommand。
+ * 从 ChatWindow 抽出来共用（消息操作行与提示词面板都用它）。
+ */
+export async function copyText(text: string): Promise<boolean> {
+	try {
+		if (navigator.clipboard?.writeText) {
+			await navigator.clipboard.writeText(text);
+			return true;
+		}
+	} catch {
+		// Non-secure local-network contexts need the legacy fallback below.
+	}
+	const field = document.createElement("textarea");
+	field.value = text;
+	field.style.position = "fixed";
+	field.style.opacity = "0";
+	document.body.appendChild(field);
+	field.select();
+	try {
+		return document.execCommand("copy");
+	} catch {
+		return false;
+	} finally {
+		field.remove();
+	}
+}

package/src/lib/command-validation.ts

@@ -15,6 +15,7 @@ const COMMANDS = new Set<AgentCommand["cmd"]>([
 	"fork",
 	"cycleModel",
 	"navigate",
+	"editAndResend",
 	"clearQueue",
 	"extensionUiResponse",
 	"reload",

package/src/lib/event-batcher.ts

@@ -0,0 +1,62 @@
+/**
+ * 事件批量器：把高频流式事件合并成"每帧一次"的批量更新。
+ *
+ * 服务端按 token 推 delta，客户端原本每个事件一次 setState → 一次整树渲染。
+ * 合并后一次渲染里按顺序折叠整批事件，token 速率再高也只有每 16ms 一次渲染，
+ * 主线程不再被切碎（点击、滚动因此变顺）。
+ */
+export interface EventBatcher<T> {
+	/** 入队；达到上限立刻冲刷，避免极端情况下无限堆积 */
+	push(event: T): void;
+	flush(): void;
+	/** 丢弃未处理的事件（例如快照到达：旧事件已经过时） */
+	cancel(): void;
+	size(): number;
+}
+
+export function createEventBatcher<T>({
+	flush,
+	schedule = (run) => {
+		const id = setTimeout(run, 16);
+		return () => clearTimeout(id);
+	},
+	limit = 400,
+}: {
+	flush: (events: T[]) => void;
+	schedule?: (run: () => void) => () => void;
+	limit?: number;
+}): EventBatcher<T> {
+	let pending: T[] = [];
+	let cancelScheduled: (() => void) | null = null;
+
+	const stopScheduled = () => {
+		if (!cancelScheduled) return;
+		cancelScheduled();
+		cancelScheduled = null;
+	};
+
+	const flushNow = () => {
+		stopScheduled();
+		if (!pending.length) return;
+		const batch = pending;
+		pending = [];
+		flush(batch);
+	};
+
+	return {
+		push(event) {
+			pending.push(event);
+			if (pending.length >= limit) {
+				flushNow();
+				return;
+			}
+			cancelScheduled ??= schedule(flushNow);
+		},
+		flush: flushNow,
+		cancel() {
+			stopScheduled();
+			pending = [];
+		},
+		size: () => pending.length,
+	};
+}