thatgfsj-code 0.9.3 → 0.9.5

package/src/tui/components/ModelSelector.tsx

@@ -1,56 +1,82 @@
 /** @jsxImportSource react */
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Box, Text } from 'ink';
 import SelectInput from 'ink-select-input';
+import { readFileSync, existsSync } from 'fs';
+import { join } from 'path';
+import { homedir } from 'os';
 
 interface Props {
   currentModel: string;
   onSelect: (model: string) => void;
-  onCancel: () => void;
+  onAddNew: () => void;
 }
 
-const COMMON_MODELS = [
-  { label: 'deepseek-chat', value: 'deepseek-chat' },
-  { label: 'deepseek-reasoner', value: 'deepseek-reasoner' },
-  { label: 'gpt-4o', value: 'gpt-4o' },
-  { label: 'gpt-4o-mini', value: 'gpt-4o-mini' },
-  { label: 'claude-sonnet-4-20250514', value: 'claude-sonnet-4-20250514' },
-  { label: 'claude-3-5-haiku-20241022', value: 'claude-3-5-haiku-20241022' },
-  { label: 'gemini-2.0-flash', value: 'gemini-2.0-flash' },
-  { label: 'gemini-2.5-pro', value: 'gemini-2.5-pro' },
-  { label: 'qwen3-235b-a22b', value: 'qwen3-235b-a22b' },
-  { label: 'glm-4-flash', value: 'glm-4-flash' },
-  { label: 'kimi-k2.6', value: 'kimi-k2.6' },
-  { label: 'mimo-v2.5-pro', value: 'mimo-v2.5-pro' },
-  { label: '─ type custom name below ─', value: '__custom__' },
-];
-
-export function ModelSelector({ currentModel, onSelect, onCancel }: Props) {
-  const [customMode, setCustomMode] = useState(false);
-  const [customValue, setCustomValue] = useState('');
-
-  if (customMode) {
-    return (
-      <Box flexDirection="column">
-        <Text color="#06B6D4" bold>Enter model name:</Text>
-        <Box>
-          <Text color="#06B6D4">❯ </Text>
-          <Text>{customValue}</Text>
-          <Text color="#06B6D4">█</Text>
-        </Box>
-      </Box>
-    );
+interface SavedModel {
+  label: string;
+  value: string;
+}
+
+function loadSavedModels(): SavedModel[] {
+  const configPath = join(homedir(), '.thatgfsj', 'config.json');
+  const models: SavedModel[] = [];
+  const seen = new Set<string>();
+
+  // Load from history if exists
+  const historyPath = join(homedir(), '.thatgfsj', 'models.json');
+  if (existsSync(historyPath)) {
+    try {
+      const history = JSON.parse(readFileSync(historyPath, 'utf-8'));
+      for (const m of history) {
+        if (!seen.has(m)) {
+          seen.add(m);
+          models.push({ label: m, value: m });
+        }
+      }
+    } catch {}
   }
 
+  // Always include current model
+  if (existsSync(configPath)) {
+    try {
+      const config = JSON.parse(readFileSync(configPath, 'utf-8'));
+      if (config.model && !seen.has(config.model)) {
+        seen.add(config.model);
+        models.push({ label: `${config.model} (当前)`, value: config.model });
+      }
+    } catch {}
+  }
+
+  // Add some common defaults if list is empty
+  if (models.length === 0) {
+    const defaults = ['deepseek-chat', 'gpt-4o', 'mimo-v2.5-pro'];
+    for (const m of defaults) {
+      models.push({ label: m, value: m });
+    }
+  }
+
+  return models;
+}
+
+export function ModelSelector({ currentModel, onSelect, onAddNew }: Props) {
+  const [items, setItems] = useState<SavedModel[]>([]);
+
+  useEffect(() => {
+    const saved = loadSavedModels();
+    // Add "add new" option at the end
+    saved.push({ label: '＋ 添加新模型', value: '__add_new__' });
+    setItems(saved);
+  }, []);
+
   return (
-    <Box flexDirection="column">
-      <Text color="#06B6D4" bold>Current: {currentModel}</Text>
-      <Text dimColor>Select model (↑↓ Enter):</Text>
+    <Box flexDirection="column" paddingLeft={1}>
+      <Text color="#06B6D4" bold>当前模型: {currentModel}</Text>
+      <Text dimColor>选择模型 (↑↓ 回车):</Text>
       <SelectInput
-        items={COMMON_MODELS}
+        items={items}
         onSelect={(item) => {
-          if (item.value === '__custom__') {
-            setCustomMode(true);
+          if (item.value === '__add_new__') {
+            onAddNew();
           } else {
             onSelect(item.value);
           }

package/src/tui/components/StatusBar.tsx

@@ -17,11 +17,11 @@ export const StatusBar = React.memo(function StatusBar({ messageCount, skills }:
       <Box justifyContent="space-between" width="100%">
         <Box>
           <Text backgroundColor="#06B6D4" color="#0F172A" bold> ⚡ THATGFSJ CODE </Text>
-          <Text dimColor> │ {messageCount} messages</Text>
+          <Text dimColor> │ {messageCount} 条消息</Text>
         </Box>
         <Box>
           {skills.length > 0 && (
-            <Text dimColor> skills: {activeSkills}{moreSkills} </Text>
+            <Text dimColor> 技能: {activeSkills}{moreSkills} </Text>
           )}
         </Box>
       </Box>

package/src/tui/components/UserInput.tsx

@@ -1,6 +1,7 @@
 /** @jsxImportSource react */
-import React, { useState } from 'react';
+import React, { useState, useCallback } from 'react';
 import { Box, Text, useInput, useApp, useFocus } from 'ink';
+import { COMMAND_LIST } from '../hooks/useCommands.js';
 
 interface Props {
   onSubmit: (input: string) => void;
@@ -11,12 +12,36 @@ export function UserInput({ onSubmit, disabled }: Props) {
   const [value, setValue] = useState('');
   const [history, setHistory] = useState<string[]>([]);
   const [historyIdx, setHistoryIdx] = useState(-1);
+  const [selectedCmd, setSelectedCmd] = useState(0);
   const { exit } = useApp();
-  const { isFocused } = useFocus({ autoFocus: true });
+  useFocus({ autoFocus: true });
+
+  const showCommands = value.startsWith('/') && value.length > 0 && !value.includes(' ');
+  const filteredCommands = showCommands
+    ? COMMAND_LIST.filter(c => c.name.startsWith(value))
+    : [];
 
   useInput((input, key) => {
     if (disabled) return;
 
+    // Command selector navigation
+    if (showCommands && filteredCommands.length > 0) {
+      if (key.upArrow) {
+        setSelectedCmd(prev => Math.max(0, prev - 1));
+        return;
+      }
+      if (key.downArrow) {
+        setSelectedCmd(prev => Math.min(filteredCommands.length - 1, prev + 1));
+        return;
+      }
+      if (key.tab || (key.return && filteredCommands.length === 1)) {
+        const selected = filteredCommands[selectedCmd] || filteredCommands[0];
+        setValue(selected.name + ' ');
+        setSelectedCmd(0);
+        return;
+      }
+    }
+
     if (key.return) {
       const trimmed = value.trim();
       if (trimmed) {
@@ -28,6 +53,7 @@ export function UserInput({ onSubmit, disabled }: Props) {
         setHistoryIdx(-1);
         onSubmit(trimmed);
         setValue('');
+        setSelectedCmd(0);
       }
       return;
     }
@@ -53,6 +79,7 @@ export function UserInput({ onSubmit, disabled }: Props) {
 
     if (key.backspace || key.delete) {
       setValue(v => v.slice(0, -1));
+      setSelectedCmd(0);
       return;
     }
 
@@ -63,14 +90,34 @@ export function UserInput({ onSubmit, disabled }: Props) {
 
     if (input && !key.ctrl && !key.meta) {
       setValue(v => v + input);
+      setSelectedCmd(0);
     }
   });
 
   return (
-    <Box paddingY={0}>
-      <Text color="#06B6D4" bold>{disabled ? '  ' : '❯ '}</Text>
-      <Text>{value}</Text>
-      {!disabled && <Text color="#06B6D4">█</Text>}
+    <Box flexDirection="column">
+      {/* Command selector */}
+      {showCommands && filteredCommands.length > 0 && (
+        <Box flexDirection="column" paddingLeft={2} marginBottom={0}>
+          {filteredCommands.map((cmd, i) => (
+            <Box key={cmd.name}>
+              <Text color={i === selectedCmd ? '#06B6D4' : '#64748B'}>
+                {i === selectedCmd ? '▸ ' : '  '}
+              </Text>
+              <Text color={i === selectedCmd ? '#06B6D4' : '#94A3B8'} bold={i === selectedCmd}>
+                {cmd.name}
+              </Text>
+              <Text color="#64748B">  {cmd.desc}</Text>
+            </Box>
+          ))}
+        </Box>
+      )}
+      {/* Input line */}
+      <Box paddingY={0}>
+        <Text color="#06B6D4" bold>{disabled ? '  ' : '❯ '}</Text>
+        <Text>{value}</Text>
+        {!disabled && <Text color="#06B6D4">█</Text>}
+      </Box>
     </Box>
   );
 }

package/src/tui/hooks/useChat.ts

@@ -8,6 +8,7 @@ interface ChatState {
   isThinking: boolean;
   streaming: string;
   streamingToolCalls: ToolCallData[];
+  queuedMessage: string | null;
 }
 
 export function useChat(app: App) {
@@ -16,19 +17,19 @@ export function useChat(app: App) {
     isThinking: false,
     streaming: '',
     streamingToolCalls: [],
+    queuedMessage: null,
   });
   const processingRef = useRef(false);
+  const queuedRef = useRef<string | null>(null);
 
-  const sendMessage = useCallback((input: string) => {
-    if (processingRef.current) return;
-    processingRef.current = true;
-
+  const processStream = async (input: string) => {
     setState(prev => ({
       ...prev,
       messages: [...prev.messages, { role: 'user', content: input }],
       isThinking: true,
       streaming: '',
       streamingToolCalls: [],
+      queuedMessage: null,
     }));
 
     app.session.addMessage('user', input);
@@ -37,112 +38,125 @@ export function useChat(app: App) {
     let fullContent = '';
     let currentToolCalls: ToolCallData[] = [];
     let lastUpdateTime = 0;
-    const THROTTLE_MS = 50; // Update UI at most every 50ms
-
-    const processStream = async () => {
-      try {
-        for await (const chunk of stream) {
-          if (chunk.includes('@@TOOL@@')) {
-            const parts = chunk.split('\n');
-            for (const part of parts) {
-              if (part.startsWith('@@TOOL@@')) {
-                try {
-                  const data = JSON.parse(part.slice(8));
-                  if (data.action === 'call') {
-                    currentToolCalls.push({ name: data.name, args: data.args || '' });
-                    setState(prev => ({
-                      ...prev,
-                      isThinking: false,
-                      streamingToolCalls: [...currentToolCalls],
-                    }));
-                  } else if (data.action === 'result') {
-                    const lastIdx = currentToolCalls.length - 1;
-                    if (lastIdx >= 0) {
-                      currentToolCalls[lastIdx] = {
-                        ...currentToolCalls[lastIdx],
-                        result: data.output || data.error || '',
-                        isError: !!data.error,
-                      };
-                    }
-                    setState(prev => ({
-                      ...prev,
-                      streamingToolCalls: [...currentToolCalls],
-                      isThinking: true,
-                    }));
+    const THROTTLE_MS = 50;
+
+    try {
+      for await (const chunk of stream) {
+        if (chunk.includes('@@TOOL@@')) {
+          const parts = chunk.split('\n');
+          for (const part of parts) {
+            if (part.startsWith('@@TOOL@@')) {
+              try {
+                const data = JSON.parse(part.slice(8));
+                if (data.action === 'call') {
+                  currentToolCalls.push({ name: data.name, args: data.args || '' });
+                  setState(prev => ({
+                    ...prev,
+                    isThinking: false,
+                    streamingToolCalls: [...currentToolCalls],
+                  }));
+                } else if (data.action === 'result') {
+                  const lastIdx = currentToolCalls.length - 1;
+                  if (lastIdx >= 0) {
+                    currentToolCalls[lastIdx] = {
+                      ...currentToolCalls[lastIdx],
+                      result: data.output || data.error || '',
+                      isError: !!data.error,
+                    };
                   }
-                } catch {
-                  fullContent += part;
+                  setState(prev => ({
+                    ...prev,
+                    streamingToolCalls: [...currentToolCalls],
+                    isThinking: true,
+                  }));
                 }
-              } else if (part) {
+              } catch {
                 fullContent += part;
               }
+            } else if (part) {
+              fullContent += part;
             }
-          } else {
-            fullContent += chunk;
-          }
-
-          // Throttle UI updates
-          const now = Date.now();
-          if (now - lastUpdateTime >= THROTTLE_MS) {
-            lastUpdateTime = now;
-            setState(prev => ({ ...prev, isThinking: false, streaming: fullContent }));
           }
+        } else {
+          fullContent += chunk;
         }
 
-        // Final update
-        if (fullContent.trim() || currentToolCalls.length > 0) {
-          app.session.addMessage('assistant', fullContent);
+        const now = Date.now();
+        if (now - lastUpdateTime >= THROTTLE_MS) {
+          lastUpdateTime = now;
+          setState(prev => ({ ...prev, isThinking: false, streaming: fullContent }));
         }
+      }
 
-        setState(prev => ({
-          ...prev,
-          messages: [
-            ...prev.messages,
-            ...(fullContent.trim() || currentToolCalls.length > 0
-              ? [{
-                  role: 'assistant' as const,
-                  content: fullContent,
-                  toolCalls: currentToolCalls.length > 0 ? currentToolCalls : undefined,
-                }]
-              : []),
-          ],
-          streaming: '',
-          streamingToolCalls: [],
-          isThinking: false,
-        }));
-
-        app.session.truncate();
-      } catch (error: any) {
-        const msg = error.message || String(error);
-        let errorMsg = `Error: ${msg}`;
-
-        if (msg.includes('401') || msg.includes('403') || msg.includes('Unauthorized')) {
-          errorMsg = `❌ API key invalid. Run \`gfcode init\` to reconfigure.`;
-        } else if (msg.includes('429') || msg.includes('rate limit') || msg.includes('quota')) {
-          errorMsg = `❌ Rate limit exceeded. Wait or run \`gfcode init\` to switch provider.`;
-        } else if (msg.includes('ECONNREFUSED') || msg.includes('ENOTFOUND')) {
-          errorMsg = `❌ Cannot connect. Check network or run \`gfcode init\`.`;
-        }
+      if (fullContent.trim() || currentToolCalls.length > 0) {
+        app.session.addMessage('assistant', fullContent);
+      }
 
-        setState(prev => ({
-          ...prev,
-          messages: [
-            ...prev.messages,
-            ...(fullContent.trim()
-              ? [{ role: 'assistant' as const, content: fullContent }]
-              : []),
-            { role: 'assistant', content: errorMsg },
-          ],
-          streaming: '',
-          streamingToolCalls: [],
-          isThinking: false,
-        }));
+      setState(prev => ({
+        ...prev,
+        messages: [
+          ...prev.messages,
+          ...(fullContent.trim() || currentToolCalls.length > 0
+            ? [{
+                role: 'assistant' as const,
+                content: fullContent,
+                toolCalls: currentToolCalls.length > 0 ? currentToolCalls : undefined,
+              }]
+            : []),
+        ],
+        streaming: '',
+        streamingToolCalls: [],
+        isThinking: false,
+      }));
+
+      app.session.truncate();
+    } catch (error: any) {
+      const msg = error.message || String(error);
+      let errorMsg = `Error: ${msg}`;
+
+      if (msg.includes('401') || msg.includes('403') || msg.includes('Unauthorized')) {
+        errorMsg = `❌ API key invalid. Run \`gfcode init\` to reconfigure.`;
+      } else if (msg.includes('429') || msg.includes('rate limit') || msg.includes('quota')) {
+        errorMsg = `❌ Rate limit exceeded. Wait or run \`gfcode init\` to switch provider.`;
+      } else if (msg.includes('ECONNREFUSED') || msg.includes('ENOTFOUND')) {
+        errorMsg = `❌ Cannot connect. Check network or run \`gfcode init\`.`;
       }
 
+      setState(prev => ({
+        ...prev,
+        messages: [
+          ...prev.messages,
+          ...(fullContent.trim()
+            ? [{ role: 'assistant' as const, content: fullContent }]
+            : []),
+          { role: 'assistant', content: errorMsg },
+        ],
+        streaming: '',
+        streamingToolCalls: [],
+        isThinking: false,
+      }));
+    }
+
+    // Check if there's a queued message
+    if (queuedRef.current) {
+      const next = queuedRef.current;
+      queuedRef.current = null;
+      await processStream(next);
+    } else {
       processingRef.current = false;
-    };
+    }
+  };
 
-    processStream();
+  const sendMessage = useCallback((input: string) => {
+    // If currently processing, queue the message
+    if (processingRef.current) {
+      queuedRef.current = input;
+      setState(prev => ({ ...prev, queuedMessage: input }));
+      return;
+    }
+
+    processingRef.current = true;
+    processStream(input);
   }, [app]);
 
   return { ...state, sendMessage };

package/src/tui/hooks/useCommands.ts

@@ -7,14 +7,42 @@ interface CommandResult {
   action?: 'clear' | 'reinit';
 }
 
+// 中文命令别名映射
+const CMD_ALIASES: Record<string, string> = {
+  '/模型': '/model',
+  '/新建': '/new',
+  '/清空': '/new',
+  '/压缩': '/compact',
+  '/技能': '/skills',
+  '/技能管理': '/skills',
+  '/mcp': '/mcp',
+  '/帮助': '/help',
+  '/服务商': '/provider',
+};
+
+export const COMMAND_LIST = [
+  { name: '/模型', desc: '切换模型' },
+  { name: '/服务商', desc: '更换服务商' },
+  { name: '/新建', desc: '新建会话' },
+  { name: '/压缩', desc: '压缩上下文' },
+  { name: '/技能', desc: '管理技能' },
+  { name: '/mcp', desc: 'MCP 设置' },
+  { name: '/帮助', desc: '查看帮助' },
+];
+
 export function useCommands(app: App) {
 
   const handleCommand = useCallback((input: string): CommandResult => {
     const cmd = input.trim();
     const parts = cmd.split(/\s+/);
-    const name = parts[0].toLowerCase();
+    let name = parts[0].toLowerCase();
     const arg = parts.slice(1).join(' ');
 
+    // 中文别名映射
+    if (CMD_ALIASES[name]) {
+      name = CMD_ALIASES[name];
+    }
+
     // ── /model [name] ───────────────────────────────────
     if (name === '/model') {
       if (!arg) {
@@ -22,20 +50,19 @@ export function useCommands(app: App) {
         return {
           handled: true,
           output: [
-            `Current: ${c.provider} / ${c.model}`,
+            `当前: ${c.provider} / ${c.model}`,
             '',
-            'Usage: /model <name>',
-            '  /model deepseek-chat',
-            '  /model gpt-4o',
-            '  /model claude-sonnet-4-20250514',
-            '  /model qwen3-235b-a22b',
+            '用法: /模型 <名称>',
+            '  /模型 deepseek-chat',
+            '  /模型 gpt-4o',
+            '  /模型 claude-sonnet-4-20250514',
             '',
-            'Or: /provider to change provider',
+            '或: /服务商 更换服务商',
           ].join('\n'),
         };
       }
       app.config.save({ model: arg });
-      return { handled: true, output: `Model → ${arg}` };
+      return { handled: true, output: `模型 → ${arg}` };
     }
 
     // ── /provider ───────────────────────────────────────
@@ -44,9 +71,9 @@ export function useCommands(app: App) {
     }
 
     // ── /new, /clear ────────────────────────────────────
-    if (name === '/new' || name === '/clear') {
+    if (name === '/new') {
       app.session.clear();
-      return { handled: true, output: 'New session.', action: 'clear' };
+      return { handled: true, output: '新会话已创建。', action: 'clear' };
     }
 
     // ── /compact ────────────────────────────────────────
@@ -54,31 +81,30 @@ export function useCommands(app: App) {
       const before = app.session.getMessageCount();
       app.session.truncate();
       const after = app.session.getMessageCount();
-      return { handled: true, output: `Compacted: ${before} → ${after} messages` };
+      return { handled: true, output: `上下文已压缩: ${before} → ${after} 条消息` };
     }
 
     // ── /skills [id] ────────────────────────────────────
     if (name === '/skills') {
       if (arg) {
-        // Toggle specific skill
         if (app.skills.isActive(arg)) {
           app.skills.deactivate(arg);
-          return { handled: true, output: `✗ ${arg}` };
+          return { handled: true, output: `✗ 已关闭: ${arg}` };
         } else if (app.skills.activate(arg)) {
-          return { handled: true, output: `✓ ${arg}` };
+          return { handled: true, output: `✓ 已开启: ${arg}` };
         }
-        return { handled: true, output: `Unknown skill: ${arg}` };
+        return { handled: true, output: `未知技能: ${arg}` };
       }
 
       const all = app.skills.list();
       const lines = [
-        'Skills:',
+        '技能列表:',
         ...all.map(s => {
           const mark = app.skills.isActive(s.id) ? '✓' : '·';
-          return `  ${mark} ${s.id}`;
+          return `  ${mark} ${s.id}  ${s.description}`;
         }),
         '',
-        'Usage: /skills <id> to toggle',
+        '用法: /技能 <id> 切换',
       ];
       return { handled: true, output: lines.join('\n') };
     }
@@ -88,11 +114,11 @@ export function useCommands(app: App) {
       return {
         handled: true,
         output: [
-          'MCP: ~/.thatgfsj/mcp.json',
+          'MCP 配置: ~/.thatgfsj/mcp.json',
           '',
           '  {',
           '    "servers": {',
-          '      "name": { "command": "npx", "args": ["-y", "server"] }',
+          '      "名称": { "command": "npx", "args": ["-y", "server"] }',
           '    }',
           '  }',
         ].join('\n'),
@@ -100,18 +126,23 @@ export function useCommands(app: App) {
     }
 
     // ── /help ───────────────────────────────────────────
-    if (name === '/help' || name === 'help') {
+    if (name === '/help') {
       return {
         handled: true,
         output: [
-          '/model <name>    Switch model',
-          '/provider        Change provider',
-          '/new             New session',
-          '/compact         Compress context',
-          '/skills [id]     List/toggle skills',
-          '/mcp             MCP settings',
-          '/help            This help',
-          'exit             Quit',
+          '命令列表:',
+          '  /模型 <名称>    切换模型',
+          '  /服务商          更换服务商',
+          '  /新建            新建会话',
+          '  /压缩            压缩上下文',
+          '  /技能 [id]       管理技能',
+          '  /mcp             MCP 设置',
+          '  /帮助            查看帮助',
+          '  exit             退出',
+          '',
+          '快捷键:',
+          '  ↑/↓              历史记录',
+          '  Ctrl+C           退出',
         ].join('\n'),
       };
     }