thatgfsj-code 1.0.3 → 3.0.0

package/src/tui/welcome.ts

@@ -1,177 +1,177 @@
-/**
- * Welcome / Setup Wizard - Clean UI
- */
-
-import chalk from 'chalk';
-import readline from 'readline';
-import { existsSync, mkdirSync, writeFileSync } from 'fs';
-import { join } from 'path';
-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 {
-
-  static show(hasApiKey: boolean): void {
-    if (hasApiKey) return;
-
-    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();
-  }
-
-  static async interactiveSetup(): Promise<void> {
-    console.clear();
-    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 ask = (prompt: string): Promise<string> =>
-      new Promise(resolve => rl.question(prompt, answer => resolve(answer.trim())));
-
-    try {
-      // ── Step 1: Provider ────────────────────────────────
-      console.log(chalk.bold('  1. Choose Provider'));
-      console.log();
-      const providers = listProviders();
-      providers.forEach((p, i) => {
-        const num = chalk.cyan((i + 1).toString().padStart(2));
-        console.log(`    ${num}  ${p.name}`);
-      });
-      console.log();
-
-      const choice = await ask(chalk.cyan('    ❯ '));
-      const selected = providers[parseInt(choice) - 1] || providers[0];
-      const providerName = selected.key;
-
-      // ── Step 2: API Key ─────────────────────────────────
-      console.log();
-      console.log(chalk.bold('  2. API Key'));
-      console.log();
-
-      let baseUrl: string | undefined;
-
-      if (isCustomProvider(providerName)) {
-        console.log(chalk.yellow('    Custom Provider (Relay Station)'));
-        console.log(chalk.gray('    OpenAI-compatible or Anthropic-compatible'));
-        console.log();
-        baseUrl = await ask(chalk.cyan('    Base URL ❯ '));
-        if (!baseUrl) {
-          console.log(chalk.red('    ❌ Base URL required'));
-          rl.close();
-          return;
-        }
-        baseUrl = baseUrl.replace(/\/+$/, '');
-      }
-
-      const apiKey = await ask(chalk.cyan('    API Key ❯ '));
-
-      // ── Step 3: Model ───────────────────────────────────
-      console.log();
-      console.log(chalk.bold('  3. Choose Model'));
-      console.log();
-
-      let model: string;
-      if (isCustomProvider(providerName)) {
-        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();
-        model = await ask(chalk.cyan('    Model ❯ '));
-        if (!model) {
-          console.log(chalk.red('    ❌ Model name required'));
-          rl.close();
-          return;
-        }
-      } else {
-        const models = getModelsForProvider(providerName);
-        models.forEach((m, i) => {
-          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 ask(chalk.cyan('    ❯ '));
-        const selectedModel = models[parseInt(modelChoice) - 1] || models[0];
-        model = selectedModel.id;
-      }
-
-      // ── Step 4: Context Length ───────────────────────────
-      console.log();
-      console.log(chalk.bold('  4. Context Length'));
-      console.log();
-      console.log(chalk.gray('    Max messages kept in conversation history'));
-      console.log(chalk.gray('    Higher = more context, more tokens used'));
-      console.log();
-      console.log(chalk.cyan('    1') + '  20  ' + chalk.gray('(short,节省 token)'));
-      console.log(chalk.cyan('    2') + '  50  ' + chalk.gray('(default,推荐)'));
-      console.log(chalk.cyan('    3') + '  100 ' + chalk.gray('(long,长对话)'));
-      console.log(chalk.cyan('    4') + '  200 ' + chalk.gray('(very long,超长对话)'));
-      console.log();
-      const ctxChoice = await ask(chalk.cyan('    ❯ '));
-      const ctxMap: Record<string, number> = { '1': 20, '2': 50, '3': 100, '4': 200 };
-      const contextLength = ctxMap[ctxChoice] || 50;
-
-      // ── Save ────────────────────────────────────────────
-      this.saveConfig(providerName, model, apiKey, baseUrl, contextLength);
-
-      // ── 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();
-    }
-  }
-
-  private static saveConfig(provider: ProviderName, model: string, apiKey: string, baseUrl?: string, contextLength = 50): void {
-    const configDir = join(homedir(), '.thatgfsj');
-    const configPath = join(configDir, 'config.json');
-
-    if (!existsSync(configDir)) {
-      mkdirSync(configDir, { recursive: true });
-    }
-
-    const config: Record<string, any> = {
-      provider,
-      model,
-      apiKey,
-      temperature: 0.7,
-      maxTokens: 4096,
-      contextLength,
-    };
-
-    if (baseUrl) config.baseUrl = baseUrl;
-
-    writeFileSync(configPath, JSON.stringify(config, null, 2));
-
-    console.log();
-    console.log(chalk.gray('    Provider: ') + chalk.white(provider));
-    console.log(chalk.gray('    Model:    ') + chalk.white(model));
-    if (baseUrl) {
-      console.log(chalk.gray('    URL:      ') + chalk.white(baseUrl));
-    }
-  }
-}
+/**
+ * Welcome / Setup Wizard - Clean UI
+ */
+
+import chalk from 'chalk';
+import readline from 'readline';
+import { existsSync, mkdirSync, writeFileSync } from 'fs';
+import { join } from 'path';
+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 {
+
+  static show(hasApiKey: boolean): void {
+    if (hasApiKey) return;
+
+    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();
+  }
+
+  static async interactiveSetup(): Promise<void> {
+    console.clear();
+    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 ask = (prompt: string): Promise<string> =>
+      new Promise(resolve => rl.question(prompt, answer => resolve(answer.trim())));
+
+    try {
+      // ── Step 1: Provider ────────────────────────────────
+      console.log(chalk.bold('  1. Choose Provider'));
+      console.log();
+      const providers = listProviders();
+      providers.forEach((p, i) => {
+        const num = chalk.cyan((i + 1).toString().padStart(2));
+        console.log(`    ${num}  ${p.name}`);
+      });
+      console.log();
+
+      const choice = await ask(chalk.cyan('    ❯ '));
+      const selected = providers[parseInt(choice) - 1] || providers[0];
+      const providerName = selected.key;
+
+      // ── Step 2: API Key ─────────────────────────────────
+      console.log();
+      console.log(chalk.bold('  2. API Key'));
+      console.log();
+
+      let baseUrl: string | undefined;
+
+      if (isCustomProvider(providerName)) {
+        console.log(chalk.yellow('    Custom Provider (Relay Station)'));
+        console.log(chalk.gray('    OpenAI-compatible or Anthropic-compatible'));
+        console.log();
+        baseUrl = await ask(chalk.cyan('    Base URL ❯ '));
+        if (!baseUrl) {
+          console.log(chalk.red('    ❌ Base URL required'));
+          rl.close();
+          return;
+        }
+        baseUrl = baseUrl.replace(/\/+$/, '');
+      }
+
+      const apiKey = await ask(chalk.cyan('    API Key ❯ '));
+
+      // ── Step 3: Model ───────────────────────────────────
+      console.log();
+      console.log(chalk.bold('  3. Choose Model'));
+      console.log();
+
+      let model: string;
+      if (isCustomProvider(providerName)) {
+        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();
+        model = await ask(chalk.cyan('    Model ❯ '));
+        if (!model) {
+          console.log(chalk.red('    ❌ Model name required'));
+          rl.close();
+          return;
+        }
+      } else {
+        const models = getModelsForProvider(providerName);
+        models.forEach((m, i) => {
+          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 ask(chalk.cyan('    ❯ '));
+        const selectedModel = models[parseInt(modelChoice) - 1] || models[0];
+        model = selectedModel.id;
+      }
+
+      // ── Step 4: Context Length ───────────────────────────
+      console.log();
+      console.log(chalk.bold('  4. Context Length'));
+      console.log();
+      console.log(chalk.gray('    Max messages kept in conversation history'));
+      console.log(chalk.gray('    Higher = more context, more tokens used'));
+      console.log();
+      console.log(chalk.cyan('    1') + '  20  ' + chalk.gray('(short,节省 token)'));
+      console.log(chalk.cyan('    2') + '  50  ' + chalk.gray('(default,推荐)'));
+      console.log(chalk.cyan('    3') + '  100 ' + chalk.gray('(long,长对话)'));
+      console.log(chalk.cyan('    4') + '  200 ' + chalk.gray('(very long,超长对话)'));
+      console.log();
+      const ctxChoice = await ask(chalk.cyan('    ❯ '));
+      const ctxMap: Record<string, number> = { '1': 20, '2': 50, '3': 100, '4': 200 };
+      const contextLength = ctxMap[ctxChoice] || 50;
+
+      // ── Save ────────────────────────────────────────────
+      this.saveConfig(providerName, model, apiKey, baseUrl, contextLength);
+
+      // ── 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();
+    }
+  }
+
+  private static saveConfig(provider: ProviderName, model: string, apiKey: string, baseUrl?: string, contextLength = 50): void {
+    const configDir = join(homedir(), '.thatgfsj');
+    const configPath = join(configDir, 'config.json');
+
+    if (!existsSync(configDir)) {
+      mkdirSync(configDir, { recursive: true });
+    }
+
+    const config: Record<string, any> = {
+      provider,
+      model,
+      apiKey,
+      temperature: 0.7,
+      maxTokens: 4096,
+      contextLength,
+    };
+
+    if (baseUrl) config.baseUrl = baseUrl;
+
+    writeFileSync(configPath, JSON.stringify(config, null, 2));
+
+    console.log();
+    console.log(chalk.gray('    Provider: ') + chalk.white(provider));
+    console.log(chalk.gray('    Model:    ') + chalk.white(model));
+    if (baseUrl) {
+      console.log(chalk.gray('    URL:      ') + chalk.white(baseUrl));
+    }
+  }
+}

package/src/types.ts

@@ -1,42 +1,104 @@
-/**
- * Global shared types for Thatgfsj Code
- * Only the most fundamental types used across modules
- */
-
-export type Role = 'system' | 'user' | 'assistant' | 'tool';
-
-export interface ChatMessage {
-  role: Role;
-  content: string;
-  name?: string;
-  tool_calls?: ToolCall[];
-  tool_call_id?: string;
-  reasoning_content?: string;
-}
-
-export interface ToolCall {
-  id: string;
-  type: 'function';
-  function: {
-    name: string;
-    arguments: string;
-  };
-}
-
-export interface ChatResponse {
-  content: string;
-  role: 'assistant';
-  usage?: {
-    prompt_tokens: number;
-    completion_tokens: number;
-    total_tokens: number;
-  };
-  tool_calls?: ToolCall[];
-  reasoning_content?: string;
-}
-
-export interface ChatOptions {
-  temperature?: number;
-  maxTokens?: number;
-  stream?: boolean;
-}
+/**
+ * Global shared types for Thatgfsj Code
+ * Only the most fundamental types used across modules
+ *
+ * v3.0.0+: Extended for Reasonix-style prompt caching:
+ *   - ChatMessage.content now accepts ContentBlock[] (Anthropic-style)
+ *   - cache_control field for explicit Anthropic cache breakpoints
+ *   - usage extended with cache_creation_input_tokens / cache_read_input_tokens
+ *     (Anthropic) and prompt_cache_hit_tokens / prompt_cache_miss_tokens (DeepSeek)
+ *   - StreamChunk now has 'thinking' / 'usage' variants for structured streaming
+ */
+
+export type Role = 'system' | 'user' | 'assistant' | 'tool';
+
+/**
+ * Anthropic-style cache control. ttl: '5m' (default) | '1h'
+ * - '5m': cheaper write cost, refreshed on each hit, expires 5 min after last hit
+ * - '1h': more expensive write cost, expires 1 hour after last hit
+ */
+export interface CacheControl {
+  type: 'ephemeral';
+  ttl?: '5m' | '1h';
+}
+
+/**
+ * Anthropic-style content blocks. text carries optional cache_control so that
+ * Anthropic prompt caching breakpoints can be placed inside messages.
+ */
+export type ContentBlock =
+  | { type: 'text'; text: string; cache_control?: CacheControl }
+  | { type: 'image'; source: { type: 'base64'; media_type: string; data: string } };
+
+export interface ChatMessage {
+  role: Role;
+  /**
+   * For 'system' / 'user' / 'assistant' (text only): a plain string.
+   * For 'user' (multimodal) or 'assistant' (Anthropic tool_use mixed with text):
+   * an array of ContentBlock.
+   * 'tool' messages must use string content (carries tool result text).
+   */
+  content: string | ContentBlock[];
+  name?: string;
+  tool_calls?: ToolCall[];
+  tool_call_id?: string;
+  reasoning_content?: string;
+  /**
+   * Anthropic prompt caching marker attached to the message itself.
+   * Only honored when the underlying provider supports it (anthropic, anthropic-relay).
+   * OpenAI / Gemini / DeepSeek ignore it (DeepSeek uses automatic prefix cache).
+   */
+  cache_control?: CacheControl;
+}
+
+export interface ToolCall {
+  id: string;
+  type: 'function';
+  function: {
+    name: string;
+    arguments: string;
+  };
+}
+
+export interface Usage {
+  prompt_tokens: number;
+  completion_tokens: number;
+  total_tokens: number;
+  // Anthropic prompt cache fields
+  cache_creation_input_tokens?: number;
+  cache_read_input_tokens?: number;
+  // DeepSeek prompt cache fields
+  prompt_cache_hit_tokens?: number;
+  prompt_cache_miss_tokens?: number;
+}
+
+export interface ChatResponse {
+  content: string;
+  role: 'assistant';
+  usage?: Usage;
+  tool_calls?: ToolCall[];
+  reasoning_content?: string;
+}
+
+export interface ChatOptions {
+  temperature?: number;
+  maxTokens?: number;
+  stream?: boolean;
+}
+
+/**
+ * Structured streaming chunk. Replaces the legacy @@TOOL@@ sentinel-string
+ * protocol that the previous version of useChat parsed by string-splitting.
+ *
+ * - 'text':        regular model output
+ * - 'tool_calls':  one or more tool calls ready to dispatch
+ * - 'thinking':    reasoning content (stripped from final persistence; kept in
+ *                  VolatileScratch for the current round only)
+ * - 'usage':       token usage + cache stats; emitted at end of stream if
+ *                  the upstream provider returned them
+ */
+export type StreamChunk =
+  | { type: 'text'; content: string }
+  | { type: 'tool_calls'; toolCalls: ToolCall[] }
+  | { type: 'thinking'; content: string }
+  | { type: 'usage'; usage: Usage };

package/src/utils/diff.ts

@@ -1,71 +1,71 @@
-/**
- * Diff Preview - Show file changes in a readable format
- * Migrated from old src/utils/diff-preview.ts
- */
-
-export interface DiffResult {
-  original: string;
-  modified: string;
-  diff: string;
-  added: number;
-  removed: number;
-}
-
-export class DiffPreview {
-  /**
-   * Generate a simple line-by-line diff
-   */
-  static diff(original: string, modified: string): DiffResult {
-    const originalLines = original.split('\n');
-    const modifiedLines = modified.split('\n');
-    const diffLines: string[] = [];
-    let added = 0;
-    let removed = 0;
-
-    // Simple diff: show removed (-) and added (+) lines
-    const maxLen = Math.max(originalLines.length, modifiedLines.length);
-
-    for (let i = 0; i < maxLen; i++) {
-      const orig = originalLines[i];
-      const mod = modifiedLines[i];
-
-      if (orig === mod) {
-        diffLines.push(`  ${orig}`);
-      } else {
-        if (orig !== undefined) {
-          diffLines.push(`- ${orig}`);
-          removed++;
-        }
-        if (mod !== undefined) {
-          diffLines.push(`+ ${mod}`);
-          added++;
-        }
-      }
-    }
-
-    return {
-      original,
-      modified,
-      diff: diffLines.join('\n'),
-      added,
-      removed,
-    };
-  }
-
-  /**
-   * Format diff for display
-   */
-  static format(result: DiffResult): string {
-    const lines = result.diff.split('\n').map(line => {
-      if (line.startsWith('+')) return `\x1b[32m${line}\x1b[0m`;
-      if (line.startsWith('-')) return `\x1b[31m${line}\x1b[0m`;
-      return line;
-    });
-
-    return [
-      `\x1b[36m--- Changes: -${result.removed} / +${result.added} ---\x1b[0m`,
-      ...lines,
-      `\x1b[36m--- End ---\x1b[0m`,
-    ].join('\n');
-  }
-}
+/**
+ * Diff Preview - Show file changes in a readable format
+ * Migrated from old src/utils/diff-preview.ts
+ */
+
+export interface DiffResult {
+  original: string;
+  modified: string;
+  diff: string;
+  added: number;
+  removed: number;
+}
+
+export class DiffPreview {
+  /**
+   * Generate a simple line-by-line diff
+   */
+  static diff(original: string, modified: string): DiffResult {
+    const originalLines = original.split('\n');
+    const modifiedLines = modified.split('\n');
+    const diffLines: string[] = [];
+    let added = 0;
+    let removed = 0;
+
+    // Simple diff: show removed (-) and added (+) lines
+    const maxLen = Math.max(originalLines.length, modifiedLines.length);
+
+    for (let i = 0; i < maxLen; i++) {
+      const orig = originalLines[i];
+      const mod = modifiedLines[i];
+
+      if (orig === mod) {
+        diffLines.push(`  ${orig}`);
+      } else {
+        if (orig !== undefined) {
+          diffLines.push(`- ${orig}`);
+          removed++;
+        }
+        if (mod !== undefined) {
+          diffLines.push(`+ ${mod}`);
+          added++;
+        }
+      }
+    }
+
+    return {
+      original,
+      modified,
+      diff: diffLines.join('\n'),
+      added,
+      removed,
+    };
+  }
+
+  /**
+   * Format diff for display
+   */
+  static format(result: DiffResult): string {
+    const lines = result.diff.split('\n').map(line => {
+      if (line.startsWith('+')) return `\x1b[32m${line}\x1b[0m`;
+      if (line.startsWith('-')) return `\x1b[31m${line}\x1b[0m`;
+      return line;
+    });
+
+    return [
+      `\x1b[36m--- Changes: -${result.removed} / +${result.added} ---\x1b[0m`,
+      ...lines,
+      `\x1b[36m--- End ---\x1b[0m`,
+    ].join('\n');
+  }
+}