@geminilight/mindos 0.6.18 → 0.6.20

package/app/app/api/ask/route.ts

@@ -16,8 +16,8 @@ import fs from 'fs';
 import path from 'path';
 import { getFileContent, getMindRoot } from '@/lib/fs';
 import { getModelConfig } from '@/lib/agent/model';
-import { getRequestScopedTools, WRITE_TOOLS, truncate } from '@/lib/agent/tools';
-import { AGENT_SYSTEM_PROMPT } from '@/lib/agent/prompt';
+import { getRequestScopedTools, getOrganizeTools, WRITE_TOOLS, truncate } from '@/lib/agent/tools';
+import { AGENT_SYSTEM_PROMPT, ORGANIZE_SYSTEM_PROMPT } from '@/lib/agent/prompt';
 import { toAgentMessages } from '@/lib/agent/to-agent-messages';
 import { logAgentOp } from '@/lib/agent/log';
 import { readSettings } from '@/lib/settings';
@@ -252,6 +252,8 @@ export async function POST(req: NextRequest) {
     attachedFiles?: string[];
     uploadedFiles?: Array<{ name: string; content: string }>;
     maxSteps?: number;
+    /** 'organize' = lean prompt for file import organize; default = full prompt */
+    mode?: 'organize' | 'default';
   };
   try {
     body = await req.json();
@@ -260,6 +262,7 @@ export async function POST(req: NextRequest) {
   }
 
   const { messages, currentFile, attachedFiles, uploadedFiles } = body;
+  const isOrganizeMode = body.mode === 'organize';
 
   // Read agent config from settings
   const serverSettings = readSettings();
@@ -271,99 +274,7 @@ export async function POST(req: NextRequest) {
   const thinkingBudget = agentConfig.thinkingBudget ?? 5000;
   const contextStrategy = agentConfig.contextStrategy ?? 'auto';
 
-  // Auto-load skill + bootstrap context for each request.
-  // 1. SKILL.md — complete skill with operating rules (always loaded)
-  // 2. user-skill-rules.md — user's personalized rules from KB root (if exists)
-  const isZh = serverSettings.disabledSkills?.includes('mindos') ?? false;
-  const skillDirName = isZh ? 'mindos-zh' : 'mindos';
-  const appDir = process.env.MINDOS_PROJECT_ROOT
-    ? path.join(process.env.MINDOS_PROJECT_ROOT, 'app')
-    : process.cwd();
-  const skillPath = path.join(appDir, `data/skills/${skillDirName}/SKILL.md`);
-  const skill = readAbsoluteFile(skillPath);
-
-  const mindRoot = getMindRoot();
-  const userSkillRules = readKnowledgeFile('user-skill-rules.md');
-
-  const targetDir = dirnameOf(currentFile);
-  const bootstrap = {
-    instruction: readKnowledgeFile('INSTRUCTION.md'),
-    index: readKnowledgeFile('README.md'),
-    config_json: readKnowledgeFile('CONFIG.json'),
-    config_md: readKnowledgeFile('CONFIG.md'),
-    target_readme: targetDir ? readKnowledgeFile(`${targetDir}/README.md`) : null,
-    target_instruction: targetDir ? readKnowledgeFile(`${targetDir}/INSTRUCTION.md`) : null,
-    target_config_json: targetDir ? readKnowledgeFile(`${targetDir}/CONFIG.json`) : null,
-    target_config_md: targetDir ? readKnowledgeFile(`${targetDir}/CONFIG.md`) : null,
-  };
-
-  // Only report failures + truncation warnings
-  const initFailures: string[] = [];
-  const truncationWarnings: string[] = [];
-  if (!skill.ok) initFailures.push(`skill.mindos: failed (${skill.error})`);
-  if (skill.ok && skill.truncated) truncationWarnings.push('skill.mindos was truncated');
-  if (userSkillRules.ok && userSkillRules.truncated) truncationWarnings.push('user-skill-rules.md was truncated');
-  if (!bootstrap.instruction.ok) initFailures.push(`bootstrap.instruction: failed (${bootstrap.instruction.error})`);
-  if (bootstrap.instruction.ok && bootstrap.instruction.truncated) truncationWarnings.push('bootstrap.instruction was truncated');
-  if (!bootstrap.index.ok) initFailures.push(`bootstrap.index: failed (${bootstrap.index.error})`);
-  if (bootstrap.index.ok && bootstrap.index.truncated) truncationWarnings.push('bootstrap.index was truncated');
-  if (!bootstrap.config_json.ok) initFailures.push(`bootstrap.config_json: failed (${bootstrap.config_json.error})`);
-  if (bootstrap.config_json.ok && bootstrap.config_json.truncated) truncationWarnings.push('bootstrap.config_json was truncated');
-  if (!bootstrap.config_md.ok) initFailures.push(`bootstrap.config_md: failed (${bootstrap.config_md.error})`);
-  if (bootstrap.config_md.ok && bootstrap.config_md.truncated) truncationWarnings.push('bootstrap.config_md was truncated');
-  if (bootstrap.target_readme && !bootstrap.target_readme.ok) initFailures.push(`bootstrap.target_readme: failed (${bootstrap.target_readme.error})`);
-  if (bootstrap.target_readme?.ok && bootstrap.target_readme.truncated) truncationWarnings.push('bootstrap.target_readme was truncated');
-  if (bootstrap.target_instruction && !bootstrap.target_instruction.ok) initFailures.push(`bootstrap.target_instruction: failed (${bootstrap.target_instruction.error})`);
-  if (bootstrap.target_instruction?.ok && bootstrap.target_instruction.truncated) truncationWarnings.push('bootstrap.target_instruction was truncated');
-  if (bootstrap.target_config_json && !bootstrap.target_config_json.ok) initFailures.push(`bootstrap.target_config_json: failed (${bootstrap.target_config_json.error})`);
-  if (bootstrap.target_config_json?.ok && bootstrap.target_config_json.truncated) truncationWarnings.push('bootstrap.target_config_json was truncated');
-  if (bootstrap.target_config_md && !bootstrap.target_config_md.ok) initFailures.push(`bootstrap.target_config_md: failed (${bootstrap.target_config_md.error})`);
-  if (bootstrap.target_config_md?.ok && bootstrap.target_config_md.truncated) truncationWarnings.push('bootstrap.target_config_md was truncated');
-
-  const initStatus = initFailures.length === 0
-    ? `All initialization contexts loaded successfully. mind_root=${getMindRoot()}${targetDir ? `, target_dir=${targetDir}` : ''}${truncationWarnings.length > 0 ? ` ⚠️ ${truncationWarnings.length} files truncated` : ''}`
-    : `Initialization issues:\n${initFailures.join('\n')}\nmind_root=${getMindRoot()}${targetDir ? `, target_dir=${targetDir}` : ''}${truncationWarnings.length > 0 ? `\n⚠️ Warnings:\n${truncationWarnings.join('\n')}` : ''}`;
-
-  const initContextBlocks: string[] = [];
-  if (skill.ok) initContextBlocks.push(`## mindos_skill_md\n\n${skill.content}`);
-  // User personalization rules (from knowledge base root)
-  if (userSkillRules.ok && !userSkillRules.truncated && userSkillRules.content.trim()) {
-    initContextBlocks.push(`## user_skill_rules\n\nUser personalization rules (user-skill-rules.md):\n\n${userSkillRules.content}`);
-  }
-  if (bootstrap.instruction.ok) initContextBlocks.push(`## bootstrap_instruction\n\n${bootstrap.instruction.content}`);
-  if (bootstrap.index.ok) initContextBlocks.push(`## bootstrap_index\n\n${bootstrap.index.content}`);
-  if (bootstrap.config_json.ok) initContextBlocks.push(`## bootstrap_config_json\n\n${bootstrap.config_json.content}`);
-  if (bootstrap.config_md.ok) initContextBlocks.push(`## bootstrap_config_md\n\n${bootstrap.config_md.content}`);
-  if (bootstrap.target_readme?.ok) initContextBlocks.push(`## bootstrap_target_readme\n\n${bootstrap.target_readme.content}`);
-  if (bootstrap.target_instruction?.ok) initContextBlocks.push(`## bootstrap_target_instruction\n\n${bootstrap.target_instruction.content}`);
-  if (bootstrap.target_config_json?.ok) initContextBlocks.push(`## bootstrap_target_config_json\n\n${bootstrap.target_config_json.content}`);
-  if (bootstrap.target_config_md?.ok) initContextBlocks.push(`## bootstrap_target_config_md\n\n${bootstrap.target_config_md.content}`);
-
-  // Build initial context from attached/current files
-  const contextParts: string[] = [];
-  const seen = new Set<string>();
-  const hasAttached = Array.isArray(attachedFiles) && attachedFiles.length > 0;
-
-  if (hasAttached) {
-    for (const filePath of attachedFiles!) {
-      if (seen.has(filePath)) continue;
-      seen.add(filePath);
-      try {
-        const content = truncate(getFileContent(filePath));
-        contextParts.push(`## Attached: ${filePath}\n\n${content}`);
-      } catch { /* ignore missing files */ }
-    }
-  }
-
-  if (currentFile && !seen.has(currentFile)) {
-    seen.add(currentFile);
-    try {
-      const content = truncate(getFileContent(currentFile));
-      contextParts.push(`## Current file: ${currentFile}\n\n${content}`);
-    } catch { /* ignore */ }
-  }
-
-  // Uploaded files
+  // Uploaded files — shared by both modes
   const uploadedParts: string[] = [];
   if (Array.isArray(uploadedFiles) && uploadedFiles.length > 0) {
     for (const f of uploadedFiles.slice(0, 8)) {
@@ -372,40 +283,154 @@ export async function POST(req: NextRequest) {
     }
   }
 
-  // Generate current time for the agent's context
-  const now = new Date();
-  const timeContext = `## Current Time Context
+  // ---------------------------------------------------------------------------
+  // Build system prompt — lean path for organize mode, full path otherwise
+  // ---------------------------------------------------------------------------
+  let systemPrompt: string;
+
+  if (isOrganizeMode) {
+    // Organize mode: minimal prompt — only KB structure + uploaded files
+    const promptParts: string[] = [ORGANIZE_SYSTEM_PROMPT];
+
+    promptParts.push(`---\n\nmind_root=${getMindRoot()}`);
+
+    // Only load root README.md for KB structure awareness (skip SKILL.md, configs, target dir, time, etc.)
+    const bootstrapIndex = readKnowledgeFile('README.md');
+    if (bootstrapIndex.ok) {
+      promptParts.push(`---\n\n## Knowledge Base Structure\n\n${bootstrapIndex.content}`);
+    }
+
+    if (uploadedParts.length > 0) {
+      promptParts.push(
+        `---\n\n## ⚠️ USER-UPLOADED FILES\n\n` +
+        `Their FULL CONTENT is below. Use this directly — do NOT call read tools on them.\n\n` +
+        uploadedParts.join('\n\n---\n\n'),
+      );
+    }
+
+    systemPrompt = promptParts.join('\n\n');
+  } else {
+    // Full mode: original prompt assembly
+    // Auto-load skill + bootstrap context for each request.
+    const isZh = serverSettings.disabledSkills?.includes('mindos') ?? false;
+    const skillDirName = isZh ? 'mindos-zh' : 'mindos';
+    const appDir = process.env.MINDOS_PROJECT_ROOT
+      ? path.join(process.env.MINDOS_PROJECT_ROOT, 'app')
+      : process.cwd();
+    const skillPath = path.join(appDir, `data/skills/${skillDirName}/SKILL.md`);
+    const skill = readAbsoluteFile(skillPath);
+
+    const userSkillRules = readKnowledgeFile('user-skill-rules.md');
+
+    const targetDir = dirnameOf(currentFile);
+    const bootstrap = {
+      instruction: readKnowledgeFile('INSTRUCTION.md'),
+      index: readKnowledgeFile('README.md'),
+      config_json: readKnowledgeFile('CONFIG.json'),
+      config_md: readKnowledgeFile('CONFIG.md'),
+      target_readme: targetDir ? readKnowledgeFile(`${targetDir}/README.md`) : null,
+      target_instruction: targetDir ? readKnowledgeFile(`${targetDir}/INSTRUCTION.md`) : null,
+      target_config_json: targetDir ? readKnowledgeFile(`${targetDir}/CONFIG.json`) : null,
+      target_config_md: targetDir ? readKnowledgeFile(`${targetDir}/CONFIG.md`) : null,
+    };
+
+    // Only report failures + truncation warnings
+    const initFailures: string[] = [];
+    const truncationWarnings: string[] = [];
+    if (!skill.ok) initFailures.push(`skill.mindos: failed (${skill.error})`);
+    if (skill.ok && skill.truncated) truncationWarnings.push('skill.mindos was truncated');
+    if (userSkillRules.ok && userSkillRules.truncated) truncationWarnings.push('user-skill-rules.md was truncated');
+    if (!bootstrap.instruction.ok) initFailures.push(`bootstrap.instruction: failed (${bootstrap.instruction.error})`);
+    if (bootstrap.instruction.ok && bootstrap.instruction.truncated) truncationWarnings.push('bootstrap.instruction was truncated');
+    if (!bootstrap.index.ok) initFailures.push(`bootstrap.index: failed (${bootstrap.index.error})`);
+    if (bootstrap.index.ok && bootstrap.index.truncated) truncationWarnings.push('bootstrap.index was truncated');
+    if (!bootstrap.config_json.ok) initFailures.push(`bootstrap.config_json: failed (${bootstrap.config_json.error})`);
+    if (bootstrap.config_json.ok && bootstrap.config_json.truncated) truncationWarnings.push('bootstrap.config_json was truncated');
+    if (!bootstrap.config_md.ok) initFailures.push(`bootstrap.config_md: failed (${bootstrap.config_md.error})`);
+    if (bootstrap.config_md.ok && bootstrap.config_md.truncated) truncationWarnings.push('bootstrap.config_md was truncated');
+    if (bootstrap.target_readme && !bootstrap.target_readme.ok) initFailures.push(`bootstrap.target_readme: failed (${bootstrap.target_readme.error})`);
+    if (bootstrap.target_readme?.ok && bootstrap.target_readme.truncated) truncationWarnings.push('bootstrap.target_readme was truncated');
+    if (bootstrap.target_instruction && !bootstrap.target_instruction.ok) initFailures.push(`bootstrap.target_instruction: failed (${bootstrap.target_instruction.error})`);
+    if (bootstrap.target_instruction?.ok && bootstrap.target_instruction.truncated) truncationWarnings.push('bootstrap.target_instruction was truncated');
+    if (bootstrap.target_config_json && !bootstrap.target_config_json.ok) initFailures.push(`bootstrap.target_config_json: failed (${bootstrap.target_config_json.error})`);
+    if (bootstrap.target_config_json?.ok && bootstrap.target_config_json.truncated) truncationWarnings.push('bootstrap.target_config_json was truncated');
+    if (bootstrap.target_config_md && !bootstrap.target_config_md.ok) initFailures.push(`bootstrap.target_config_md: failed (${bootstrap.target_config_md.error})`);
+    if (bootstrap.target_config_md?.ok && bootstrap.target_config_md.truncated) truncationWarnings.push('bootstrap.target_config_md was truncated');
+
+    const initStatus = initFailures.length === 0
+      ? `All initialization contexts loaded successfully. mind_root=${getMindRoot()}${targetDir ? `, target_dir=${targetDir}` : ''}${truncationWarnings.length > 0 ? ` ⚠️ ${truncationWarnings.length} files truncated` : ''}`
+      : `Initialization issues:\n${initFailures.join('\n')}\nmind_root=${getMindRoot()}${targetDir ? `, target_dir=${targetDir}` : ''}${truncationWarnings.length > 0 ? `\n⚠️ Warnings:\n${truncationWarnings.join('\n')}` : ''}`;
+
+    const initContextBlocks: string[] = [];
+    if (skill.ok) initContextBlocks.push(`## mindos_skill_md\n\n${skill.content}`);
+    if (userSkillRules.ok && !userSkillRules.truncated && userSkillRules.content.trim()) {
+      initContextBlocks.push(`## user_skill_rules\n\nUser personalization rules (user-skill-rules.md):\n\n${userSkillRules.content}`);
+    }
+    if (bootstrap.instruction.ok) initContextBlocks.push(`## bootstrap_instruction\n\n${bootstrap.instruction.content}`);
+    if (bootstrap.index.ok) initContextBlocks.push(`## bootstrap_index\n\n${bootstrap.index.content}`);
+    if (bootstrap.config_json.ok) initContextBlocks.push(`## bootstrap_config_json\n\n${bootstrap.config_json.content}`);
+    if (bootstrap.config_md.ok) initContextBlocks.push(`## bootstrap_config_md\n\n${bootstrap.config_md.content}`);
+    if (bootstrap.target_readme?.ok) initContextBlocks.push(`## bootstrap_target_readme\n\n${bootstrap.target_readme.content}`);
+    if (bootstrap.target_instruction?.ok) initContextBlocks.push(`## bootstrap_target_instruction\n\n${bootstrap.target_instruction.content}`);
+    if (bootstrap.target_config_json?.ok) initContextBlocks.push(`## bootstrap_target_config_json\n\n${bootstrap.target_config_json.content}`);
+    if (bootstrap.target_config_md?.ok) initContextBlocks.push(`## bootstrap_target_config_md\n\n${bootstrap.target_config_md.content}`);
+
+    // Build initial context from attached/current files
+    const contextParts: string[] = [];
+    const seen = new Set<string>();
+    const hasAttached = Array.isArray(attachedFiles) && attachedFiles.length > 0;
+
+    if (hasAttached) {
+      for (const filePath of attachedFiles!) {
+        if (seen.has(filePath)) continue;
+        seen.add(filePath);
+        try {
+          const content = truncate(getFileContent(filePath));
+          contextParts.push(`## Attached: ${filePath}\n\n${content}`);
+        } catch { /* ignore missing files */ }
+      }
+    }
+
+    if (currentFile && !seen.has(currentFile)) {
+      seen.add(currentFile);
+      try {
+        const content = truncate(getFileContent(currentFile));
+        contextParts.push(`## Current file: ${currentFile}\n\n${content}`);
+      } catch { /* ignore */ }
+    }
+
+    const now = new Date();
+    const timeContext = `## Current Time Context
 - Current UTC Time: ${now.toISOString()}
 - System Local Time: ${new Intl.DateTimeFormat('en-US', { dateStyle: 'full', timeStyle: 'long' }).format(now)}
 - Unix Timestamp: ${Math.floor(now.getTime() / 1000)}
 
 *Note: The times listed above represent "NOW". The user may have sent messages hours or days ago in this same conversation thread. Each user message in the history contains its own specific timestamp which you should refer to when understanding historical context.*`;
 
-  const promptParts: string[] = [AGENT_SYSTEM_PROMPT];
-  
-  promptParts.push(`---\n\n${timeContext}`);
-  
-  promptParts.push(`---\n\nInitialization status (auto-loaded at request start):\n\n${initStatus}`);
+    const promptParts: string[] = [AGENT_SYSTEM_PROMPT];
+    promptParts.push(`---\n\n${timeContext}`);
+    promptParts.push(`---\n\nInitialization status (auto-loaded at request start):\n\n${initStatus}`);
 
-  if (initContextBlocks.length > 0) {
-    promptParts.push(`---\n\nInitialization context:\n\n${initContextBlocks.join('\n\n---\n\n')}`);
-  }
+    if (initContextBlocks.length > 0) {
+      promptParts.push(`---\n\nInitialization context:\n\n${initContextBlocks.join('\n\n---\n\n')}`);
+    }
 
-  if (contextParts.length > 0) {
-    promptParts.push(`---\n\nThe user is currently viewing these files:\n\n${contextParts.join('\n\n---\n\n')}`);
-  }
+    if (contextParts.length > 0) {
+      promptParts.push(`---\n\nThe user is currently viewing these files:\n\n${contextParts.join('\n\n---\n\n')}`);
+    }
 
-  if (uploadedParts.length > 0) {
-    promptParts.push(
-      `---\n\n## ⚠️ USER-UPLOADED FILES (ACTIVE ATTACHMENTS)\n\n` +
-      `The user has uploaded the following file(s) in this conversation. ` +
-      `Their FULL CONTENT is provided below. You MUST use this content directly when the user refers to these files. ` +
-      `Do NOT use read_file or search tools to find them — they exist only here, not in the knowledge base.\n\n` +
-      uploadedParts.join('\n\n---\n\n'),
-    );
-  }
+    if (uploadedParts.length > 0) {
+      promptParts.push(
+        `---\n\n## ⚠️ USER-UPLOADED FILES (ACTIVE ATTACHMENTS)\n\n` +
+        `The user has uploaded the following file(s) in this conversation. ` +
+        `Their FULL CONTENT is provided below. You MUST use this content directly when the user refers to these files. ` +
+        `Do NOT use read_file or search tools to find them — they exist only here, not in the knowledge base.\n\n` +
+        uploadedParts.join('\n\n---\n\n'),
+      );
+    }
 
-  const systemPrompt = promptParts.join('\n\n');
+    systemPrompt = promptParts.join('\n\n');
+  }
 
   try {
     const { model, modelName, apiKey, provider } = getModelConfig();
@@ -424,7 +449,7 @@ export async function POST(req: NextRequest) {
     // Capture API key for this request — safe since each POST creates a new Agent instance.
     const requestApiKey = apiKey;
     const projectRoot = process.env.MINDOS_PROJECT_ROOT || path.resolve(process.cwd(), '..');
-    const requestTools = await getRequestScopedTools();
+    const requestTools = isOrganizeMode ? getOrganizeTools() : await getRequestScopedTools();
     const customTools = toPiCustomToolDefinitions(requestTools);
 
     const authStorage = AuthStorage.create();
@@ -492,12 +517,18 @@ export async function POST(req: NextRequest) {
           }
         }
 
+        let hasContent = false;
+        let lastModelError = '';
+
         session.subscribe((event: AgentEvent) => {
           if (isTextDeltaEvent(event)) {
+            hasContent = true;
             send({ type: 'text_delta', delta: getTextDelta(event) });
           } else if (isThinkingDeltaEvent(event)) {
+            hasContent = true;
             send({ type: 'thinking_delta', delta: getThinkingDelta(event) });
           } else if (isToolExecutionStartEvent(event)) {
+            hasContent = true;
             const { toolCallId, toolName, args } = getToolExecutionStart(event);
             const safeArgs = sanitizeToolArgs(toolName, args);
             send({
@@ -555,12 +586,30 @@ export async function POST(req: NextRequest) {
             }
 
             console.log(`[ask] Step ${stepCount}/${stepLimit}`);
+          } else if (event.type === 'agent_end') {
+            // Capture model errors from the last assistant message.
+            // pi-coding-agent resolves prompt() without throwing after retries;
+            // the error is only visible in agent_end event messages.
+            const msgs = (event as any).messages;
+            if (Array.isArray(msgs)) {
+              for (let i = msgs.length - 1; i >= 0; i--) {
+                const m = msgs[i];
+                if (m?.role === 'assistant' && m?.stopReason === 'error' && m?.errorMessage) {
+                  lastModelError = m.errorMessage;
+                  break;
+                }
+              }
+            }
           }
         });
 
         session.prompt(lastUserContent).then(() => {
           metrics.recordRequest(Date.now() - requestStartTime);
-          send({ type: 'done' });
+          if (!hasContent && lastModelError) {
+            send({ type: 'error', message: lastModelError });
+          } else {
+            send({ type: 'done' });
+          }
           controller.close();
         }).catch((err) => {
           metrics.recordRequest(Date.now() - requestStartTime);
@@ -587,3 +636,4 @@ export async function POST(req: NextRequest) {
     return apiError(ErrorCodes.MODEL_INIT_FAILED, err instanceof Error ? err.message : 'Failed to initialize AI model', 500);
   }
 }
+

package/app/app/api/settings/list-models/route.ts

@@ -0,0 +1,96 @@
+export const dynamic = 'force-dynamic';
+import { NextRequest, NextResponse } from 'next/server';
+import { effectiveAiConfig } from '@/lib/settings';
+
+const TIMEOUT = 10_000;
+
+export async function POST(req: NextRequest) {
+  try {
+    const body = await req.json();
+    const { provider, apiKey, baseUrl } = body as {
+      provider?: string;
+      apiKey?: string;
+      baseUrl?: string;
+    };
+
+    if (provider !== 'anthropic' && provider !== 'openai') {
+      return NextResponse.json({ ok: false, error: 'Invalid provider' }, { status: 400 });
+    }
+
+    const cfg = effectiveAiConfig();
+    let resolvedKey = apiKey || '';
+    if (!resolvedKey || resolvedKey === '***set***') {
+      resolvedKey = provider === 'anthropic' ? cfg.anthropicApiKey : cfg.openaiApiKey;
+    }
+
+    if (!resolvedKey) {
+      return NextResponse.json({ ok: false, error: 'No API key configured' });
+    }
+
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(), TIMEOUT);
+
+    try {
+      let models: string[] = [];
+
+      if (provider === 'openai') {
+        const resolvedBaseUrl = (baseUrl || cfg.openaiBaseUrl || 'https://api.openai.com/v1').replace(/\/+$/, '');
+        const res = await fetch(`${resolvedBaseUrl}/models`, {
+          headers: { Authorization: `Bearer ${resolvedKey}` },
+          signal: ctrl.signal,
+        });
+
+        if (!res.ok) {
+          const errBody = await res.text().catch(() => '');
+          return NextResponse.json({
+            ok: false,
+            error: `Failed to list models: HTTP ${res.status} ${errBody.slice(0, 200)}`,
+          });
+        }
+
+        const json = await res.json();
+        if (Array.isArray(json?.data)) {
+          models = json.data
+            .map((m: any) => m.id as string)
+            .filter(Boolean)
+            .sort((a: string, b: string) => a.localeCompare(b));
+        }
+      } else {
+        const res = await fetch('https://api.anthropic.com/v1/models', {
+          headers: {
+            'x-api-key': resolvedKey,
+            'anthropic-version': '2023-06-01',
+          },
+          signal: ctrl.signal,
+        });
+
+        if (!res.ok) {
+          const errBody = await res.text().catch(() => '');
+          return NextResponse.json({
+            ok: false,
+            error: `Failed to list models: HTTP ${res.status} ${errBody.slice(0, 200)}`,
+          });
+        }
+
+        const json = await res.json();
+        if (Array.isArray(json?.data)) {
+          models = json.data
+            .map((m: any) => m.id as string)
+            .filter(Boolean)
+            .sort((a: string, b: string) => a.localeCompare(b));
+        }
+      }
+
+      return NextResponse.json({ ok: true, models });
+    } catch (e: unknown) {
+      if (e instanceof Error && e.name === 'AbortError') {
+        return NextResponse.json({ ok: false, error: 'Request timed out' });
+      }
+      return NextResponse.json({ ok: false, error: e instanceof Error ? e.message : 'Network error' });
+    } finally {
+      clearTimeout(timer);
+    }
+  } catch (err) {
+    return NextResponse.json({ ok: false, error: String(err) }, { status: 500 });
+  }
+}

package/app/app/api/settings/test-key/route.ts

@@ -58,45 +58,45 @@ async function testOpenAI(apiKey: string, model: string, baseUrl: string): Promi
         'Content-Type': 'application/json',
         'Authorization': `Bearer ${apiKey}`,
       },
-      body: JSON.stringify({ model, max_tokens: 1, messages: [{ role: 'user', content: 'hi' }] }),
+      body: JSON.stringify({ model, messages: [{ role: 'user', content: 'hi' }] }),
       signal: ctrl.signal,
     });
     const latency = Date.now() - start;
-    if (res.ok) {
-      // `/api/ask` always sends tool definitions, so key test should verify this
-      // compatibility as well (not just plain chat completion).
-      const toolRes = await fetch(url, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          'Authorization': `Bearer ${apiKey}`,
-        },
-        body: JSON.stringify({
-          model,
-          max_tokens: 1,
-          messages: [
-            { role: 'system', content: 'You are a helpful assistant.' },
-            { role: 'user', content: 'hi' },
-          ],
-          tools: [{
-            type: 'function',
-            function: {
-              name: 'noop',
-              description: 'No-op function used for compatibility checks.',
-              parameters: {
-                type: 'object',
-                properties: {},
-                additionalProperties: false,
-              },
-            },
-          }],
-          tool_choice: 'none',
-        }),
-        signal: ctrl.signal,
-      });
-
-      if (toolRes.ok) return { ok: true, latency };
+    if (!res.ok) {
+      const body = await res.text();
+      return { ok: false, ...classifyError(res.status, body) };
+    }
 
+    // Tool compatibility test — `/api/ask` always sends tool definitions.
+    const toolRes = await fetch(url, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${apiKey}`,
+      },
+      body: JSON.stringify({
+        model,
+        messages: [
+          { role: 'system', content: 'You are a helpful assistant.' },
+          { role: 'user', content: 'hi' },
+        ],
+        tools: [{
+          type: 'function',
+          function: {
+            name: 'noop',
+            description: 'No-op function used for compatibility checks.',
+            parameters: {
+              type: 'object',
+              properties: {},
+              additionalProperties: false,
+            },
+          },
+        }],
+        tool_choice: 'none',
+      }),
+      signal: ctrl.signal,
+    });
+    if (!toolRes.ok) {
       const toolBody = await toolRes.text();
       const toolErr = classifyError(toolRes.status, toolBody);
       return {
@@ -105,8 +105,8 @@ async function testOpenAI(apiKey: string, model: string, baseUrl: string): Promi
         error: `Model endpoint passes basic test but is incompatible with agent tool calls: ${toolErr.error}`,
       };
     }
-    const body = await res.text();
-    return { ok: false, ...classifyError(res.status, body) };
+
+    return { ok: true, latency };
   } catch (e: unknown) {
     if (e instanceof Error && e.name === 'AbortError') return { ok: false, code: 'network_error', error: 'Request timed out' };
     return { ok: false, code: 'network_error', error: e instanceof Error ? e.message : 'Network error' };

package/app/components/OrganizeToast.tsx

@@ -5,6 +5,7 @@ import { useRouter } from 'next/navigation';
 import {
   Check, X, Loader2, Sparkles, AlertCircle, Undo2,
   ChevronDown, FilePlus, FileEdit, ExternalLink,
+  Maximize2, Minimize2, FileIcon,
 } from 'lucide-react';
 import { useLocale } from '@/lib/LocaleContext';
 import type { useAiOrganize } from '@/hooks/useAiOrganize';
@@ -84,6 +85,7 @@ export default function OrganizeToast({
   const { elapsed, displayHint } = useOrganizeTimer(isOrganizing, aiOrganize.stageHint);
 
   const [expanded, setExpanded] = useState(false);
+  const [maximized, setMaximized] = useState(false);
   const [undoing, setUndoing] = useState(false);
   const dismissTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const historyIdRef = useRef<string | null>(null);
@@ -197,7 +199,211 @@ export default function OrganizeToast({
 
   if (!isActive) return null;
 
-  // Expanded panel (file list with per-file undo)
+  // ── Shared file-change row renderer ──
+  function renderChangeRow(c: typeof aiOrganize.changes[number], idx: number) {
+    const wasUndone = c.undone;
+    const undoable = aiOrganize.canUndo(c.path);
+    const fileName = c.path.split('/').pop() ?? c.path;
+    return (
+      <div
+        key={`${c.path}-${idx}`}
+        className={`flex items-center gap-2 px-3 py-2 rounded-md text-sm transition-colors ${wasUndone ? 'bg-muted/30 opacity-50' : 'bg-muted/50'}`}
+      >
+        {wasUndone ? (
+          <Undo2 size={14} className="text-muted-foreground shrink-0" />
+        ) : c.action === 'create' ? (
+          <FilePlus size={14} className="text-success shrink-0" />
+        ) : (
+          <FileEdit size={14} className="text-[var(--amber)] shrink-0" />
+        )}
+        <span className={`truncate flex-1 ${wasUndone ? 'line-through text-muted-foreground' : 'text-foreground'}`}>
+          {fileName}
+        </span>
+        {wasUndone ? (
+          <span className="text-xs text-muted-foreground shrink-0">{fi.organizeUndone as string}</span>
+        ) : (
+          <span className={`text-xs shrink-0 ${c.ok ? 'text-muted-foreground' : 'text-error'}`}>
+            {!c.ok ? fi.organizeFailed as string
+              : c.action === 'create' ? fi.organizeCreated as string
+              : fi.organizeUpdated as string}
+          </span>
+        )}
+        {undoable && (
+          <button
+            type="button"
+            onClick={() => handleUndoOne(c.path)}
+            disabled={undoing}
+            className="text-2xs text-muted-foreground/60 hover:text-foreground transition-colors shrink-0 px-1 disabled:opacity-40"
+            title={fi.organizeUndoOne as string}
+          >
+            <Undo2 size={12} />
+          </button>
+        )}
+        {c.ok && !c.undone && (
+          <button
+            type="button"
+            onClick={() => handleViewFile(c.path)}
+            className="text-2xs text-muted-foreground/60 hover:text-[var(--amber)] transition-colors shrink-0 px-1"
+            title={fi.organizeViewFile as string}
+          >
+            <ExternalLink size={12} />
+          </button>
+        )}
+      </div>
+    );
+  }
+
+  // ── Shared footer actions ──
+  function renderActions() {
+    return (
+      <div className="flex items-center justify-end gap-3 px-4 py-3 border-t border-border">
+        {isDone && aiOrganize.hasAnyUndoable && (
+          <button
+            onClick={handleUndoAll}
+            disabled={undoing}
+            className="flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors px-2 py-1.5 disabled:opacity-50"
+          >
+            {undoing ? <Loader2 size={12} className="animate-spin" /> : <Undo2 size={12} />}
+            {fi.organizeUndoAll as string}
+          </button>
+        )}
+        <button
+          onClick={handleDismiss}
+          className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-xs font-medium bg-[var(--amber)] text-[var(--amber-foreground)] hover:opacity-90 transition-all"
+        >
+          <Check size={12} />
+          {fi.organizeDone as string}
+        </button>
+      </div>
+    );
+  }
+
+  // ═══════════════════════════════════════════════════════════════════════════
+  //  Maximized Modal — full detail view with source files, summary, changes
+  // ═══════════════════════════════════════════════════════════════════════════
+  if (maximized) {
+    return (
+      <div
+        className="fixed inset-0 z-50 overlay-backdrop flex items-center justify-center p-4"
+        onClick={(e) => { if (e.target === e.currentTarget) setMaximized(false); }}
+      >
+        <div
+          className="w-full max-w-xl max-h-[80vh] flex flex-col bg-card rounded-xl shadow-xl border border-border animate-in fade-in-0 zoom-in-95 duration-200"
+          onClick={handleUserAction}
+          role="dialog"
+          aria-modal="true"
+          aria-label={fi.organizeDetailTitle as string}
+        >
+          {/* Header */}
+          <div className="flex items-center justify-between px-5 pt-5 pb-3 shrink-0">
+            <div className="flex items-center gap-2">
+              {isOrganizing ? (
+                <div className="relative shrink-0">
+                  <Sparkles size={16} className="text-[var(--amber)]" />
+                  <Loader2 size={10} className="absolute -bottom-0.5 -right-0.5 text-[var(--amber)] animate-spin" />
+                </div>
+              ) : isDone ? (
+                <Check size={16} className="text-success" />
+              ) : (
+                <AlertCircle size={16} className="text-error" />
+              )}
+              <h2 className="text-base font-semibold text-foreground">
+                {fi.organizeDetailTitle as string}
+              </h2>
+              {isOrganizing && (
+                <span className="text-xs text-muted-foreground/60 tabular-nums">
+                  {(fi.organizeElapsed as (s: number) => string)(elapsed)}
+                </span>
+              )}
+            </div>
+            <div className="flex items-center gap-1">
+              <button
+                type="button"
+                onClick={() => setMaximized(false)}
+                className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground transition-colors"
+                title={fi.organizeMinimizeModal as string}
+              >
+                <Minimize2 size={14} />
+              </button>
+              <button
+                type="button"
+                onClick={handleDismiss}
+                className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground transition-colors"
+              >
+                <X size={14} />
+              </button>
+            </div>
+          </div>
+
+          {/* Scrollable body */}
+          <div className="flex-1 min-h-0 overflow-y-auto px-5 pb-2 space-y-4">
+            {/* Live progress during organizing */}
+            {isOrganizing && (
+              <div className="flex items-center gap-2 px-3 py-2.5 rounded-lg bg-[var(--amber-subtle)] border border-[var(--amber-dim)]">
+                <Loader2 size={14} className="text-[var(--amber)] animate-spin shrink-0" />
+                <span className="text-xs text-foreground">{stageText(t, displayHint)}</span>
+              </div>
+            )}
+
+            {/* Source files */}
+            {aiOrganize.sourceFileNames.length > 0 && (
+              <div>
+                <h3 className="text-xs font-medium text-muted-foreground mb-1.5">
+                  {fi.organizeSourceFiles as string}
+                </h3>
+                <div className="flex flex-wrap gap-1.5">
+                  {aiOrganize.sourceFileNames.map((name, i) => (
+                    <span key={i} className="inline-flex items-center gap-1 px-2 py-1 rounded-md bg-muted/60 text-xs text-foreground">
+                      <FileIcon size={11} className="text-muted-foreground shrink-0" />
+                      {name}
+                    </span>
+                  ))}
+                </div>
+              </div>
+            )}
+
+            {/* AI Summary */}
+            {(aiOrganize.summary || isOrganizing) && (
+              <div>
+                <h3 className="text-xs font-medium text-muted-foreground mb-1.5">
+                  {fi.organizeSummaryLabel as string}
+                </h3>
+                <div className="px-3 py-2.5 rounded-lg bg-muted/30 border border-border text-sm text-foreground leading-relaxed whitespace-pre-wrap">
+                  {aiOrganize.summary || (fi.organizeNoSummary as string)}
+                </div>
+              </div>
+            )}
+
+            {/* File changes */}
+            {aiOrganize.changes.length > 0 && (
+              <div>
+                <h3 className="text-xs font-medium text-muted-foreground mb-1.5">
+                  {(fi.organizeChangesLabel as (n: number) => string)(aiOrganize.changes.length)}
+                </h3>
+                <div className="space-y-0.5">
+                  {aiOrganize.changes.map((c, idx) => renderChangeRow(c, idx))}
+                </div>
+              </div>
+            )}
+
+            {/* Error detail */}
+            {isError && (
+              <div className="px-3 py-2.5 rounded-lg bg-error/5 border border-error/20 text-xs text-error">
+                {aiOrganize.error}
+              </div>
+            )}
+          </div>
+
+          {/* Footer actions */}
+          {(isDone || isError) && renderActions()}
+        </div>
+      </div>
+    );
+  }
+
+  // ═══════════════════════════════════════════════════════════════════════════
+  //  Expanded panel (file list with per-file undo) — bottom toast size
+  // ═══════════════════════════════════════════════════════════════════════════
   if (expanded && (isDone || isError)) {
     return (
       <div
@@ -212,71 +418,29 @@ export default function OrganizeToast({
               {isDone ? fi.organizeReviewTitle as string : fi.organizeErrorTitle as string}
             </span>
           </div>
-          <button
-            type="button"
-            onClick={() => setExpanded(false)}
-            className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground transition-colors"
-          >
-            <ChevronDown size={14} />
-          </button>
+          <div className="flex items-center gap-1">
+            <button
+              type="button"
+              onClick={() => { setExpanded(false); setMaximized(true); }}
+              className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground transition-colors"
+              title={fi.organizeDetailTitle as string}
+            >
+              <Maximize2 size={13} />
+            </button>
+            <button
+              type="button"
+              onClick={() => setExpanded(false)}
+              className="p-1 rounded hover:bg-muted text-muted-foreground hover:text-foreground transition-colors"
+            >
+              <ChevronDown size={14} />
+            </button>
+          </div>
         </div>
 
         {/* File list */}
         {isDone && (
           <div className="max-h-[240px] overflow-y-auto p-2 space-y-0.5">
-            {aiOrganize.changes.map((c, idx) => {
-              const wasUndone = c.undone;
-              const undoable = aiOrganize.canUndo(c.path);
-              const fileName = c.path.split('/').pop() ?? c.path;
-
-              return (
-                <div
-                  key={`${c.path}-${idx}`}
-                  className={`flex items-center gap-2 px-3 py-2 rounded-md text-sm transition-colors ${wasUndone ? 'bg-muted/30 opacity-50' : 'bg-muted/50'}`}
-                >
-                  {wasUndone ? (
-                    <Undo2 size={14} className="text-muted-foreground shrink-0" />
-                  ) : c.action === 'create' ? (
-                    <FilePlus size={14} className="text-success shrink-0" />
-                  ) : (
-                    <FileEdit size={14} className="text-[var(--amber)] shrink-0" />
-                  )}
-                  <span className={`truncate flex-1 ${wasUndone ? 'line-through text-muted-foreground' : 'text-foreground'}`}>
-                    {fileName}
-                  </span>
-                  {wasUndone ? (
-                    <span className="text-xs text-muted-foreground shrink-0">{fi.organizeUndone as string}</span>
-                  ) : (
-                    <span className={`text-xs shrink-0 ${c.ok ? 'text-muted-foreground' : 'text-error'}`}>
-                      {!c.ok ? fi.organizeFailed as string
-                        : c.action === 'create' ? fi.organizeCreated as string
-                        : fi.organizeUpdated as string}
-                    </span>
-                  )}
-                  {undoable && (
-                    <button
-                      type="button"
-                      onClick={() => handleUndoOne(c.path)}
-                      disabled={undoing}
-                      className="text-2xs text-muted-foreground/60 hover:text-foreground transition-colors shrink-0 px-1 disabled:opacity-40"
-                      title={fi.organizeUndoOne as string}
-                    >
-                      <Undo2 size={12} />
-                    </button>
-                  )}
-                  {c.ok && !c.undone && (
-                    <button
-                      type="button"
-                      onClick={() => handleViewFile(c.path)}
-                      className="text-2xs text-muted-foreground/60 hover:text-[var(--amber)] transition-colors shrink-0 px-1"
-                      title={fi.organizeViewFile as string}
-                    >
-                      <ExternalLink size={12} />
-                    </button>
-                  )}
-                </div>
-              );
-            })}
+            {aiOrganize.changes.map((c, idx) => renderChangeRow(c, idx))}
           </div>
         )}
 
@@ -286,31 +450,14 @@ export default function OrganizeToast({
           </div>
         )}
 
-        {/* Actions */}
-        <div className="flex items-center justify-end gap-3 px-4 py-3 border-t border-border">
-          {isDone && aiOrganize.hasAnyUndoable && (
-            <button
-              onClick={handleUndoAll}
-              disabled={undoing}
-              className="flex items-center gap-1.5 text-xs text-muted-foreground hover:text-foreground transition-colors px-2 py-1.5 disabled:opacity-50"
-            >
-              {undoing ? <Loader2 size={12} className="animate-spin" /> : <Undo2 size={12} />}
-              {fi.organizeUndoAll as string}
-            </button>
-          )}
-          <button
-            onClick={handleDismiss}
-            className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg text-xs font-medium bg-[var(--amber)] text-[var(--amber-foreground)] hover:opacity-90 transition-all"
-          >
-            <Check size={12} />
-            {fi.organizeDone as string}
-          </button>
-        </div>
+        {renderActions()}
       </div>
     );
   }
 
-  // Compact toast bar
+  // ═══════════════════════════════════════════════════════════════════════════
+  //  Compact toast bar
+  // ═══════════════════════════════════════════════════════════════════════════
   return (
     <div
       className="fixed bottom-4 left-1/2 -translate-x-1/2 z-50 flex items-center gap-3 bg-card border border-border rounded-xl shadow-lg px-4 py-3 max-w-md animate-in fade-in-0 slide-in-from-bottom-2 duration-200"
@@ -372,6 +519,14 @@ export default function OrganizeToast({
           <span className="text-xs text-muted-foreground/60 tabular-nums shrink-0">
             {(fi.organizeElapsed as (s: number) => string)(elapsed)}
           </span>
+          <button
+            type="button"
+            onClick={() => { setMaximized(true); handleUserAction(); }}
+            className="text-muted-foreground/50 hover:text-muted-foreground transition-colors shrink-0"
+            title={fi.organizeDetailTitle as string}
+          >
+            <Maximize2 size={13} />
+          </button>
           <button
             type="button"
             onClick={handleDismiss}

package/app/components/Panel.tsx

@@ -107,11 +107,12 @@ export default function Panel({
     };
   }, [newPopover]);
 
-  // Double-click hint: show only until user has used it once
-  const [dblHintSeen, setDblHintSeen] = useState(() => {
-    if (typeof window === 'undefined') return false;
-    return localStorage.getItem('mindos-tree-dblclick-hint') === '1';
-  });
+  // Double-click hint: show only until user has used it once.
+  // Initialize false to match SSR; hydrate from localStorage in useEffect.
+  const [dblHintSeen, setDblHintSeen] = useState(false);
+  useEffect(() => {
+    try { if (localStorage.getItem('mindos-tree-dblclick-hint') === '1') setDblHintSeen(true); } catch { /* ignore */ }
+  }, []);
   const markDblHintSeen = useCallback(() => {
     if (!dblHintSeen) {
       setDblHintSeen(true);

package/app/components/settings/AiTab.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { useState, useRef, useCallback, useEffect } from 'react';
-import { AlertCircle, Loader2 } from 'lucide-react';
+import { AlertCircle, ChevronDown, Loader2 } from 'lucide-react';
 import type { AiSettings, AgentSettings, ProviderConfig, SettingsData, AiTabProps } from './types';
 import { Field, Select, Input, EnvBadge, ApiKeyInput, Toggle, SectionLabel } from './Primitives';
 import { useLocale } from '@/lib/LocaleContext';
@@ -73,11 +73,10 @@ export function AiTab({ data, updateAi, updateAgent, t }: AiTabProps) {
 
       if (json.ok) {
         setTestResult(prev => ({ ...prev, [providerName]: { state: 'ok', latency: json.latency } }));
-        // Auto-clear after 5s
         if (okTimerRef.current) clearTimeout(okTimerRef.current);
         okTimerRef.current = setTimeout(() => {
           setTestResult(prev => ({ ...prev, [providerName]: { state: 'idle' } }));
-        }, 5000);
+        }, 8000);
       } else {
         setTestResult(prev => ({
           ...prev,
@@ -139,7 +138,9 @@ export function AiTab({ data, updateAi, updateAgent, t }: AiTabProps) {
           )}
         </button>
         {result.state === 'ok' && result.latency != null && (
-          <span className="text-xs text-success">{t.settings.ai.testKeyOk(result.latency)}</span>
+          <span className="text-xs text-success">
+            {t.settings.ai.testKeyOk(result.latency)}
+          </span>
         )}
         {result.state === 'error' && (
           <span className="text-xs text-error">✗ {errorMessage(t, result.code)}</span>
@@ -163,10 +164,14 @@ export function AiTab({ data, updateAi, updateAgent, t }: AiTabProps) {
       {provider === 'anthropic' ? (
         <>
           <Field label={<>{t.settings.ai.model} <EnvBadge overridden={env.ANTHROPIC_MODEL} /></>}>
-            <Input
+            <ModelInput
               value={anthropic.model}
-              onChange={e => patchProvider('anthropic', { model: e.target.value })}
+              onChange={v => patchProvider('anthropic', { model: v })}
               placeholder={envVal.ANTHROPIC_MODEL || 'claude-sonnet-4-6'}
+              provider="anthropic"
+              apiKey={anthropic.apiKey}
+              envKey={env.ANTHROPIC_API_KEY}
+              t={t}
             />
           </Field>
           <Field
@@ -183,10 +188,15 @@ export function AiTab({ data, updateAi, updateAgent, t }: AiTabProps) {
       ) : (
         <>
           <Field label={<>{t.settings.ai.model} <EnvBadge overridden={env.OPENAI_MODEL} /></>}>
-            <Input
+            <ModelInput
               value={openai.model}
-              onChange={e => patchProvider('openai', { model: e.target.value })}
+              onChange={v => patchProvider('openai', { model: v })}
               placeholder={envVal.OPENAI_MODEL || 'gpt-5.4'}
+              provider="openai"
+              apiKey={openai.apiKey}
+              envKey={env.OPENAI_API_KEY}
+              baseUrl={openai.baseUrl}
+              t={t}
             />
           </Field>
           <Field
@@ -309,6 +319,111 @@ export function AiTab({ data, updateAi, updateAgent, t }: AiTabProps) {
   );
 }
 
+/* ── Model Input with "List models" picker ── */
+
+function ModelInput({
+  value, onChange, placeholder, provider, apiKey, envKey, baseUrl, t,
+}: {
+  value: string;
+  onChange: (v: string) => void;
+  placeholder: string;
+  provider: 'anthropic' | 'openai';
+  apiKey: string;
+  envKey?: boolean;
+  baseUrl?: string;
+  t: AiTabProps['t'];
+}) {
+  const [models, setModels] = useState<string[] | null>(null);
+  const [loading, setLoading] = useState(false);
+  const [open, setOpen] = useState(false);
+  const [error, setError] = useState('');
+  const containerRef = useRef<HTMLDivElement>(null);
+
+  const hasKey = !!apiKey || !!envKey;
+
+  const fetchModels = useCallback(async () => {
+    if (loading) return;
+    setLoading(true);
+    setError('');
+    try {
+      const body: Record<string, string> = { provider };
+      if (apiKey) body.apiKey = apiKey;
+      if (baseUrl) body.baseUrl = baseUrl;
+
+      const res = await fetch('/api/settings/list-models', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(body),
+      });
+      const json = await res.json();
+      if (json.ok && Array.isArray(json.models)) {
+        setModels(json.models);
+        setOpen(true);
+      } else {
+        setError(json.error || 'Failed to fetch models');
+      }
+    } catch {
+      setError('Network error');
+    } finally {
+      setLoading(false);
+    }
+  }, [provider, apiKey, baseUrl, loading]);
+
+  useEffect(() => {
+    if (!open) return;
+    function handleClickOutside(e: MouseEvent) {
+      if (containerRef.current && !containerRef.current.contains(e.target as Node)) {
+        setOpen(false);
+      }
+    }
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => document.removeEventListener('mousedown', handleClickOutside);
+  }, [open]);
+
+  return (
+    <div ref={containerRef} className="relative">
+      <div className="flex gap-1.5">
+        <Input
+          value={value}
+          onChange={e => onChange(e.target.value)}
+          placeholder={placeholder}
+          className="flex-1"
+        />
+        <button
+          type="button"
+          disabled={!hasKey || loading}
+          onClick={fetchModels}
+          title={t.settings.ai.listModels}
+          className="inline-flex items-center gap-1 px-2 py-1 text-xs rounded-lg border border-border text-muted-foreground hover:text-foreground hover:border-foreground/20 transition-colors disabled:opacity-40 disabled:cursor-not-allowed shrink-0"
+        >
+          {loading ? <Loader2 size={12} className="animate-spin" /> : <ChevronDown size={12} />}
+          {t.settings.ai.listModels}
+        </button>
+      </div>
+      {error && <p className="text-xs text-error mt-1">{error}</p>}
+      {open && models && models.length > 0 && (
+        <div className="absolute z-50 mt-1 w-full max-h-48 overflow-y-auto rounded-lg border border-border bg-popover shadow-lg">
+          {models.map(m => (
+            <button
+              key={m}
+              type="button"
+              className={`w-full text-left px-3 py-1.5 text-xs hover:bg-accent transition-colors ${m === value ? 'bg-accent/60 font-medium' : ''}`}
+              onClick={() => { onChange(m); setOpen(false); }}
+            >
+              {m}
+            </button>
+          ))}
+        </div>
+      )}
+      {open && models && models.length === 0 && (
+        <div className="absolute z-50 mt-1 w-full rounded-lg border border-border bg-popover shadow-lg px-3 py-2 text-xs text-muted-foreground">
+          {t.settings.ai.noModelsFound}
+        </div>
+      )}
+    </div>
+  );
+}
+
 /* ── Ask AI Display Mode (localStorage-based, no server roundtrip) ── */
 
 function AskDisplayMode() {

package/app/hooks/useAiOrganize.ts

@@ -281,6 +281,7 @@ export function useAiOrganize() {
           messages,
           uploadedFiles: truncatedFiles,
           maxSteps: 15,
+          mode: 'organize',
         }),
         signal: controller.signal,
       });

package/app/lib/agent/model.ts

@@ -57,6 +57,8 @@ export function getModelConfig(): {
     // For custom proxy endpoints, set conservative compat flags.
     // Most proxies (Azure, Bedrock relays, corporate gateways) only support
     // a subset of OpenAI's features. These defaults prevent silent failures.
+    // NOTE: maxTokensField is NOT overridden — pi-ai auto-detects the correct
+    // field based on URL (defaults to max_completion_tokens for modern APIs).
     if (hasCustomBase) {
       model = {
         ...model,
@@ -68,7 +70,6 @@ export function getModelConfig(): {
           supportsReasoningEffort: false,
           supportsUsageInStreaming: false,
           supportsStrictMode: false,
-          maxTokensField: 'max_tokens' as const,
         },
       };
       if (customApiVariant) {

package/app/lib/agent/prompt.ts

@@ -35,3 +35,26 @@ Persona: Methodical, strictly objective, execution-oriented. Zero fluff. Never u
 - Reply in the user's language.
 - Use clean Markdown (tables, lists, bold).
 - End with concrete next actions if the task is incomplete.`;
+
+/**
+ * Lean system prompt for "organize uploaded files" mode.
+ *
+ * Design goal: ~200 tokens (vs ~600 for general). Strips everything the
+ * organize task doesn't need: anti-hallucination (no KB Q&A), cite sources,
+ * smart recovery, skills/MCP discovery, output formatting.
+ *
+ * The full SKILL.md is NOT loaded in organize mode — only the bootstrap
+ * README.md (for KB structure awareness) is injected by route.ts.
+ */
+export const ORGANIZE_SYSTEM_PROMPT = `You are MindOS Agent — an expert at organizing information into a local Markdown knowledge base.
+
+Your ONLY job: read the user's uploaded files, extract key information, and save well-structured Markdown notes into the knowledge base using file tools.
+
+Rules:
+1. Read uploaded file content from the "USER-UPLOADED FILES" section below — do NOT call read tools on them.
+2. Use \`list_files\` to understand the existing KB structure before deciding where to place notes.
+3. Create new files or update existing ones. Prefer \`create_file\` for new content, \`update_section\` / \`append_to_file\` for additions to existing files.
+4. Match the language of the source files when writing notes.
+5. Batch parallel tool calls in a single turn for efficiency.
+6. Do NOT write to the KB root directory — place files under the most fitting subdirectory.
+7. After writing, provide a brief summary of what you created/updated.`;

package/app/lib/agent/tools.ts

@@ -173,6 +173,18 @@ export const WRITE_TOOLS = new Set([
   'update_section', 'edit_lines', 'delete_file', 'rename_file', 'move_file', 'append_csv',
 ]);
 
+/** Tool names sufficient for the "organize uploaded files" task. */
+const ORGANIZE_TOOL_NAMES = new Set([
+  'list_files', 'read_file', 'search',
+  'create_file', 'batch_create_files', 'write_file',
+  'append_to_file', 'insert_after_heading', 'update_section',
+]);
+
+/** Lean tool set for organize mode — skips MCP discovery, history, backlinks, etc. */
+export function getOrganizeTools(): AgentTool<any>[] {
+  return knowledgeBaseTools.filter(t => ORGANIZE_TOOL_NAMES.has(t.name));
+}
+
 export async function getRequestScopedTools(): Promise<AgentTool<any>[]> {
   try {
     const result = await listMcporterServers();

package/app/lib/i18n-en.ts

@@ -144,7 +144,7 @@ export const en = {
     searching: 'Searching knowledge base...',
     generating: 'Generating response...',
     stopped: 'Generation stopped.',
-    errorNoResponse: 'No response from AI. Please check your API key and provider settings.',
+    errorNoResponse: 'AI returned no content. Possible causes: model does not support streaming, proxy compatibility issue, or request exceeds context limit.',
     reconnecting: (attempt: number, max: number) => `Connection lost. Reconnecting (${attempt}/${max})...`,
     reconnectFailed: 'Connection failed after multiple attempts.',
     retry: 'Retry',
@@ -789,6 +789,12 @@ export const en = {
     organizeUndone: 'Undone',
     organizeViewFile: 'View file',
     organizeUndoSuccess: (n: number) => `Reverted ${n} file${n !== 1 ? 's' : ''}`,
+    organizeDetailTitle: 'AI Organize Details',
+    organizeSourceFiles: 'Source Files',
+    organizeSummaryLabel: 'AI Summary',
+    organizeChangesLabel: (n: number) => `Changes (${n})`,
+    organizeNoSummary: 'AI is working...',
+    organizeMinimizeModal: 'Minimize',
   },
   importHistory: {
     title: 'Import History',
@@ -836,6 +842,8 @@ export const en = {
       testKeyNetworkError: 'Network error',
       testKeyNoKey: 'No API key configured',
       testKeyUnknown: 'Test failed',
+      listModels: 'Browse',
+      noModelsFound: 'No models found',
     },
     agent: {
       title: 'Agent Behavior',

package/app/lib/i18n-zh.ts

@@ -169,7 +169,7 @@ export const zh = {
     searching: '正在搜索知识库...',
     generating: '正在生成回复...',
     stopped: '已停止生成。',
-    errorNoResponse: 'AI 未返回响应，请检查 API Key 和服务商设置。',
+    errorNoResponse: 'AI 未返回有效内容。可能原因：模型不支持流式输出、中转站兼容性问题、或请求超出上下文限制。',
     reconnecting: (attempt: number, max: number) => `连接中断，正在重连 (${attempt}/${max})...`,
     reconnectFailed: '多次重连失败，请检查网络后重试。',
     retry: '重试',
@@ -813,6 +813,12 @@ export const zh = {
     organizeUndone: '已撤销',
     organizeViewFile: '查看文件',
     organizeUndoSuccess: (n: number) => `已撤销 ${n} 个文件`,
+    organizeDetailTitle: 'AI 整理详情',
+    organizeSourceFiles: '源文件',
+    organizeSummaryLabel: 'AI 总结',
+    organizeChangesLabel: (n: number) => `变更列表 (${n})`,
+    organizeNoSummary: 'AI 正在处理中...',
+    organizeMinimizeModal: '最小化',
   },
   importHistory: {
     title: '导入历史',
@@ -860,6 +866,8 @@ export const zh = {
       testKeyNetworkError: '网络错误',
       testKeyNoKey: '未配置 API Key',
       testKeyUnknown: '测试失败',
+      listModels: '选择模型',
+      noModelsFound: '未找到可用模型',
     },
     agent: {
       title: 'Agent 行为',

package/app/next-env.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
+import "./.next/dev/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geminilight/mindos",
-  "version": "0.6.18",
+  "version": "0.6.20",
   "description": "MindOS — Human-Agent Collaborative Mind System. Local-first knowledge base that syncs your mind to all AI Agents via MCP.",
   "keywords": [
     "mindos",