thatgfsj-code 2.2.9 → 3.0.1

package/src/tui/components/Markdown.tsx

@@ -1,35 +1,35 @@
-/** @jsxImportSource react */
-import React, { useMemo } from 'react';
-import { Text } from 'ink';
-import { marked } from 'marked';
-import TerminalRenderer from 'marked-terminal';
-
-// Configure marked to use terminal renderer
-marked.setOptions({
-  // @ts-ignore - marked-terminal types are incomplete
-  renderer: new TerminalRenderer({
-    showSectionPrefix: false,
-    tab: 2,
-  }),
-});
-
-interface Props {
-  content: string;
-}
-
-export function Markdown({ content }: Props) {
-  const rendered = useMemo(() => {
-    try {
-      const result = marked.parse(content);
-      // marked.parse returns string | Promise<string> depending on async option
-      if (typeof result === 'string') {
-        return result.trimEnd();
-      }
-      return content;
-    } catch {
-      return content;
-    }
-  }, [content]);
-
-  return <Text>{rendered}</Text>;
-}
+/** @jsxImportSource react */
+import React, { useMemo } from 'react';
+import { Text } from 'ink';
+import { marked } from 'marked';
+import TerminalRenderer from 'marked-terminal';
+
+// Configure marked to use terminal renderer
+marked.setOptions({
+  // @ts-ignore - marked-terminal types are incomplete
+  renderer: new TerminalRenderer({
+    showSectionPrefix: false,
+    tab: 2,
+  }),
+});
+
+interface Props {
+  content: string;
+}
+
+export function Markdown({ content }: Props) {
+  const rendered = useMemo(() => {
+    try {
+      const result = marked.parse(content);
+      // marked.parse returns string | Promise<string> depending on async option
+      if (typeof result === 'string') {
+        return result.trimEnd();
+      }
+      return content;
+    } catch {
+      return content;
+    }
+  }, [content]);
+
+  return <Text>{rendered}</Text>;
+}

package/src/tui/components/ModelSelector.tsx

@@ -1,87 +1,107 @@
-/** @jsxImportSource react */
-import React, { useState, useEffect } from 'react';
-import { Box, Text } from 'ink';
-import SelectInput from 'ink-select-input';
-import { readFileSync, existsSync } from 'fs';
-import { join } from 'path';
-import { homedir } from 'os';
-
-interface Props {
-  currentModel: string;
-  onSelect: (model: string) => void;
-  onAddNew: () => void;
-}
-
-interface SavedModel {
-  label: string;
-  value: string;
-}
-
-function loadSavedModels(): SavedModel[] {
-  const configPath = join(homedir(), '.thatgfsj', 'config.json');
-  const models: SavedModel[] = [];
-  const seen = new Set<string>();
-
-  // Load from history if exists
-  const historyPath = join(homedir(), '.thatgfsj', 'models.json');
-  if (existsSync(historyPath)) {
-    try {
-      const history = JSON.parse(readFileSync(historyPath, 'utf-8'));
-      for (const m of history) {
-        if (!seen.has(m)) {
-          seen.add(m);
-          models.push({ label: m, value: m });
-        }
-      }
-    } catch {}
-  }
-
-  // Always include current model
-  if (existsSync(configPath)) {
-    try {
-      const config = JSON.parse(readFileSync(configPath, 'utf-8'));
-      if (config.model && !seen.has(config.model)) {
-        seen.add(config.model);
-        models.push({ label: `${config.model} (当前)`, value: config.model });
-      }
-    } catch {}
-  }
-
-  // Add some common defaults if list is empty
-  if (models.length === 0) {
-    const defaults = ['deepseek-chat', 'gpt-4o', 'mimo-v2.5-pro'];
-    for (const m of defaults) {
-      models.push({ label: m, value: m });
-    }
-  }
-
-  return models;
-}
-
-export function ModelSelector({ currentModel, onSelect, onAddNew }: Props) {
-  const [items, setItems] = useState<SavedModel[]>([]);
-
-  useEffect(() => {
-    const saved = loadSavedModels();
-    // Add "add new" option at the end
-    saved.push({ label: '＋ 添加新模型', value: '__add_new__' });
-    setItems(saved);
-  }, []);
-
-  return (
-    <Box flexDirection="column" paddingLeft={1}>
-      <Text color="#06B6D4" bold>当前模型: {currentModel}</Text>
-      <Text dimColor>选择模型 (↑↓ 回车):</Text>
-      <SelectInput
-        items={items}
-        onSelect={(item) => {
-          if (item.value === '__add_new__') {
-            onAddNew();
-          } else {
-            onSelect(item.value);
-          }
-        }}
-      />
-    </Box>
-  );
-}
+/** @jsxImportSource react */
+import React, { useState, useEffect } from 'react';
+import { Box, Text } from 'ink';
+import SelectInput from 'ink-select-input';
+import { readFileSync, existsSync } from 'fs';
+import { join } from 'path';
+import { homedir } from 'os';
+import { PROVIDERS, getModelsForProvider } from '../../config/providers.js';
+import type { ProviderName } from '../../config/types.js';
+
+interface Props {
+  currentModel: string;
+  currentProvider?: ProviderName;
+  onSelect: (model: string) => void;
+  onAddNew: () => void;
+}
+
+interface SavedModel {
+  label: string;
+  value: string;
+}
+
+function loadSavedModels(currentProvider?: ProviderName): SavedModel[] {
+  const configPath = join(homedir(), '.thatgfsj', 'config.json');
+  const models: SavedModel[] = [];
+  const seen = new Set<string>();
+
+  // 1. Load from history if exists
+  const historyPath = join(homedir(), '.thatgfsj', 'models.json');
+  if (existsSync(historyPath)) {
+    try {
+      const history = JSON.parse(readFileSync(historyPath, 'utf-8'));
+      for (const m of history) {
+        if (!seen.has(m)) {
+          seen.add(m);
+          models.push({ label: m, value: m });
+        }
+      }
+    } catch {}
+  }
+
+  // 2. Always include current model
+  if (existsSync(configPath)) {
+    try {
+      const config = JSON.parse(readFileSync(configPath, 'utf-8'));
+      if (config.model && !seen.has(config.model)) {
+        seen.add(config.model);
+        models.push({ label: `${config.model} (当前)`, value: config.model });
+      }
+    } catch {}
+  }
+
+  // 3. v3.0.0 bug fix: ALWAYS include the current provider's catalog of
+  // models, otherwise users on a custom relay (mimo / one-api / etc.) who
+  // only have the current model in history see a list of 1 item and can't
+  // switch to deepseek / gpt-4o / etc. without going through init wizard.
+  // This is the model_selector "选 deepseek 然后退出" bug: the list only
+  // contained the current model, so the user pressed Enter on the wrong
+  // item (or thought the list was broken), then Ctrl+C'd out.
+  if (currentProvider && PROVIDERS[currentProvider]) {
+    const catalog = getModelsForProvider(currentProvider);
+    for (const m of catalog) {
+      if (!seen.has(m.id)) {
+        seen.add(m.id);
+        models.push({ label: m.id, value: m.id });
+      }
+    }
+  }
+
+  // 4. Universal fallbacks if user is on no history and no catalog
+  if (models.length === 0) {
+    const defaults = ['deepseek-chat', 'gpt-4o', 'mimo-v2.5-pro'];
+    for (const m of defaults) {
+      models.push({ label: m, value: m });
+    }
+  }
+
+  return models;
+}
+
+export function ModelSelector({ currentModel, currentProvider, onSelect, onAddNew }: Props) {
+  const [items, setItems] = useState<SavedModel[]>([]);
+
+  useEffect(() => {
+    const saved = loadSavedModels(currentProvider);
+    // Add "add new" option at the end
+    saved.push({ label: '＋ 添加新模型', value: '__add_new__' });
+    setItems(saved);
+  }, [currentProvider]);
+
+  return (
+    <Box flexDirection="column" paddingLeft={1}>
+      <Text color="#06B6D4" bold>当前模型: {currentModel}</Text>
+      <Text dimColor>选择模型 (↑↓ 回车):</Text>
+      <SelectInput
+        items={items}
+        onSelect={(item) => {
+          if (item.value === '__add_new__') {
+            onAddNew();
+          } else {
+            onSelect(item.value);
+          }
+        }}
+      />
+    </Box>
+  );
+}

package/src/tui/components/StatusBar.tsx

@@ -1,30 +1,30 @@
-/** @jsxImportSource react */
-import React from 'react';
-import { Box, Text } from 'ink';
-
-interface Props {
-  messageCount: number;
-  skills: string[];
-}
-
-export const StatusBar = React.memo(function StatusBar({ messageCount, skills }: Props) {
-  const activeSkills = skills.slice(0, 3).join(', ');
-  const moreSkills = skills.length > 3 ? ` +${skills.length - 3}` : '';
-
-  return (
-    <Box flexDirection="column" marginTop={0}>
-      <Text color="#374151">{'─'.repeat(80)}</Text>
-      <Box justifyContent="space-between" width="100%">
-        <Box>
-          <Text backgroundColor="#06B6D4" color="#0F172A" bold> ⚡ THATGFSJ CODE </Text>
-          <Text dimColor> │ {messageCount} 条消息</Text>
-        </Box>
-        <Box>
-          {skills.length > 0 && (
-            <Text dimColor> 技能: {activeSkills}{moreSkills} </Text>
-          )}
-        </Box>
-      </Box>
-    </Box>
-  );
-});
+/** @jsxImportSource react */
+import React from 'react';
+import { Box, Text } from 'ink';
+
+interface Props {
+  messageCount: number;
+  skills: string[];
+}
+
+export const StatusBar = React.memo(function StatusBar({ messageCount, skills }: Props) {
+  const activeSkills = skills.slice(0, 3).join(', ');
+  const moreSkills = skills.length > 3 ? ` +${skills.length - 3}` : '';
+
+  return (
+    <Box flexDirection="column" marginTop={0}>
+      <Text color="#374151">{'─'.repeat(80)}</Text>
+      <Box justifyContent="space-between" width="100%">
+        <Box>
+          <Text backgroundColor="#06B6D4" color="#0F172A" bold> ⚡ THATGFSJ CODE </Text>
+          <Text dimColor> │ {messageCount} 条消息</Text>
+        </Box>
+        <Box>
+          {skills.length > 0 && (
+            <Text dimColor> 技能: {activeSkills}{moreSkills} </Text>
+          )}
+        </Box>
+      </Box>
+    </Box>
+  );
+});

package/src/tui/components/Thinking.tsx

@@ -1,17 +1,17 @@
-/** @jsxImportSource react */
-import React from 'react';
-import { Box, Text } from 'ink';
-
-interface Props {
-  active?: boolean;
-}
-
-export function Thinking({ active = false }: Props) {
-  if (!active) return null;
-
-  return (
-    <Box paddingLeft={1}>
-      <Text color="#06B6D4">⟳ Thinking...</Text>
-    </Box>
-  );
-}
+/** @jsxImportSource react */
+import React from 'react';
+import { Box, Text } from 'ink';
+
+interface Props {
+  active?: boolean;
+}
+
+export function Thinking({ active = false }: Props) {
+  if (!active) return null;
+
+  return (
+    <Box paddingLeft={1}>
+      <Text color="#06B6D4">⟳ Thinking...</Text>
+    </Box>
+  );
+}

package/src/tui/components/ToolCall.tsx

@@ -1,107 +1,102 @@
-/** @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);
-  // v2.2.7 edge: treat null same as undefined (both mean "still
-  // running"). Previous check `result !== undefined` would render
-  // null as an empty string output, causing confusion.
-  const result = (tool.result !== undefined && tool.result !== null)
-    ? 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 };
+/** @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 };