@rexvane/piweb 0.3.2 → 0.3.4

package/README.md

@@ -39,27 +39,21 @@ npm install -g @rexvane/piweb
 piweb
 ```
 
-A global install prepares the production bundle once (during install, or on the first run if the script was skipped) and then starts in production mode. If that build fails, `piweb` reports it instead of falling back to a development server that cannot work without dev dependencies; retry with `npm rebuild -g @rexvane/piweb`. The package registers both `pi` and `piweb` (`pi web` starts the UI, any other argument is forwarded to the official pi CLI); if the official `pi` package is also installed globally, the two compete for the same `pi` command and the most recent install wins.
+A global install prepares the production bundle once (during install, or on the first run if the script was skipped) and then starts in production mode. If that build fails, `piweb` reports it instead of falling back to a development server that cannot work without dev dependencies; retry with `npm rebuild -g @rexvane/piweb`. The package registers only the `piweb` command, so it never conflicts with the official `pi` CLI (`npm i -g @earendil-works/pi-coding-agent`) if you have both.
 
 ### Inside this repository
 
-You can launch PiWeb directly from your terminal using `pi web` (case-insensitive: `pi web`, `PI WEB`, `Pi Web`):
-
 ```bash
-# Link commands globally (one-time setup)
-npm link
-
-# Launch anywhere in your terminal (case-insensitive)
-pi web
+npm install
+npm run dev        # development server with hot reload
 ```
 
-You can also run directly with npm:
+Or run a production build locally:
 
 ```bash
-# Start PiWeb (defaults to http://127.0.0.1:30141 and auto-opens browser)
-npm run web
-# or
-npm start
+npm install
+npm run build      # or: npm run build:release (staged, does not touch a running build)
+npm start          # serves on http://127.0.0.1:30141 (auto-increments if busy)
 ```
 
 ### CLI Options (`bin/piweb.js`)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@rexvane/piweb",
-	"version": "0.3.2",
+	"version": "0.3.4",
 	"license": "MIT",
 	"type": "module",
 	"description": "Modern web UI for the pi coding agent, driven by the official pi SDK without modifying pi",
@@ -21,7 +21,6 @@
 		"cli"
 	],
 	"bin": {
-		"pi": "bin/pi.js",
 		"piweb": "bin/piweb.js"
 	},
 	"files": [

package/scripts/build-output.mjs

@@ -54,8 +54,9 @@ export function assertInstallation(root) {
 	const realRoot = fs.realpathSync(root);
 	const manifestPath = assertLocalPath(realRoot, "package.json");
 	const manifest = JSON.parse(fs.readFileSync(manifestPath, "utf8"));
-	// Accept the historical name so installations made before the npm rename keep working.
-	if (manifest?.name !== "piweb" && manifest?.name !== "pi-web") throw new Error(`refusing to update outside the PiWeb installation: ${realRoot}`);
+	// Accept the historical names so installations made before the npm rename keep working.
+	const validNames = ["piweb", "pi-web", "@rexvane/piweb"];
+	if (!validNames.includes(manifest?.name)) throw new Error(`refusing to update outside the PiWeb installation: ${realRoot}`);
 	return realRoot;
 }
 

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

@@ -72,6 +72,7 @@ export async function POST(req: Request) {
 			revision?: string;
 			text?: string;
 			force?: boolean;
+			allowPrivate?: boolean;
 		};
 		if (body.action === "setKey") {
 			if (!body.providerId || !body.apiKey) return NextResponse.json({ success: false, error: "missing fields" }, { status: 400 });
@@ -93,7 +94,7 @@ export async function POST(req: Request) {
 		}
 		if (body.action === "discoverModels") {
 			if (!body.baseUrl) return NextResponse.json({ success: false, error: "missing baseUrl" }, { status: 400 });
-			const models = await discoverModels({ baseUrl: body.baseUrl, api: body.api, apiKey: body.apiKey, providerId: body.providerId });
+			const models = await discoverModels({ baseUrl: body.baseUrl, api: body.api, apiKey: body.apiKey, providerId: body.providerId, allowPrivate: body.allowPrivate === true });
 			return NextResponse.json({ success: true, data: { models } });
 		}
 		if (body.action === "providerUsage") {

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

@@ -1,5 +1,5 @@
 import { NextResponse } from "next/server";
-import { listSkills, readSkillFile, setSkillDisabled } from "@/lib/skills-service";
+import { deleteSkill, listSkills, readSkillFile, setSkillDisabled } from "@/lib/skills-service";
 import { BoundaryError, resolveWorkspacePath } from "@/lib/path-security";
 
 export const dynamic = "force-dynamic";
@@ -17,7 +17,7 @@ export async function GET(req: Request) {
 
 export async function POST(req: Request) {
 	try {
-		const body = (await req.json()) as { action: "toggle" | "read"; filePath?: string; disabled?: boolean; cwd?: string };
+		const body = (await req.json()) as { action: "toggle" | "read" | "delete"; filePath?: string; disabled?: boolean; cwd?: string };
 		const cwd = await resolveWorkspacePath(body.cwd || process.cwd());
 		if (body.action === "toggle") {
 			if (!body.filePath || typeof body.disabled !== "boolean")
@@ -29,6 +29,11 @@ export async function POST(req: Request) {
 			if (!body.filePath) return NextResponse.json({ success: false, error: "missing filePath" }, { status: 400 });
 			return NextResponse.json({ success: true, data: { content: await readSkillFile(body.filePath, cwd) } });
 		}
+		if (body.action === "delete") {
+			if (!body.filePath) return NextResponse.json({ success: false, error: "missing filePath" }, { status: 400 });
+			const r = await deleteSkill(body.filePath, cwd);
+			return NextResponse.json({ success: true, data: r });
+		}
 		return NextResponse.json({ success: false, error: "unknown action" }, { status: 400 });
 	} catch (error) {
 		return NextResponse.json(

package/src/components/AppShell.tsx

@@ -81,6 +81,7 @@ export function AppShell() {
 		setGroupBy,
 		setOrderBy,
 		addWorkspaceByPicker,
+		addWorkspaceByPath,
 		removeWorkspace,
 		refreshModels,
 		sendCommand,
@@ -201,11 +202,17 @@ export function AppShell() {
 	}, [currentPath]);
 
 	// 已知工作区列表（给 Hero 建议）；启动不预选任何工作区，
-	// 未选择时输入框仍可用，发送会提示先选择工作区
-	const knownCwds = useMemo(
-		() => Array.from(new Set([...addedWorkspaces, ...sessions.map((s) => s.cwd)])).filter(Boolean),
-		[addedWorkspaces, sessions],
-	);
+	// 未选择时输入框仍可用，发送会提示先选择工作区。
+	// 已删除工作区要过滤（与会话栏分组同口径）：否则它下面残留的会话 cwd
+	// 会把刚删掉的工作区重新喂回顶部下拉。
+	const knownCwds = useMemo(() => {
+		const removed = new Set(removedWorkspaces.map((w) => w.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase()));
+		const keep = (cwd: string) => {
+			const norm = cwd.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+			return Boolean(norm) && !removed.has(norm);
+		};
+		return Array.from(new Set([...addedWorkspaces, ...sessions.map((s) => s.cwd)].filter(keep)));
+	}, [addedWorkspaces, sessions, removedWorkspaces]);
 
 	// 模型目录派生值：数百个模型对象的映射只在目录变化时重算，
 	// 不能跟着每次 token 增量 / 3 秒轮询重跑（usePiWeb 的 setState 都会触发本组件渲染）
@@ -695,6 +702,7 @@ export function AppShell() {
 							providerNames={providerNames}
 							authByProvider={authByProvider}
 							addWorkspaceByPicker={addWorkspaceByPicker}
+							addWorkspaceByPath={addWorkspaceByPath}
 							heroModel={heroModel}
 							onSelectHeroModel={(provider, id) => {
 								setHeroModel({ provider, id });
@@ -825,7 +833,7 @@ export function AppShell() {
 											contextPercent={snapshot?.contextUsage?.percent ?? null}
 											contextTokens={snapshot?.contextUsage?.tokens ?? null}
 											contextWindow={snapshot?.contextUsage?.contextWindow ?? null}
-											contextSource={{ systemChars: contextSystemChars, messages: state.messages }}
+											contextSource={{ systemChars: contextSystemChars, messages: state.messages, breakdown: snapshot?.contextBreakdown }}
 											contextVisible={(snapshot?.messages?.length ?? 0) > 0}
 											model={snapshot?.model}
 											thinkingLevel={snapshot?.thinkingLevel}
@@ -1013,6 +1021,7 @@ function Hero({
 	providerNames,
 	authByProvider,
 	addWorkspaceByPicker,
+	addWorkspaceByPath,
 	heroModel,
 	onSelectHeroModel,
 	defaultModel,
@@ -1039,6 +1048,7 @@ function Hero({
 	providerNames: Record<string, string>;
 	authByProvider: Record<string, boolean>;
 	addWorkspaceByPicker: () => Promise<string | null>;
+	addWorkspaceByPath: (dir: string) => Promise<string | null>;
 	heroModel: { provider: string; id: string } | null;
 	onSelectHeroModel: (provider: string, id: string) => void;
 	defaultModel?: ModelChoice;
@@ -1048,6 +1058,8 @@ function Hero({
 }) {
 	const { t } = useI18n();
 	const [wsMenu, setWsMenu] = useState(false);
+	const [wsPathDraft, setWsPathDraft] = useState("");
+	const [wsPathError, setWsPathError] = useState<string | null>(null);
 	const menuRef = useRef<HTMLDivElement>(null);
 
 	useEffect(() => {
@@ -1069,6 +1081,19 @@ function Hero({
 		}
 	};
 
+	// 手动输入路径添加（原生选择器不可用 / 无桌面环境兜底）
+	const addByPath = async () => {
+		const p = await addWorkspaceByPath(wsPathDraft);
+		if (p) {
+			setWsPathDraft("");
+			setWsPathError(null);
+			setCwd(p);
+			setWsMenu(false);
+		} else {
+			setWsPathError(t.workspacePathInvalid);
+		}
+	};
+
 	const currentLabel = cwd ? (getWorkspaceName ? getWorkspaceName(cwd) : basename(cwd)) : t.startWith;
 
 	return (
@@ -1130,6 +1155,24 @@ function Hero({
 									<IconProjectAddOutline16 size={14} style={{ flex: "none", color: "var(--dsw-label-tertiary)" }} />
 									{t.addWorkspace}
 								</button>
+								<div className="flex items-center gap-1.5 px-2 py-1.5" style={{ fontSize: 12.5 }}>
+									<input
+										className="min-w-0 flex-1 rounded-lg px-2 py-1"
+										style={{ border: "0.5px solid var(--dsw-border-l3)", background: "var(--dsw-input-bg, transparent)", color: "inherit" }}
+										placeholder={t.workspacePathPlaceholder}
+										value={wsPathDraft}
+										onChange={(e) => { setWsPathDraft(e.target.value); setWsPathError(null); }}
+										onKeyDown={(e) => {
+											if (e.key === "Enter") { e.preventDefault(); void addByPath(); }
+										}}
+									/>
+									<button type="button" className="pw-chip" style={{ flex: "none" }} disabled={!wsPathDraft.trim()} onClick={() => void addByPath()}>
+										{t.workspacePathAdd}
+									</button>
+								</div>
+								{wsPathError && (
+									<div className="px-3.5 pb-1.5" style={{ fontSize: 11, color: "var(--dsw-danger)" }}>{wsPathError}</div>
+								)}
 							</div>
 						)}
 					</div>

package/src/components/ChatInput.tsx

@@ -84,7 +84,11 @@ export function ChatInput({
 	contextTokens: number | null;
 	contextWindow: number | null;
 	/** 上下文分段数据源：ContextMeter 弹窗打开时才做字符统计 */
-	contextSource?: { systemChars: number; messages: { content: Array<{ type: string; text?: string; thinking?: string }> }[] };
+	contextSource?: {
+		systemChars: number;
+		messages: { role?: string; content: Array<{ type: string; text?: string; thinking?: string }> }[];
+		breakdown?: import("@/lib/types").ContextBreakdown;
+	};
 	/** 还没有对话时隐藏上下文计量 */
 	contextVisible?: boolean;
 	model?: { provider: string; id: string; name: string };

package/src/components/ChatWindow.tsx

@@ -35,8 +35,10 @@ import type { ContextResource, TrajEntry, TrajTokens, WebContent, WebMessage, We
 import {
 	classifyModelError,
 	cleanCommand,
+	deleteTargetOf,
 	displayToolName,
 	firstSentence,
+	isDeleteCommand,
 	langOfPath,
 	previewSide,
 	relativizeInText,
@@ -457,10 +459,10 @@ const ToolStep = memo(function ToolStep({
 		if (kind !== "write" || !state || state.state !== "done" || state.isError) return null;
 		const parsed = parseUnifiedDiff(state.patch || output);
 		if (parsed) return parsed;
-		// pi 的 write 工具不带 patch：新文件按带行号的正文展示（中性色，不标 +）
+		// pi 的 write 工具不带 patch：新文件按新增行展示（全绿 +），与 edit 的 diff 口径一致
 		if (isWriteTool) {
 			const content = str((args as { content?: unknown } | undefined)?.content);
-			if (content) return content.replace(/\r/g, "").replace(/\n$/, "").split("\n").map((text, i): DiffLine => ({ kind: "ctx", old: i + 1, new: i + 1, text }));
+			if (content) return content.replace(/\r/g, "").replace(/\n$/, "").split("\n").map((text, i): DiffLine => ({ kind: "add", new: i + 1, text }));
 		}
 		return null;
 	}, [args, isWriteTool, kind, output, state]);
@@ -478,6 +480,8 @@ const ToolStep = memo(function ToolStep({
 		return str(a?.path ?? a?.file_path) ?? "";
 	})();
 	const fullCommand = kind === "cmd" ? (str((args as Record<string, unknown>)?.command) ?? str((args as Record<string, unknown>)?.cmd) ?? str((args as Record<string, unknown>)?.script) ?? "") : "";
+	// 删除文件的命令：完成后给红色标记（内容级 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 hasOutput = Boolean(output || state?.encodingLoss);
@@ -488,7 +492,7 @@ const ToolStep = memo(function ToolStep({
 	const diffHidden = diff && diffLines && !open ? diff.length - diffLines.length : 0;
 	const diffStat = hasDiff && diff
 		? isWriteTool && !state?.patch
-			? t.resultWrote.replace("{n}", String(diff.length))
+			? t.diffSummary.replace("{add}", String(diff.length)).replace("{del}", "0")
 			: t.diffSummary.replace("{add}", String(diff.filter((l) => l.kind === "add").length)).replace("{del}", String(diff.filter((l) => l.kind === "del").length))
 		: "";
 	const toggle = () => setOpen((o) => !o);
@@ -508,6 +512,11 @@ const ToolStep = memo(function ToolStep({
 					<span className="pw-arg" style={{ color: "var(--dsw-label-caption)" }}>{displayToolName(name)}</span>
 				)}
 				{diffStat && <span className="pw-meta">{diffStat}</span>}
+				{deletedTarget && (
+					<span className="pw-meta" style={{ color: "var(--dsw-danger)" }} title={deletedTarget}>
+						{t.deletedFile.replace("{path}", relativizeInText(deletedTarget, cwd || ""))}
+					</span>
+				)}
 				{summary.scriptLines > 1 && <span className="pw-meta">{t.commandLines.replace("{n}", String(summary.scriptLines))}</span>}
 				{running && <span className="pw-meta">{fmtSpan(elapsed)}</span>}
 				{!running && duration >= 1000 && <span className="pw-meta">{fmtSpan(duration)}</span>}
@@ -638,6 +647,7 @@ const ERROR_HINT_KEY: Record<ModelErrorKind, string> = {
 	timeout: "modelErrorTimeout",
 	server: "modelErrorServer",
 	network: "modelErrorNetwork",
+	moderation: "modelErrorModeration",
 };
 
 function ErrorStep({ message, count, model }: { message: string; count: number; model?: string }) {

package/src/components/ContextMeter.tsx

@@ -1,18 +1,31 @@
 "use client";
 
 /**
- * 上下文占用（对齐 dsh ContextMeter）：
- * 圆环常驻按钮 + 弹窗显示「百分比 / ~已用 / 窗口」与分段占用条
- * （系统提示词 / 对话消息 / 工具，mac 磁盘存储条式的多色分段）。
+ * 上下文占用：
+ * 圆环常驻按钮 + 弹窗显示「百分比 / ~已用 / 窗口」与 13 类分段占用条
+ * （mac 磁盘存储条式的多色分段，含 Free Space 段）。
+ * 分段口径：全部为字符/4 启发式估算（与 SDK estimateTokens 一致），
+ * 服务端分项（System Prompt / Tools / Memory / Skills / Compacted / Buffer）来自快照，
+ * 消息分项（User / Agent Text / Thinking / Tool Call / Tool Output）弹窗打开时前端统计。
  * 无对话时不渲染（由父组件经 contextVisible 控制）。
  */
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useI18n } from "@/i18n";
+import { classifyMessageChars } from "@/lib/process-format";
+import type { ContextBreakdown } from "@/lib/types";
 
 function fmtTok(n: number): string {
 	return n >= 1000 ? `${(n / 1000).toFixed(1)}K` : String(Math.round(n));
 }
 
+/** 13 类分段的定义（顺序即渲染顺序） */
+interface Segment {
+	key: string;
+	label: string;
+	tokens: number;
+	color: string;
+}
+
 export function ContextMeter({
 	percent,
 	tokens,
@@ -22,8 +35,12 @@ export function ContextMeter({
 	percent: number | null;
 	tokens: number | null;
 	contextWindow: number | null;
-	/** 分段数据源：字符统计只在弹窗打开时执行（流式期间消息每 token 都变，不能常驻扫描） */
-	source?: { systemChars: number; messages: { content: Array<{ type: string; text?: string; thinking?: string }> }[] };
+	/** 分段数据源：消息字符统计只在弹窗打开时执行（流式期间消息每 token 都变，不能常驻扫描） */
+	source?: {
+		systemChars: number;
+		messages: { role?: string; content: Array<{ type: string; text?: string; thinking?: string; arguments?: unknown }> }[];
+		breakdown?: ContextBreakdown;
+	};
 }) {
 	const [open, setOpen] = useState(false);
 	const ref = useRef<HTMLDivElement>(null);
@@ -38,16 +55,21 @@ export function ContextMeter({
 		return () => document.removeEventListener("mousedown", h);
 	}, [open]);
 
-	// 分段估算只在弹窗打开时计算（≈3.5 字符/token）
-	const segments = useMemo(() => {
-		if (!open) return { system: 0, messages: 0 };
-		let chars = 0;
-		for (const message of source?.messages ?? []) {
-			for (const content of message.content) {
-				chars += content.type === "text" ? (content.text?.length ?? 0) : content.type === "thinking" ? (content.thinking?.length ?? 0) : 0;
-			}
-		}
-		return { system: Math.round((source?.systemChars ?? 0) / 3.5), messages: Math.round(chars / 3.5) };
+	const used = tokens ?? 0;
+	const window_ = contextWindow ?? 0;
+	const b = source?.breakdown;
+
+	// 消息分项只在弹窗打开时统计（≈4 字符/token，与 SDK 一致）
+	const messageSegments = useMemo(() => {
+		if (!open) return { user: 0, agentText: 0, agentThinking: 0, agentToolCall: 0, toolOutput: 0 };
+		const chars = classifyMessageChars(source?.messages ?? []);
+		return {
+			user: Math.max(0, Math.round(chars.user / 4)),
+			agentText: Math.max(0, Math.round(chars.agentText / 4)),
+			agentThinking: Math.max(0, Math.round(chars.agentThinking / 4)),
+			agentToolCall: Math.max(0, Math.round(chars.agentToolCall / 4)),
+			toolOutput: Math.max(0, Math.round(chars.toolOutput / 4)),
+		};
 	}, [open, source]);
 
 	const p = percent ?? 0;
@@ -55,15 +77,34 @@ export function ContextMeter({
 	const r = 5.5;
 	const c = 2 * Math.PI * r;
 	const shown = Math.max(0, Math.min(100, p));
-	const used = tokens ?? 0;
-	const window_ = contextWindow ?? 0;
 
-	// 分段估算：系统提示词 / 对话消息；工具与基底取余量，保证各段之和等于总量
-	const systemTokens = Math.max(0, Math.round(segments?.system ?? 0));
-	const messageTokens = Math.max(0, Math.round(segments?.messages ?? 0));
-	const toolTokens = Math.max(0, used - systemTokens - messageTokens);
-	const segTotal = systemTokens + messageTokens + toolTokens || 1;
-	const bar = (n: number) => `${(n / segTotal) * 100}%`;
+	const segments: Segment[] = b
+		? [
+				{ key: "systemPrompt", label: t.contextSystemPrompt, tokens: b.systemPrompt, color: "var(--dsw-accent)" },
+				{ key: "systemTools", label: t.contextSystemTools, tokens: b.systemTools, color: "#8B7EC8" },
+				{ key: "customTools", label: t.contextCustomTools, tokens: b.customTools, color: "#B39DDB" },
+				{ key: "memory", label: t.contextMemory, tokens: b.memory, color: "#5FA8D3" },
+				{ key: "skills", label: t.contextSkills, tokens: b.skills, color: "#4FB286" },
+				{ key: "user", label: t.contextUserMessages, tokens: messageSegments.user, color: "var(--dsw-success)" },
+				{ key: "agentText", label: t.contextAgentText, tokens: messageSegments.agentText, color: "#7BC96F" },
+				{ key: "agentThinking", label: t.contextAgentThinking, tokens: messageSegments.agentThinking, color: "#C9A66B" },
+				{ key: "agentToolCall", label: t.contextAgentToolCall, tokens: messageSegments.agentToolCall, color: "#D3A15F" },
+				{ key: "toolOutput", label: t.contextToolOutput, tokens: messageSegments.toolOutput, color: "var(--dsw-warn)" },
+				{ key: "compacted", label: t.contextCompacted, tokens: b.compacted, color: "#A05A78" },
+				{ key: "buffer", label: t.contextAutoCompactBuffer, tokens: b.autoCompactBuffer, color: "var(--dsw-border-l3)" },
+			]
+		: // 服务端分项缺失（旧快照）：退回旧三段口径
+			[
+				{ key: "system", label: t.contextSystem, tokens: Math.max(0, Math.round((source?.systemChars ?? 0) / 4)), color: "var(--dsw-accent)" },
+				{ key: "messages", label: t.contextMessages, tokens: messageSegments.user + messageSegments.agentText + messageSegments.agentThinking, color: "var(--dsw-success)" },
+				{ key: "tools", label: t.contextTools, tokens: Math.max(0, used - Math.max(0, Math.round((source?.systemChars ?? 0) / 4)) - messageSegments.user - messageSegments.agentText - messageSegments.agentThinking), color: "var(--dsw-warn)" },
+			];
+
+	// Free Space：窗口余量（窗口未知则不显示）；分段条不归一化到已用之和
+	const usedSum = segments.reduce((sum, s) => sum + s.tokens, 0);
+	const free = window_ > 0 ? Math.max(0, window_ - usedSum) : 0;
+	const barTotal = window_ > 0 ? window_ : usedSum || 1;
+	const bar = (n: number) => `${(n / barTotal) * 100}%`;
 
 	return (
 		<div ref={ref} className="relative">
@@ -98,18 +139,20 @@ export function ContextMeter({
 						{tokens === null ? "—" : `~${fmtTok(used)}`} / {window_ > 0 ? fmtTok(window_) : "—"}
 					</div>
 
-					{/* 分段占用条（mac 磁盘存储条式多色分段） */}
-					{(systemTokens > 0 || messageTokens > 0 || toolTokens > 0) && (
+					{/* 分段占用条（mac 磁盘存储条式多色分段，含 Free Space） */}
+					{usedSum > 0 && (
 						<div className="mt-3 flex h-2 w-full overflow-hidden rounded-full" style={{ background: "var(--dsw-selector)" }} aria-hidden>
-							{systemTokens > 0 && <span style={{ width: bar(systemTokens), background: "var(--dsw-accent)" }} />}
-							{messageTokens > 0 && <span style={{ width: bar(messageTokens), background: "var(--dsw-success)" }} />}
-							{toolTokens > 0 && <span style={{ width: bar(toolTokens), background: "var(--dsw-warn)" }} />}
+							{segments.filter((s) => s.tokens > 0).map((s) => (
+								<span key={s.key} style={{ width: bar(s.tokens), background: s.color }} />
+							))}
+							{free > 0 && <span style={{ width: bar(free), background: "transparent" }} />}
 						</div>
 					)}
 					<div className="mt-2 flex flex-col gap-1" style={{ color: "var(--dsw-label-tertiary)" }}>
-						<SegmentRow label={t.contextSystem} tokens={systemTokens} color="var(--dsw-accent)" />
-						<SegmentRow label={t.contextMessages} tokens={messageTokens} color="var(--dsw-success)" />
-						<SegmentRow label={t.contextTools} tokens={toolTokens} color="var(--dsw-warn)" />
+						{segments.filter((s) => s.tokens > 0).map((s) => (
+							<SegmentRow key={s.key} label={s.label} tokens={s.tokens} color={s.color} />
+						))}
+						{window_ > 0 && <SegmentRow label={t.contextFreeSpace} tokens={free} color="var(--dsw-selector)" />}
 					</div>
 				</div>
 			)}

package/src/components/ProjectPanel.tsx

@@ -161,6 +161,12 @@ export function ProjectPanel({
 					<IconCloseOutline14 size={13} />
 				</button>
 			</div>
+			{/* 生长快照不可用（找不到 git 等）：明确提示 + 已退化为当前目录结构 */}
+			{cwd && hasSession && !growth.available && !growth.loading && (
+				<div className="mx-3 mb-2 rounded-lg px-2 py-1" style={{ fontSize: 11.5, color: "var(--dsw-warn)", background: "var(--dsw-hover)" }} role="status">
+					{t.growthUnavailableFallback}
+				</div>
+			)}
 			{gitError && (
 				<div className="mx-3 mb-2 rounded-lg px-2 py-1" style={{ fontSize: 11.5, color: "var(--dsw-danger)" }} title={gitError} role="alert" data-testid="growth-git-error">
 					{t.gitStatusUnknown}

package/src/components/ProviderSetupModal.module.css

@@ -271,6 +271,24 @@
 	opacity: 0.48;
 }
 
+.discoverControls {
+	display: flex;
+	flex: none;
+	align-items: center;
+	gap: 12px;
+}
+
+.allowPrivate {
+	display: flex;
+	align-items: center;
+	gap: 4px;
+	font-size: 11.5px;
+	color: var(--dsw-label-caption);
+	cursor: pointer;
+	user-select: none;
+	white-space: nowrap;
+}
+
 .modelEmpty {
 	margin-top: 13px;
 	padding: 17px;

package/src/components/ProviderSetupModal.tsx

@@ -145,13 +145,13 @@ export function ProviderSetupModal({
 	};
 
 	/** 供 ModelCatalog 的候选对话框调用：用表单当前值（含未保存的 key）探测远端目录 */
-	const discoverAvailableModels = async (): Promise<ModelDraft[]> => {
+	const discoverAvailableModels = async (allowPrivate: boolean): Promise<ModelDraft[]> => {
 		if (!baseUrl.trim()) throw new Error(t.apiAddress);
 		const response = await fetch("/api/models", {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
 			// builtin 模式带 providerId：表单 key 为空时后端回退到已存密钥 / OAuth 令牌
-			body: JSON.stringify({ action: "discoverModels", baseUrl: baseUrl.trim(), api: mode === "builtin" ? selected?.apis[0] : api, apiKey: apiKey.trim(), providerId: mode === "builtin" ? selected?.id : undefined }),
+			body: JSON.stringify({ action: "discoverModels", baseUrl: baseUrl.trim(), api: mode === "builtin" ? selected?.apis[0] : api, apiKey: apiKey.trim(), providerId: mode === "builtin" ? selected?.id : undefined, allowPrivate }),
 		});
 		const result = await response.json();
 		if (!response.ok || !result.success) throw new Error(result.error || t.toastError);
@@ -332,14 +332,16 @@ export function ModelCatalog({
 	setModels: React.Dispatch<React.SetStateAction<ModelDraft[]>>;
 	updateModel: (index: number, patch: Partial<ModelDraft>) => void;
 	inheritedCount?: number;
-	/** 用表单当前值探测远端目录；抛错时错误显示在目录内 */
-	discover?: () => Promise<ModelDraft[]>;
+	/** 用表单当前值探测远端目录（allowPrivate：用户勾选了允许访问本机/私网地址）；抛错时错误显示在目录内 */
+	discover?: (allowPrivate: boolean) => Promise<ModelDraft[]>;
 	discoverDisabled?: boolean;
 }) {
 	const { t } = useI18n();
 	const [expanded, setExpanded] = useState<ReadonlySet<number>>(new Set());
 	const [discovering, setDiscovering] = useState(false);
 	const [discoverError, setDiscoverError] = useState("");
+	// 本地网关（Ollama 等）在私网/回环地址上，探测需要用户显式授权
+	const [allowPrivate, setAllowPrivate] = useState(false);
 	// 候选对话框：null = 关闭
 	const [candidates, setCandidates] = useState<ModelDraft[] | null>(null);
 	const [picked, setPicked] = useState<ReadonlySet<string>>(new Set());
@@ -384,7 +386,7 @@ export function ModelCatalog({
 		setDiscovering(true);
 		setDiscoverError("");
 		try {
-			const found = await discover();
+			const found = await discover(allowPrivate);
 			if (!found.length) {
 				setDiscoverError(t.discoverEmpty);
 				return;
@@ -441,9 +443,19 @@ export function ModelCatalog({
 					</div>
 				</div>
 				{discover ? (
-					<button className={styles.discoverButton} disabled={discoverDisabled || discovering} onClick={() => void startDiscover()}>
-						{discovering ? t.discoveringModels : t.discoverModels}
-					</button>
+					<div className={styles.discoverControls}>
+						<label className={styles.allowPrivate} title={t.allowPrivateHint}>
+							<input
+								type="checkbox"
+								checked={allowPrivate}
+								onChange={(event) => setAllowPrivate(event.target.checked)}
+							/>
+							{t.allowPrivateDiscovery}
+						</label>
+						<button className={styles.discoverButton} disabled={discoverDisabled || discovering} onClick={() => void startDiscover()}>
+							{discovering ? t.discoveringModels : t.discoverModels}
+						</button>
+					</div>
 				) : null}
 			</div>
 			{discoverError ? <div className={styles.catalogError}>{discoverError}</div> : null}