bingocode 1.0.29 → 1.0.31

package/adapters/telegram/__tests__/media.test.ts

@@ -0,0 +1,86 @@
+import { describe, it, expect, beforeEach, afterEach, mock } from 'bun:test'
+import * as fs from 'node:fs/promises'
+import * as path from 'node:path'
+import * as os from 'node:os'
+import { TelegramMediaService } from '../media.js'
+import { AttachmentStore } from '../../common/attachment/attachment-store.js'
+
+let tmpRoot: string
+let originalFetch: typeof fetch
+
+function makeMockBot() {
+  const fetchMock = mock(async (url: string | URL) => {
+    const u = typeof url === 'string' ? url : url.toString()
+    expect(u).toContain('/file/botFAKE_TOKEN/photos/abc.jpg')
+    return new Response(Buffer.from('PHOTODATA'), {
+      status: 200,
+      headers: { 'content-type': 'image/jpeg' },
+    })
+  })
+  ;(globalThis as any).fetch = fetchMock
+  return {
+    token: 'FAKE_TOKEN',
+    api: {
+      getFile: mock(async (fileId: string) => ({
+        file_id: fileId,
+        file_unique_id: 'unique',
+        file_path: 'photos/abc.jpg',
+      })),
+      sendPhoto: mock(async () => ({ message_id: 1 })),
+      sendDocument: mock(async () => ({ message_id: 2 })),
+    },
+    fetchMock,
+  }
+}
+
+beforeEach(async () => {
+  originalFetch = globalThis.fetch
+  tmpRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'tg-media-test-'))
+})
+
+afterEach(async () => {
+  globalThis.fetch = originalFetch
+  await fs.rm(tmpRoot, { recursive: true, force: true })
+})
+
+describe('TelegramMediaService', () => {
+  it('downloadFile fetches the real URL and stores a LocalAttachment', async () => {
+    const bot = makeMockBot()
+    const store = new AttachmentStore({ root: tmpRoot, retentionMs: 60_000 })
+    const svc = new TelegramMediaService(bot as any, store)
+    const local = await svc.downloadFile('fid_123', 'sess-1', {
+      fileName: 'abc.jpg',
+      mimeType: 'image/jpeg',
+    })
+    expect(local.kind).toBe('image')
+    expect(local.name).toBe('abc.jpg')
+    expect(local.size).toBe('PHOTODATA'.length)
+    expect(local.buffer.toString()).toBe('PHOTODATA')
+    const onDisk = await fs.readFile(local.path)
+    expect(onDisk.toString()).toBe('PHOTODATA')
+  })
+
+  it('sendPhoto calls bot.api.sendPhoto with InputFile-like payload', async () => {
+    const bot = makeMockBot()
+    const store = new AttachmentStore({ root: tmpRoot, retentionMs: 60_000 })
+    const svc = new TelegramMediaService(bot as any, store)
+    await svc.sendPhoto(42, Buffer.from('IMG'), 'caption text')
+    expect(bot.api.sendPhoto).toHaveBeenCalledTimes(1)
+    const args = (bot.api.sendPhoto as any).mock.calls[0]
+    expect(args[0]).toBe(42)
+    // grammY InputFile wraps the buffer; just verify it's an object.
+    expect(args[1]).toBeDefined()
+    expect(args[2]?.caption).toBe('caption text')
+  })
+
+  it('sendDocument calls bot.api.sendDocument', async () => {
+    const bot = makeMockBot()
+    const store = new AttachmentStore({ root: tmpRoot, retentionMs: 60_000 })
+    const svc = new TelegramMediaService(bot as any, store)
+    await svc.sendDocument(42, Buffer.from('DOC'), 'spec.pdf')
+    expect(bot.api.sendDocument).toHaveBeenCalledTimes(1)
+    const args = (bot.api.sendDocument as any).mock.calls[0]
+    expect(args[0]).toBe(42)
+    expect(args[1]).toBeDefined()
+  })
+})

package/adapters/telegram/__tests__/telegram.test.ts

@@ -0,0 +1,115 @@
+import { describe, it, expect } from 'bun:test'
+import { splitMessage, formatPermissionRequest, truncateInput, escapeMarkdownV2 } from '../../common/format.js'
+
+/**
+ * Telegram Adapter 翻译逻辑测试
+ *
+ * 由于 grammy Bot 需要实际 Token 才能初始化，
+ * 这里测试的是不依赖 Bot 实例的核心翻译逻辑。
+ */
+
+describe('Telegram message formatting', () => {
+  describe('long message splitting', () => {
+    it('splits messages at Telegram 4096 char limit', () => {
+      const longText = 'a'.repeat(8000)
+      const chunks = splitMessage(longText, 4000)
+      expect(chunks.length).toBe(2)
+      expect(chunks[0]!.length).toBeLessThanOrEqual(4000)
+      expect(chunks[1]!.length).toBeLessThanOrEqual(4000)
+    })
+
+    it('keeps short messages as single chunk', () => {
+      const chunks = splitMessage('Hello World', 4000)
+      expect(chunks).toEqual(['Hello World'])
+    })
+
+    it('splits at paragraph boundary when possible', () => {
+      const text = 'A'.repeat(2000) + '\n\n' + 'B'.repeat(2000)
+      const chunks = splitMessage(text, 3000)
+      expect(chunks.length).toBe(2)
+    })
+  })
+
+  describe('permission request formatting', () => {
+    it('formats Bash command request', () => {
+      const result = formatPermissionRequest('Bash', { command: 'npm test' }, 'abcde')
+      expect(result).toContain('🔐')
+      expect(result).toContain('Bash')
+      expect(result).toContain('npm test')
+      expect(result).toContain('abcde')
+    })
+
+    it('formats Write file request', () => {
+      const result = formatPermissionRequest(
+        'Write',
+        { file_path: '/src/index.ts', content: 'console.log("hello")' },
+        'fghij',
+      )
+      expect(result).toContain('Write')
+      expect(result).toContain('index.ts')
+      expect(result).toContain('fghij')
+    })
+
+    it('truncates long input in permission request', () => {
+      const longInput = { command: 'x'.repeat(500) }
+      const result = formatPermissionRequest('Bash', longInput, 'xxxxx')
+      expect(result.length).toBeLessThan(600)
+    })
+  })
+
+  describe('callback_data parsing', () => {
+    it('parses permit:requestId:yes format', () => {
+      const data = 'permit:abcde:yes'
+      const parts = data.split(':')
+      expect(parts[0]).toBe('permit')
+      expect(parts[1]).toBe('abcde')
+      expect(parts[2]).toBe('yes')
+    })
+
+    it('parses permit:requestId:no format', () => {
+      const data = 'permit:abcde:no'
+      const parts = data.split(':')
+      expect(parts[2]).toBe('no')
+    })
+
+    it('ignores non-permit callbacks', () => {
+      const data = 'other:action'
+      expect(data.startsWith('permit:')).toBe(false)
+    })
+  })
+
+  describe('MarkdownV2 escaping', () => {
+    it('escapes underscores', () => {
+      expect(escapeMarkdownV2('hello_world')).toBe('hello\\_world')
+    })
+
+    it('escapes multiple special chars', () => {
+      const result = escapeMarkdownV2('file.ts (line 42)')
+      expect(result).toBe('file\\.ts \\(line 42\\)')
+    })
+
+    it('handles code blocks safely', () => {
+      const result = escapeMarkdownV2('`code`')
+      expect(result).toBe('\\`code\\`')
+    })
+  })
+
+  describe('whitelist logic', () => {
+    it('empty allowedUsers means allow all', () => {
+      const allowedUsers: number[] = []
+      const isAllowed = (userId: number) =>
+        allowedUsers.length === 0 || allowedUsers.includes(userId)
+      expect(isAllowed(12345)).toBe(true)
+      expect(isAllowed(99999)).toBe(true)
+    })
+
+    it('non-empty allowedUsers filters correctly', () => {
+      const allowedUsers = [111, 222]
+      const isAllowed = (userId: number) =>
+        allowedUsers.length === 0 || allowedUsers.includes(userId)
+      expect(isAllowed(111)).toBe(true)
+      expect(isAllowed(222)).toBe(true)
+      expect(isAllowed(333)).toBe(false)
+    })
+  })
+})

package/bin/bingo-win.cjs

@@ -71,6 +71,32 @@ if (!bunExists()) {
 // 安装后 bun.exe 在固定位置；若在 PATH 里则直接用 "bun"
 const bun = fs.existsSync(bunPath) ? bunPath : 'bun';
 
+// ── 自动检测并安装 git ──
+function gitExists() {
+  const result = spawnSync('git', ['--version'], { stdio: 'ignore', shell: true });
+  return result.status === 0;
+}
+
+function installGit() {
+  console.log('[bingo] git 未检测到，正在通过 winget 自动安装...');
+  const result = spawnSync(
+    'winget',
+    ['install', '--id', 'Git.Git', '-e', '--source', 'winget',
+     '--accept-package-agreements', '--accept-source-agreements'],
+    { stdio: 'inherit', shell: true }
+  );
+  if (result.status !== 0) {
+    console.warn('[bingo] git 自动安装失败，请手动安装：https://git-scm.com');
+    // 不退出 —— git 不是启动必须依赖，缺少时仅降级部分功能
+  } else {
+    console.log('[bingo] git 安装完成，若 PATH 未生效请重启终端。');
+  }
+}
+
+if (!gitExists()) {
+  installGit();
+}
+
 // Bingo Manager 入口（窗口管理控制台，不走 cli.tsx 完整启动流程）
 const entry = path.join(__dirname, '..', 'src', 'entrypoints', 'manager.tsx');
 

package/bin/bingocode-win.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { spawn } = require('node:child_process');
+const { spawn, spawnSync } = require('node:child_process');
 const path = require('path');
 const os = require('os');
 const fs = require('fs');
@@ -33,11 +33,63 @@ process.env.NoDefaultCurrentDirectoryInExePath = '1';
   }
 })();
 
-// 自动定位 bun 路径
-const bun =
+// ── 自动定位并安装 bun ──
+const bunPath =
   process.env.BUN_PATH ||
   path.join(os.homedir(), '.bun', 'bin', 'bun.exe');
 
+function bunExists() {
+  if (fs.existsSync(bunPath)) return true;
+  const result = spawnSync('bun', ['--version'], { stdio: 'ignore', shell: true });
+  return result.status === 0;
+}
+
+function installBun() {
+  console.log('[bingocode] bun 未检测到，正在自动安装...');
+  const result = spawnSync(
+    'powershell',
+    ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command',
+     'irm bun.sh/install.ps1 | iex'],
+    { stdio: 'inherit', shell: false }
+  );
+  if (result.status !== 0) {
+    console.error('[bingocode] bun 安装失败，请手动安装：https://bun.sh');
+    process.exit(1);
+  }
+  console.log('[bingocode] bun 安装完成，正在启动...');
+}
+
+if (!bunExists()) {
+  installBun();
+}
+
+const bun = fs.existsSync(bunPath) ? bunPath : 'bun';
+
+// ── 自动检测并安装 git ──
+function gitExists() {
+  const result = spawnSync('git', ['--version'], { stdio: 'ignore', shell: true });
+  return result.status === 0;
+}
+
+function installGit() {
+  console.log('[bingocode] git 未检测到，正在通过 winget 自动安装...');
+  const result = spawnSync(
+    'winget',
+    ['install', '--id', 'Git.Git', '-e', '--source', 'winget',
+     '--accept-package-agreements', '--accept-source-agreements'],
+    { stdio: 'inherit', shell: true }
+  );
+  if (result.status !== 0) {
+    console.warn('[bingocode] git 自动安装失败，请手动安装：https://git-scm.com');
+  } else {
+    console.log('[bingocode] git 安装完成，若 PATH 未生效请重启终端。');
+  }
+}
+
+if (!gitExists()) {
+  installGit();
+}
+
 // 主 CLI 入口
 const entry = path.join(__dirname, '..', 'src', 'entrypoints', 'cli.tsx');
 

package/bin/claude-win.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { spawn } = require('node:child_process');
+const { spawn, spawnSync } = require('node:child_process');
 const path = require('path');
 const os = require('os');
 const fs = require('fs');
@@ -32,11 +32,63 @@ process.env.NoDefaultCurrentDirectoryInExePath = '1';
   }
 })();
 
-// 自动定位 bun 路径
-const bun =
+// ── 自动定位并安装 bun ──
+const bunPath =
   process.env.BUN_PATH ||
   path.join(os.homedir(), '.bun', 'bin', 'bun.exe');
 
+function bunExists() {
+  if (fs.existsSync(bunPath)) return true;
+  const result = spawnSync('bun', ['--version'], { stdio: 'ignore', shell: true });
+  return result.status === 0;
+}
+
+function installBun() {
+  console.log('[claude] bun 未检测到，正在自动安装...');
+  const result = spawnSync(
+    'powershell',
+    ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command',
+     'irm bun.sh/install.ps1 | iex'],
+    { stdio: 'inherit', shell: false }
+  );
+  if (result.status !== 0) {
+    console.error('[claude] bun 安装失败，请手动安装：https://bun.sh');
+    process.exit(1);
+  }
+  console.log('[claude] bun 安装完成，正在启动...');
+}
+
+if (!bunExists()) {
+  installBun();
+}
+
+const bun = fs.existsSync(bunPath) ? bunPath : 'bun';
+
+// ── 自动检测并安装 git ──
+function gitExists() {
+  const result = spawnSync('git', ['--version'], { stdio: 'ignore', shell: true });
+  return result.status === 0;
+}
+
+function installGit() {
+  console.log('[claude] git 未检测到，正在通过 winget 自动安装...');
+  const result = spawnSync(
+    'winget',
+    ['install', '--id', 'Git.Git', '-e', '--source', 'winget',
+     '--accept-package-agreements', '--accept-source-agreements'],
+    { stdio: 'inherit', shell: true }
+  );
+  if (result.status !== 0) {
+    console.warn('[claude] git 自动安装失败，请手动安装：https://git-scm.com');
+  } else {
+    console.log('[claude] git 安装完成，若 PATH 未生效请重启终端。');
+  }
+}
+
+if (!gitExists()) {
+  installGit();
+}
+
 // 主 CLI 入口
 const entry = path.join(__dirname, '..', 'src', 'entrypoints', 'cli.tsx');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingocode",
-  "version": "1.0.29",
+  "version": "1.0.31",
   "type": "module",
   "bin": {
     "claude": "bin/claude-win.cjs",

package/src/entrypoints/cli.tsx

@@ -30,13 +30,15 @@ if (feature('ABLATION_BASELINE') && process.env.CLAUDE_CODE_ABLATION_BASELINE) {
  * All imports are dynamic to minimize module evaluation for fast paths.
  * Fast-path for --version has zero imports beyond this file.
  */
-import { CliMenuManager } from '../manager/CliMenuManager';
-import { render } from 'ink';
 
 async function main(): Promise<void> {
   const args = process.argv.slice(2);
   // 兼容demo参数：只渲染CLI新主菜单管理器，不影响原有逻辑
+  // CliMenuManager 和 ink 改为动态 import，避免顶层 import 导致模块副作用
+  // 抢占 stdin，使新电脑首次启动时 TrustDialog 卡死
   if (args.includes('--cli-menu-demo')) {
+    const { CliMenuManager } = await import('../manager/CliMenuManager');
+    const { render } = await import('ink');
     render(<CliMenuManager />);
     return;
   }

package/src/manager/CliMenuManager.tsx

@@ -280,19 +280,33 @@ export const CliMenuManager: React.FC = () => {
   // 配置就绪探测（用于避免 Logo 早期读取）
   const [configReady, setConfigReady] = useState(false);
 
-  // 启动/复用本地唯一服务，并注入 apiUrl
+  // 启动/复用本地唯一服务，并注入 apiUrl（含重试机制）
   useEffect(() => {
     let mounted = true;
     (async () => {
-      try {
-        if (apiUrl) return;
-        const entry = path.resolve(import.meta.dir, '../server/index.ts');
-        const handle = await ensureSingletonLocalServer({ serverEntry: entry });
-        if (!mounted) { await handle.stopIfLast(); return; }
-        setApiUrl(handle.baseUrl);
-        setStopIfLast(() => handle.stopIfLast);
-      } catch (e: any) {
-        setBootErr(e.message || '本地服务启动失败');
+      if (apiUrl) return;
+      const entry = path.resolve(import.meta.dir, '../server/index.ts');
+      const MAX_RETRIES = 3;
+      const RETRY_DELAYS = [0, 2000, 5000]; // 首次无延迟，第2次2秒，第3次5秒
+      for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
+        if (!mounted) return;
+        if (attempt > 0) {
+          setBootErr(`第 ${attempt} 次启动失败，${RETRY_DELAYS[attempt] / 1000}秒后重试...`);
+          await new Promise(r => setTimeout(r, RETRY_DELAYS[attempt]));
+        }
+        if (!mounted) return;
+        try {
+          const handle = await ensureSingletonLocalServer({ serverEntry: entry });
+          if (!mounted) { await handle.stopIfLast(); return; }
+          setApiUrl(handle.baseUrl);
+          setStopIfLast(() => handle.stopIfLast);
+          setBootErr(null);
+          return; // 成功，退出重试
+        } catch (e: any) {
+          if (attempt === MAX_RETRIES - 1) {
+            setBootErr(e.message || '本地服务启动失败');
+          }
+        }
       }
     })();
     return () => { mounted = false; if (stopIfLast) stopIfLast(); };
@@ -653,7 +667,8 @@ export const CliMenuManager: React.FC = () => {
   }
 
   // 新增：会话恢复（供快捷键和右侧菜单复用）
-  async function resumeSession(sessionId: string) {
+  // workDir: 会话原始工作目录，用于跨文件夹恢复（确保新进程能找到 session 文件）
+  async function resumeSession(sessionId: string, workDir?: string | null) {
     try {
       const fsReq = require('fs');
       const pathReq = require('path');
@@ -673,7 +688,7 @@ export const CliMenuManager: React.FC = () => {
         : ['-c', `${binName} --resume ${sessionId}`];
       const spawnEnv = await buildSpawnEnv();
       spawn(spawnCmd, spawnArgs, {
-        cwd: process.env.CALLER_DIR || process.cwd(),
+        cwd: workDir || process.env.CALLER_DIR || process.cwd(),
         env: spawnEnv,
         detached: true,
         stdio: 'ignore'
@@ -749,7 +764,7 @@ export const CliMenuManager: React.FC = () => {
         toggleMarkSession(selectedHistory.id);
         break;
       case '__continue':
-        resumeSession(selectedHistory.id);
+        resumeSession(selectedHistory.id, selectedHistory.workDir);
         break;
       case '__delete':
         setHistoryMenuStage('deleteConfirm');
@@ -810,7 +825,7 @@ export const CliMenuManager: React.FC = () => {
             setSelectedHistory(null);
             setMsgsPage(0);
           } else if (item.value === '__continue') {
-            resumeSession(selectedHistory.id);
+            resumeSession(selectedHistory.id, selectedHistory.workDir);
           } else if (item.value === '__delete') {
             setHistoryMenuStage('deleteConfirm');
           } else if (item.value === '__toggle_mark') {
@@ -870,9 +885,17 @@ export const CliMenuManager: React.FC = () => {
       const WELCOME_W = 58;
       const leftPad = Math.max(0, Math.floor((VIEW_W - WELCOME_W) / 2));
       return (
-        <Box flexDirection="row" width={VIEW_W} height={MID_H}>
-          <Box width={leftPad} flexShrink={0} />
-          <WelcomeV2 />
+        <Box flexDirection="column" width={VIEW_W} height={MID_H}>
+          <Box flexDirection="row" width={VIEW_W} flexGrow={1}>
+            <Box width={leftPad} flexShrink={0} />
+            <WelcomeV2 />
+          </Box>
+          {!apiUrl && !bootErr && (
+            <Text color="yellow">⏳ 服务启动中...</Text>
+          )}
+          {bootErr && (
+            <Text color="red">服务启动失败: {bootErr}</Text>
+          )}
         </Box>
       );
     }
@@ -1014,6 +1037,14 @@ export const CliMenuManager: React.FC = () => {
 
     // Provider
     if (page === 'provider') {
+      if (!apiUrl) {
+        return (
+          <Box width={VIEW_W} height={MID_H} flexDirection="column">
+            <Text color="yellow">{bootErr ? `服务启动失败: ${bootErr}` : '⏳ 服务启动中，请稍候...'}</Text>
+            <Text dimColor>ESC 返回主菜单</Text>
+          </Box>
+        );
+      }
       return (
         <Box width={VIEW_W} height={MID_H} flexDirection="column">
           <ProviderPanel apiUrl={apiUrl} onBack={() => setPage(null)} />