thatgfsj-code 2.2.9 → 3.0.1

package/src/tools/types.ts

@@ -1,122 +1,122 @@
-/**
- * Tool interface definitions
- * Extracted from old src/core/types.ts
- */
-
-// ==================== Tool Parameter & Schema ====================
-
-export interface ToolParameter {
-  name: string;
-  type: string;
-  description: string;
-  required: boolean;
-  default?: any;
-  enum?: string[];
-}
-
-export interface ToolInputSchema {
-  type: 'object';
-  properties: Record<string, {
-    type: string;
-    description: string;
-    default?: any;
-    enum?: string[];
-  }>;
-  required?: string[];
-}
-
-export interface ToolMetadata {
-  permissions?: ('read' | 'write' | 'execute' | 'network')[];
-  maxDuration?: number;
-  tags?: string[];
-  version?: string;
-  deprecated?: string;
-}
-
-// ==================== Tool Interface ====================
-
-export interface ToolContext {
-  sessionId?: string;
-  workingDirectory?: string;
-  confirmAction?: (msg: string) => Promise<boolean>;
-  signal?: AbortSignal;
-  toolCallId?: string;
-}
-
-export interface ToolResult {
-  success: boolean;
-  output?: string;
-  error?: string;
-  data?: any;
-}
-
-export interface Tool {
-  name: string;
-  description: string;
-  parameters: ToolParameter[];
-  inputSchema?: ToolInputSchema;
-  metadata?: ToolMetadata;
-  execute(params: Record<string, any>, ctx?: ToolContext): Promise<ToolResult>;
-}
-
-// ==================== Tool Builder ====================
-
-export class ToolBuilder {
-  private _name = '';
-  private _description = '';
-  private _parameters: ToolParameter[] = [];
-  private _inputSchema: ToolInputSchema = { type: 'object', properties: {} };
-  private _metadata: ToolMetadata = {};
-  private _fn?: (params: Record<string, any>, ctx: ToolContext) => Promise<ToolResult>;
-
-  name(n: string): this { this._name = n; return this; }
-  description(d: string): this { this._description = d; return this; }
-
-  param(p: ToolParameter): this {
-    this._parameters.push(p);
-    this._inputSchema.properties[p.name] = {
-      type: p.type,
-      description: p.description,
-      default: p.default,
-      enum: p.enum,
-    };
-    return this;
-  }
-
-  stringParam(name: string, description: string, required = true, defaultVal?: string): this {
-    return this.param({ name, type: 'string', description, required, default: defaultVal });
-  }
-
-  booleanParam(name: string, description: string, required = false, defaultVal?: boolean): this {
-    return this.param({ name, type: 'boolean', description, required, default: defaultVal });
-  }
-
-  permissions(...perms: ('read' | 'write' | 'execute' | 'network')[]): this {
-    this._metadata.permissions = perms;
-    return this;
-  }
-
-  tags(...t: string[]): this {
-    this._metadata.tags = t;
-    return this;
-  }
-
-  handle(fn: (params: Record<string, any>, ctx: ToolContext) => Promise<ToolResult>): this {
-    this._fn = fn;
-    return this;
-  }
-
-  build(): Tool {
-    if (!this._name || !this._fn) {
-      throw new Error('Tool name and handler are required');
-    }
-    return {
-      name: this._name,
-      description: this._description,
-      parameters: this._parameters,
-      inputSchema: this._inputSchema,
-      metadata: this._metadata,
-      execute: this._fn,
-    };
-  }
-}
+/**
+ * Tool interface definitions
+ * Extracted from old src/core/types.ts
+ */
+
+// ==================== Tool Parameter & Schema ====================
+
+export interface ToolParameter {
+  name: string;
+  type: string;
+  description: string;
+  required: boolean;
+  default?: any;
+  enum?: string[];
+}
+
+export interface ToolInputSchema {
+  type: 'object';
+  properties: Record<string, {
+    type: string;
+    description: string;
+    default?: any;
+    enum?: string[];
+  }>;
+  required?: string[];
+}
+
+export interface ToolMetadata {
+  permissions?: ('read' | 'write' | 'execute' | 'network')[];
+  maxDuration?: number;
+  tags?: string[];
+  version?: string;
+  deprecated?: string;
+}
+
+// ==================== Tool Interface ====================
+
+export interface ToolContext {
+  sessionId?: string;
+  workingDirectory?: string;
+  confirmAction?: (msg: string) => Promise<boolean>;
+  signal?: AbortSignal;
+  toolCallId?: string;
+}
+
+export interface ToolResult {
+  success: boolean;
+  output?: string;
+  error?: string;
+  data?: any;
+}
+
+export interface Tool {
+  name: string;
+  description: string;
+  parameters: ToolParameter[];
+  inputSchema?: ToolInputSchema;
+  metadata?: ToolMetadata;
+  execute(params: Record<string, any>, ctx?: ToolContext): Promise<ToolResult>;
+}
+
+// ==================== Tool Builder ====================
+
+export class ToolBuilder {
+  private _name = '';
+  private _description = '';
+  private _parameters: ToolParameter[] = [];
+  private _inputSchema: ToolInputSchema = { type: 'object', properties: {} };
+  private _metadata: ToolMetadata = {};
+  private _fn?: (params: Record<string, any>, ctx: ToolContext) => Promise<ToolResult>;
+
+  name(n: string): this { this._name = n; return this; }
+  description(d: string): this { this._description = d; return this; }
+
+  param(p: ToolParameter): this {
+    this._parameters.push(p);
+    this._inputSchema.properties[p.name] = {
+      type: p.type,
+      description: p.description,
+      default: p.default,
+      enum: p.enum,
+    };
+    return this;
+  }
+
+  stringParam(name: string, description: string, required = true, defaultVal?: string): this {
+    return this.param({ name, type: 'string', description, required, default: defaultVal });
+  }
+
+  booleanParam(name: string, description: string, required = false, defaultVal?: boolean): this {
+    return this.param({ name, type: 'boolean', description, required, default: defaultVal });
+  }
+
+  permissions(...perms: ('read' | 'write' | 'execute' | 'network')[]): this {
+    this._metadata.permissions = perms;
+    return this;
+  }
+
+  tags(...t: string[]): this {
+    this._metadata.tags = t;
+    return this;
+  }
+
+  handle(fn: (params: Record<string, any>, ctx: ToolContext) => Promise<ToolResult>): this {
+    this._fn = fn;
+    return this;
+  }
+
+  build(): Tool {
+    if (!this._name || !this._fn) {
+      throw new Error('Tool name and handler are required');
+    }
+    return {
+      name: this._name,
+      description: this._description,
+      parameters: this._parameters,
+      inputSchema: this._inputSchema,
+      metadata: this._metadata,
+      execute: this._fn,
+    };
+  }
+}

package/src/tui/app.tsx

@@ -1,186 +1,200 @@
-/** @jsxImportSource react */
-import React, { useState, useCallback } from 'react';
-import { Box, Text, useStdout } from 'ink';
-import { Header } from './components/Header.js';
-import { ChatList } from './components/ChatList.js';
-import { Thinking } from './components/Thinking.js';
-import { UserInput } from './components/UserInput.js';
-import { StatusBar } from './components/StatusBar.js';
-import { ModelSelector } from './components/ModelSelector.js';
-import { InitWizard } from './components/InitWizard.js';
-import { useChat } from './hooks/useChat.js';
-import { useCommands } from './hooks/useCommands.js';
-import type { App } from '../app/index.js';
-import type { MessageData } from './components/ChatMessage.js';
-import type { ProviderName } from '../config/types.js';
-import { writeFileSync, readFileSync, existsSync, mkdirSync } from 'fs';
-import { join } from 'path';
-import { homedir } from 'os';
-
-interface Props {
-  app: App;
-}
-
-function saveModelToHistory(model: string) {
-  const dir = join(homedir(), '.thatgfsj');
-  const path = join(dir, 'models.json');
-  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
-  let history: string[] = [];
-  if (existsSync(path)) {
-    try { history = JSON.parse(readFileSync(path, 'utf-8')); } catch {}
-  }
-  if (!history.includes(model)) {
-    history.push(model);
-    writeFileSync(path, JSON.stringify(history, null, 2));
-  }
-}
-
-type ViewMode = 'chat' | 'model_select' | 'init_wizard' | 'init_key' | 'init_url' | 'init_custom_model';
-
-export function TuiApp({ app }: Props) {
-  const { messages, isThinking, streaming, streamingToolCalls, queuedMessage, sendMessage, cancel } = useChat(app);
-  const { handleCommand } = useCommands(app);
-  const [systemMessages, setSystemMessages] = useState<MessageData[]>([]);
-  const [viewMode, setViewMode] = useState<ViewMode>('chat');
-  const [initProvider, setInitProvider] = useState<ProviderName>('siliconflow');
-  const [initUrl, setInitUrl] = useState('');
-  const { stdout } = useStdout();
-  const terminalWidth = stdout?.columns || 80;
-
-  const addMsg = useCallback((content: string) => {
-    setSystemMessages(prev => [...prev, { role: 'assistant', content }]);
-  }, []);
-
-  const onSubmit = useCallback(async (input: string) => {
-    // Init wizard - API Key input
-    if (viewMode === 'init_key') {
-      const key = input.trim();
-      if (!key) { setViewMode('chat'); return; }
-      // Save and complete
-      const { App: AppClass } = await import('../app/index.js');
-      const cfg = app.config.get();
-      app.config.save({ provider: initProvider, apiKey: key, model: cfg.model || 'default' });
-      saveModelToHistory(cfg.model || 'default');
-      setViewMode('chat');
-      addMsg(`配置已更新: ${initProvider}`);
-      return;
-    }
-
-    // Init wizard - Custom URL input
-    if (viewMode === 'init_url') {
-      const url = input.trim();
-      if (!url) { setViewMode('chat'); return; }
-      setInitUrl(url);
-      setViewMode('init_key');
-      return;
-    }
-
-    // Init wizard - Custom model name
-    if (viewMode === 'init_custom_model') {
-      const model = input.trim();
-      if (model) {
-        app.config.save({ model });
-        saveModelToHistory(model);
-        addMsg(`模型已切换: ${model}`);
-      }
-      setViewMode('chat');
-      return;
-    }
-
-    // Model selector - ignore text input
-    if (viewMode === 'model_select') return;
-
-    // Normal command handling
-    const result = handleCommand(input);
-
-    if (result.handled) {
-      if (input.trim() === '/模型' || input.trim() === '/model') {
-        setViewMode('model_select');
-        return;
-      }
-
-      if (result.output) {
-        setSystemMessages(prev => [
-          ...prev,
-          { role: 'user', content: input },
-          { role: 'assistant', content: result.output! },
-        ]);
-      }
-
-      if (result.action === 'clear') setSystemMessages([]);
-
-      if (result.action === 'reinit') {
-        setViewMode('init_wizard');
-      }
-
-      return;
-    }
-
-    sendMessage(input);
-  }, [handleCommand, sendMessage, app, viewMode, initProvider, initUrl, addMsg]);
-
-  const allMessages = [...systemMessages, ...messages];
-  const activeSkills = app.skills.listActive().map(s => s.id);
-
-  return (
-    <Box flexDirection="column" paddingX={1}>
-      <Header provider={app.config.get().provider} model={app.config.get().model} />
-      <ChatList
-        messages={allMessages}
-        streaming={streaming}
-        streamingToolCalls={streamingToolCalls}
-        width={terminalWidth - 4}
-      />
-      <Thinking active={isThinking} />
-      {queuedMessage && (
-        <Box paddingLeft={1}>
-          <Text color="#F59E0B">📎 已排队: </Text>
-          <Text color="#94A3B8">{queuedMessage}</Text>
-        </Box>
-      )}
-      {viewMode === 'model_select' ? (
-        <ModelSelector
-          currentModel={app.config.get().model}
-          onSelect={(model) => {
-            app.config.save({ model });
-            saveModelToHistory(model);
-            setViewMode('chat');
-            addMsg(`模型已切换: ${model}`);
-          }}
-          onAddNew={() => setViewMode('init_wizard')}
-        />
-      ) : viewMode === 'init_wizard' ? (
-        <InitWizard
-          onComplete={(provider, model, apiKey, baseUrl) => {
-            app.config.save({ provider, model, apiKey, baseUrl });
-            saveModelToHistory(model);
-            setViewMode('chat');
-            addMsg(`配置完成: ${provider} / ${model}`);
-          }}
-          onCancel={() => setViewMode('chat')}
-        />
-      ) : (
-        <Box flexDirection="column">
-          {viewMode === 'init_key' && (
-            <Box paddingLeft={1} marginBottom={0}>
-              <Text color="#06B6D4" bold>输入 API Key: </Text>
-              <Text dimColor>({initProvider})</Text>
-            </Box>
-          )}
-          {viewMode === 'init_url' && (
-            <Box paddingLeft={1} marginBottom={0}>
-              <Text color="#06B6D4" bold>输入中转站 URL: </Text>
-            </Box>
-          )}
-          {viewMode === 'init_custom_model' && (
-            <Box paddingLeft={1} marginBottom={0}>
-              <Text color="#06B6D4" bold>输入模型名称: </Text>
-            </Box>
-          )}
-          <UserInput onSubmit={onSubmit} onCancel={cancel} disabled={false} />
-        </Box>
-      )}
-      <StatusBar messageCount={allMessages.length} skills={activeSkills} />
-    </Box>
-  );
-}
+/** @jsxImportSource react */
+import React, { useState, useCallback, useEffect } from 'react';
+import { Box, Text, useStdout } from 'ink';
+import { Header } from './components/Header.js';
+import { ChatList } from './components/ChatList.js';
+import { Thinking } from './components/Thinking.js';
+import { UserInput } from './components/UserInput.js';
+import { StatusBar } from './components/StatusBar.js';
+import { ModelSelector } from './components/ModelSelector.js';
+import { InitWizard } from './components/InitWizard.js';
+import { useChat } from './hooks/useChat.js';
+import { useCommands } from './hooks/useCommands.js';
+import type { App } from '../app/index.js';
+import type { MessageData } from './components/ChatMessage.js';
+import type { ProviderName } from '../config/types.js';
+import { writeFileSync, readFileSync, existsSync, mkdirSync } from 'fs';
+import { join } from 'path';
+import { homedir } from 'os';
+
+interface Props {
+  app: App;
+}
+
+function saveModelToHistory(model: string) {
+  const dir = join(homedir(), '.thatgfsj');
+  const path = join(dir, 'models.json');
+  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+  let history: string[] = [];
+  if (existsSync(path)) {
+    try { history = JSON.parse(readFileSync(path, 'utf-8')); } catch {}
+  }
+  if (!history.includes(model)) {
+    history.push(model);
+    writeFileSync(path, JSON.stringify(history, null, 2));
+  }
+}
+
+type ViewMode = 'chat' | 'model_select' | 'init_wizard' | 'init_key' | 'init_url' | 'init_custom_model';
+
+export function TuiApp({ app }: Props) {
+  const { messages, isThinking, streaming, streamingToolCalls, queuedMessage, sendMessage, cancel } = useChat(app);
+  const { handleCommand } = useCommands(app);
+  const [systemMessages, setSystemMessages] = useState<MessageData[]>([]);
+  const [viewMode, setViewMode] = useState<ViewMode>('chat');
+  const [initProvider, setInitProvider] = useState<ProviderName>('siliconflow');
+  const [initUrl, setInitUrl] = useState('');
+  const { stdout } = useStdout();
+  const terminalWidth = stdout?.columns || 80;
+
+  // v3.0.0: cache stats snapshot for the Header. Re-read whenever messages
+  // change (i.e. a round just completed and recorded new usage). Polling on
+  // an interval would be wasteful; React re-render is the trigger.
+  const [cacheSnapshot, setCacheSnapshot] = useState(() => app.cacheStats.snapshot());
+  useEffect(() => {
+    setCacheSnapshot(app.cacheStats.snapshot());
+  }, [messages.length]);
+
+  const addMsg = useCallback((content: string) => {
+    setSystemMessages(prev => [...prev, { role: 'assistant', content }]);
+  }, []);
+
+  const onSubmit = useCallback(async (input: string) => {
+    // Init wizard - API Key input
+    if (viewMode === 'init_key') {
+      const key = input.trim();
+      if (!key) { setViewMode('chat'); return; }
+      // Save and complete
+      const { App: AppClass } = await import('../app/index.js');
+      const cfg = app.config.get();
+      app.config.save({ provider: initProvider, apiKey: key, model: cfg.model || 'default' });
+      saveModelToHistory(cfg.model || 'default');
+      setViewMode('chat');
+      addMsg(`配置已更新: ${initProvider}`);
+      return;
+    }
+
+    // Init wizard - Custom URL input
+    if (viewMode === 'init_url') {
+      const url = input.trim();
+      if (!url) { setViewMode('chat'); return; }
+      setInitUrl(url);
+      setViewMode('init_key');
+      return;
+    }
+
+    // Init wizard - Custom model name
+    if (viewMode === 'init_custom_model') {
+      const model = input.trim();
+      if (model) {
+        app.config.save({ model });
+        saveModelToHistory(model);
+        addMsg(`模型已切换: ${model}`);
+      }
+      setViewMode('chat');
+      return;
+    }
+
+    // Model selector - ignore text input
+    if (viewMode === 'model_select') return;
+
+    // Normal command handling
+    const result = handleCommand(input);
+
+    if (result.handled) {
+      if (input.trim() === '/模型' || input.trim() === '/model') {
+        setViewMode('model_select');
+        return;
+      }
+
+      if (result.output) {
+        setSystemMessages(prev => [
+          ...prev,
+          { role: 'user', content: input },
+          { role: 'assistant', content: result.output! },
+        ]);
+      }
+
+      if (result.action === 'clear') setSystemMessages([]);
+
+      if (result.action === 'reinit') {
+        setViewMode('init_wizard');
+      }
+
+      return;
+    }
+
+    sendMessage(input);
+  }, [handleCommand, sendMessage, app, viewMode, initProvider, initUrl, addMsg]);
+
+  const allMessages = [...systemMessages, ...messages];
+  const activeSkills = app.skills.listActive().map(s => s.id);
+
+  return (
+    <Box flexDirection="column" paddingX={1}>
+      <Header
+        provider={app.config.get().provider}
+        model={app.config.get().model}
+        cacheHitRate={cacheSnapshot.hitRate > 0 ? cacheSnapshot.hitRate : null}
+        cacheSavingsCNY={cacheSnapshot.estimatedSavingsCNY}
+      />
+      <ChatList
+        messages={allMessages}
+        streaming={streaming}
+        streamingToolCalls={streamingToolCalls}
+        width={terminalWidth - 4}
+      />
+      <Thinking active={isThinking} />
+      {queuedMessage && (
+        <Box paddingLeft={1}>
+          <Text color="#F59E0B">📎 已排队: </Text>
+          <Text color="#94A3B8">{queuedMessage}</Text>
+        </Box>
+      )}
+      {viewMode === 'model_select' ? (
+        <ModelSelector
+          currentModel={app.config.get().model}
+          currentProvider={app.config.get().provider}
+          onSelect={(model) => {
+            app.config.save({ model });
+            saveModelToHistory(model);
+            setViewMode('chat');
+            addMsg(`模型已切换: ${model}`);
+          }}
+          onAddNew={() => setViewMode('init_wizard')}
+        />
+      ) : viewMode === 'init_wizard' ? (
+        <InitWizard
+          onComplete={(provider, model, apiKey, baseUrl) => {
+            app.config.save({ provider, model, apiKey, baseUrl });
+            saveModelToHistory(model);
+            setViewMode('chat');
+            addMsg(`配置完成: ${provider} / ${model}`);
+          }}
+          onCancel={() => setViewMode('chat')}
+        />
+      ) : (
+        <Box flexDirection="column">
+          {viewMode === 'init_key' && (
+            <Box paddingLeft={1} marginBottom={0}>
+              <Text color="#06B6D4" bold>输入 API Key: </Text>
+              <Text dimColor>({initProvider})</Text>
+            </Box>
+          )}
+          {viewMode === 'init_url' && (
+            <Box paddingLeft={1} marginBottom={0}>
+              <Text color="#06B6D4" bold>输入中转站 URL: </Text>
+            </Box>
+          )}
+          {viewMode === 'init_custom_model' && (
+            <Box paddingLeft={1} marginBottom={0}>
+              <Text color="#06B6D4" bold>输入模型名称: </Text>
+            </Box>
+          )}
+          <UserInput onSubmit={onSubmit} onCancel={cancel} disabled={false} />
+        </Box>
+      )}
+      <StatusBar messageCount={allMessages.length} skills={activeSkills} />
+    </Box>
+  );
+}