thatgfsj-code 0.4.0 → 0.5.0

package/src/tui/welcome.ts

@@ -1,6 +1,5 @@
 /**
- * Welcome / Setup Wizard
- * Supports all providers + custom relay stations (中转站)
+ * Welcome / Setup Wizard - Clean UI
  */
 
 import chalk from 'chalk';
@@ -11,119 +10,124 @@ import { homedir } from 'os';
 import { PROVIDERS, getModelsForProvider, listProviders, isCustomProvider } from '../config/providers.js';
 import type { ProviderName } from '../config/types.js';
 
+const line = chalk.gray('─'.repeat(52));
+
 export class WelcomeScreen {
-  /**
-   * Show welcome if no API key is configured
-   */
+
   static show(hasApiKey: boolean): void {
     if (hasApiKey) return;
 
-    const w = 62;
-    console.log(chalk.cyan('+') + chalk.white.bold(' Thatgfsj Code ') + chalk.cyan('-'.repeat(w - 16)) + '+');
-    console.log(chalk.cyan('|') + chalk.yellow(' 快速开始指南').padEnd(w) + chalk.cyan('|'));
-    console.log(chalk.cyan('|') + ' '.repeat(w) + chalk.cyan('|'));
-    console.log(chalk.cyan('|') + chalk.gray(' 运行 gfcode init 配置你的 API Key').padEnd(w) + chalk.cyan('|'));
-    console.log(chalk.cyan('|') + chalk.gray(' 支持: OpenAI / Claude / DeepSeek / Kimi / 智谱 / 中转站').padEnd(w) + chalk.cyan('|'));
-    console.log(chalk.cyan('+') + '-'.repeat(w) + '+');
+    console.log();
+    console.log(chalk.cyan.bold('  ⚡ Thatgfsj Code') + chalk.gray(' v0.5.0'));
+    console.log(chalk.gray('  AI Coding Assistant'));
+    console.log(line);
+    console.log();
+    console.log(chalk.yellow('  ⚠  No API key configured'));
+    console.log();
+    console.log(chalk.gray('  Run ') + chalk.cyan.bold('gfcode init') + chalk.gray(' to set up your provider.'));
+    console.log();
+    console.log(chalk.gray('  Supported providers:'));
+    console.log(chalk.gray('  OpenAI · Claude · DeepSeek · Kimi · GLM · Gemini · 中转站'));
+    console.log(line);
     console.log();
   }
 
-  /**
-   * Interactive setup wizard
-   */
   static async interactiveSetup(): Promise<void> {
     console.clear();
-    console.log(chalk.cyan('\n  🤖 Thatgfsj Code 配置向导\n'));
+    console.log();
+    console.log(chalk.cyan.bold('  ⚡ Thatgfsj Code') + chalk.gray(' - Setup'));
+    console.log(line);
+    console.log();
 
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout,
     });
 
-    const question = (prompt: string): Promise<string> =>
+    const ask = (prompt: string): Promise<string> =>
       new Promise(resolve => rl.question(prompt, answer => resolve(answer.trim())));
 
     try {
-      // Step 1: Choose provider
-      console.log(chalk.white('  步骤 1/3: 选择 AI 提供商\n'));
+      // ── Step 1: Provider ────────────────────────────────
+      console.log(chalk.bold('  1. Choose Provider'));
+      console.log();
       const providers = listProviders();
       providers.forEach((p, i) => {
-        const num = (i + 1).toString().padStart(2);
-        console.log(chalk.green(`  ${num}. ${p.name}`));
+        const num = chalk.cyan((i + 1).toString().padStart(2));
+        console.log(`    ${num}  ${p.name}`);
       });
       console.log();
 
-      const choice = await question(chalk.green('  请选择 (1-' + providers.length + '): '));
+      const choice = await ask(chalk.cyan('    ❯ '));
       const selected = providers[parseInt(choice) - 1] || providers[0];
       const providerName = selected.key;
 
-      // Step 2: Enter API Key (and base URL for custom providers)
-      console.log(chalk.white('\n  步骤 2/3: 配置连接信息\n'));
+      // ── Step 2: API Key ─────────────────────────────────
+      console.log();
+      console.log(chalk.bold('  2. API Key'));
+      console.log();
 
       let baseUrl: string | undefined;
 
       if (isCustomProvider(providerName)) {
-        // Custom provider needs base URL
-        console.log(chalk.yellow('  自定义 Provider (中转站) 模式'));
-        console.log(chalk.gray('  支持 OpenAI 兼容 或 Anthropic 兼容 的中转站'));
+        console.log(chalk.yellow('    Custom Provider (Relay Station)'));
+        console.log(chalk.gray('    OpenAI-compatible or Anthropic-compatible'));
         console.log();
-        baseUrl = await question(chalk.green('  请输入中转站 Base URL: '));
+        baseUrl = await ask(chalk.cyan('    Base URL ❯ '));
         if (!baseUrl) {
-          console.log(chalk.red('  ❌ 中转站必须提供 Base URL'));
+          console.log(chalk.red('    ❌ Base URL required'));
           rl.close();
           return;
         }
-        // Remove trailing slash
         baseUrl = baseUrl.replace(/\/+$/, '');
-        // Remove /v1 suffix if present (we'll add it in the provider)
-        // Actually keep it as-is since the user knows their endpoint
       }
 
-      const apiKey = await question(chalk.green('  请输入 API Key: '));
+      const apiKey = await ask(chalk.cyan('    API Key ❯ '));
 
-      // Step 3: Choose model
-      console.log(chalk.white('\n  步骤 3/3: 选择模型\n'));
+      // ── Step 3: Model ───────────────────────────────────
+      console.log();
+      console.log(chalk.bold('  3. Choose Model'));
+      console.log();
 
       if (isCustomProvider(providerName)) {
-        // Custom provider: let user type model name
-        console.log(chalk.gray('  输入中转站支持的模型名称'));
-        console.log(chalk.gray('  例如: gpt-4o-mini, claude-sonnet-4-20250514, deepseek-chat'));
-        const model = await question(chalk.green('  模型名称: '));
+        console.log(chalk.gray('    Enter model name for your relay station'));
+        console.log(chalk.gray('    e.g. gpt-4o-mini, claude-sonnet-4-20250514'));
+        console.log();
+        const model = await ask(chalk.cyan('    Model ❯ '));
         if (!model) {
-          console.log(chalk.red('  ❌ 必须指定模型'));
+          console.log(chalk.red('    ❌ Model name required'));
           rl.close();
           return;
         }
-
-        // Save config
         this.saveConfig(providerName, model, apiKey, baseUrl);
       } else {
-        // Standard provider: show model list
         const models = getModelsForProvider(providerName);
         models.forEach((m, i) => {
-          const num = (i + 1).toString().padStart(2);
-          console.log(chalk.green(`  ${num}. ${m.name}`) + chalk.gray(` - ${m.desc}`));
+          const num = chalk.cyan((i + 1).toString().padStart(2));
+          console.log(`    ${num}  ${chalk.white(m.name)}  ${chalk.gray(m.desc)}`);
         });
         console.log();
 
-        const modelChoice = await question(chalk.green('  请选择模型 (1-' + models.length + '): '));
+        const modelChoice = await ask(chalk.cyan('    ❯ '));
         const selectedModel = models[parseInt(modelChoice) - 1] || models[0];
-
         this.saveConfig(providerName, selectedModel.id, apiKey, baseUrl);
       }
 
-      console.log(chalk.green('\n  ✅ 配置已保存!'));
-      console.log(chalk.gray(`  配置文件: ${join(homedir(), '.thatgfsj', 'config.json')}`));
-      console.log(chalk.cyan('\n  运行 gfcode 开始使用\n'));
+      // ── Done ────────────────────────────────────────────
+      console.log();
+      console.log(line);
+      console.log(chalk.green.bold('  ✅ Configuration saved!'));
+      console.log();
+      console.log(chalk.gray('  Config: ') + chalk.white(join(homedir(), '.thatgfsj', 'config.json')));
+      console.log(chalk.gray('  Run ') + chalk.cyan.bold('gfcode') + chalk.gray(' to start.'));
+      console.log(line);
+      console.log();
 
     } finally {
       rl.close();
     }
   }
 
-  /**
-   * Save config to file
-   */
   private static saveConfig(provider: ProviderName, model: string, apiKey: string, baseUrl?: string): void {
     const configDir = join(homedir(), '.thatgfsj');
     const configPath = join(configDir, 'config.json');
@@ -140,16 +144,15 @@ export class WelcomeScreen {
       maxTokens: 4096,
     };
 
-    if (baseUrl) {
-      config.baseUrl = baseUrl;
-    }
+    if (baseUrl) config.baseUrl = baseUrl;
 
     writeFileSync(configPath, JSON.stringify(config, null, 2));
 
-    console.log(chalk.gray(`  提供商: ${provider}`));
-    console.log(chalk.gray(`  模型: ${model}`));
+    console.log();
+    console.log(chalk.gray('    Provider: ') + chalk.white(provider));
+    console.log(chalk.gray('    Model:    ') + chalk.white(model));
     if (baseUrl) {
-      console.log(chalk.gray(`  Base URL: ${baseUrl}`));
+      console.log(chalk.gray('    URL:      ') + chalk.white(baseUrl));
     }
   }
 }

package/src/app/agent.ts

@@ -1,140 +0,0 @@
-/**
- * Agent Loop - Core agent logic with streaming and tool execution
- * Extracted from old src/core/ai-engine.ts
- *
- * The agent loop: while(true) { stream response → check tool calls → execute → repeat }
- */
-
-import chalk from 'chalk';
-import type { ChatMessage, ChatResponse } from '../types.js';
-import type { Tool } from '../tools/types.js';
-import type { HookManager } from '../hooks/index.js';
-import { LLMService } from '../llm/index.js';
-import { ToolRegistry } from '../tools/index.js';
-
-export interface AgentConfig {
-  maxIterations?: number;
-  hooks?: HookManager;
-}
-
-export class Agent {
-  private llm: LLMService;
-  private registry: ToolRegistry;
-  private hooks?: HookManager;
-  private maxIterations: number;
-
-  constructor(llm: LLMService, registry: ToolRegistry, config: AgentConfig = {}) {
-    this.llm = llm;
-    this.registry = registry;
-    this.hooks = config.hooks;
-    this.maxIterations = config.maxIterations ?? 10;
-
-    // Register tools with LLM service
-    this.llm.registerTools(registry.list());
-  }
-
-  /**
-   * Run agent loop with streaming output
-   * Returns the final response
-   */
-  async *run(messages: ChatMessage[]): AsyncGenerator<string, ChatResponse> {
-    let currentMessages = [...messages];
-    let iterations = 0;
-
-    while (iterations < this.maxIterations) {
-      iterations++;
-
-      // Hook: beforeAgentLoop
-      if (this.hooks) {
-        await this.hooks.emit('beforeAgentLoop', { messages: currentMessages, iteration: iterations });
-      }
-
-      // Stream the response
-      let fullContent = '';
-
-      for await (const chunk of this.llm.chatStream(currentMessages, { maxIterations: 1 })) {
-        fullContent += chunk;
-        yield chunk;
-      }
-
-      // Get the full response to check for tool calls
-      const response: ChatResponse = {
-        content: fullContent,
-        role: 'assistant',
-      };
-
-      // Check if the response contains tool calls
-      // For now, we rely on the LLM service to handle tool calls internally
-      // If the LLM service returned tool_calls, we need to process them
-      if (response.tool_calls && response.tool_calls.length > 0) {
-        currentMessages.push({
-          role: 'assistant',
-          content: response.content,
-          tool_calls: response.tool_calls,
-        });
-
-        for (const toolCall of response.tool_calls) {
-          // Hook: beforeToolCall
-          if (this.hooks) {
-            await this.hooks.emit('beforeToolCall', {
-              toolName: toolCall.function.name,
-              toolParams: JSON.parse(toolCall.function.arguments || '{}'),
-              toolCallId: toolCall.id,
-            });
-          }
-
-          const result = await this.registry.execute(
-            toolCall.function.name,
-            JSON.parse(toolCall.function.arguments || '{}')
-          );
-
-          // Hook: afterToolCall
-          if (this.hooks) {
-            await this.hooks.emit('afterToolCall', {
-              toolName: toolCall.function.name,
-              toolParams: JSON.parse(toolCall.function.arguments || '{}'),
-              toolResult: result,
-              toolCallId: toolCall.id,
-            });
-          }
-
-          currentMessages.push({
-            role: 'tool',
-            content: result.success ? (result.output || JSON.stringify(result.data)) : (result.error || 'Tool failed'),
-            tool_call_id: toolCall.id,
-            name: toolCall.function.name,
-          });
-
-          yield `\n${chalk.gray(`[tool: ${toolCall.function.name}]`)}`;
-        }
-
-        continue; // Next iteration
-      }
-
-      // No tool calls - done
-      if (response.content) {
-        currentMessages.push({ role: 'assistant', content: response.content });
-      }
-
-      // Hook: afterAgentLoop
-      if (this.hooks) {
-        await this.hooks.emit('afterAgentLoop', { messages: currentMessages, iteration: iterations });
-      }
-
-      return response;
-    }
-
-    return { content: '[Agent loop exceeded maximum iterations]', role: 'assistant' };
-  }
-
-  /**
-   * Non-streaming chat (convenience method)
-   */
-  async chat(messages: ChatMessage[]): Promise<ChatResponse> {
-    let fullContent = '';
-    for await (const chunk of this.run(messages)) {
-      fullContent += chunk;
-    }
-    return { content: fullContent, role: 'assistant' };
-  }
-}