@geminilight/mindos 0.6.38 → 0.6.40

package/app/components/shared/ProviderSelect.tsx

@@ -0,0 +1,134 @@
+'use client';
+
+import { useState } from 'react';
+import { CheckCircle2, ChevronDown, SkipForward } from 'lucide-react';
+import { type ProviderId, PROVIDER_PRESETS, groupedProviders } from '@/lib/agent/providers';
+import { useLocale } from '@/lib/stores/locale-store';
+
+interface ProviderSelectProps {
+  value: ProviderId | 'skip';
+  onChange: (id: ProviderId | 'skip') => void;
+  showSkip?: boolean;
+  compact?: boolean;
+  configuredProviders?: Set<ProviderId>;
+}
+
+export default function ProviderSelect({
+  value, onChange, showSkip = false, compact = false, configuredProviders,
+}: ProviderSelectProps) {
+  const { locale } = useLocale();
+  const [showMore, setShowMore] = useState(false);
+  const groups = groupedProviders();
+
+  const renderItem = (id: ProviderId) => {
+    const preset = PROVIDER_PRESETS[id];
+    const displayName = locale === 'zh' ? preset.nameZh : preset.name;
+    const isSelected = value === id;
+    const isConfigured = configuredProviders?.has(id);
+
+    if (compact) {
+      return (
+        <button
+          key={id}
+          type="button"
+          onClick={() => onChange(id)}
+          className={`flex items-center gap-2 px-3 py-2 rounded-lg border text-left transition-all text-sm ${
+            isSelected
+              ? 'border-[var(--amber)] bg-[var(--amber-subtle)] shadow-sm'
+              : 'border-border/50 hover:border-border hover:bg-muted/30'
+          }`}
+        >
+          <span className={`font-medium ${isSelected ? 'text-foreground' : 'text-muted-foreground'}`}>
+            {displayName}
+          </span>
+          {isConfigured && !isSelected && (
+            <CheckCircle2 size={12} className="text-success ml-auto shrink-0" />
+          )}
+          {isSelected && (
+            <CheckCircle2 size={14} className="ml-auto shrink-0" style={{ color: 'var(--amber)' }} />
+          )}
+        </button>
+      );
+    }
+
+    return (
+      <button
+        key={id}
+        type="button"
+        onClick={() => onChange(id)}
+        className="flex items-start gap-3 p-4 rounded-xl border text-left transition-all duration-150"
+        style={{
+          background: isSelected ? 'var(--amber-dim)' : 'var(--card)',
+          borderColor: isSelected ? 'var(--amber)' : 'var(--border)',
+        }}
+      >
+        <div className="flex-1 min-w-0">
+          <p className="text-sm font-medium" style={{ color: 'var(--foreground)' }}>{displayName}</p>
+          <p className="text-xs mt-0.5" style={{ color: 'var(--muted-foreground)' }}>
+            {preset.defaultModel}
+          </p>
+        </div>
+        {isConfigured && !isSelected && (
+          <CheckCircle2 size={14} className="text-success shrink-0 mt-0.5" />
+        )}
+        {isSelected && (
+          <CheckCircle2 size={16} className="shrink-0 mt-0.5" style={{ color: 'var(--amber)' }} />
+        )}
+      </button>
+    );
+  };
+
+  const { primary: primaryItems, more: moreItems } = groups;
+
+  return (
+    <div className="space-y-2">
+      {/* Primary providers — always visible */}
+      <div className={compact ? 'flex flex-wrap gap-2' : 'grid grid-cols-1 gap-2'}>
+        {primaryItems.map(renderItem)}
+      </div>
+
+      {/* Show more toggle */}
+      {moreItems.length > 0 && (
+        <>
+          <button
+            type="button"
+            onClick={() => setShowMore(!showMore)}
+            className="flex items-center gap-1 text-xs text-muted-foreground hover:text-foreground transition-colors py-1"
+          >
+            <ChevronDown size={12} className={`transition-transform ${showMore ? 'rotate-180' : ''}`} />
+            {showMore
+              ? (locale === 'zh' ? '收起' : 'Show less')
+              : (locale === 'zh' ? `更多 (${moreItems.length})` : `More providers (${moreItems.length})`)}
+          </button>
+
+          {showMore && (
+            <div className={compact ? 'flex flex-wrap gap-2' : 'grid grid-cols-1 gap-2'}>
+              {moreItems.map(renderItem)}
+            </div>
+          )}
+        </>
+      )}
+
+      {/* Skip option — only in onboarding */}
+      {showSkip && (
+        <button
+          type="button"
+          onClick={() => onChange('skip')}
+          className="flex items-center gap-2 px-3 py-2 rounded-lg border text-left transition-all text-sm w-full mt-1"
+          style={{
+            background: value === 'skip' ? 'var(--amber-dim)' : 'var(--card)',
+            borderColor: value === 'skip' ? 'var(--amber)' : 'var(--border)',
+          }}
+        >
+          <SkipForward size={14} className="shrink-0" style={{ color: value === 'skip' ? 'var(--amber)' : 'var(--muted-foreground)' }} />
+          <span className={`font-medium ${value === 'skip' ? 'text-foreground' : 'text-muted-foreground'}`}>
+            {locale === 'zh' ? '暂时跳过' : 'Skip for now'}
+          </span>
+          {value === 'skip' && (
+            <CheckCircle2 size={14} className="ml-auto shrink-0" style={{ color: 'var(--amber)' }} />
+          )}
+        </button>
+      )}
+    </div>
+  );
+}

package/app/components/walkthrough/WalkthroughOverlay.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import { useState, useEffect, useCallback, useId } from 'react';
-import { useLocale } from '@/lib/LocaleContext';
-import { useWalkthrough } from './WalkthroughProvider';
+import { useLocale } from '@/lib/stores/locale-store';
+import { useWalkthrough } from '@/lib/stores/walkthrough-store';
 import { walkthroughSteps } from './steps';
 import WalkthroughTooltip from './WalkthroughTooltip';
 

package/app/components/walkthrough/WalkthroughTooltip.tsx

@@ -1,8 +1,8 @@
 'use client';
 
 import { useState, useEffect } from 'react';
-import { useLocale } from '@/lib/LocaleContext';
-import { useWalkthrough } from './WalkthroughProvider';
+import { useLocale } from '@/lib/stores/locale-store';
+import { useWalkthrough } from '@/lib/stores/walkthrough-store';
 
 interface WalkthroughTooltipProps {
   stepIndex: number;

package/app/components/walkthrough/index.ts

@@ -1,3 +1,3 @@
-export { default as WalkthroughProvider, useWalkthrough } from './WalkthroughProvider';
+export { useWalkthrough } from '@/lib/stores/walkthrough-store';
 export { walkthroughSteps } from './steps';
 export type { WalkthroughAnchor } from './steps';

package/app/data/skills/mindos/SKILL.md

@@ -7,17 +7,21 @@ description: >
   Use when the task targets files inside the user's MindOS KB (mindRoot).
   NOT for editing app source, project docs, or paths outside the KB.
   Core concepts: Space, Instruction (INSTRUCTION.md), Skill (SKILL.md); notes can embody both.
+  Trigger when user asks to: save or record a note, search their knowledge base, update or edit
+  a file, organize notes, run a workflow or SOP, capture decisions from a session, append rows
+  to a table or CSV, hand off context to another agent — or says "帮我记下来" / "搜一下我的笔记" /
+  "更新知识库" / "整理文件" / "执行工作流".
 ---
 
 # MindOS Skill
 
-<!-- version: 1.3.1 -->
+<!-- version: 1.3.2 -->
 
 **Before every task, internalize these 5 rules:**
 
 1. The **bootstrap directory tree is the primary index** — reason from names and hierarchy before calling search. Most questions can be answered by reading what's already in context.
 2. **Default to read-only.** Only invoke write tools when the user explicitly asks to save, record, organize, or edit. Lookup / summarize / quote = no writes.
-3. **Rule precedence** (highest wins): user's current-turn instruction → `user-skill-rules.md` → nearest directory `INSTRUCTION.md` → root `INSTRUCTION.md` → this SKILL's defaults.
+3. **Rule precedence** (highest wins): user's current-turn instruction → `.mindos/user-preferences.md` → nearest directory `INSTRUCTION.md` → root `INSTRUCTION.md` → this SKILL's defaults.
 4. **Multi-file edits require a plan first.** Present the full change list; execute only after approval.
 5. After create/delete/move/rename → **sync affected READMEs** automatically.
 
@@ -83,8 +87,7 @@ User request
       └─ ASK for clarification. Propose 2-3 specific options based on KB state. Do NOT start editing.
 ```
 
-**For any write/SOP/structural path above → read [references/write-supplement.md](./references/write-supplement.md) first.**
-It covers: startup protocol, write tool selection, and step-by-step execution details for each path.
+**For any write/SOP/structural path above → the write supplement is already loaded in context (see `## Write & Workflow Supplement` section below or in the next context block).**
 
 ---
 
@@ -97,7 +100,7 @@ It covers: startup protocol, write tool selection, and step-by-step execution de
 | Find files | `mindos_search_notes` (2-4 parallel keyword variants) | Single-keyword search |
 | Read content | `mindos_read_file` or `mindos_read_lines` (for large files) | Reading entire large file when you need 10 lines |
 
-Write, structural, and history tools → [references/write-supplement.md](./references/write-supplement.md).
+Write, structural, and history tools → see Write & Workflow Supplement (loaded below or in next context block).
 
 ### Fallbacks
 
@@ -112,21 +115,33 @@ Write, structural, and history tools → [references/write-supplement.md](./refe
 |---------|------|-----------|
 | **Read-only Q&A** | Lookup / summarize / quote | Tree reasoning → search → read → answer with citations → state gaps |
 
-For write, SOP, structural, and handoff patterns → [references/write-supplement.md](./references/write-supplement.md).
+For write, SOP, structural, and handoff patterns → see Write & Workflow Supplement (loaded below or in next context block).
 
 ---
 
-## Interaction rules
+## Judgment heuristics
 
-- **Ambiguous request?** Ask first. Propose 2-3 options based on KB state (recent changes, directory structure). Never start reorganizing without understanding scope.
-- **Cite sources.** Every fact from the KB gets a file path so the user can verify.
-- **Brevity first.** Show the most likely match, not an exhaustive list.
+**Save intent — read vs. write boundary**
+- "帮我记下来" / "记录一下" / "保存这个" = write
+- "搜一下有没有关于 X 的笔记" / "总结上周的工作" = read-only
+- Ambiguous boundary ("整理一下这些内容") → ask first: display only, or write back to KB?
+
+**File location uncertainty**
+- 扫目录树 5 秒内定不下来 → don't invent a new directory; use the nearest semantically-fit existing one and inform the user
+- User says "just put it somewhere" → place in inbox or top-level general directory, propose classification after (triggers Structure classification hook)
+
+**Scope creep signals**
+- Single input routes to >5 files → pause, confirm scope; users rarely intend bulk rewrites
+- "Update all of these" + content spans multiple topics → split into batches, confirm each, don't execute all at once
+
+**Citation discipline**
+- KB-cited facts must include the file path so the user can verify
 
 ---
 
 ## Post-task hooks
 
-After **write tasks** (not simple single-file edits or read-only), scan this table. If a condition matches, make a one-line proposal. At most 1 proposal; pick highest priority. Check `user-skill-rules.md` suppression section first. Skip all if user asked for quiet mode.
+After **write tasks** (not simple single-file edits or read-only), scan this table. If a condition matches, make a one-line proposal. At most 1 proposal; pick highest priority. Check `.mindos/user-preferences.md` suppression section first. Skip all if user asked for quiet mode.
 
 | Hook | Priority | Condition |
 |------|----------|-----------|
@@ -142,7 +157,7 @@ If a hook triggers → read [references/post-task-hooks.md](./references/post-ta
 
 ## Preference capture
 
-When the user expresses a standing preference ("don't do X", "always put Y in Z"), read [references/preference-capture.md](./references/preference-capture.md) and follow the confirm-then-write flow to `user-skill-rules.md`.
+When the user expresses a standing preference ("don't do X", "always put Y in Z"), read [references/preference-capture.md](./references/preference-capture.md) and follow the confirm-then-write flow to `.mindos/user-preferences.md`.
 **Do NOT read** preference-capture unless the user actually expressed a preference to persist.
 
 ## SOP authoring

package/app/data/skills/mindos-zh/SKILL.md

@@ -6,17 +6,21 @@ description: >
   update notes, search knowledge base, organize, SOP, retrospective, CSV, handoff, route notes, distill experience.
   仅 mindRoot 知识库内任务。不用于：改代码仓库/项目文档/KB 外路径。
   核心概念：空间、指令(INSTRUCTION.md)、技能(SKILL.md)；笔记可承载指令与技能。
+  当用户说"帮我记下来"、"搜一下我的笔记"、"更新知识库"、"整理文件"、"执行工作流"、
+  "记录这次会议的决策"、"追加到表格"、"交接给下一个 Agent" 时触发。
+  也适用于：save/record a note, search KB, update/edit files, run SOP, capture decisions,
+  append CSV rows, cross-agent handoff — 所有 mindRoot 知识库内的读写操作。
 ---
 
 # MindOS Skill
 
-<!-- version: 1.3.1 -->
+<!-- version: 1.3.2 -->
 
 **每次任务前，内化这 5 条规则：**
 
 1. **bootstrap 目录树是首要索引** — 先从目录名和层级推断，再搜索。大多数定位不需要工具调用。
 2. **默认只读。** 只有用户明确要求保存、记录、整理、修改时才调写入工具。查阅/总结/引用 = 不写。
-3. **规则优先级**（越上越优先）：用户当轮指令 → `user-skill-rules.md` → 就近目录 `INSTRUCTION.md` → 根 `INSTRUCTION.md` → 本 SKILL 默认。
+3. **规则优先级**（越上越优先）：用户当轮指令 → `.mindos/user-preferences.md` → 就近目录 `INSTRUCTION.md` → 根 `INSTRUCTION.md` → 本 SKILL 默认。
 4. **多文件编辑必须先出计划。** 展示完整变更清单，确认后再执行。
 5. 增删/移动/重命名后 → **自动同步受影响 README**。
 
@@ -82,8 +86,7 @@ description: >
       └─ 先问清楚。基于 KB 状态提出 2-3 个具体选项。不要开始编辑。
 ```
 
-**以上任何写入 / SOP / 结构路径 → 先读 [references/write-supplement.md](./references/write-supplement.md)。**
-包含：启动协议、写工具选型、各路径详细执行步骤。
+**以上任何写入 / SOP / 结构路径 → 写入补充已加载到上下文（见下方或下一个上下文块中的 `## 写入与工作流补充` 章节）。**
 
 ---
 
@@ -96,7 +99,7 @@ description: >
 | 找文件 | `mindos_search_notes`（2-4 条并行关键词变体）| 单关键词搜索 |
 | 读内容 | `mindos_read_file` 或 `mindos_read_lines`（大文件） | 只需 10 行却读整文件 |
 
-写入、结构变更、历史工具 → [references/write-supplement.md](./references/write-supplement.md)。
+写入、结构变更、历史工具 → 见写入与工作流补充（已加载到下方或下一个上下文块）。
 
 ### 回退
 
@@ -111,21 +114,33 @@ description: >
 |------|----------|----------|
 | **只读问答** | 查找 / 总结 / 引用 | 目录树推断 → 搜索 → 读取 → 标注来源 → 明确说信息缺口 |
 
-写入模式详细执行步骤 → [references/write-supplement.md](./references/write-supplement.md)。
+写入模式详细执行步骤 → 见写入与工作流补充（已加载到下方或下一个上下文块）。
 
 ---
 
-## 交互规则
+## 判断启发式规则
 
-- **模糊请求？** 先问。基于 KB 现状提出 2-3 个选项。不要在没理解范围前开始编辑。
-- **标注来源。** KB 中的事实附带文件路径，便于验证。
-- **简洁优先。** 展示最可能的匹配，不列全部。
+**保存意图 — 读写边界识别**
+- "帮我记下来" / "记录一下" / "保存这个" = 写入
+- "搜一下有没有关于 X 的笔记" / "总结上周的工作" = 只读
+- 模糊边界（"整理一下这些内容"）→ 先问：是读取展示，还是写回 KB？
+
+**文件位置不确定时**
+- 扫目录树 5 秒内定不下来 → 不要自创新目录；放语义最近的已有目录，告知用户
+- 用户说"随便放个地方" → 放 inbox 或最顶层通用目录，任务后提议归类（触发 Structure classification hook）
+
+**范围蔓延信号**
+- 单条输入导致路由表 > 5 个文件 → 暂停，先确认范围；用户鲜少意图批量重写
+- "把这些都更新一下" + 内容跨越多个主题 → 拆成批次确认，不一次性执行
+
+**引用纪律**
+- KB 中引用的事实必须附带文件路径，便于用户核查
 
 ---
 
 ## 任务后 Hooks
 
-**写入任务**完成后（简单单文件修改或只读查阅跳过），扫描下表。命中则发起一句话提议，最多 1 条，选优先级最高项。先查 `user-skill-rules.md` 的抑制区；用户要求安静模式时全部跳过。
+**写入任务**完成后（简单单文件修改或只读查阅跳过），扫描下表。命中则发起一句话提议，最多 1 条，选优先级最高项。先查 `.mindos/user-preferences.md` 的抑制区；用户要求安静模式时全部跳过。
 
 | Hook | 优先级 | 触发条件 |
 |------|--------|---------|
@@ -141,7 +156,7 @@ description: >
 
 ## 偏好捕获
 
-用户表达要长期记住的偏好（「以后不要…」「这个该放在…」）时，读 [references/preference-capture.md](./references/preference-capture.md) 并按确认后写入流程存入 `user-skill-rules.md`。
+用户表达要长期记住的偏好（「以后不要…」「这个该放在…」）时，读 [references/preference-capture.md](./references/preference-capture.md) 并按确认后写入流程存入 `.mindos/user-preferences.md`。
 **不要读** preference-capture 除非用户真的表达了要持久化的偏好。
 
 ## SOP 编写

package/app/hooks/useAcpDetection.ts

@@ -30,7 +30,7 @@ interface AcpDetectionState {
 
 const STORAGE_KEY = 'mindos:acp-detection';
 const STALE_TTL_MS = 30 * 60 * 1000;
-const REVALIDATE_TTL_MS = 5 * 60 * 1000;
+const REVALIDATE_TTL_MS = 30 * 60 * 1000;
 
 interface DetectionCache {
   installed: DetectedAgent[];

package/app/hooks/useAskChat.ts

@@ -0,0 +1,248 @@
+'use client';
+
+import { useRef, useState, useCallback } from 'react';
+import type { Message, ImagePart, AskMode } from '@/lib/types';
+import type { ProviderId } from '@/lib/agent/providers';
+import { consumeUIMessageStream } from '@/lib/agent/stream-consumer';
+import { isRetryableError, retryDelay, sleep } from '@/lib/agent/reconnect';
+
+export type LoadingPhase = 'connecting' | 'thinking' | 'streaming' | 'reconnecting';
+
+export interface AskChatRefs {
+  inputValueRef: React.RefObject<string>;
+  mentionRef: React.RefObject<{ mentionQuery: string | null }>;
+  slashRef: React.RefObject<{ slashQuery: string | null }>;
+  imageUploadRef: React.RefObject<{ images: ImagePart[]; clearImages: () => void }>;
+  sessionRef: React.RefObject<{
+    messages: Message[];
+    setMessages: React.Dispatch<React.SetStateAction<Message[]>>;
+  }>;
+  uploadRef: React.RefObject<{
+    localAttachments: { name: string; content: string }[];
+  }>;
+  selectedSkillRef: React.RefObject<{ name: string } | null>;
+  selectedAcpAgentRef: React.RefObject<unknown>;
+  attachedFilesRef: React.RefObject<string[]>;
+}
+
+interface UseAskChatOpts {
+  currentFile?: string;
+  chatMode: AskMode;
+  providerOverride: ProviderId | null;
+  onFirstMessage?: () => void;
+  refs: AskChatRefs;
+  errorLabels: { noResponse: string; stopped: string };
+  resetInputState: () => void;
+}
+
+export function useAskChat({
+  currentFile,
+  chatMode,
+  providerOverride,
+  onFirstMessage,
+  refs,
+  errorLabels,
+  resetInputState,
+}: UseAskChatOpts) {
+  const [isLoading, setIsLoading] = useState(false);
+  const [loadingPhase, setLoadingPhase] = useState<LoadingPhase>('connecting');
+  const [reconnectAttempt, setReconnectAttempt] = useState(0);
+  const reconnectMaxRef = useRef(3);
+  const abortRef = useRef<AbortController | null>(null);
+  const firstMessageFired = useRef(false);
+
+  const stop = useCallback(() => { abortRef.current?.abort(); }, []);
+
+  const submit = useCallback(async (e: React.FormEvent) => {
+    e.preventDefault();
+    const m = refs.mentionRef.current;
+    const s = refs.slashRef.current;
+    const img = refs.imageUploadRef.current;
+    const sess = refs.sessionRef.current;
+    const upl = refs.uploadRef.current;
+    if (!m || !s || !img || !sess || !upl) return;
+    if (m.mentionQuery !== null || s.slashQuery !== null) return;
+    const text = refs.inputValueRef.current?.trim() ?? '';
+    if ((!text && img.images.length === 0) || isLoadingRef.current) return;
+
+    const skill = refs.selectedSkillRef.current;
+    const acpAgent = refs.selectedAcpAgentRef.current;
+    const pendingImages = img.images.length > 0 ? [...img.images] : undefined;
+    const userMsg: Message = {
+      role: 'user',
+      content: text,
+      timestamp: Date.now(),
+      ...(skill && { skillName: skill.name }),
+      ...(pendingImages && { images: pendingImages }),
+    };
+    img.clearImages();
+    const requestMessages = [...sess.messages, userMsg];
+    sess.setMessages([...requestMessages, { role: 'assistant', content: '', timestamp: Date.now() }]);
+
+    resetInputState();
+
+    if (onFirstMessage && !firstMessageFired.current) {
+      firstMessageFired.current = true;
+      onFirstMessage();
+    }
+    setIsLoading(true);
+    setLoadingPhase('connecting');
+    setReconnectAttempt(0);
+
+    const controller = new AbortController();
+    abortRef.current = controller;
+
+    let maxRetries = 3;
+    try {
+      const stored = localStorage.getItem('mindos-reconnect-retries');
+      if (stored !== null) { const n = parseInt(stored, 10); if (Number.isFinite(n)) maxRetries = Math.max(0, Math.min(10, n)); }
+    } catch { /* localStorage unavailable */ }
+    reconnectMaxRef.current = maxRetries;
+
+    const requestBody = JSON.stringify({
+      messages: requestMessages,
+      currentFile,
+      attachedFiles: refs.attachedFilesRef.current,
+      uploadedFiles: upl.localAttachments.map(f => ({
+        name: f.name,
+        content: f.content.length > 20_000
+          ? f.content.slice(0, 20_000) + '\n\n[...truncated to first ~20000 chars]'
+          : f.content,
+      })),
+      selectedAcpAgent: acpAgent,
+      mode: chatMode,
+      providerOverride: providerOverride ?? undefined,
+    });
+
+    const doFetch = async (): Promise<{ finalMessage: Message }> => {
+      const res = await fetch('/api/ask', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: requestBody,
+        signal: controller.signal,
+      });
+
+      if (!res.ok) {
+        let errorMsg = `Request failed (${res.status})`;
+        try {
+          const errBody = await res.json() as { error?: { message?: string } | string; message?: string };
+          if (typeof errBody?.error === 'string' && errBody.error.trim()) {
+            errorMsg = errBody.error;
+          } else if (typeof errBody?.error === 'object' && typeof errBody.error?.message === 'string' && errBody.error.message.trim()) {
+            errorMsg = errBody.error.message;
+          } else if (typeof errBody?.message === 'string' && errBody.message.trim()) {
+            errorMsg = errBody.message;
+          }
+        } catch (err) { console.warn("[useAskChat] error body parse failed:", err); }
+        const err = new Error(errorMsg);
+        (err as Error & { httpStatus?: number }).httpStatus = res.status;
+        throw err;
+      }
+
+      if (!res.body) throw new Error('No response body');
+
+      setLoadingPhase('thinking');
+
+      const finalMessage = await consumeUIMessageStream(
+        res.body,
+        (msg) => {
+          setLoadingPhase('streaming');
+          refs.sessionRef.current?.setMessages(prev => {
+            const updated = [...prev];
+            updated[updated.length - 1] = msg;
+            return updated;
+          });
+        },
+        controller.signal,
+      );
+      return { finalMessage };
+    };
+
+    try {
+      let lastError: Error | null = null;
+
+      for (let attempt = 0; attempt <= maxRetries; attempt++) {
+        if (controller.signal.aborted) break;
+
+        if (attempt > 0) {
+          setReconnectAttempt(attempt);
+          setLoadingPhase('reconnecting');
+          refs.sessionRef.current?.setMessages(prev => {
+            const updated = [...prev];
+            updated[updated.length - 1] = { role: 'assistant', content: '', timestamp: Date.now() };
+            return updated;
+          });
+          await sleep(retryDelay(attempt - 1), controller.signal);
+          setLoadingPhase('connecting');
+        }
+
+        try {
+          const { finalMessage } = await doFetch();
+          if (!finalMessage.content.trim() && (!finalMessage.parts || finalMessage.parts.length === 0)) {
+            refs.sessionRef.current?.setMessages(prev => {
+              const updated = [...prev];
+              updated[updated.length - 1] = { role: 'assistant', content: `__error__${errorLabels.noResponse}` };
+              return updated;
+            });
+          }
+          return;
+        } catch (err) {
+          lastError = err instanceof Error ? err : new Error(String(err));
+          const httpStatus = (err as Error & { httpStatus?: number }).httpStatus;
+          if (!isRetryableError(err, httpStatus) || attempt >= maxRetries) break;
+        }
+      }
+
+      if (lastError) throw lastError;
+    } catch (err) {
+      if ((err as Error).name === 'AbortError') {
+        refs.sessionRef.current?.setMessages(prev => {
+          const updated = [...prev];
+          const lastIdx = updated.length - 1;
+          if (lastIdx >= 0 && updated[lastIdx].role === 'assistant') {
+            const last = updated[lastIdx];
+            const hasContent = last.content.trim() || (last.parts && last.parts.length > 0);
+            if (!hasContent) {
+              updated[lastIdx] = { role: 'assistant', content: `__error__${errorLabels.stopped}` };
+            }
+          }
+          return updated;
+        });
+      } else {
+        const errMsg = err instanceof Error ? err.message : 'Something went wrong';
+        refs.sessionRef.current?.setMessages(prev => {
+          const updated = [...prev];
+          const lastIdx = updated.length - 1;
+          if (lastIdx >= 0 && updated[lastIdx].role === 'assistant') {
+            const last = updated[lastIdx];
+            const hasContent = last.content.trim() || (last.parts && last.parts.length > 0);
+            if (!hasContent) {
+              updated[lastIdx] = { role: 'assistant', content: `__error__${errMsg}` };
+              return updated;
+            }
+          }
+          return [...updated, { role: 'assistant', content: `__error__${errMsg}` }];
+        });
+      }
+    } finally {
+      setIsLoading(false);
+      setReconnectAttempt(0);
+      abortRef.current = null;
+    }
+  }, [currentFile, chatMode, providerOverride, errorLabels.noResponse, errorLabels.stopped, onFirstMessage, refs, resetInputState]);
+
+  const isLoadingRef = useRef(isLoading);
+  isLoadingRef.current = isLoading;
+
+  return {
+    isLoading,
+    isLoadingRef,
+    loadingPhase,
+    reconnectAttempt,
+    reconnectMaxRef,
+    abortRef,
+    firstMessageFired,
+    submit,
+    stop,
+  };
+}

package/app/hooks/useAskPanel.ts

@@ -1,6 +1,6 @@
 'use client';
 
-import { useState, useEffect, useCallback } from 'react';
+import { useState, useEffect, useCallback, useRef } from 'react';
 import { RIGHT_ASK_DEFAULT_WIDTH, RIGHT_ASK_MIN_WIDTH, RIGHT_ASK_MAX_WIDTH } from '@/components/RightAskPanel';
 import { useAskModal, type AcpAgentSelection } from './useAskModal';
 
@@ -35,6 +35,7 @@ export function useAskPanel(): AskPanelState {
   const [askMaximized, setAskMaximized] = useState(false);
   const [askOpenSource, setAskOpenSource] = useState<'user' | 'guide' | 'guide-next'>('user');
   const [askAcpAgent, setAskAcpAgent] = useState<AcpAgentSelection | null>(null);
+  const prevWidthRef = useRef(RIGHT_ASK_DEFAULT_WIDTH);
 
   const askModal = useAskModal();
 
@@ -44,7 +45,10 @@ export function useAskPanel(): AskPanelState {
       const stored = localStorage.getItem('right-ask-panel-width');
       if (stored) {
         const w = parseInt(stored, 10);
-        if (w >= RIGHT_ASK_MIN_WIDTH && w <= RIGHT_ASK_MAX_WIDTH) setAskPanelWidth(w);
+        if (w >= RIGHT_ASK_MIN_WIDTH && w <= RIGHT_ASK_MAX_WIDTH) {
+          setAskPanelWidth(w);
+          prevWidthRef.current = w;
+        }
       }
       const mode = localStorage.getItem('ask-mode');
       if (mode === 'popup') setAskMode('popup');
@@ -88,8 +92,24 @@ export function useAskPanel(): AskPanelState {
     }
   }, [askMode]);
 
-  const closeAskPanel = useCallback(() => { setAskPanelOpen(false); setAskMaximized(false); }, []);
-  const toggleAskMaximized = useCallback(() => setAskMaximized(v => !v), []);
+  const closeAskPanel = useCallback(() => {
+    setAskPanelOpen(false);
+    if (askMaximized) {
+      setAskPanelWidth(prevWidthRef.current);
+      setAskMaximized(false);
+    }
+  }, [askMaximized]);
+
+  const toggleAskMaximized = useCallback(() => {
+    setAskMaximized(prev => {
+      if (!prev) {
+        prevWidthRef.current = askPanelWidth;
+      } else {
+        setAskPanelWidth(prevWidthRef.current);
+      }
+      return !prev;
+    });
+  }, [askPanelWidth]);
   const closeDesktopAskPopup = useCallback(() => setDesktopAskPopupOpen(false), []);
 
   const handleAskWidthChange = useCallback((w: number) => setAskPanelWidth(w), []);