@rexvane/piweb 0.3.3 → 0.3.4

package/src/components/SettingsPanel.tsx

@@ -5,6 +5,7 @@
  * 五节：General / Models / 安全 / 技能 / 插件。
  */
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { createPortal } from "react-dom";
 import { type EnterBehavior, getEnterBehavior, setEnterBehavior as saveEnterBehavior } from "@/lib/enter-behavior";
 import {
 	IconAgentPresetOutline16,
@@ -605,11 +606,16 @@ function SelectOption({
 	disabled?: boolean;
 }) {
 	const [open, setOpen] = useState(false);
-	const ref = useRef<HTMLDivElement>(null);
+	const [rect, setRect] = useState<{ left: number; top: number; bottom: number } | null>(null);
+	const anchorRef = useRef<HTMLButtonElement>(null);
+	const popRef = useRef<HTMLDivElement>(null);
 	useEffect(() => {
 		if (!open) return;
+		// 弹层挂在 body（fixed 定位）：设置对话框 overflow-hidden 会裁掉 absolute 弹层
+		const anchor = anchorRef.current?.getBoundingClientRect();
+		if (anchor) setRect({ left: anchor.left, top: anchor.bottom + 6, bottom: anchor.top - 6 });
 		const h = (e: MouseEvent) => {
-			if (!ref.current?.contains(e.target as Node)) setOpen(false);
+			if (!anchorRef.current?.contains(e.target as Node) && !popRef.current?.contains(e.target as Node)) setOpen(false);
 		};
 		document.addEventListener("mousedown", h);
 		return () => document.removeEventListener("mousedown", h);
@@ -619,19 +625,19 @@ function SelectOption({
 	}, [disabled]);
 	const current = options.find((o) => o.value === value);
 	return (
-		<div ref={ref} className="relative">
-			<button className="select-chip" data-open={open} disabled={disabled} onClick={() => setOpen((o) => !o)}>
+		<div className="relative">
+			<button ref={anchorRef} className="select-chip" data-open={open} disabled={disabled} onClick={() => setOpen((o) => !o)}>
 				{current?.label ?? value}
 				<span className="chevron">
 					<IconChevronDown14 size={14} />
 				</span>
 			</button>
-			{open && !disabled && (
+			{open && !disabled && rect && createPortal(
 				<div
-					// left-0：根容器在表单里占满整行宽，right-0 会把弹层甩到行右缘（远离 chip）；
-					// chip 恒在容器左缘，左对齐两种用法（Row 的 flex-none / Field 的整行）都正确
-					className="popover absolute left-0 top-10 z-50 p-1.5 shadow-xl"
-					style={{ minWidth: width ?? 140, width: "max-content", maxHeight: 280, overflowY: "auto" }}
+					ref={popRef}
+					className="popover fixed z-[130] p-1.5 shadow-xl"
+					// 下方空间不足时向上翻转；左右都对齐 chip 左缘
+					style={{ left: rect.left, top: Math.min(rect.top, window.innerHeight - 40), minWidth: width ?? 140, width: "max-content", maxHeight: 280, overflowY: "auto" }}
 				>
 					{options.map((o) => {
 						const selected = o.value === value;
@@ -664,7 +670,8 @@ function SelectOption({
 							</button>
 						);
 					})}
-				</div>
+				</div>,
+				document.body,
 			)}
 		</div>
 	);
@@ -1140,6 +1147,17 @@ function ModelsSection() {
 								<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"
@@ -1201,12 +1219,12 @@ function ModelsSection() {
 												models={cModels}
 												setModels={setCModels}
 												updateModel={(index, patch) => setCModels((current) => current.map((model, at) => (at === index ? { ...model, ...patch } : model)))}
-												discover={async () => {
+												discover={async (allowPrivate) => {
 													const response = await fetch("/api/models", {
 														method: "POST",
 														headers: { "Content-Type": "application/json" },
 														// providerId：key 留空（保持不变）时后端回退到已存密钥
-														body: JSON.stringify({ action: "discoverModels", providerId: p.id, baseUrl: cBaseUrl.trim(), api: cApi, apiKey: cKey.trim() }),
+														body: JSON.stringify({ action: "discoverModels", providerId: p.id, baseUrl: cBaseUrl.trim(), api: cApi, apiKey: cKey.trim(), allowPrivate }),
 													});
 													const result = await response.json();
 													if (!result.success) throw new Error(result.error || t.toastError);
@@ -1257,12 +1275,12 @@ function ModelsSection() {
 															setModels={setBModels}
 															updateModel={(index, patch) => setBModels((current) => current.map((model, at) => (at === index ? { ...model, ...patch } : model)))}
 															inheritedCount={p.modelCount}
-															discover={async () => {
+															discover={async (allowPrivate) => {
 																const response = await fetch("/api/models", {
 																	method: "POST",
 																	headers: { "Content-Type": "application/json" },
 																	// providerId：key 留空（保持不变）时后端回退到已存密钥
-																	body: JSON.stringify({ action: "discoverModels", providerId: p.id, baseUrl: (bBaseUrl.trim() || p.baseUrl || ""), api: p.apis[0], apiKey: keyDraft.trim() }),
+																	body: JSON.stringify({ action: "discoverModels", providerId: p.id, baseUrl: (bBaseUrl.trim() || p.baseUrl || ""), api: p.apis[0], apiKey: keyDraft.trim(), allowPrivate }),
 																});
 																const result = await response.json();
 																if (!result.success) throw new Error(result.error || t.toastError);
@@ -1279,12 +1297,16 @@ function ModelsSection() {
 														style={{ fontSize: 12.5, color: "var(--dsw-danger)" }}
 														disabled={editBusy}
 													onClick={async () => {
-														if (!window.confirm(t.confirmRemoveKey.replace("{name}", p.name))) return;
+														if (p.storedAuthType === "oauth") {
+															if (!window.confirm(t.confirmRemoveOAuth.replace("{name}", p.name))) return;
+														} else {
+															if (!window.confirm(t.confirmRemoveKey.replace("{name}", p.name))) return;
+														}
 														const j = await call({ action: "removeKey", providerId: p.id });
 															if (j.success) setEditing(null);
 														}}
 													>
-														{t.removeKey}
+														{p.storedAuthType === "oauth" ? t.removeOAuth : t.removeKey}
 													</button>
 												)}
 												<button className="btn-outline" style={{ height: 32 }} disabled={editBusy} onClick={() => setEditing(null)}>{t.cancel}</button>
@@ -1626,11 +1648,30 @@ function SkillsSection({ cwd, onOpenFileContent }: { cwd: string; onOpenFileCont
 		if (j.success) onOpenFileContent?.(s.filePath, j.data.content);
 	};
 
+	const [deleteError, setDeleteError] = useState<string | null>(null);
+	const remove = async (s: SkillRow) => {
+		if (!window.confirm(t.confirmDeleteSkill.replace("{name}", s.name))) return;
+		setDeleteError(null);
+		const r = await fetch("/api/skills", {
+			method: "POST",
+			headers: { "Content-Type": "application/json" },
+			body: JSON.stringify({ action: "delete", filePath: s.filePath, cwd }),
+		});
+		const j = await r.json();
+		if (j.success) void load();
+		else setDeleteError(j.error || t.toastError);
+	};
+
 	const scopeLabel = (s: SkillRow["scope"]) => (s === "global" ? t.scopeGlobal : s === "project" ? t.scopeProject : t.scopePackage);
 
 	return (
 		<div className="flex flex-col gap-4">
 			<div style={{ fontSize: 12, color: "var(--dsw-label-caption)" }}>{t.skillsDesc}</div>
+			{deleteError && (
+				<div role="alert" className="rounded-lg px-3 py-2" style={{ fontSize: 12.5, background: "var(--dsw-hover)", color: "var(--dsw-danger)" }}>
+					{deleteError}
+				</div>
+			)}
 			{skills.length === 0 && (
 				<div style={{ fontSize: 13, color: "var(--dsw-label-caption)" }}>—</div>
 			)}
@@ -1659,6 +1700,21 @@ function SkillsSection({ cwd, onOpenFileContent }: { cwd: string; onOpenFileCont
 							>
 								{t.viewSkillFile}
 							</button>
+							{s.scope !== "package" && (
+								<button
+									className="rounded-lg px-2.5 py-1"
+									style={{ fontSize: 11.5, color: "var(--dsw-danger)" }}
+									title={t.deleteSkillHint}
+									onClick={() => void remove(s)}
+								>
+									{t.delete}
+								</button>
+							)}
+							{s.scope === "package" && (
+								<span style={{ fontSize: 10.5, color: "var(--dsw-label-caption)" }} title={t.skillDeletePackageHint}>
+									{t.skillDeletePackageHint}
+								</span>
+							)}
 							<button
 								className="relative h-5 w-9 flex-none rounded-full transition-colors"
 								style={{ background: s.disabled ? "var(--dsw-border-l3)" : "var(--dsw-accent)" }}

package/src/hooks/useGrowth.ts

@@ -265,19 +265,33 @@ export function useGrowth({
 		try {
 			const params = new URLSearchParams({ cwd });
 			if (sessionPath) params.set("session", sessionPath);
-			const [growthResult, diskResult] = await Promise.allSettled([
-				sessionPath ? getJson<{ available: boolean; steps: GrowthStep[] }>(`/api/growth?${params}`, controller.signal) : Promise.resolve({ available: true, steps: [] }),
-				listDiskEntries(cwd, "", controller.signal),
-			]);
+			// 两个请求解耦：磁盘目录先到先画，growth 慢（git 探测超时等）不拖住目录树
+			const growthRequest = sessionPath
+				? getJson<{ available: boolean; steps: GrowthStep[] }>(`/api/growth?${params}`, controller.signal).then(
+					(value) => ({ status: "fulfilled" as const, value }),
+					(reason: unknown) => ({ status: "rejected" as const, reason }),
+				)
+				: Promise.resolve({ status: "fulfilled" as const, value: { available: true, steps: [] } });
+			const diskRequest = listDiskEntries(cwd, "", controller.signal).then(
+				(value) => ({ status: "fulfilled" as const, value }),
+				(reason: unknown) => ({ status: "rejected" as const, reason }),
+			);
+			void diskRequest.then((diskResult) => {
+				if (!isCurrent(controller)) return;
+				if (diskResult.status === "fulfilled") {
+					updateLazy(controller, (previous) => new Map(previous).set("", diskNodes("", diskResult.value)));
+				}
+			});
+			const growthResult = await growthRequest;
 			if (!isCurrent(controller)) return;
 			if (growthResult.status === "fulfilled") {
 				setFetched({ key, steps: growthResult.value.steps ?? [], available: growthResult.value.available !== false, error: null });
 			} else {
 				setFetched({ key, steps: [], available: true, error: growthResult.reason instanceof Error ? growthResult.reason.message : "failed to load" });
 			}
-			if (diskResult.status === "fulfilled") {
-				updateLazy(controller, (previous) => new Map(previous).set("", diskNodes("", diskResult.value)));
-			} else if (growthResult.status === "fulfilled") {
+			const diskResult = await diskRequest;
+			if (!isCurrent(controller)) return;
+			if (diskResult.status === "rejected" && growthResult.status === "fulfilled") {
 				setFetched((previous) => ({ ...previous, error: diskResult.reason instanceof Error ? diskResult.reason.message : "failed to list workspace" }));
 			}
 		} finally {

package/src/hooks/usePiWeb.ts

@@ -496,6 +496,28 @@ export function usePiWeb() {
 		}
 	}, [refreshWorkspaces]);
 
+	/** 手动输入路径添加工作区（原生选择器不可用 / 无桌面环境时的兜底） */
+	const addWorkspaceByPath = useCallback(async (dir: string): Promise<string | null> => {
+		const trimmed = dir.trim().replace(/^["']|["']$/g, "");
+		if (!trimmed) return null;
+		try {
+			const r = await fetch("/api/workspaces", {
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				body: JSON.stringify({ action: "add", path: trimmed }),
+			});
+			const j = await r.json();
+			if (!r.ok || !j.success) throw new Error(j.error || `request failed (${r.status})`);
+			setAddedWorkspaces(j.data?.workspaces ?? []);
+			await refreshWorkspaces();
+			return trimmed;
+		} catch (error) {
+			const message = error instanceof Error ? error.message : "failed to add workspace";
+			setState((current) => ({ ...current, error: message }));
+			return null;
+		}
+	}, [refreshWorkspaces]);
+
 	const removeWorkspace = useCallback(
 		async (dir: string) => {
 			try {
@@ -884,6 +906,7 @@ export function usePiWeb() {
 		setGroupBy,
 		setOrderBy,
 		addWorkspaceByPicker,
+		addWorkspaceByPath,
 		removeWorkspace,
 		refreshModels,
 		sendCommand,

package/src/i18n.tsx

@@ -64,6 +64,7 @@ const zh = {
 	toolExit: "退出码 {code}",
 	toolWritten: "已写入",
 	diffSummary: "+{add} −{del} 行",
+	deletedFile: "已删除 {path}",
 	backToBottom: "回到底部",
 	modeSteer: "插话",
 	modeQueue: "排队",
@@ -133,6 +134,7 @@ const zh = {
 	modelErrorContext: "上下文超出模型窗口，可用 /compact 压缩后重试",
 	modelErrorTimeout: "请求超时",
 	modelErrorServer: "供应商服务端出错或过载",
+	modelErrorModeration: "请求内容被供应商审核拦截（敏感词），换措辞或新开会话试试",
 	modelErrorNetwork: "网络连接失败",
 	turnAborted: "已中止",
 	moreLines: "还有 {n} 行",
@@ -143,6 +145,9 @@ const zh = {
 	workspaces: "工作区",
 	searchSessions: "搜索会话...",
 	addWorkspace: "添加工作区",
+	workspacePathPlaceholder: "输入路径添加…",
+	workspacePathInvalid: "路径无效或目录不存在",
+	workspacePathAdd: "添加",
 	groupBy: "分组方式",
 	sortBy: "排序方式",
 	byWorkspace: "按工作区",
@@ -258,6 +263,19 @@ const zh = {
 	contextSystem: "系统提示词",
 	contextMessages: "对话消息",
 	contextTools: "工具",
+	contextSystemPrompt: "System Prompt",
+	contextSystemTools: "System Tools",
+	contextCustomTools: "Custom Tools",
+	contextMemory: "Memory（AGENTS.md）",
+	contextSkills: "Skills",
+	contextUserMessages: "User Messages",
+	contextAgentText: "Agent Text",
+	contextAgentThinking: "Agent Thinking",
+	contextAgentToolCall: "Agent Tool Call",
+	contextToolOutput: "Tool Output",
+	contextCompacted: "Compacted Data",
+	contextAutoCompactBuffer: "Auto-Compact Buffer",
+	contextFreeSpace: "Free Space",
 	// 统计条
 	turns: "轮次",
 	toolCalls: "工具调用",
@@ -345,7 +363,7 @@ const zh = {
 	providerIdImmutable: "Provider ID 创建后不可修改；如需更名，请删除后重建。",
 	modelConfigReopen: "模型配置已保存。新建会话或重启 PiWeb 后，当前运行时才能使用新配置。",
 	customModelIdentityNotice: "自定义模型 ID 只是发往该 API 地址的路由名；PiWeb 不会自动下载、接入或识别本机 Ollama 模型。",
-	customApiKeyHint: "可留空改用 auth.json；Ollama 等无鉴权本地服务仍需填写任意占位值。",
+	customApiKeyHint: "可留空改用 auth.json；指向本机/私网的无鉴权服务（Ollama 等）保存时自动填占位值。",
 	modelsTitle: "模型",
 	modelsDesc: "填入各提供方的 API 密钥即可使用其模型。",
 	addProvider: "添加提供方",
@@ -374,6 +392,8 @@ const zh = {
 	displayNameOptional: "显示名称（可选）",
 	modelCatalog: "模型目录",
 	discoverModels: "获取可用模型",
+	allowPrivateDiscovery: "允许本机/私网",
+	allowPrivateHint: "模型地址指向本机或私有网络（如 Ollama、LM Studio、one-api 本地网关）时勾选，本次探测放行；发消息不受此限制",
 	discoveringModels: "获取中...",
 	usingDefaultModels: "正在使用 Pi SDK 默认模型 · {count} 个",
 	customModelsRequired: "至少添加一个可发送的模型 ID",
@@ -385,6 +405,8 @@ const zh = {
 	saving: "保存中...",
 	setKey: "保存 Key",
 	removeKey: "移除 Key",
+	removeOAuth: "移除 OAuth",
+	confirmRemoveOAuth: "确定移除“{name}”的 OAuth 登录吗？移除后需重新登录才能使用。",
 	confirmRemoveProvider: "确定删除提供方“{name}”及其配置吗？",
 	confirmRemoveKey: "确定移除“{name}”的已保存密钥吗？",
 	customProviders: "自定义 Provider（models.json）",
@@ -412,6 +434,9 @@ const zh = {
 	updatedTo: "已更新到 {v}，重启 PiWeb 后生效",
 	updateFailed: "更新失败",
 	skillsDesc: "关闭后技能不会出现在系统提示中，仅可通过 /skill:名称 手动调用",
+	confirmDeleteSkill: "确定删除技能“{name}”吗？将删除其所在技能目录，不可恢复。",
+	deleteSkillHint: "删除技能目录",
+	skillDeletePackageHint: "包技能请用禁用管理",
 	scopeGlobal: "全局",
 	scopeProject: "项目",
 	scopePackage: "包",
@@ -472,6 +497,7 @@ const zh = {
 	growthNoChangesRound: "本轮无文件改动",
 	growthNoSession: "打开或新建一个会话后，这里会显示项目的生长过程。",
 	growthUnavailable: "机器上找不到 git，项目生长功能不可用",
+	growthUnavailableFallback: "生长快照不可用（找不到可用的 git），已显示当前目录结构",
 	growthStepLabel: "第 {n} 步",
 	growthRoundLabel: "第 {n} 轮",
 	growthStepsCount: "{n} 步",
@@ -571,6 +597,7 @@ const en: Dict = {
 	toolExit: "exit {code}",
 	toolWritten: "written",
 	diffSummary: "+{add} −{del} lines",
+	deletedFile: "deleted {path}",
 	backToBottom: "Back to bottom",
 	modeSteer: "steer",
 	modeQueue: "queue",
@@ -640,6 +667,7 @@ const en: Dict = {
 	modelErrorContext: "Context exceeds the model window; try /compact and retry",
 	modelErrorTimeout: "Request timed out",
 	modelErrorServer: "Provider server error or overloaded",
+	modelErrorModeration: "Request blocked by the provider's content filter (sensitive words); rephrase or start a new session",
 	modelErrorNetwork: "Network connection failed",
 	turnAborted: "Aborted",
 	moreLines: "{n} more lines",
@@ -650,6 +678,9 @@ const en: Dict = {
 	workspaces: "Workspaces",
 	searchSessions: "Search sessions...",
 	addWorkspace: "Add workspace",
+	workspacePathPlaceholder: "Type a path to add…",
+	workspacePathInvalid: "Invalid path or directory does not exist",
+	workspacePathAdd: "Add",
 	groupBy: "Group by",
 	sortBy: "Sort by",
 	byWorkspace: "Workspace",
@@ -763,6 +794,19 @@ const en: Dict = {
 	contextSystem: "System prompt",
 	contextMessages: "Messages",
 	contextTools: "Tools",
+	contextSystemPrompt: "System Prompt",
+	contextSystemTools: "System Tools",
+	contextCustomTools: "Custom Tools",
+	contextMemory: "Memory (AGENTS.md)",
+	contextSkills: "Skills",
+	contextUserMessages: "User Messages",
+	contextAgentText: "Agent Text",
+	contextAgentThinking: "Agent Thinking",
+	contextAgentToolCall: "Agent Tool Call",
+	contextToolOutput: "Tool Output",
+	contextCompacted: "Compacted Data",
+	contextAutoCompactBuffer: "Auto-Compact Buffer",
+	contextFreeSpace: "Free Space",
 	turns: "turns",
 	toolCalls: "tool calls",
 	cost: "cost",
@@ -846,7 +890,7 @@ const en: Dict = {
 	providerIdImmutable: "A Provider ID cannot be changed after creation. Delete and recreate it to rename it.",
 	modelConfigReopen: "Model configuration saved. Start a new session or restart PiWeb before using it in the current runtime.",
 	customModelIdentityNotice: "A custom model ID is only a route name sent to that API endpoint. PiWeb does not automatically download, attach, or identify local Ollama models.",
-	customApiKeyHint: "Leave blank to use auth.json. Keyless local services such as Ollama still need any placeholder value.",
+	customApiKeyHint: "Leave blank to use auth.json. Keyless local/private services (Ollama etc.) get a placeholder key automatically on save.",
 	modelsTitle: "Models",
 	modelsDesc: "Enter an API key for each provider to use its models.",
 	addProvider: "Add provider",
@@ -875,6 +919,8 @@ const en: Dict = {
 	displayNameOptional: "Display name (optional)",
 	modelCatalog: "Model catalog",
 	discoverModels: "Fetch available models",
+	allowPrivateDiscovery: "Allow local/private",
+	allowPrivateHint: "Check this when the model address points to loopback or a private network (Ollama, LM Studio, one-api gateways) to allow this probe; chat requests are not affected",
 	discoveringModels: "Fetching...",
 	usingDefaultModels: "Using Pi SDK default models · {count}",
 	customModelsRequired: "Add at least one model ID that can be sent",
@@ -886,6 +932,8 @@ const en: Dict = {
 	saving: "Saving...",
 	setKey: "Save key",
 	removeKey: "Remove key",
+	removeOAuth: "Remove OAuth",
+	confirmRemoveOAuth: "Remove the OAuth login for \"{name}\"? You will need to log in again to use it.",
 	confirmRemoveProvider: "Delete provider \"{name}\" and its configuration?",
 	confirmRemoveKey: "Remove the saved key for \"{name}\"?",
 	customProviders: "Custom providers (models.json)",
@@ -913,6 +961,9 @@ const en: Dict = {
 	updatedTo: "Updated to {v}; restart PiWeb to apply",
 	updateFailed: "Update failed",
 	skillsDesc: "Disabled skills are hidden from the system prompt and only callable via /skill:name",
+	confirmDeleteSkill: "Delete skill \"{name}\"? Its skill directory will be removed and cannot be recovered.",
+	deleteSkillHint: "Delete the skill directory",
+	skillDeletePackageHint: "package skill: use disable",
 	scopeGlobal: "Global",
 	scopeProject: "Project",
 	scopePackage: "Package",
@@ -972,6 +1023,7 @@ const en: Dict = {
 	growthNoChangesRound: "No file changes in this round",
 	growthNoSession: "Open or start a session to watch the project grow here.",
 	growthUnavailable: "git was not found on this machine; project growth is unavailable",
+	growthUnavailableFallback: "Growth snapshots are unavailable (no usable git); showing the current directory structure",
 	growthStepLabel: "Step {n}",
 	growthRoundLabel: "Round {n}",
 	growthStepsCount: "{n} steps",

package/src/lib/agent-manager.ts

@@ -30,9 +30,12 @@ import { userTurnsFromEntries } from "./growth-turns";
 import { TrajLedger, buildTrajectoryFromEntries, toTrajTokens } from "./trajectory";
 import { sanitizeToolOutput } from "./text-sanitize";
 import { BoundaryError } from "./path-security";
+import { estimateTokensOf } from "./process-format";
+import { getPiSettings } from "./pi-settings";
 import { clampThinkingLevel, getSupportedThinkingLevels } from "@earendil-works/pi-ai";
 import type {
 	AgentCommand,
+	ContextBreakdown,
 	ContextResource,
 	GrowthStep,
 	TrajEntry,
@@ -604,6 +607,91 @@ function loadContextResources(cwd: string, loader: AgentSession["resourceLoader"
 	];
 }
 
+/**
+ * 上下文占用的服务端估算分项。systemPrompt 是整段拼接（正文 + memory + skills + 工具列表），
+ * 所以 Memory / Skills 从资源加载器与 systemPrompt 的资源段差分得出：
+ * SDK 的拼接顺序固定为 正文 → context files → skills → 工具列表，按内容定位切块。
+ */
+async function buildContextBreakdown(
+	cwd: string,
+	session: AgentSession | null,
+	resources: ContextResource[],
+): Promise<ContextBreakdown> {
+	const breakdown: ContextBreakdown = {
+		systemPrompt: 0, systemTools: 0, customTools: 0, memory: 0, skills: 0, compacted: 0, autoCompactBuffer: 0,
+	};
+	if (!session) return breakdown;
+	try {
+		const prompt = session.systemPrompt ?? "";
+		// 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 段落定位
+		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);
+				}
+			}
+		} catch {
+			/* loader 不可用则跳过 */
+		}
+		// System Prompt 正文 = 全文减去资源段与 skills 段的近似差分，下限 0
+		const estimatedSections = breakdown.memory + breakdown.skills;
+		breakdown.systemPrompt = Math.max(0, estimateTokensOf(prompt) - estimatedSections);
+		// 工具：builtin 与扩展注册的分开统计（schema + description + guidelines 序列化估算）
+		try {
+			const tools = session.getAllTools();
+			for (const tool of tools) {
+				const size = estimateTokensOf(JSON.stringify({
+					name: tool.name,
+					description: tool.description,
+					parameters: tool.parameters,
+					promptGuidelines: tool.promptGuidelines,
+				}));
+				if ((tool as { sourceInfo?: { source?: string } }).sourceInfo?.source === "builtin") breakdown.systemTools += size;
+				else breakdown.customTools += size;
+			}
+		} catch {
+			/* getAllTools 不可用则跳过 */
+		}
+		// 最新一次压缩的摘要
+		try {
+			const entries = m_smEntries(session);
+			for (let i = entries.length - 1; i >= 0; i -= 1) {
+				const entry = entries[i] as { type?: string; summary?: string };
+				if (entry?.type === "compaction" && typeof entry.summary === "string") {
+					breakdown.compacted = estimateTokensOf(entry.summary);
+					break;
+				}
+			}
+		} catch {
+			/* entries 不可用则跳过 */
+		}
+		// auto-compact 预留 = compaction.reserveTokens（启用时）
+		try {
+			const settings = await getPiSettings();
+			if (settings.compaction.enabled) breakdown.autoCompactBuffer = settings.compaction.reserveTokens;
+		} catch {
+			/* 设置读取失败则保持 0 */
+		}
+	} catch {
+		/* systemPrompt 不可用则保持 0 */
+	}
+	return breakdown;
+}
+
+/** SessionManager 的 getEntries 经由 session 暴露的形态（各版本字段名有差异，这里宽松取） */
+function m_smEntries(session: AgentSession): unknown[] {
+	const s = session as unknown as { sm?: { getEntries?: () => unknown[] }; sessionManager?: { getEntries?: () => unknown[] } };
+	return s.sm?.getEntries?.() ?? s.sessionManager?.getEntries?.() ?? [];
+}
+
 function environmentTrajectory(m: Managed, session: AgentSession | null): TrajEntry[] {
 	const ts = m.ledger.entries[0]?.ts ?? Date.now();
 	const entries: TrajEntry[] = [];
@@ -1051,6 +1139,13 @@ export async function buildSnapshot(m: Managed): Promise<WebSnapshot> {
 	} catch {
 		contextResources = [];
 	}
+	// 服务端可得的上下文分项（估算；失败不影响快照）
+	let contextBreakdown: ContextBreakdown | undefined;
+	try {
+		contextBreakdown = await buildContextBreakdown(m.cwd, m.session, contextResources);
+	} catch {
+		contextBreakdown = undefined;
+	}
 
 	// 斜杠命令数据源：技能 / 提示模板 / 扩展命令，加上项目信任与资源诊断
 	const resources = collectResources(m);
@@ -1065,6 +1160,7 @@ export async function buildSnapshot(m: Managed): Promise<WebSnapshot> {
 		name,
 		contextFiles: contextResources.map((resource) => resource.path),
 		contextResources,
+		contextBreakdown,
 		...resources,
 		messages,
 		userTurns: userTurnsFromEntries(m.sm.getEntries() as any[]),
@@ -1143,7 +1239,14 @@ export async function execute(m: Managed, cmd: AgentCommand): Promise<CommandRes
 					if (m.disposed) throw new Error("session is disposed");
 					// 只有用户显式选择 steer/followUp 才排队；旧的普通提交不能悄悄成为 steering。
 					if ((session.isStreaming || m.runActive) && !cmd.behavior) return { ok: false, error: "session is busy; choose steer or followUp" };
-					if (!session.isStreaming) await growthOf(m).prepare();
+					if (!session.isStreaming) {
+						// 基线快照不能无限阻塞首条 prompt（git 不可用时每次探测至多 30s 超时）：
+						// 5s 内没完成就放行 prompt，快照后台补拍（工具结束后照常记步，外部修改兜底）。
+						await Promise.race([
+							growthOf(m).prepare().catch(() => undefined),
+							new Promise<void>((resolve) => setTimeout(resolve, 5000)),
+						]);
+					}
 					if (m.disposed) throw new Error("session is disposed");
 					return await new Promise<CommandResult>((resolve) => {
 						let accepted = false;