thatgfsj-code 3.0.1 → 3.0.3

package/src/tui/components/InitWizard.tsx

@@ -1,8 +1,9 @@
 /** @jsxImportSource react */
-import React, { useState, useEffect } from 'react';
-import { Box, Text } from 'ink';
+import React, { useState } from 'react';
+import { Box, Text, useInput } from 'ink';
 import SelectInput from 'ink-select-input';
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
+import TextInput from 'ink-text-input';
+import { writeFileSync, existsSync, mkdirSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 import { listProviders, getModelsForProvider, isCustomProvider } from '../../config/providers.js';
@@ -13,14 +14,7 @@ interface Props {
   onCancel: () => void;
 }
 
-type InitStep =
-  | 'provider'
-  | 'api_key'
-  | 'model'
-  | 'custom_model'
-  | 'custom_url'
-  | 'cache_strategy'
-  | 'cache_ttl';
+type InitStep = 'provider' | 'custom_url' | 'api_key' | 'model' | 'custom_model' | 'cache_strategy';
 
 interface CacheChoice {
   enabled: boolean;
@@ -28,15 +22,24 @@ interface CacheChoice {
 }
 
 /**
- * v3.0.0: InitWizard gained two new steps after model selection:
- *   - cache_strategy: enable / disable prompt caching
- *   - cache_ttl:      5m vs 1h (only if enabled)
+ * v3.0.1: InitWizard is now fully self-contained — it manages its own
+ * step state AND its own keyboard input for text-entry steps (api_key,
+ * custom_url, custom_model). The previous version had a fatal bug:
  *
- * The defaults mirror ConfigManager.DEFAULT_CONFIG (enabled, 5m). Users on
- * OpenAI / DeepSeek / Gemini can ignore these — those providers do
- * automatic caching and the flag is purely advisory there. The flag
- * matters for Anthropic users who want to opt out of cache_control
- * markers or pick a longer TTL.
+ *   The text-entry steps (`api_key`, `custom_url`, `custom_model`) only
+ *   rendered a `<Text>` prompt with no actual input box. The host
+ *   component (app.tsx) had its own UserInput BUT only rendered it when
+ *   viewMode was NOT 'init_wizard' (see app.tsx ternary). So when the
+ *   wizard's internal step advanced to 'api_key', the user could SEE the
+ *   "输入 API Key: 服务商: deepseek" prompt but had NO way to type into
+ *   it. Ink silently swallowed keystrokes (no useInput handler was
+ *   active), and the user was stuck on a frozen screen — exactly the
+ *   bug that prompted the user-reported "选择 deepseek 然后退出":
+ *   pressing Ctrl+C felt like the only escape.
+ *
+ * Fix: this file now uses `useInput` and `ink-text-input` for the text
+ * steps. The SetViewMode-based input delegation in app.tsx is no longer
+ * required for the InitWizard flow.
  */
 export function InitWizard({ onComplete, onCancel }: Props) {
   const [step, setStep] = useState<InitStep>('provider');
@@ -61,7 +64,6 @@ export function InitWizard({ onComplete, onCancel }: Props) {
       temperature: 0.7,
       maxTokens: 4096,
       contextLength: 50,
-      // v3.0.0: cache policy from wizard
       cache: {
         enabled: cacheChoice.enabled,
         ttl: cacheChoice.ttl,
@@ -70,18 +72,17 @@ export function InitWizard({ onComplete, onCancel }: Props) {
     };
     if (url) config.baseUrl = url;
     writeFileSync(configPath, JSON.stringify(config, null, 2));
+  };
 
-    // Save to models history
-    const historyPath = join(dir, 'models.json');
-    let history: string[] = [];
-    if (existsSync(historyPath)) {
-      try { history = JSON.parse(readFileSync(historyPath, 'utf-8')); } catch {}
-    }
-    if (!history.includes(model)) {
-      history.push(model);
-      writeFileSync(historyPath, JSON.stringify(history, null, 2));
+  // v3.0.1: ESC cancels the wizard from any text-entry step. This is the
+  // hook that the previous version was missing — when the user pressed
+  // ESC on the frozen "输入 API Key" screen, nothing happened because no
+  // useInput was active. Now it bails out cleanly.
+  useInput((_input, key) => {
+    if (key.escape && (step === 'api_key' || step === 'custom_url' || step === 'custom_model')) {
+      onCancel();
     }
-  };
+  });
 
   // Step 1: Provider selection
   if (step === 'provider') {
@@ -92,8 +93,9 @@ export function InitWizard({ onComplete, onCancel }: Props) {
         <SelectInput
           items={items}
           onSelect={(item) => {
-            setSelectedProvider(item.value as ProviderName);
-            if (isCustomProvider(item.value as ProviderName)) {
+            const provider = item.value as ProviderName;
+            setSelectedProvider(provider);
+            if (isCustomProvider(provider)) {
               setStep('custom_url');
             } else {
               setStep('api_key');
@@ -104,24 +106,57 @@ export function InitWizard({ onComplete, onCancel }: Props) {
     );
   }
 
-  // Custom URL input
+  // Custom URL input — v3.0.1 NOW has a real TextInput
   if (step === 'custom_url') {
     return (
       <Box flexDirection="column" paddingLeft={1}>
         <Text color="#06B6D4" bold>输入中转站 URL:</Text>
         <Text dimColor>例如: https://api.example.com/v1</Text>
-        <Text color="#F59E0B">（请直接输入 URL 并回车）</Text>
+        <Text color="#F59E0B">（请直接输入 URL 并回车，ESC 取消）</Text>
+        <Box marginTop={1}>
+          <Text color="#06B6D4">❯ </Text>
+          <TextInput
+            value={customUrl}
+            onChange={setCustomUrl}
+            onSubmit={(value) => {
+              if (value.trim()) {
+                setCustomUrl(value.trim());
+                setStep('api_key');
+              }
+            }}
+          />
+        </Box>
       </Box>
     );
   }
 
-  // Step 2: API Key
+  // Step 2: API Key — v3.0.1 NOW has a real TextInput
   if (step === 'api_key') {
+    const providerLabel = providers.find(p => p.key === selectedProvider)?.name || selectedProvider;
     return (
       <Box flexDirection="column" paddingLeft={1}>
         <Text color="#06B6D4" bold>输入 API Key:</Text>
-        <Text dimColor>服务商: {providers.find(p => p.key === selectedProvider)?.name}</Text>
-        <Text color="#F59E0B">（请直接输入 Key 并回车）</Text>
+        <Text dimColor>服务商: {providerLabel}</Text>
+        <Text color="#F59E0B">（请直接输入 Key 并回车，ESC 取消）</Text>
+        <Box marginTop={1}>
+          <Text color="#06B6D4">❯ </Text>
+          <TextInput
+            value={apiKey}
+            onChange={setApiKey}
+            onSubmit={(value) => {
+              if (value.trim()) {
+                setApiKey(value.trim());
+                if (isCustomProvider(selectedProvider)) {
+                  // Custom OpenAI/Anthropic: after key, go to model
+                  setStep('model');
+                } else {
+                  // Standard providers: skip to model selection
+                  setStep('model');
+                }
+              }
+            }}
+          />
+        </Box>
       </Box>
     );
   }
@@ -142,7 +177,6 @@ export function InitWizard({ onComplete, onCancel }: Props) {
               setStep('custom_model');
             } else {
               setSelectedModel(item.value);
-              // v3.0.0: prompt the user for cache strategy after model.
               setStep('cache_strategy');
             }
           }}
@@ -151,56 +185,56 @@ export function InitWizard({ onComplete, onCancel }: Props) {
     );
   }
 
-  // Custom model name
+  // Custom model name input — v3.0.1 NOW has a real TextInput
   if (step === 'custom_model') {
     return (
       <Box flexDirection="column" paddingLeft={1}>
         <Text color="#06B6D4" bold>输入模型名称:</Text>
-        <Text color="#F59E0B">（请直接输入模型名并回车）</Text>
+        <Text color="#F59E0B">（请直接输入模型名并回车，ESC 取消）</Text>
+        <Box marginTop={1}>
+          <Text color="#06B6D4">❯ </Text>
+          <TextInput
+            value={selectedModel}
+            onChange={setSelectedModel}
+            onSubmit={(value) => {
+              if (value.trim()) {
+                setSelectedModel(value.trim());
+                setStep('cache_strategy');
+              }
+            }}
+          />
+        </Box>
       </Box>
     );
   }
 
-  // v3.0.0: prompt-cache strategy step
+  // v3.0.3: prompt-cache strategy step — auto / 5m / 1h / off.
+  // The wizard used to require two questions (on/off + 5m/1h). Now it
+  // gives the user a single, clear choice up front, with "自动" as the
+  // default. The auto path lets the runtime pick the TTL based on the
+  // conversation length (see cache/smartModel.ts decideTTL).
   if (step === 'cache_strategy') {
     const items = [
-      { label: '✓ 开启（推荐，节省 token 成本）', value: 'on' },
+      { label: '🤖 自动（推荐：根据会话长度智能选 5m / 1h）', value: 'auto' },
+      { label: '⏱ 强制 5 分钟（短会话，写入便宜）', value: '5m' },
+      { label: '🕐 强制 1 小时（长会话，命中率优先）', value: '1h' },
       { label: '✗ 关闭（每次请求都重新计算）', value: 'off' },
     ];
     return (
       <Box flexDirection="column" paddingLeft={1}>
-        <Text color="#06B6D4" bold>是否开启 Prompt Caching?</Text>
-        <Text dimColor>对 Anthropic / DeepSeek / Gemini 有效，OpenAI 兼容接口默认自动缓存。</Text>
+        <Text color="#06B6D4" bold>Prompt Caching 策略:</Text>
+        <Text dimColor>对 Anthropic / DeepSeek / Gemini 有效。</Text>
+        <Text dimColor>自动模式：短会话用 5m（便宜），长会话（&gt;15 轮）自动切 1h。</Text>
         <SelectInput
           items={items}
           onSelect={(item) => {
-            if (item.value === 'on') {
-              setCacheChoice(c => ({ ...c, enabled: true }));
-              setStep('cache_ttl');
+            if (item.value === 'off') {
+              setCacheChoice({ enabled: false, ttl: '5m' });
+            } else if (item.value === 'auto') {
+              setCacheChoice({ enabled: true, ttl: '5m' });  // start at 5m, smartModel will upgrade
             } else {
-              setCacheChoice(c => ({ ...c, enabled: false }));
-              saveConfig(selectedProvider, selectedModel, apiKey, customUrl || undefined);
-              onComplete(selectedProvider, selectedModel, apiKey, customUrl || undefined);
+              setCacheChoice({ enabled: true, ttl: item.value as '5m' | '1h' });
             }
-          }}
-        />
-      </Box>
-    );
-  }
-
-  // v3.0.0: TTL choice
-  if (step === 'cache_ttl') {
-    const items = [
-      { label: '5 分钟（写入成本低，适合短会话）', value: '5m' },
-      { label: '1 小时（写入成本高，适合长会话）', value: '1h' },
-    ];
-    return (
-      <Box flexDirection="column" paddingLeft={1}>
-        <Text color="#06B6D4" bold>Cache TTL:</Text>
-        <SelectInput
-          items={items}
-          onSelect={(item) => {
-            setCacheChoice(c => ({ ...c, ttl: item.value as '5m' | '1h' }));
             saveConfig(selectedProvider, selectedModel, apiKey, customUrl || undefined);
             onComplete(selectedProvider, selectedModel, apiKey, customUrl || undefined);
           }}

package/src/tui/hooks/useCommands.ts

@@ -20,6 +20,8 @@ const CMD_ALIASES: Record<string, string> = {
   '/服务商': '/provider',
   '/思考': '/thinking',
   '/缓存': '/cache',
+  '/ttl': '/ttl',
+  '/TTL': '/ttl',
 };
 
 export const COMMAND_LIST = [
@@ -28,6 +30,7 @@ export const COMMAND_LIST = [
   { name: '/新建', desc: '新建会话' },
   { name: '/压缩', desc: '压缩上下文' },
   { name: '/缓存', desc: '缓存命中率' },
+  { name: '/ttl', desc: '查看/设置 Cache TTL' },
   { name: '/技能', desc: '管理技能' },
   { name: '/mcp', desc: 'MCP 设置' },
   { name: '/帮助', desc: '查看帮助' },
@@ -142,6 +145,42 @@ export function useCommands(app: App) {
       return { handled: true, output: lines.join('\n') };
     }
 
+    // v3.0.3: /ttl — view or pin the cache TTL.
+    //
+    //   /ttl              show current effective TTL + decision reason
+    //   /ttl 5m|1h        pin TTL for this session (sticky, no cache reset)
+    //   /ttl auto         resume auto-decision (clears the pin)
+    if (name === '/ttl') {
+      const configTtl = (app.config.get() as any).cache?.ttl as 'auto' | '5m' | '1h' | undefined;
+      const resolved = app.resolvedTtl;
+      if (arg === 'auto') {
+        app.config.save({ cache: { ...(app.config.get() as any).cache, ttl: 'auto' } });
+        app.resolvedTtl = null;
+        return { handled: true, output: '✓ Cache TTL 已重置为自动（下一轮重新评估）' };
+      }
+      if (arg === '5m' || arg === '1h') {
+        app.config.save({ cache: { ...(app.config.get() as any).cache, ttl: arg } });
+        app.resolvedTtl = arg;
+        return { handled: true, output: `✓ Cache TTL 已固定为 ${arg}（首次请求会重建缓存）` };
+      }
+      // No arg: show current state
+      const lines = [
+        '⏱  Cache TTL',
+        '─────────────────────────',
+        `  配置:      ${configTtl ?? 'auto'}`,
+        `  当前会话:  ${resolved ?? '尚未评估'}`,
+        '',
+        '说明: '+
+          (configTtl === 'auto'
+            ? '自动模式 – 短会话(≤14 轮)用 5m节省写入成本，' +
+              '长会话(≥15 轮 或 ≥50k 字符)自动升级到 1h 复用缓存。'
+            : `${configTtl} 模式 – TTL 每次请求都固定。`),
+        '',
+        '/ttl 5m|1h|auto  调整 TTL',
+      ];
+      return { handled: true, output: lines.join('\n') };
+    }
+
     // ── /skills [id] ────────────────────────────────────
     if (name === '/skills') {
       if (arg) {

package/tests/cache/smartModel.test.ts

@@ -0,0 +1,112 @@
+import { describe, it, expect } from 'vitest';
+import { decideTTL, totalConversationChars, shouldDowngrade } from '../../src/cache/smartModel.js';
+import type { ChatMessage } from '../../src/types.js';
+
+function userMsg(s: string): ChatMessage {
+  return { role: 'user', content: s };
+}
+function assistantMsg(s: string): ChatMessage {
+  return { role: 'assistant', content: s };
+}
+
+describe('decideTTL', () => {
+  it('round 0 → 5m (default)', () => {
+    const d = decideTTL([], null);
+    expect(d.ttl).toBe('5m');
+    expect(d.isFirstDecision).toBe(true);
+  });
+
+  it('short session (≤14 turns, <50k chars) → 5m', () => {
+    const messages = [
+      userMsg('hello'),
+      assistantMsg('hi'),
+      userMsg('how are you?'),
+      assistantMsg('good'),
+    ];
+    const d = decideTTL(messages, null);
+    expect(d.ttl).toBe('5m');
+    expect(d.reason).toMatch(/short-session/);
+  });
+
+  it('long session (≥15 turns) → 1h', () => {
+    // Build 16 user + 16 assistant = 32 messages (16 turns)
+    const messages: ChatMessage[] = [];
+    for (let i = 0; i < 16; i++) {
+      messages.push(userMsg(`question ${i}`));
+      messages.push(assistantMsg(`answer ${i} long enough to be content`));
+    }
+    const d = decideTTL(messages, null);
+    expect(d.ttl).toBe('1h');
+    expect(d.reason).toMatch(/long-session/);
+  });
+
+  it('large context (>50k chars) → 1h even with few turns', () => {
+    const bigContent = 'x'.repeat(60_000);
+    const messages: ChatMessage[] = [
+      userMsg('hi'),
+      { role: 'assistant', content: bigContent },
+    ];
+    const d = decideTTL(messages, null);
+    expect(d.ttl).toBe('1h');
+    expect(d.reason).toMatch(/long-context/);
+  });
+
+  it('reuses previous TTL (stability rule)', () => {
+    const messages = [userMsg('hello'), assistantMsg('hi')];
+    const d1 = decideTTL(messages, null);
+    expect(d1.ttl).toBe('5m');
+    expect(d1.isFirstDecision).toBe(true);
+
+    // Now grow to 30 turns without changing TTL
+    for (let i = 0; i < 30; i++) {
+      messages.push(userMsg(`q${i}`));
+      messages.push(assistantMsg(`a${i}`));
+    }
+    const d2 = decideTTL(messages, '5m');
+    expect(d2.ttl).toBe('5m');
+    expect(d2.isFirstDecision).toBe(false);
+    expect(d2.reason).toBe('reused-from-previous-round');
+  });
+});
+
+describe('totalConversationChars', () => {
+  it('sums string content', () => {
+    const total = totalConversationChars([
+      userMsg('abc'),
+      assistantMsg('defgh'),
+    ]);
+    expect(total).toBe(8);
+  });
+
+  it('handles array content blocks', () => {
+    const total = totalConversationChars([
+      { role: 'user', content: [
+        { type: 'text', text: 'hello' },
+        { type: 'image', source: { type: 'base64', media_type: 'image/png', data: 'XXXX' } },
+      ] as any },
+    ]);
+    expect(total).toBe(5);
+  });
+});
+
+describe('shouldDowngrade', () => {
+  it('downgrades short prompts without tool calls', () => {
+    const d = shouldDowngrade([], 'hi');
+    expect(d.downgrade).toBe(true);
+  });
+
+  it('does not downgrade long prompts', () => {
+    const d = shouldDowngrade([], 'x'.repeat(300));
+    expect(d.downgrade).toBe(false);
+    expect(d.reason).toBe('prompt-too-long');
+  });
+
+  it('does not downgrade when recent tool calls exist', () => {
+    const messages: ChatMessage[] = [
+      { role: 'assistant', content: '...', tool_calls: [{ id: '1', type: 'function', function: { name: 'f', arguments: '{}' } }] },
+    ];
+    const d = shouldDowngrade(messages, 'hi');
+    expect(d.downgrade).toBe(false);
+    expect(d.reason).toBe('recent-tool-call');
+  });
+});