@rexvane/piweb 0.3.14 → 0.3.16

package/src/hooks/usePiWeb.ts

@@ -13,6 +13,7 @@ import type {
 	WebMessage,
 	WebSnapshot,
 	ToolPreset,
+	WorkflowMode,
 } from "@/lib/types";
 
 export interface ToolCardState {
@@ -64,6 +65,22 @@ export interface PiWebState {
 	growth: { steps: GrowthStep[]; pending: string[]; error: string | null };
 }
 
+export function previewEditedBranch(messages: WebMessage[], entryId: string, text: string): WebMessage[] | null {
+	const index = messages.findIndex((message) => message.role === "user" && message.id === entryId);
+	if (index < 0) return null;
+	const original = messages[index];
+	return [
+		...messages.slice(0, index),
+		{
+			...original,
+			content: [
+				{ type: "text" as const, text },
+				...original.content.filter((part) => part.type === "image"),
+			],
+		},
+	];
+}
+
 export interface SessionListItem extends SessionSummary {
 	streaming: boolean;
 	/** 正在运行的会话最后一个工具步骤（侧栏副标题） */
@@ -191,6 +208,9 @@ export const foldPiWebEvent = (state: PiWebState, evt: WebEvent): PiWebState =>
 				tools: { active: evt.active, all: evt.all.map((n) => ({ name: n })) },
 			};
 			return s;
+		case "workflow":
+			if (s.snapshot) s.snapshot = { ...s.snapshot, workflow: evt.workflow };
+			return s;
 		case "resources":
 			if (s.snapshot) {
 				s.snapshot = {
@@ -335,14 +355,20 @@ export function usePiWeb() {
 	const [currentId, setCurrentId] = useState<string | null>(null);
 	const [currentPath, setCurrentPath] = useState<string | null>(null);
 	const [state, setState] = useState<PiWebState>(emptyState);
+	const stateRef = useRef(state);
+	stateRef.current = state;
 	/** 当前 SSE 连接的增量批量器：按帧合并事件，避免每个 token 一次整树渲染 */
 	const batcherRef = useRef<EventBatcher<WebEvent> | null>(null);
 	const [models, setModels] = useState<{ providers: any[]; models: any[] } | null>(null);
+	const [modelLoading, setModelLoading] = useState(true);
+	const [modelLoadError, setModelLoadError] = useState<string | null>(null);
+	const modelRequestRef = useRef(0);
 	const [addedWorkspaces, setAddedWorkspaces] = useState<string[]>([]);
 	const [removedWorkspaces, setRemovedWorkspaces] = useState<string[]>([]);
 	const [groupBy, setGroupByState] = useState<"workspace" | "flat">("workspace");
 	const [orderBy, setOrderByState] = useState<"updated" | "manual">("updated");
 	const [resyncNonce, setResyncNonce] = useState(0);
+	const resync = useCallback(() => setResyncNonce((nonce) => nonce + 1), []);
 	const [snapshotEpoch, setSnapshotEpoch] = useState(0);
 	const esRef = useRef<EventSource | null>(null);
 	const promptRequestsRef = useRef(new Set<string>());
@@ -350,6 +376,7 @@ export function usePiWeb() {
 	const presetRestorePromiseRef = useRef<Promise<void> | null>(null);
 	const activeSessionRef = useRef(currentId);
 	activeSessionRef.current = currentId;
+	const editSyncRef = useRef<{ sessionId: string; phase: "submitting" | "resyncing"; error?: string } | null>(null);
 	const subscribedSessionRef = useRef<string | null>(null);
 	const retrySessionList = useCallback(() => setSessionListRetryNonce((value) => value + 1), []);
 	const clearCompaction = useCallback(() => setState((current) => ({ ...current, compaction: null })), []);
@@ -505,6 +532,28 @@ export function usePiWeb() {
 		}
 	}, [refreshWorkspaces]);
 
+	/** 直接添加指定路径到工作区列表；成功返回规范化路径 */
+	const addWorkspaceByPath = useCallback(async (dir: string): Promise<string | null> => {
+		try {
+			const r = await fetch("/api/workspaces", {
+				method: "POST",
+				headers: { "Content-Type": "application/json" },
+				body: JSON.stringify({ action: "add", path: dir }),
+			});
+			const j = await r.json();
+			if (!r.ok || !j.success) throw new Error(j.error || `request failed (${r.status})`);
+			if (j.data?.workspaces) {
+				setAddedWorkspaces(j.data.workspaces);
+			}
+			await refreshWorkspaces();
+			return dir;
+		} catch (error) {
+			const message = error instanceof Error ? error.message : "failed to add workspace";
+			setState((current) => ({ ...current, error: message }));
+			throw error;
+		}
+	}, [refreshWorkspaces]);
+
 
 	const removeWorkspace = useCallback(
 		async (dir: string) => {
@@ -593,12 +642,20 @@ export function usePiWeb() {
 
 	// 模型目录
 	const refreshModels = useCallback(async () => {
+		const request = ++modelRequestRef.current;
+		setModelLoading(true);
+		setModelLoadError(null);
 		try {
 			const r = await fetch("/api/models");
 			const j = await r.json();
-			if (j.success) setModels({ providers: j.data.providers, models: j.data.models });
-		} catch {
-			/* ignore */
+			if (!r.ok || !j.success || !Array.isArray(j.data?.providers) || !Array.isArray(j.data?.models)) {
+				throw new Error(j.error || `request failed (${r.status})`);
+			}
+			if (request === modelRequestRef.current) setModels({ providers: j.data.providers, models: j.data.models });
+		} catch (error) {
+			if (request === modelRequestRef.current) setModelLoadError(error instanceof Error ? error.message : "model catalog unavailable");
+		} finally {
+			if (request === modelRequestRef.current) setModelLoading(false);
 		}
 	}, []);
 	useEffect(() => {
@@ -610,14 +667,17 @@ export function usePiWeb() {
 		esRef.current?.close();
 		esRef.current = null;
 		if (!currentId) {
+			editSyncRef.current = null;
 			subscribedSessionRef.current = null;
 			setState(emptyState(savedToolPreset()));
 			return;
 		}
 		const reconnectingCurrentSession = subscribedSessionRef.current === currentId;
+		if (!reconnectingCurrentSession) editSyncRef.current = null;
 		subscribedSessionRef.current = currentId;
+		const editResync = editSyncRef.current?.sessionId === currentId && editSyncRef.current.phase === "resyncing";
 		setState((current) => reconnectingCurrentSession
-			? { ...current, connected: false }
+			? { ...current, connected: editResync ? current.connected : false }
 			: { ...emptyState(savedToolPreset()), connected: false });
 		let retryDelayMs = 2000;
 		const connect = () => {
@@ -642,7 +702,10 @@ export function usePiWeb() {
 			};
 			// 流式事件按帧合并：token 速率再高也只每 16ms 渲染一次（见 event-batcher）
 			const batcher = createEventBatcher<WebEvent>({
-				flush: (events) => setState((s) => events.reduce((acc, evt) => foldPiWebEvent(acc, evt), s)),
+				flush: (events) => {
+					if (editSyncRef.current?.sessionId === currentId) return;
+					setState((s) => events.reduce((acc, evt) => foldPiWebEvent(acc, evt), s));
+				},
 			});
 			batcherRef.current = batcher;
 			es.onmessage = (e) => {
@@ -654,6 +717,9 @@ export function usePiWeb() {
 					return;
 				}
 				if (parsed.type === "snapshot" && parsed.snapshot) {
+					const editSync = editSyncRef.current;
+					if (editSync?.sessionId === currentId && editSync.phase === "submitting") return;
+					if (editSync?.sessionId === currentId) editSyncRef.current = null;
 					// 快照是权威状态：之前缓冲的增量已经过时，直接丢弃
 					batcher.cancel();
 					retryDelayMs = 2000;
@@ -665,7 +731,7 @@ export function usePiWeb() {
 						tools: toolsFromMessages(snap.messages, snap.isStreaming),
 						toolPreset: snap.toolPreset,
 						connected: true,
-						error: null,
+						error: editSync?.sessionId === currentId ? editSync.error ?? null : null,
 						compaction: null,
 						retryNotice: null,
 						// 服务器当前 pending 集合是权威来源，刷新可恢复、已答请求不能复活。
@@ -677,6 +743,7 @@ export function usePiWeb() {
 						growth: { ...prev.growth, error: snap.growthError ?? null },
 					}));
 				} else {
+					if (editSyncRef.current?.sessionId === currentId) return;
 					batcher.push(parsed as WebEvent);
 				}
 			};
@@ -719,9 +786,42 @@ export function usePiWeb() {
 		}
 	}, [currentId]);
 
+	const editAndResend = useCallback(async (entryId: string, text: string) => {
+		if (editSyncRef.current?.sessionId === currentId) return { success: false, error: "edit already in progress" };
+		if (!currentId || !previewEditedBranch(stateRef.current.messages, entryId, text)) return { success: false, error: "message is not editable" };
+		editSyncRef.current = { sessionId: currentId, phase: "submitting" };
+		batcherRef.current?.cancel();
+		setState((previous) => {
+			const messages = previewEditedBranch(previous.messages, entryId, text);
+			if (!messages) return previous;
+			return {
+				...previous,
+				messages,
+				tools: toolsFromMessages(messages),
+				snapshot: previous.snapshot ? { ...previous.snapshot, messages, isStreaming: true } : null,
+				error: null,
+				retryNotice: null,
+				workingMessage: null,
+			};
+		});
+		const result = await sendCommand({ cmd: "editAndResend", entryId, text });
+		if (editSyncRef.current?.sessionId === currentId) {
+			editSyncRef.current = {
+				sessionId: currentId,
+				phase: "resyncing",
+				error: result?.success ? undefined : result?.error ?? "Failed to edit message",
+			};
+			batcherRef.current?.cancel();
+			esRef.current?.close();
+			esRef.current = null;
+			resync();
+		}
+		return result;
+	}, [currentId, resync, sendCommand]);
+
 	const newSession = useCallback(async (
 		cwd: string,
-		overrides: { provider?: string; modelId?: string; thinking?: string } = {},
+		overrides: { provider?: string; modelId?: string; thinking?: string; mode?: WorkflowMode } = {},
 	): Promise<string | null> => {
 		try {
 			const r = await fetch("/api/agent/new", {
@@ -735,6 +835,7 @@ export function usePiWeb() {
 				const id = idOf(p);
 				// 工具预设取通用设置的持久化选择；模型/思考级别由 Hero 页显式下发
 				const setup: Record<string, unknown>[] = [{ cmd: "setToolPreset", preset: savedToolPreset() }];
+				if (overrides.mode && overrides.mode !== "agent") setup.push({ cmd: "setWorkflowMode", mode: overrides.mode });
 				if (overrides.provider && overrides.modelId) setup.push({ cmd: "setModel", provider: overrides.provider, modelId: overrides.modelId });
 				if (overrides.thinking) setup.push({ cmd: "setThinkingLevel", level: overrides.thinking });
 				for (const command of setup) {
@@ -828,7 +929,6 @@ export function usePiWeb() {
 	// ---------- 会话预设已移除：工具档位见通用设置/工具启用情况，模型与思考级别由 Hero 页显式下发 ----------
 
 	/** 强制重连 SSE 拿新快照（navigate 等场景） */
-	const resync = useCallback(() => setResyncNonce((n) => n + 1), []);
 	/** 应答扩展对话框（select/confirm/input）；cancelled=true 表示用户关掉了 */
 	const answerExtensionDialog = useCallback(
 		async (id: string, response: { value?: string; confirmed?: boolean; cancelled?: boolean }) => {
@@ -887,6 +987,8 @@ export function usePiWeb() {
 		currentPath,
 		state,
 		models,
+		modelLoading,
+		modelLoadError,
 		addedWorkspaces,
 		removedWorkspaces,
 		workspaceAliases,
@@ -901,9 +1003,11 @@ export function usePiWeb() {
 		setGroupBy,
 		setOrderBy,
 		addWorkspaceByPicker,
+		addWorkspaceByPath,
 		removeWorkspace,
 		refreshModels,
 		sendCommand,
+		editAndResend,
 		newSession,
 		openSession,
 		closeSession,

package/src/i18n.tsx

@@ -13,6 +13,8 @@ const zh = {
 	rename: "重命名",
 	renameSession: "重命名会话",
 	renameWorkspace: "重命名工作区",
+	sessionActions: "会话操作",
+	workspaceActions: "工作区操作",
 	search: "搜索",
 	save: "保存",
 	close: "关闭",
@@ -71,6 +73,23 @@ const zh = {
 	backToBottom: "回到底部",
 	modeSteer: "插话",
 	modeQueue: "排队",
+	workflowAgent: "Agent",
+	workflowPlan: "Plan",
+	workflowGoal: "Goal",
+	workflowMenu: "选择工作模式",
+	workflowClear: "退出工作模式",
+	workflowPlanPlaceholder: "规划改动…",
+	workflowGoalPlaceholder: "描述要达成的目标…",
+	workflowAgentHint: "直接执行任务",
+	workflowPlanHint: "先只读规划，确认后执行",
+	workflowGoalHint: "围绕目标持续推进并验证",
+	planReady: "方案已就绪，等待你确认",
+	planReadyHint: "确认后开始修改代码并验证结果",
+	planRefine: "调整方案",
+	planApproving: "正在启动…",
+	planApprovalFailed: "启动失败，请重试",
+	planApprove: "执行方案",
+	goalActive: "当前目标",
 	sendSteer: "插话：当前工具跑完就送达",
 	sendQueue: "排队：本轮结束后发送",
 	queueEdit: "↑ 取回编辑",
@@ -197,6 +216,7 @@ const zh = {
 	webAuthOn: "已启用（PI_WEB_PASSWORD）",
 	webAuthOff: "未启用（仅本机可访问）",
 	logout: "退出登录",
+	logoutFailed: "退出登录失败，请检查网络后重试。",
 	authMethodApiKey: "API 密钥",
 	oauthDevicePrompt: "请在浏览器中完成授权",
 	oauthOpenAuth: "打开授权页面",
@@ -235,6 +255,8 @@ const zh = {
 	noSessions: "暂无会话",
 	// Hero
 	startWith: "新建工作区",
+	heroTitle: "让想法落到代码。",
+	heroDescription: "规划、执行、验证。一个专注于交付的轻量工作台。",
 	// 输入卡
 	inputPlaceholder: "给 pi 发消息…",
 	thinking: "思考",
@@ -244,6 +266,8 @@ const zh = {
 	triggerLoading: "正在加载模型…",
 	blockedComposer: "当前模型不可用，请先选择模型",
 	emptyModels: "没有可用的模型。",
+	modelsLoading: "正在加载模型…",
+	modelsLoadFailed: "模型列表加载失败。",
 	emptyEfforts: "当前模型未提供推理等级。",
 	thinkingUnsupported: "此模型不支持",
 	thinkingUnsupportedHint: "模型没有声明推理能力。自定义模型请在 ~/.pi/agent/models.json 里给该模型加 \"reasoning\": true（可选 thinkingLevelMap 指定档位）",
@@ -317,8 +341,9 @@ const zh = {
 	contextAgentToolCall: "Agent Tool Call",
 	contextToolOutput: "Tool Output",
 	contextCompacted: "Compacted Data",
-	contextAutoCompactBuffer: "Auto-Compact Buffer",
-	contextFreeSpace: "Free Space",
+	contextAutoCompactBuffer: "自动压缩预留（非占用）",
+	contextFreeSpace: "剩余空间",
+	contextEstimateNote: "总量由 Pi 估算；下方分类按字符估算，不可相加。",
 	// 统计条
 	turns: "轮次",
 	toolCalls: "工具调用",
@@ -414,6 +439,7 @@ const zh = {
 	themeNordPaper: "北欧纸墨",
 	themePebrel: "Pebrel",
 	themeDsh: "海与墨",
+	themePiWeb: "PiWeb · 工作台",
 	fontSize: "正文字号",
 	fontUiSize: "界面字体",
 	fontUiSizeDesc: "侧栏、按钮、标签等界面文字",
@@ -506,6 +532,8 @@ const zh = {
 	updateFailed: "更新失败",
 	updateManualHint: "先停止 piweb，再执行上面的命令（Windows 无法替换运行中的安装目录）",
 	skillsDesc: "关闭后技能不会出现在系统提示中，仅可通过 /skill:名称 手动调用",
+	skillsLoading: "正在加载技能…",
+	skillsEmpty: "当前工作区没有可用技能",
 	confirmDeleteSkill: "确定删除技能“{name}”吗？将删除其所在技能目录，不可恢复。",
 	deleteSkillHint: "删除技能目录",
 	skillDeletePackageHint: "包技能请用禁用管理",
@@ -619,6 +647,8 @@ const en: Dict = {
 	rename: "Rename",
 	renameSession: "Rename session",
 	renameWorkspace: "Rename workspace",
+	sessionActions: "Session actions",
+	workspaceActions: "Workspace actions",
 	search: "Search",
 	save: "Save",
 	close: "Close",
@@ -676,6 +706,23 @@ const en: Dict = {
 	backToBottom: "Back to bottom",
 	modeSteer: "steer",
 	modeQueue: "queue",
+	workflowAgent: "Agent",
+	workflowPlan: "Plan",
+	workflowGoal: "Goal",
+	workflowMenu: "Choose workflow mode",
+	workflowClear: "Leave workflow mode",
+	workflowPlanPlaceholder: "Plan changes…",
+	workflowGoalPlaceholder: "Describe the goal…",
+	workflowAgentHint: "Execute the task directly",
+	workflowPlanHint: "Plan read-only, then request approval",
+	workflowGoalHint: "Pursue and verify an objective",
+	planReady: "Plan ready for your approval",
+	planReadyHint: "Confirm to make changes and verify the result",
+	planRefine: "Refine plan",
+	planApproving: "Starting…",
+	planApprovalFailed: "Could not start. Try again.",
+	planApprove: "Execute plan",
+	goalActive: "Current goal",
 	sendSteer: "Steer: delivered after the current tool call",
 	sendQueue: "Queue: sent after this turn ends",
 	queueEdit: "↑ Edit queued",
@@ -802,6 +849,7 @@ const en: Dict = {
 	webAuthOn: "Enabled (PI_WEB_PASSWORD)",
 	webAuthOff: "Disabled (local access only)",
 	logout: "Sign out",
+	logoutFailed: "Could not sign out. Check your connection and retry.",
 	authMethodApiKey: "API key",
 	oauthDevicePrompt: "Finish authorization in your browser",
 	oauthOpenAuth: "Open authorization page",
@@ -839,6 +887,8 @@ const en: Dict = {
 	oauthCancel: "Cancel login",
 	noSessions: "No sessions yet",
 	startWith: "New workspace",
+	heroTitle: "Move ideas into working code.",
+	heroDescription: "Plan, execute, verify. A focused workbench for shipping.",
 	inputPlaceholder: "Message pi…",
 	thinking: "Thinking",
 	thinkingOff: "Off",
@@ -847,6 +897,8 @@ const en: Dict = {
 	triggerLoading: "Loading models…",
 	blockedComposer: "This model is unavailable — select one to continue",
 	emptyModels: "No models available.",
+	modelsLoading: "Loading models…",
+	modelsLoadFailed: "Could not load models.",
 	emptyEfforts: "This model provides no reasoning effort levels.",
 	thinkingUnsupported: "Not supported by this model",
 	thinkingUnsupportedHint: "The model does not declare reasoning support. For custom models, add \"reasoning\": true (optionally a thinkingLevelMap) to the model in ~/.pi/agent/models.json",
@@ -920,8 +972,9 @@ const en: Dict = {
 	contextAgentToolCall: "Agent Tool Call",
 	contextToolOutput: "Tool Output",
 	contextCompacted: "Compacted Data",
-	contextAutoCompactBuffer: "Auto-Compact Buffer",
+	contextAutoCompactBuffer: "Auto-compact reserve (not used)",
 	contextFreeSpace: "Free Space",
+	contextEstimateNote: "Pi estimates total usage; content categories are rough estimates and do not add up.",
 	turns: "turns",
 	toolCalls: "tool calls",
 	cost: "cost",
@@ -1013,6 +1066,7 @@ const en: Dict = {
 	themeNordPaper: "Nord & Paper",
 	themePebrel: "Pebrel",
 	themeDsh: "Sea & Ink",
+	themePiWeb: "PiWeb · Workbench",
 	fontSize: "Font size",
 	fontUiSize: "UI font size",
 	fontUiSizeDesc: "Sidebar, buttons, labels and other UI text",
@@ -1105,6 +1159,8 @@ const en: Dict = {
 	updateFailed: "Update failed",
 	updateManualHint: "Stop piweb, then run the command above (Windows cannot replace a running installation)",
 	skillsDesc: "Disabled skills are hidden from the system prompt and only callable via /skill:name",
+	skillsLoading: "Loading skills…",
+	skillsEmpty: "No skills available in this workspace",
 	confirmDeleteSkill: "Delete skill \"{name}\"? Its skill directory will be removed and cannot be recovered.",
 	deleteSkillHint: "Delete the skill directory",
 	skillDeletePackageHint: "package skill: use disable",