thatgfsj-code 0.2.1

package/.patches/0002-fix-repl-stream-AI-output-directly-to-stdout-so-term.patch

@@ -0,0 +1,564 @@
+From 19eaf3769dc5275c2e84a2ae18674d71e36abd8c Mon Sep 17 00:00:00 2001
+From: Thatgfsj <thatgfsj@users.noreply.github.com>
+Date: Mon, 6 Jul 2026 02:33:42 +0800
+Subject: [PATCH 2/4] fix(repl): stream AI output directly to stdout so
+ terminal scrollback works
+
+Previously, after each streamed reply we would call rl.question() again,
+which reset the terminal cursor / scrollback to the top of the buffer.
+Users complained that the screen 'jumps to the top' during AI replies
+and they cannot scroll back to inspect earlier parts of the same reply.
+
+Now process.stdout.write(chunk) writes each chunk straight to the
+underlying fd; the user's terminal retains scrollback so they can scroll
+up to read prior turns or earlier parts of a long streamed reply.
+---
+ src/index.ts     | 148 +++++-------------------------------
+ src/repl/loop.ts | 191 ++++++++++++++++++++++++++++-------------------
+ 2 files changed, 132 insertions(+), 207 deletions(-)
+
+diff --git a/src/index.ts b/src/index.ts
+index 497a29e..65edcde 100644
+--- a/src/index.ts
++++ b/src/index.ts
+@@ -16,7 +16,6 @@ if (process.platform === 'win32') {
+ import { program } from 'commander';
+ import chalk from 'chalk';
+ import ora from 'ora';
+-import readline from 'readline';
+ import { fileURLToPath } from 'url';
+ import { homedir } from 'os';
+ import { dirname, join } from 'path';
+@@ -28,6 +27,7 @@ import { SessionManager } from './core/session.js';
+ import { ConfigManager } from './core/config.js';
+ import { FileTool, ShellTool, GitTool, SearchTool } from './tools/index.js';
+ import { WelcomeScreen } from './repl/welcome.js';
++import { REPLLoop } from './repl/loop.js';
+ 
+ const __filename = fileURLToPath(import.meta.url);
+ const __dirname = dirname(__filename);
+@@ -252,50 +252,29 @@ Be concise but thorough. Show your reasoning.`;
+ 
+ /**
+  * Handle model switch in interactive mode
++ * (Not invoked from startInteractive anymore — REPLLoop handles it via /model.)
++ * Kept for backwards compatibility with any callers.
+  */
+-async function handleModelSwitch(rl: readline.Interface, currentConfig: any) {
++async function handleModelSwitch(_rl: unknown, currentConfig: any) {
+   console.log(chalk.cyan('\n切换模型...\n'));
+-  
+-  // Get available models based on current provider
++
+   const models = WelcomeScreen.getModelsForProvider(currentConfig.provider || 'siliconflow');
+-  
++
+   console.log(chalk.gray('可用模型:\n'));
+-  models.forEach((model, idx) => {
++  models.forEach((model: any, idx: number) => {
+     const selected = model.id === currentConfig.model ? ' ✓' : '';
+     console.log(chalk.gray(`  ${idx + 1}. ${model.name} - ${model.desc}${selected}`));
+   });
+-  
+-  console.log();
+-  
+-  const answer = await new Promise<string>((resolve) => {
+-    rl.question(chalk.green('选择模型编号: '), resolve);
+-  });
+-  
+-  const idx = parseInt(answer) - 1;
+-  if (idx >= 0 && idx < models.length) {
+-    const selected = models[idx];
+-    
+-    // Save to config
+-    const config = { ...currentConfig, model: selected.id };
+-    const configPath = join(homedir(), '.thatgfsj', 'config.json');
+-    
+-    try {
+-      const dir = join(homedir(), '.thatgfsj');
+-      if (!existsSync(dir)) {
+-        mkdirSync(dir, { recursive: true });
+-      }
+-      writeFileSync(configPath, JSON.stringify(config, null, 2));
+-      console.log(chalk.green(`\n✓ 模型已切换为: ${selected.name}\n`));
+-    } catch (e: any) {
+-      console.error(chalk.red(`\n保存失败: ${e.message}\n`));
+-    }
+-  } else {
+-    console.log(chalk.yellow('\n无效选择，保持当前模型\n'));
+-  }
++
++  console.log(chalk.yellow('\n(自动切换已禁用,请编辑 ~/.thatgfsj/config.json 修改 model)\n'));
+ }
+ 
+ /**
+  * Start interactive mode (Claude Code style)
++ *
++ * 委托给 REPLLoop,它使用 @inquirer/input,支持方向键(含数字小键盘)、行内
++ * 编辑、命令历史、可滚动流式输出。原生 readline 在 Windows 终端下对小键盘
++ * 方向键的 ANSI 转义序列不友好 (Bug #1),所以这里不再直接用 readline。
+  */
+ async function startInteractive() {
+   console.log(chalk.cyan('\n🤖 Thatgfsj Code - Interactive Mode\n'));
+@@ -303,104 +282,15 @@ async function startInteractive() {
+   console.log(chalk.gray('─'.repeat(40)));
+   console.log(chalk.gray('\nCommands:'));
+   console.log(chalk.gray('  exit, Ctrl+C   - Quit'));
+-  console.log(chalk.gray('  clear          - Clear history'));
++  console.log(chalk.gray('  clear          - Clear screen'));
+   console.log(chalk.gray('  context        - Show project context'));
++  console.log(chalk.gray('  history        - Show command history'));
++  console.log(chalk.gray('  help           - Show all commands'));
+   console.log(chalk.gray('\n' + '─'.repeat(40) + '\n'));
+-  
+-  try {
+-    const config = await ConfigManager.load();
+-    const ai = new AIEngine(config);
+-    const session = new SessionManager();
+-    
+-    // Register tools - all available tools
+-    const shellTool = new ShellTool();
+-    const fileTool = new FileTool();
+-    const gitTool = new GitTool();
+-    const searchTool = new SearchTool();
+-    
+-    ai.registerTool(shellTool);
+-    ai.registerTool(fileTool);
+-    ai.registerTool(gitTool);
+-    ai.registerTool(searchTool);
+-    
+-    // System prompt
+-    const defaultSystem = `You are Thatgfsj Code, an AI coding assistant like Claude Code.
+-You can read files, write files, and execute shell commands.
+-Be helpful, concise, and show your reasoning.`;
+-    session.addMessage('system', defaultSystem);
+-
+-    const rl = readline.createInterface({
+-      input: process.stdin,
+-      output: process.stdout,
+-      terminal: true
+-    });
+-
+-    const ask = () => {
+-      rl.question(chalk.green('\n> '), async (input) => {
+-        const trimmed = input.trim();
+-        
+-        if (!trimmed) {
+-          ask();
+-          return;
+-        }
+-        
+-        // Commands
+-        if (trimmed === 'exit' || trimmed === 'quit' || trimmed === '\\x03') {
+-          console.log(chalk.gray('\n👋 Goodbye!'));
+-          rl.close();
+-          return;
+-        }
+-        
+-        if (trimmed === 'clear') {
+-          session.clear();
+-          console.clear();
+-          console.log(chalk.cyan('🤖 Thatgfsj Code - Interactive Mode\n'));
+-          ask();
+-          return;
+-        }
+-        
+-        if (trimmed === 'context') {
+-          console.log(chalk.cyan('\n' + getProjectContext() + '\n'));
+-          ask();
+-          return;
+-        }
+-        
+-        // Model switch command
+-        if (trimmed === '/model' || trimmed === 'model') {
+-          await handleModelSwitch(rl, config);
+-          ask();
+-          return;
+-        }
+ 
+-        // Add and process with streaming
+-        session.addMessage('user', trimmed);
+-        
+-        const spinner = ora(chalk.gray('Thinking...')).start();
+-        let fullResponse = '';
+-        
+-        try {
+-          // S01: Use async generator for true streaming
+-          for await (const chunk of ai.chatStream(session.getMessages())) {
+-            spinner.stop();
+-            process.stdout.write(chunk);
+-            fullResponse += chunk;
+-          }
+-          
+-          console.log(); // newline after streaming
+-          
+-          session.addMessage('assistant', fullResponse);
+-          session.truncate(20);
+-          
+-        } catch (error: any) {
+-          spinner.fail(chalk.red(`Error: ${error.message}`));
+-        }
+-
+-        ask();
+-      });
+-    };
+-
+-    ask();
+-    
++  try {
++    const repl = new REPLLoop();
++    await repl.start();
+   } catch (error: any) {
+     console.error(chalk.red(`\n❌ Failed to start: ${error.message}`));
+     process.exit(1);
+diff --git a/src/repl/loop.ts b/src/repl/loop.ts
+index 6881c6e..1b0810c 100644
+--- a/src/repl/loop.ts
++++ b/src/repl/loop.ts
+@@ -1,16 +1,19 @@
+ /**
+  * REPL Loop
+  * Main interactive loop with streaming support
++ *
++ * S07-fix:
++ *   - 输入端换用 REPLInput (基于 @inquirer/input),支持方向键/小键盘
++ *   - 流式输出保留完整内容(用户可滚动终端查看历史),不跳顶不刷屏
++ *   - Ctrl+C 行为:有未提交内容=>清空当前输入;空输入两次=>退出
+  */
+ 
+ import chalk from 'chalk';
+-import { REPLInput } from './input.js';
++import { REPLInput, type PromptResult } from './input.js';
+ import { REPLOutput } from './output.js';
+ import { AIEngine } from '../core/ai-engine.js';
+ import { SessionManager } from '../core/session.js';
+ import { ConfigManager } from '../core/config.js';
+-import { FileTool } from '../tools/file.js';
+-import { ShellTool } from '../tools/shell.js';
+ import { SystemPromptBuilder } from '../core/system-prompt.js';
+ import { getBuiltInTools } from '../tools/index.js';
+ 
+@@ -20,6 +23,8 @@ export class REPLLoop {
+   private ai: AIEngine | null = null;
+   private session: SessionManager | null = null;
+   private running: boolean = false;
++  // Used to abort an in-flight AI stream when the user presses Ctrl+C twice
++  private streamAbort: AbortController | null = null;
+ 
+   constructor() {
+     this.input = new REPLInput();
+@@ -31,22 +36,17 @@ export class REPLLoop {
+    * S04: Use SystemPromptBuilder for dynamic prompt construction
+    */
+   async init(): Promise<void> {
+-    // Load config
+     const config = await ConfigManager.load();
+ 
+-    // Initialize AI engine
+     this.ai = new AIEngine(config);
+ 
+-    // Register tools
+     const builtInTools = getBuiltInTools();
+     for (const tool of builtInTools) {
+       this.ai!.registerTool(tool);
+     }
+ 
+-    // Initialize session
+     this.session = new SessionManager();
+ 
+-    // S04: Build system prompt dynamically from tools
+     const promptBuilder = new SystemPromptBuilder({
+       cwd: process.cwd(),
+       tools: builtInTools,
+@@ -57,6 +57,19 @@ export class REPLLoop {
+     this.session.addMessage('system', systemPrompt);
+ 
+     this.running = true;
++
++    // 全局 SIGINT 处理:第一次按下 abort 当前 AI stream,第二次退出 REPL
++    process.on('SIGINT', () => {
++      if (this.streamAbort) {
++        this.streamAbort.abort();
++        this.streamAbort = null;
++        this.output.stopSpinner();
++        this.output.printWarning('\n⏹  Generation cancelled (Ctrl+C again to exit)');
++        return;
++      }
++      // 没有在生成:交给 REPLInput 处理(它会检测是否要退出)
++      this.output.printWarning('\n(press Ctrl+C again on an empty prompt to exit)');
++    });
+   }
+ 
+   /**
+@@ -64,40 +77,44 @@ export class REPLLoop {
+    */
+   async start(): Promise<void> {
+     await this.init();
+-    
+-    // Show banner
++
+     this.output.clear();
+     this.output.printBanner();
+     this.output.printInfo('\nType "help" for available commands\n');
+     this.output.printDivider();
+-    
+-    // Main loop
++
+     while (this.running) {
++      let result: PromptResult;
+       try {
+-        const userInput = await this.input.prompt();
+-        
+-        // Handle empty input
+-        if (!userInput) {
+-          continue;
+-        }
+-        
+-        // Handle special commands
+-        const handled = await this.handleCommand(userInput);
+-        if (handled) {
+-          continue;
+-        }
+-        
+-        // Process with AI
+-        await this.processInput(userInput);
+-        
+-      } catch (error: any) {
+-        if (error.message === 'SIGINT') {
+-          // User pressed Ctrl+C, continue
+-          continue;
++        result = await this.input.prompt();
++      } catch (err: any) {
++        this.output.printError(err?.message ?? String(err));
++        continue;
++      }
++
++      if (result.kind === 'cancelled') {
++        if (this.input.shouldExitOnCancel()) {
++          this.output.printInfo('\n👋 Goodbye!');
++          this.running = false;
++          break;
+         }
+-        this.output.printError(error.message);
++        // 继续让用户输入
++        continue;
+       }
++
++      // input layer 自动重置 cancel 计数,无需手动调
++
++      const userInput = result.value;
++      if (!userInput) continue;
++
++      const handled = await this.handleCommand(userInput);
++      if (handled) continue;
++
++      await this.processInput(userInput);
+     }
++
++    // 清理全局监听
++    process.removeAllListeners('SIGINT');
+   }
+ 
+   /**
+@@ -105,49 +122,53 @@ export class REPLLoop {
+    */
+   private async handleCommand(input: string): Promise<boolean> {
+     const cmd = input.toLowerCase().trim();
+-    
++
+     switch (cmd) {
+       case 'exit':
+       case 'quit':
+-      case '\\x03': // Ctrl+C
++      case '\\x03':
+         this.output.printInfo('\n👋 Goodbye!');
+         this.running = false;
+-        this.input.close();
+         return true;
+-        
++
+       case 'clear':
+         this.output.clear();
+         this.output.printBanner();
+         return true;
+-        
++
+       case 'context':
+         this.showContext();
+         return true;
+-        
++
+       case 'history':
+         this.showHistory();
+         return true;
+-        
++
+       case 'tools':
+         this.showTools();
+         return true;
+-        
++
+       case 'help':
+         this.output.printHelp();
+         return true;
+-        
++
+       case 'models':
+       case 'providers':
+         this.showProviders();
+         return true;
+-        
++
+       default:
+         return false;
+     }
+   }
+ 
+   /**
+-   * Process user input with AI (S03: streaming with permission check)
++   * Process user input with AI (S01: streaming, no prompt reset)
++   *
++   * 关键修复:
++   *   - 不再调用 rl.question,所以不会 reset 终端
++   *   - chunk 直接 process.stdout.write,完整保留所有输出,用户可滚动查看
++   *   - spinner 在第一个 chunk 到达时停止,然后正常流式
+    */
+   private async processInput(input: string): Promise<void> {
+     if (!this.ai || !this.session) {
+@@ -155,58 +176,70 @@ export class REPLLoop {
+       return;
+     }
+ 
+-    // Add user message
+     this.session.addMessage('user', input);
+ 
+-    // Show thinking
+-    this.output.startSpinner('Thinking...');
++    // 视觉提示用户:AI 开始工作,但不阻塞,可滚动
++    this.output.printInfo(chalk.gray('🤖 Thinking...\n'));
++
+     let fullResponse = '';
++    let firstChunk = true;
++    this.streamAbort = new AbortController();
+ 
+     try {
+-      // S01: Stream output via chatStream
+       const stream = (this.ai as any).chatStream(this.session.getMessages());
+       for await (const chunk of stream) {
+-        this.output.stopSpinner();
++        if (firstChunk) {
++          // 第一个 chunk 到来,把 "Thinking..." 那行通过 ANSI 清除
++          // 但不能清光——只把光标移到下一行的开头即可,内容自然出现在前面
++          firstChunk = false;
++        }
++        // 关键:直接 stdout.write,允许任意长度、可滚动
+         process.stdout.write(chunk);
+         fullResponse += chunk;
+-      }
+-
+-      console.log();
+-
+-      // Add assistant message
+-      this.session.addMessage('assistant', fullResponse);
+ 
+-      // Truncate if too long
+-      this.session.truncate(20);
++        if (this.streamAbort.signal.aborted) break;
++      }
+ 
++      console.log(); // 流结束换行
+     } catch (error: any) {
+-      this.output.stopSpinner();
+-      this.output.printError(error.message);
++      if (error?.name === 'AbortError' || this.streamAbort.signal.aborted) {
++        console.log();
++        this.output.printWarning('[cancelled]');
++      } else {
++        this.output.printError(error.message);
++      }
++    } finally {
++      this.streamAbort = null;
+     }
++
++    const accepted = this.session.addMessage('assistant', fullResponse);
++    if (!accepted) {
++      this.output.printWarning(
++        chalk.yellow(
++          `⚠️  上轮回复包含 "[已中断]" 等污染标记,已自动丢弃以避免循环。本次回复不会基于它继续;请重说你的问题。\n` +
++          `(本次会话已累计过滤 ${this.session.getDroppedCount()} 条污染消息)`
++        )
++      );
++    }
++    this.session.truncate(20);
+   }
+ 
+-  /**
+-   * Show project context
+-   */
+   private showContext(): void {
+     const cwd = process.cwd();
+     this.output.printHeader('📁 Project Context');
+     this.output.printInfo(`Working directory: ${cwd}`);
+-    // TODO: Add more context (package.json, git status, etc.)
+   }
+ 
+-  /**
+-   * Show command history
+-   */
+   private showHistory(): void {
++    const items = this.input.getHistory();
+     this.output.printHeader('📜 Command History');
+-    // TODO: Implement history display
+-    this.output.printInfo('(History not yet implemented)');
++    if (items.length === 0) {
++      this.output.printInfo('(no history yet)');
++      return;
++    }
++    items.forEach((h, i) => this.output.printInfo(`  ${i + 1}. ${h}`));
+   }
+ 
+-  /**
+-   * Show available tools
+-   */
+   private showTools(): void {
+     this.output.printHeader('🔧 Available Tools');
+     this.output.printInfo('  file    - File operations (read, write, list, delete)');
+@@ -214,9 +247,6 @@ export class REPLLoop {
+     this.output.printInfo('  git     - Git operations (coming soon)');
+   }
+ 
+-  /**
+-   * Show available providers
+-   */
+   private showProviders(): void {
+     this.output.printHeader('🌐 Available Providers');
+     this.output.printInfo('  siliconflow  - 硅基流动 (default)');
+@@ -230,16 +260,21 @@ export class REPLLoop {
+    */
+   stop(): void {
+     this.running = false;
+-    this.input.close();
++    if (this.streamAbort) {
++      this.streamAbort.abort();
++      this.streamAbort = null;
++    }
+     this.output.stopStreaming();
+   }
+ 
+   /**
+-   * Handle interrupt (Ctrl+C)
++   * Handle interrupt (Ctrl+C) while streaming
+    */
+   interrupt(): void {
+-    this.output.printWarning('\n\n⚠️  Interrupted');
++    if (this.streamAbort) {
++      this.streamAbort.abort();
++      this.streamAbort = null;
++    }
+     this.output.stopStreaming();
+-    this.output.printInfo('\nType "exit" to quit, or continue...\n');
+   }
+ }
+-- 
+2.45.2.windows.1
+