thatgfsj-code 3.0.4 → 3.0.7

package/src/tui/components/ToolCall.tsx

@@ -1,102 +0,0 @@
-/** @jsxImportSource react */
-import React from 'react';
-import { Box, Text } from 'ink';
-
-interface ToolCallData {
-  name: string;
-  args: string;
-  result?: string;
-  isError?: boolean;
-}
-
-interface Props {
-  tool: ToolCallData;
-  width?: number;
-}
-
-function formatToolName(name: string, args: string): string {
-  try {
-    const obj = JSON.parse(args);
-    switch (name) {
-      case 'file': {
-        const action = obj.action || '';
-        const path = (obj.path || '').replace(/.*[/\\]/, '');
-        return `${action} ${path || obj.path || ''}`;
-      }
-      case 'shell': return obj.command?.slice(0, 60) || '';
-      case 'git': return obj.command || '';
-      case 'search': return obj.query || obj.pattern || '';
-      case 'nwt': return obj.action || '';
-      default: return Object.keys(obj).slice(0, 2).join(', ');
-    }
-  } catch {
-    return '';
-  }
-}
-
-function truncateOutput(output: string, maxLines = 8): { text: string; truncated: boolean } {
-  const lines = output.split('\n');
-  if (lines.length <= maxLines) return { text: output, truncated: false };
-  return { text: lines.slice(0, maxLines).join('\n'), truncated: true };
-}
-
-export function ToolCall({ tool, width }: Props) {
-  const label = formatToolName(tool.name, tool.args);
-  const result = tool.result !== undefined ? truncateOutput(tool.result) : null;
-
-  return (
-    <Box flexDirection="column" marginBottom={0} paddingLeft={1}>
-      {/* Tool header */}
-      <Box>
-        <Text color="#06B6D4" bold>⚙ </Text>
-        <Text color="#06B6D4">{tool.name}</Text>
-        {label && <Text color="#64748B"> {label}</Text>}
-      </Box>
-
-      {/* Result — v2.2.6 fix:
-          - Use `!== undefined` (not truthy) so empty string results
-            still render (truthy check dropped them, making it look
-            like the tool result was missing).
-          - Switch wrap from "truncate" to "wrap" so long lines don't
-            silently disappear off-screen.
-          - Always render the Box even when result is empty (just
-            with a "(no output)" marker), so the visual frame stays
-            consistent.
-          - If truncated, show explicit "(+N more lines)" indicator
-            so users know the result was clipped. */}
-      {result !== null && (
-        <Box paddingLeft={2} flexDirection="column">
-          {result.text.length === 0 ? (
-            <Text color="#94A3B8" dimColor>(no output)</Text>
-          ) : (
-            <>
-              {result.text.split('\n').map((line, i) => (
-                <Text
-                  key={i}
-                  color={tool.isError ? '#EF4444' : '#64748B'}
-                  wrap="wrap"
-                >
-                  {line || ' '}
-                </Text>
-              ))}
-              {result.truncated && (
-                <Text color="#94A3B8" dimColor>
-                  {'  '}(+{tool.result!.split('\n').length - 8} more lines)
-                </Text>
-              )}
-            </>
-          )}
-        </Box>
-      )}
-      {/* v2.2.6: if result is undefined (still running), show a
-          pending indicator so the user knows the tool is in flight. */}
-      {result === null && tool.result === undefined && (
-        <Box paddingLeft={2}>
-          <Text color="#94A3B8" dimColor>  ⏳ running...</Text>
-        </Box>
-      )}
-    </Box>
-  );
-}
-
-export type { ToolCallData };

package/src/tui/components/UserInput.tsx

@@ -1,151 +0,0 @@
-/** @jsxImportSource react */
-import React, { useState } from 'react';
-import { Box, Text, useInput, useApp, useFocus } from 'ink';
-import { COMMAND_LIST } from '../hooks/useCommands.js';
-
-interface Props {
-  onSubmit: (input: string) => void;
-  onCancel: () => void;
-  disabled?: boolean;
-}
-
-export function UserInput({ onSubmit, onCancel, disabled }: Props) {
-  const [value, setValue] = useState('');
-  const [history, setHistory] = useState<string[]>([]);
-  const [historyIdx, setHistoryIdx] = useState(-1);
-  const [selectedCmd, setSelectedCmd] = useState(0);
-  const { exit } = useApp();
-  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) => {
-    // ESC - cancel/clear (always works, even when disabled)
-    if (key.escape) {
-      setValue('');
-      setSelectedCmd(0);
-      setHistoryIdx(-1);
-      onCancel();
-      return;
-    }
-
-    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) {
-        const selected = filteredCommands[selectedCmd] || filteredCommands[0];
-        // v3.0.0 bug fix: previously we set `value = selected.name + ' '` and
-        // returned, which forced the user to press Enter a SECOND time to
-        // actually execute the command. For single-word commands like
-        // /模型 /新建 /压缩 /帮助 /技能 etc. that meant: "press Enter twice
-        // to switch model", which is confusing and a reproduce-and-exit
-        // vector if the user panics and Ctrl+C's in the middle.
-        //
-        // Fix: when Enter is pressed on a command-list item, EXECUTE the
-        // command directly. If the user wants to append args (e.g. /模型
-        // <name>), they can type them after the slash. Tab still writes
-        // the name into the input so the user can append text.
-        if (key.return) {
-          setSelectedCmd(0);
-          setValue('');
-          setHistory(prev => [...prev, selected.name]);
-          setHistoryIdx(-1);
-          onSubmit(selected.name);
-          return;
-        }
-        // Tab: write the name into the input so the user can append args.
-        setValue(selected.name + ' ');
-        setSelectedCmd(0);
-        return;
-      }
-    }
-
-    if (key.return) {
-      const trimmed = value.trim();
-      if (trimmed) {
-        if (trimmed === 'exit' || trimmed === 'quit') {
-          exit();
-          return;
-        }
-        setHistory(prev => [...prev, trimmed]);
-        setHistoryIdx(-1);
-        onSubmit(trimmed);
-        setValue('');
-        setSelectedCmd(0);
-      }
-      return;
-    }
-
-    if (key.upArrow && history.length > 0) {
-      const newIdx = historyIdx === -1 ? history.length - 1 : Math.max(0, historyIdx - 1);
-      setHistoryIdx(newIdx);
-      setValue(history[newIdx]);
-      return;
-    }
-
-    if (key.downArrow && historyIdx >= 0) {
-      const newIdx = historyIdx + 1;
-      if (newIdx >= history.length) {
-        setHistoryIdx(-1);
-        setValue('');
-      } else {
-        setHistoryIdx(newIdx);
-        setValue(history[newIdx]);
-      }
-      return;
-    }
-
-    if (key.backspace || key.delete) {
-      setValue(v => v.slice(0, -1));
-      setSelectedCmd(0);
-      return;
-    }
-
-    if (key.ctrl && input === 'c') {
-      exit();
-      return;
-    }
-
-    if (input && !key.ctrl && !key.meta) {
-      setValue(v => v + input);
-      setSelectedCmd(0);
-    }
-  });
-
-  return (
-    <Box flexDirection="column">
-      {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>
-      )}
-      <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

@@ -1,287 +0,0 @@
-import { useState, useCallback, useRef } from 'react';
-import type { MessageData } from '../components/ChatMessage.js';
-import type { ToolCallData } from '../components/ToolCall.js';
-import type { App } from '../../app/index.js';
-import { compressThinking, splitThinking, summarizeThinking } from '../../utils/thinking.js';
-import type { StreamChunk, Usage } from '../../types.js';
-
-interface ChatState {
-  messages: MessageData[];
-  isThinking: boolean;
-  streaming: string;
-  streamingToolCalls: ToolCallData[];
-  queuedMessage: string | null;
-  /**
-   * v3.0.0: Latest cache usage emitted by the provider, surfaced to the TUI
-   * Header. Null when no usage data was returned (e.g. provider does not
-   * support cache stats or streaming without stream_options.include_usage).
-   */
-  lastUsage: Usage | null;
-}
-
-/**
- * Hook for managing chat state and the streaming response lifecycle.
- *
- * v3.0.0: streamResponse yields structured StreamChunks (text / tool_calls /
- * thinking / usage). The previous @@TOOL@@ sentinel-string parsing is gone.
- *
- * Persisted message order matches the source chunks exactly:
- *   - text chunks → accumulated into fullContent (later compressed via
- *     compressThinking before persistence)
- *   - tool_calls chunks → results are summarized into a `[tool: name → result]`
- *     suffix on the assistant message (same belt-and-suspenders behavior as
- *     v2.2.6)
- *   - usage chunks → surfaced via state.lastUsage so the TUI Header can render
- *     cache hit-rate (consumed by app.tsx via /cache command in M3)
- */
-export function useChat(app: App) {
-  const [state, setState] = useState<ChatState>({
-    messages: [],
-    isThinking: false,
-    streaming: '',
-    streamingToolCalls: [],
-    queuedMessage: null,
-    lastUsage: null,
-  });
-  const processingRef = useRef(false);
-  const queuedRef = useRef<string | null>(null);
-  const abortRef = useRef(false);
-
-  const processStream = async (input: string) => {
-    abortRef.current = false;
-    setState(prev => ({
-      ...prev,
-      messages: [...prev.messages, { role: 'user', content: input }],
-      isThinking: true,
-      streaming: '',
-      streamingToolCalls: [],
-      queuedMessage: null,
-    }));
-
-    app.session.addMessage('user', input);
-
-    const stream = app.streamResponse();
-    let fullContent = '';
-    let currentToolCalls: ToolCallData[] = [];
-    // Latest usage from this round; surfaced via state.lastUsage.
-    let lastUsage: Usage | null = null;
-    let lastUpdateTime = 0;
-    const THROTTLE_MS = 50;
-
-    /**
-     * Flush streaming state to React. Throttled to ~20fps so the terminal
-     * doesn't flicker on long completions (combined with <Static> below the
-     * completion line stays put while the streaming line updates in place).
-     */
-    const flushStreaming = () => {
-      const now = Date.now();
-      if (now - lastUpdateTime < THROTTLE_MS) return;
-      lastUpdateTime = now;
-      setState(prev => ({ ...prev, isThinking: false, streaming: fullContent }));
-    };
-
-    try {
-      for await (const chunk of stream as AsyncIterable<StreamChunk>) {
-        // Check abort
-        if (abortRef.current) {
-          break;
-        }
-
-        switch (chunk.type) {
-          case 'text':
-            if (chunk.content) {
-              fullContent += chunk.content;
-              flushStreaming();
-            }
-            break;
-
-          case 'thinking':
-            // Reasoning text. We do not append it to fullContent (it is
-            // stripped from persistence in compressThinking), but we surface
-            // it via the streaming display when app.showThinking is on.
-            if (app.showThinking && chunk.content) {
-              fullContent += chunk.content;
-              flushStreaming();
-            }
-            break;
-
-          case 'tool_calls':
-            if (chunk.toolCalls && chunk.toolCalls.length > 0) {
-              // Replace rather than append — LLMService emits one combined
-              // tool_calls chunk per iteration. This is the dispatch plan.
-              currentToolCalls = chunk.toolCalls.map(tc => ({
-                name: tc.function.name,
-                args: tc.function.arguments,
-                // Results are appended by the *next* text chunk via the
-                // `[tool: name → result]` suffix we add on persistence. The
-                // streaming ToolCall panel below renders a "running" state
-                // until the next iteration's tool_calls chunk comes back
-                // with `result` (we look up by name).
-                result: undefined,
-                isError: false,
-              }));
-              setState(prev => ({
-                ...prev,
-                isThinking: false,
-                streamingToolCalls: [...currentToolCalls],
-              }));
-            }
-            break;
-
-          case 'usage':
-            lastUsage = chunk.usage;
-            setState(prev => ({ ...prev, lastUsage: chunk.usage }));
-            break;
-        }
-      }
-
-      // v2.2.4 (port from v2.1.0): DO NOT persist truncated assistant
-      // messages. The previous code literally wrote `'\n\n[已中断]'`
-      // as a suffix and persisted it — which is what created the
-      // hallucination loop where the next turn's LLM echoed the
-      // marker back. The fix is two-pronged:
-      //   1. Never persist when the stream was aborted (here).
-      //   2. SessionManager.addMessageSafe drops messages that match
-      //      the pollution filter as a belt-and-suspenders check
-      //      for cases where we somehow persist a polluted message.
-      const wasAborted = abortRef.current;
-      const shouldPersist = !wasAborted &&
-        (fullContent.trim() || currentToolCalls.length > 0);
-
-      if (shouldPersist) {
-        // v2.2.5: strip  blocks from the persisted message
-        // when compression is enabled. Same rationale as in
-        // cmd/index.tsx — keeps history compact, avoids re-feeding
-        // reasoning into the next turn's context window.
-        const toPersist = compressThinking(fullContent, app.showThinking);
-        app.session.addMessageSafe('assistant', toPersist);
-      }
-
-      // v2.2.5: build a displayable version. When thinking is hidden
-      // we still want the user to see a one-line indicator of how
-      // much reasoning the model did, plus the conclusion.
-      const split = splitThinking(fullContent);
-      const displayContent = app.showThinking
-        ? fullContent
-        : (split.thinking
-            ? `${summarizeThinking(split)}\n${split.conclusion}`
-            : fullContent);
-
-      // v2.2.6 (tool-result belt-and-suspenders): if any tool call
-      // returned text, also append a compact "[tool: name → result]"
-      // summary to the persisted/displayed content. This guarantees
-      // the user sees the tool output regardless of whether the Ink
-      // <ToolCall/> component renders it correctly. Past sessions
-      // have had cases where the streaming ToolCall rendering failed
-      // silently (e.g. result was empty string, wrap=truncate cut
-      // long output off-screen) and the user had no idea what the
-      // tool actually returned.
-      //
-      // v3.0.0: since LLMService now folds tool results into
-      // currentMessages without surfacing them as separate chunks, we no
-      // longer have a `result` field on each ToolCallData here. The
-      // result summary is built by reading back from
-      // app.session.getMessages() — the latest `tool` role message per
-      // tool call id. To keep this lightweight we fall back to a brief
-      // "[tool: name → see message]" suffix when the result is not
-      // available in our local streaming state.
-      const toolSummary = currentToolCalls.length > 0
-        ? '\n\n' + currentToolCalls.map((tc) => {
-            const r = tc.result !== undefined ? tc.result : '(see tool result above)';
-            const short = r.length > 200 ? r.slice(0, 197) + '...' : r;
-            return `[tool: ${tc.name} → ${short}]`;
-          }).join('\n')
-        : '';
-
-      setState(prev => ({
-        ...prev,
-        messages: [
-          ...prev.messages,
-          ...(shouldPersist
-            ? [{
-                role: 'assistant' as const,
-                content: displayContent + toolSummary,
-                toolCalls: currentToolCalls.length > 0 ? currentToolCalls : undefined,
-              }]
-            : []),
-        ],
-        streaming: '',
-        streamingToolCalls: [],
-        isThinking: false,
-        lastUsage,
-      }));
-
-      app.session.truncate();
-    } catch (error: any) {
-      if (abortRef.current) {
-        setState(prev => ({
-          ...prev,
-          messages: [
-            ...prev.messages,
-            ...(fullContent.trim()
-              ? [{ role: 'assistant' as const, content: fullContent + '\n\n[已中断]' }]
-              : [{ role: 'assistant' as const, content: '[已中断]' }]),
-          ],
-          streaming: '',
-          streamingToolCalls: [],
-          isThinking: false,
-        }));
-      } else {
-        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\`.`;
-        } else if (msg.includes('abort') || msg.includes('AbortError')) {
-          errorMsg = `[已中断]`;
-        }
-
-        setState(prev => ({
-          ...prev,
-          messages: [
-            ...prev.messages,
-            ...(fullContent.trim()
-              ? [{ role: 'assistant' as const, content: fullContent }]
-              : []),
-            { role: 'assistant', content: errorMsg },
-          ],
-          streaming: '',
-          streamingToolCalls: [],
-          isThinking: false,
-        }));
-      }
-    }
-
-    // Process queued message
-    if (!abortRef.current && queuedRef.current) {
-      const next = queuedRef.current;
-      queuedRef.current = null;
-      await processStream(next);
-    } else {
-      processingRef.current = false;
-    }
-  };
-
-  const sendMessage = useCallback((input: string) => {
-    if (processingRef.current) {
-      queuedRef.current = input;
-      setState(prev => ({ ...prev, queuedMessage: input }));
-      return;
-    }
-
-    processingRef.current = true;
-    processStream(input);
-  }, [app]);
-
-  const cancel = useCallback(() => {
-    abortRef.current = true;
-    queuedRef.current = null;
-    setState(prev => ({ ...prev, queuedMessage: null, isThinking: false }));
-  }, []);
-
-  return { ...state, sendMessage, cancel };
-}