@rexvane/piweb 0.3.21 → 0.3.22

package/src/app/globals.css

@@ -1712,6 +1712,192 @@ body[data-pebrel-theme="pebrel"][data-ds-dark-theme] {
 	pointer-events: none;
 }
 
+/* 输入卡待发送图片：平铺缩略图 / 牌堆 / 扇形（src/components/composer/ComposerImages.tsx） */
+.pw-image-thumb {
+	position: relative;
+	flex: none;
+}
+.pw-image-thumb img {
+	display: block;
+	box-shadow: 0 0 0 0.5px var(--dsw-border-l2);
+}
+.pw-image-fan {
+	position: relative;
+	flex: none;
+	transition: width 320ms cubic-bezier(0.2, 0.8, 0.2, 1), height 320ms cubic-bezier(0.2, 0.8, 0.2, 1);
+}
+.pw-image-card {
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 96px;
+	height: 96px;
+	transition: transform 360ms cubic-bezier(0.2, 0.8, 0.2, 1), opacity 200ms ease;
+}
+.pw-image-card[data-hidden="true"] {
+	opacity: 0;
+	pointer-events: none;
+}
+.pw-image-face {
+	display: block;
+	width: 100%;
+	height: 100%;
+	overflow: hidden;
+	border-radius: 10px;
+	/* 不透明的底：长图上下留白的地方不能透出后面那张 */
+	background: linear-gradient(var(--dsw-selector), var(--dsw-selector)), var(--dsw-glass-input);
+	box-shadow: 0 0 0 0.5px var(--dsw-border-l3), 0 1px 3px rgba(0, 0, 0, 0.12);
+	transition: box-shadow var(--ds-duration-fast) var(--ds-ease-in-out);
+}
+.pw-image-card[data-lifted="true"] .pw-image-face {
+	box-shadow: 0 0 0 0.5px var(--dsw-border-l4), 0 10px 24px rgba(0, 0, 0, 0.22);
+}
+.pw-image-face img {
+	transition: opacity 240ms ease;
+}
+/* 牌堆里后面几张只露空白卡边，一眼看出是一叠；扇开时图淡入 */
+.pw-image-fan:not([data-expanded="true"]) .pw-image-card + .pw-image-card .pw-image-face img {
+	opacity: 0;
+}
+.pw-image-face:focus-visible {
+	outline: 2px solid var(--dsw-accent);
+	outline-offset: 2px;
+}
+/* 张数多、露出的条带太窄：删除按钮只在悬停 / 聚焦那张上出现，免得挤成一排 */
+.pw-image-fan[data-crowded="true"] .pw-image-delete {
+	opacity: 0;
+	pointer-events: none;
+	transition: opacity var(--ds-duration-fast) var(--ds-ease-in-out);
+}
+.pw-image-fan[data-crowded="true"] .pw-image-card:hover .pw-image-delete,
+.pw-image-fan[data-crowded="true"] .pw-image-card:focus-within .pw-image-delete {
+	opacity: 1;
+	pointer-events: auto;
+}
+.pw-image-delete {
+	position: absolute;
+	top: -6px;
+	right: -6px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 22px;
+	height: 22px;
+	border-radius: 999px;
+	font-size: 11px;
+	background: var(--dsw-label-primary);
+	color: var(--dsw-bg-base);
+	/* 一圈底色描边：压在别的图片上也看得清 */
+	box-shadow: 0 0 0 1.5px var(--dsw-glass-input);
+}
+.pw-image-delete:disabled {
+	opacity: 0.4;
+}
+/* 放大预览 */
+.pw-viewer {
+	position: fixed;
+	inset: 0;
+	z-index: 200;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding: 56px 16px 24px;
+	background: rgba(0, 0, 0, 0.78);
+}
+.pw-viewer-bar {
+	position: absolute;
+	top: 12px;
+	left: 16px;
+	right: 16px;
+	display: flex;
+	align-items: center;
+	gap: 8px;
+}
+.pw-viewer-count {
+	flex: 1;
+	font-size: 13px;
+	font-variant-numeric: tabular-nums;
+	color: rgba(255, 255, 255, 0.78);
+}
+.pw-viewer-btn {
+	height: 30px;
+	min-width: 30px;
+	padding: 0 12px;
+	border-radius: 999px;
+	font-size: 13px;
+	color: #fff;
+	background: rgba(255, 255, 255, 0.14);
+	transition: background var(--ds-duration-fast) var(--ds-ease-in-out);
+}
+.pw-viewer-btn:hover {
+	background: rgba(255, 255, 255, 0.24);
+}
+.pw-viewer-btn:disabled {
+	opacity: 0.4;
+}
+.pw-viewer-image {
+	max-width: 100%;
+	max-height: 100%;
+	object-fit: contain;
+	border-radius: 12px;
+}
+.pw-viewer-nav {
+	position: absolute;
+	top: 50%;
+	width: 40px;
+	height: 40px;
+	margin-top: -20px;
+	border-radius: 999px;
+	font-size: 26px;
+	line-height: 38px;
+	color: #fff;
+	background: rgba(255, 255, 255, 0.14);
+	transition: background var(--ds-duration-fast) var(--ds-ease-in-out);
+}
+.pw-viewer-nav:hover {
+	background: rgba(255, 255, 255, 0.24);
+}
+.pw-viewer-nav[data-side="prev"] {
+	left: 16px;
+}
+.pw-viewer-nav[data-side="next"] {
+	right: 16px;
+}
+.pw-viewer-btn:focus-visible,
+.pw-viewer-nav:focus-visible {
+	outline: 2px solid #fff;
+	outline-offset: 2px;
+}
+@media (prefers-reduced-motion: reduce) {
+	.pw-image-fan,
+	.pw-image-card {
+		transition: none;
+	}
+}
+
+/* 设置页模型体检卡片里的小输入框 / 下拉（容量、视觉） */
+.pw-audit-field {
+	width: 100%;
+	height: 30px;
+	padding: 0 8px;
+	border: 0.5px solid var(--dsw-border-l2);
+	border-radius: 9px;
+	background: var(--dsw-glass-input);
+	color: var(--dsw-label-primary);
+	font-size: 12.5px;
+	transition: border-color var(--ds-duration-fast) var(--ds-ease-in-out), box-shadow var(--ds-duration-fast) var(--ds-ease-in-out);
+}
+.pw-audit-field:focus {
+	border-color: var(--dsw-accent);
+	box-shadow: 0 0 0 2px var(--dsw-accent-soft);
+}
+.pw-audit-field[aria-invalid="true"] {
+	border-color: var(--dsw-danger);
+}
+.pw-audit-field:disabled {
+	opacity: 0.55;
+}
+
 /* 项目栏 */
 .pw-project {
 	background: var(--dsw-sidebar-fill);

package/src/components/AppShell.tsx

@@ -41,6 +41,9 @@ import { useFileViewer } from "@/hooks/useFileViewer";
 import type { TreeNode } from "@/lib/growth-tree";
 import { syncPebrelTheme } from "@/lib/theme";
 import type { ModelChoice } from "@/components/ModelSelector";
+import type { NewSessionDefaults } from "@/lib/model-defaults";
+import { readRememberedHeroModel, writeRememberedHeroModel } from "@/lib/hero-model-memory";
+import { newSessionThinkingLevel } from "@/lib/thinking-level";
 import type { ImageAttachment, TrajEntry } from "@/lib/types";
 
 // dsh ui-layout columns.ts 几何常量
@@ -164,6 +167,8 @@ export function AppShell() {
 	const growthSelectLatest = useRef<() => void>(() => {});
 	const [heroCwd, setHeroCwd] = useState("");
 	const [heroModel, setHeroModel] = useState<{ provider: string; id: string } | null>(null);
+	/** 当前工作区的新会话默认值（pi 的初始模型规则 + 设置里的思考档位），切换工作区时重新取 */
+	const [heroDefaults, setHeroDefaults] = useState<NewSessionDefaults | null>(null);
 	const [heroThinking, setHeroThinking] = useState("");
 	const [isNarrow, setIsNarrow] = useState(false);
 	const [mobileSidebarOpen, setMobileSidebarOpen] = useState(false);
@@ -173,6 +178,29 @@ export function AppShell() {
 		setSidebarCollapsed(localStorage.getItem("piweb.sidebarCollapsed") === "1");
 		setDrawerOpen(localStorage.getItem("piweb.drawerOpen") === "1");
 	}, []);
+	/** 新会话时加载用户之前的选择，或使用系统建议（第一个认证的） */
+	useEffect(() => {
+		if (!heroCwd) {
+			setHeroModel(null);
+			return;
+		}
+		// 只认这个工作区自己记住的模型；没有就不预选，输入框等用户在新会话页选
+		setHeroModel(readRememberedHeroModel(localStorage, heroCwd));
+	}, [heroCwd]);
+	useEffect(() => {
+		setHeroDefaults(null);
+		if (!heroCwd) return;
+		let stale = false;
+		fetch(`/api/models/defaults?cwd=${encodeURIComponent(heroCwd)}`)
+			.then((r) => r.json() as Promise<{ success?: boolean; data?: NewSessionDefaults }>)
+			.then((json) => {
+				if (!stale && json.success && json.data) setHeroDefaults(json.data);
+			})
+			.catch(() => undefined);
+		return () => {
+			stale = true;
+		};
+	}, [heroCwd]);
 	/** 右侧抽屉开关(项目栏降级成抽屉入口后,它是"最右一列是否打开"唯一的开关) */
 	const toggleDrawer = useCallback((next?: boolean) => {
 		setDrawerOpen((cur) => {
@@ -280,11 +308,28 @@ export function AppShell() {
 			})),
 		[models],
 	);
-	const defaultModel = useMemo(() => modelChoices.find((m) => authByProvider[m.provider]), [modelChoices, authByProvider]);
+	// 新会话页当前选中的模型：只有在这个工作区选过（或记住过）才有；没有就是 undefined，输入框保持禁用
+	const heroChoice = useMemo(
+		() => (heroModel ? modelChoices.find((m) => m.provider === heroModel.provider && m.id === heroModel.id) : undefined),
+		[heroModel, modelChoices],
+	);
 	const heroModelLevels = useMemo(
-		() => (heroModel ? modelChoices.find((m) => m.provider === heroModel.provider && m.id === heroModel.id) : defaultModel)?.thinkingLevels ?? ["off", "minimal", "low", "medium", "high", "xhigh", "max"],
-		[heroModel, modelChoices, defaultModel],
+		() => heroChoice?.thinkingLevels ?? ["off", "minimal", "low", "medium", "high", "xhigh", "max"],
+		[heroChoice],
 	);
+	/**
+	 * 新会话实际会用的思考档位：用户显式选过才算选择（下发时才带上）；界面平时只显示这里算出的生效值，
+	 * 不把它当作选择发给服务端。
+	 */
+	const heroEffectiveThinking = useMemo(() => {
+		const choice = heroChoice;
+		return newSessionThinkingLevel({
+			supported: heroModelLevels,
+			requested: heroThinking,
+			modelOverride: choice ? heroDefaults?.modelThinkingLevels[`${choice.provider}/${choice.id}`] : undefined,
+			defaultLevel: heroDefaults?.defaultThinkingLevel,
+		});
+	}, [heroChoice, heroModelLevels, heroThinking, heroDefaults]);
 
 
 	// ---------- 拖拽 ----------
@@ -462,12 +507,14 @@ export function AppShell() {
 			setError(t.pickWorkspaceFirst);
 			return { success: false };
 		}
-		// 用户没手动选过模型时也要把界面显示的默认模型显式下发，
-		// 否则后端不 setModel、SDK 自选的默认与界面显示不一致。
-		const effective = heroModel ?? (defaultModel ? { provider: defaultModel.provider, id: defaultModel.id } : null);
+		// 没选模型不建会话：输入框本来就禁用，这里再拦一次；模型一律显式下发，不让 SDK 自选
+		if (!heroChoice) {
+			setError(t.blockedComposer);
+			return { success: false };
+		}
 		const p = await newSession(cwd, {
-			provider: effective?.provider,
-			modelId: effective?.id,
+			provider: heroChoice.provider,
+			modelId: heroChoice.id,
 			thinking: heroThinking || undefined,
 		});
 		if (!p) return { success: false };
@@ -519,7 +566,7 @@ export function AppShell() {
 				void sendCommand({ cmd: "fork" }).then((r) => {
 					if (r.success && r.data?.sessionPath) openSession(r.data.sessionPath);
 				});
-			} else if (name === "reload") void sendCommand({ cmd: "reload" });
+			} else if (name === "reload") void sendCommand({ cmd: "reload" }).then(() => refreshModels());
 			else setError(t.cmdUnknown.replace("{name}", name));
 		},
 		[sendCommand, currentId, closeSession, openSession, setError, t],
@@ -588,7 +635,9 @@ export function AppShell() {
 		if (!path) return;
 		updateDraft(draftKey, (previous) => {
 			const references = previous.references ?? [];
-			if (references.includes(path)) return previous;
+			// 目录在 @ 选择器里存成 `src/lib/`：去重按去掉尾斜杠比较，避免同一目录两条
+			const samePath = (a: string, b: string) => a.replace(/[\\/]+$/, "") === b.replace(/[\\/]+$/, "");
+			if (references.some((existing) => samePath(existing, path))) return previous;
 			return { ...previous, references: [...references, path] };
 		});
 		requestAnimationFrame(() => document.querySelector<HTMLTextAreaElement>('[data-testid="composer"] textarea')?.focus());
@@ -823,15 +872,17 @@ export function AppShell() {
 							providerNames={providerNames}
 							authByProvider={authByProvider}
 							addWorkspaceByPicker={addWorkspaceByPicker}
-							heroModel={heroModel}
+							heroChoice={heroChoice}
 							onSelectHeroModel={(provider, id) => {
-								setHeroModel({ provider, id });
+								const choice = { provider, id };
+								setHeroModel(choice);
+								// 只记在当前工作区名下
+								if (heroCwd) writeRememberedHeroModel(localStorage, heroCwd, choice);
 								const levels = modelChoices.find((model) => model.provider === provider && model.id === id)?.thinkingLevels ?? [];
 								if (heroThinking && !levels.includes(heroThinking)) setHeroThinking("");
 							}}
-							defaultModel={defaultModel}
 							heroModelLevels={heroModelLevels}
-							heroThinking={heroThinking}
+							heroEffectiveThinking={heroEffectiveThinking}
 							onSelectHeroThinking={setHeroThinking}
 						/>
 						{/* 草稿阶段的错误行内显示（不再弹右下角） */}
@@ -962,6 +1013,7 @@ export function AppShell() {
 											authByProvider={authByProvider}
 											queue={snapshot?.queue ?? { steering: [], followUp: [] }}
 											commands={slashCommands}
+											cwd={panelCwd}
 											onCommand={runSlashCommand}
 											onSend={sendPrompt}
 											onSteer={(text, images) => sendCommand({ cmd: "prompt", text, images, behavior: "steer" })}
@@ -1113,11 +1165,10 @@ function Hero({
 	providerNames,
 	authByProvider,
 	addWorkspaceByPicker,
-	heroModel,
+	heroChoice,
 	onSelectHeroModel,
-	defaultModel,
 	heroModelLevels,
-	heroThinking,
+	heroEffectiveThinking,
 	onSelectHeroThinking,
 }: {
 	draft: ChatDraft;
@@ -1139,11 +1190,10 @@ function Hero({
 	providerNames: Record<string, string>;
 	authByProvider: Record<string, boolean>;
 	addWorkspaceByPicker: () => Promise<string | null>;
-	heroModel: { provider: string; id: string } | null;
+	heroChoice?: ModelChoice;
 	onSelectHeroModel: (provider: string, id: string) => void;
-	defaultModel?: ModelChoice;
 	heroModelLevels: string[];
-	heroThinking: string;
+	heroEffectiveThinking: string;
 	onSelectHeroThinking: (level: string) => void;
 }) {
 	const { t } = useI18n();
@@ -1237,14 +1287,16 @@ function Hero({
 
 				{/* 输入卡 */}
 				<ChatInput
-						draft={draft}
-						onDraftChange={onDraftChange}
-						onUploadError={onUploadError}
-						onUploadProgress={onUploadProgress}
-						uploadFailure={uploadFailure}
-						pendingUploadCount={pendingUploadCount}
-						pendingSend={pendingSend}
-						onSendPendingChange={onSendPendingChange}
+					draft={draft}
+					onDraftChange={onDraftChange}
+					onUploadError={onUploadError}
+					onUploadProgress={onUploadProgress}
+					uploadFailure={uploadFailure}
+					pendingUploadCount={pendingUploadCount}
+					pendingSend={pendingSend}
+					onSendPendingChange={onSendPendingChange}
+					// 新会话也能 @ 引用：候选来自上面选中的工作区
+					cwd={cwd}
 					commands={commands}
 					onCommand={onCommand}
 					isStreaming={false}
@@ -1252,8 +1304,8 @@ function Hero({
 					contextTokens={null}
 					contextWindow={null}
 					contextVisible={false}
-					model={heroModel ? models.find((m) => m.provider === heroModel.provider && m.id === heroModel.id) ?? { provider: heroModel.provider, id: heroModel.id, name: heroModel.id, reasoning: false, contextWindow: 0 } : defaultModel}
-					thinkingLevel={heroThinking || undefined}
+					model={heroChoice}
+					thinkingLevel={heroEffectiveThinking}
 					thinkingLevels={heroModelLevels}
 					models={models}
 					providerNames={providerNames}