bingocode 1.0.21 → 1.0.22

package/package.json

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

package/src/components/Onboarding.tsx

@@ -5,7 +5,7 @@ import { setupTerminal, shouldOfferTerminalSetup } from '../commands/terminalSet
 import { useExitOnCtrlCDWithKeybindings } from '../hooks/useExitOnCtrlCDWithKeybindings.js';
 import { Box, Link, Newline, Text, useTheme } from '../ink.js';
 import { useKeybindings } from '../keybindings/useKeybinding.js';
-import { isAnthropicAuthEnabled } from '../utils/auth.js';
+import { isAnthropicAuthEnabled, isManagedOAuthContext } from '../utils/auth.js';
 import { normalizeApiKeyForConfig } from '../utils/authPortable.js';
 import { getCustomApiKeyStatus } from '../utils/config.js';
 import { env } from '../utils/env.js';
@@ -114,7 +114,11 @@ export function Onboarding({
     goToNextStep();
   }
   const steps: OnboardingStep[] = [];
-  if (oauthEnabled) {
+  // Skip preflight in managed OAuth context (claude-desktop / CCR):
+  // The desktop app already verifies local server connectivity,
+  // and the Anthropic /api/hello endpoint may return 400 before OAuth login,
+  // which would incorrectly kill the onboarding flow.
+  if (oauthEnabled && !isManagedOAuthContext()) {
     steps.push({
       id: 'preflight',
       component: preflightStep

package/src/manager/CliMenuManager.tsx

@@ -17,6 +17,9 @@ import { TopToolbar } from '../manager/TopToolbar.tsx';
 
 // 主题切换（Hook）
 import { useTheme } from '../components/design-system/ThemeProvider.js';
+// Markdown 渲染（纯函数，不依赖 AppStateProvider context）
+import { applyMarkdown } from '../utils/markdown.js';
+import { Ansi } from '../ink/Ansi.js';
 
 // 配置相关（仅使用可用接口）
 import { getGlobalConfig, saveGlobalConfig } from '../utils/config.ts';
@@ -132,21 +135,57 @@ function loadMarkedSessionIds(): Set<string> {
   }
 }
 
-//@C:F ID=F.CM.saveMarkedSessionIds;K=F;V=1.0;P=save marked ids;D=CLI;M=cli;S=persist;In=Set<string>;Out=void
+//@C:F ID=F.CM.saveMarkedSessionIds;K=F;V=1.1;P=save marked ids;D=CLI;M=cli;S=persist;In=Set<string>;Out=void
 function saveMarkedSessionIds(set: Set<string>) {
   try {
+    const dir = path.dirname(MARKED_FILE);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
     fs.writeFileSync(MARKED_FILE, JSON.stringify([...set]), 'utf-8');
-  } catch {}
+  } catch (err) {
+    console.error('[saveMarkedSessionIds] 写入失败:', err);
+  }
 }
 
-// 通用消息结构，供 <Messages />
-type ChatMessage = {
+// 消息条目（与后端 MessageEntry 对齐）
+type MessageEntry = {
   id: string;
-  userId: string;
-  content: string;
-  createdAt?: string;
+  type: 'user' | 'assistant' | 'system' | 'tool_use' | 'tool_result';
+  content: unknown; // string 或 ContentBlock[]
+  timestamp: string;
+  model?: string;
+  parentUuid?: string;
+  parentToolUseId?: string;
+  isSidechain?: boolean;
 };
 
+/** 从 MessageEntry.content 提取纯文本 */
+function extractTextFromContent(content: unknown): string {
+  if (typeof content === 'string') return content;
+  if (Array.isArray(content)) {
+    return content
+      .map((block: any) => {
+        if (block.type === 'text' && typeof block.text === 'string') return block.text;
+        if (block.type === 'tool_use') return `[Tool: ${block.name || 'unknown'}]`;
+        if (block.type === 'tool_result') {
+          if (typeof block.content === 'string') return block.content;
+          if (Array.isArray(block.content)) {
+            return block.content
+              .filter((b: any) => b.type === 'text')
+              .map((b: any) => b.text)
+              .join('\n');
+          }
+          return '[Tool Result]';
+        }
+        return '';
+      })
+      .filter(Boolean)
+      .join('\n');
+  }
+  return String(content ?? '');
+}
+
 //@C:F ID=F.CM.CliMenuManager;K=F;V=1.5;P=CLI 主菜单;D=CLI;M=cli;S=main;In=;Out=JSX.Element
 export const CliMenuManager: React.FC = () => {
   const { stdout } = useStdout();
@@ -208,8 +247,8 @@ export const CliMenuManager: React.FC = () => {
   const [historyMenuStage, setHistoryMenuStage] = useState<'list'|'window'|'deleteConfirm'>('list');
   const [selectedHistory, setSelectedHistory] = useState<any|null>(null);
 
-  // 历史-消息内容（分页视口）
-  const [sessionMessages, setSessionMessages] = useState<ChatMessage[]>([]);
+  // 历史-消息内容
+  const [sessionMessages, setSessionMessages] = useState<MessageEntry[]>([]);
   const [loadingMsgs, setLoadingMsgs] = useState(false);
   const [msgsErr, setMsgsErr] = useState<string | null>(null);
   const [msgsPage, setMsgsPage] = useState(0); // 0=最新页（底部），1=向上翻一页
@@ -380,9 +419,26 @@ export const CliMenuManager: React.FC = () => {
 
   // 会话消息获取
   useEffect(() => {
-    // 进入 window 不再加载消息（只看属性）
-    if (false) {
-      /* 保留原实现以备将来恢复消息视图时启用 */
+    if (page === 'history' && historyMenuStage === 'window' && selectedHistory && apiUrl) {
+      let cancelled = false;
+      setLoadingMsgs(true);
+      setMsgsErr(null);
+      setSessionMessages([]);
+      setMsgsPage(0);
+      (async () => {
+        try {
+          const resp = await axios.get(`${apiUrl}/api/sessions/${selectedHistory.id}/messages`);
+          if (!cancelled) {
+            const msgs: MessageEntry[] = resp.data?.messages ?? [];
+            setSessionMessages(msgs);
+          }
+        } catch (e: any) {
+          if (!cancelled) setMsgsErr(e.message || '消息加载失败');
+        } finally {
+          if (!cancelled) setLoadingMsgs(false);
+        }
+      })();
+      return () => { cancelled = true; };
     } else {
       setSessionMessages([]);
       setLoadingMsgs(false);
@@ -531,6 +587,15 @@ export const CliMenuManager: React.FC = () => {
           handleHistoryMenuAction('__back');
           return;
         }
+        // 消息滚动：↑/k 向上翻页，↓/j 向下翻页
+        if (key.upArrow || input === 'k') {
+          setMsgsPage(p => Math.max(0, p - 1));
+          return;
+        }
+        if (key.downArrow || input === 'j') {
+          setMsgsPage(p => p + 1);
+          return;
+        }
 
       } else if (historyMenuStage === 'deleteConfirm') {
         if (input === 'q') {
@@ -860,54 +925,62 @@ export const CliMenuManager: React.FC = () => {
       }
 
       if (historyMenuStage === 'window' && selectedHistory) {
-        const halfH = Math.floor(MID_H / 2);
         const isMarked = markedSessionIds.has(selectedHistory.id);
-        const menu = secondaryMenu ?? {
-          title: lang === 'zh' ? '会话操作' : 'Session Actions',
-          items: [
-            { label: (isMarked ? i18nMap[lang].unmark : i18nMap[lang].mark), value: '__toggle_mark' },
-            { label: '→ 继续会话聊天', value: '__continue' },
-            { label: '→ 删除会话聊天', value: '__delete' },
-            { label: '← 返回历史列表', value: '__back' },
-          ],
-          onSelect: (item: any) => {
-            if (item.value === '__back') {
-              setHistoryMenuStage('list');
-              setSelectedHistory(null);
-              setMsgsPage(0);
-            } else if (item.value === '__continue' && selectedHistory) {
-              resumeSession(selectedHistory.id);
-            } else if (item.value === '__delete') {
-              setHistoryMenuStage('deleteConfirm');
-            } else if (item.value === '__toggle_mark' && selectedHistory) {
-              toggleMarkSession(selectedHistory.id);
-            }
-          }
-        };
+
+        // ── 信息栏高度固定 3 行（标题 + 元信息 + 提示） ──
+        const INFO_H = 3;
+        const MSGS_H = Math.max(3, MID_H - INFO_H);
+
+        // ── 过滤出可展示的消息（user / assistant / system，跳过 tool_use / tool_result） ──
+        const displayMsgs = sessionMessages.filter(
+          m => m.type === 'user' || m.type === 'assistant' || m.type === 'system'
+        );
+
+        // ── 分页：每页 MSGS_PAGE_SIZE 条消息 ──
+        const totalPages = Math.max(1, Math.ceil(displayMsgs.length / MSGS_PAGE_SIZE));
+        const safePage = Math.min(msgsPage, totalPages - 1);
+        const pageStart = safePage * MSGS_PAGE_SIZE;
+        const pageMsgs = displayMsgs.slice(pageStart, pageStart + MSGS_PAGE_SIZE);
 
         return (
           <Box width={VIEW_W} height={MID_H} flexDirection="column">
-            {/* 上半区：只显示会话属性 */}
-            <Box height={halfH} flexDirection="column">
+            {/* ── 顶部信息栏 ── */}
+            <Box height={INFO_H} flexDirection="column">
               <Text color={isMarked ? 'yellow' : 'cyan'}>
-                {isMarked ? '★ ' : ''}会话属性
+                {isMarked ? '★ ' : ''}{selectedHistory.title || 'Untitled'}
+                <Text dimColor>  {selectedHistory.createdAt?.slice(0, 16).replace('T', ' ') || ''} · {displayMsgs.length} msgs</Text>
               </Text>
-              <Text>id: {selectedHistory.id}</Text>
-              <Text>标题: {selectedHistory.title}</Text>
-              <Text>创建时间: {selectedHistory.createdAt}</Text>
-              <Text>消息数: {selectedHistory.messageCount ?? 0}</Text>
-              <Text>已标记: {isMarked ? '是' : '否'}</Text>
-              <Hint>m 标记/取消 · c 继续 · d 删除 · q 返回</Hint>
+              <Hint>
+                j/↓ 下翻 · k/↑ 上翻 · m 标记 · c 继续 · d 删除 · q 返回
+                {displayMsgs.length > MSGS_PAGE_SIZE ? `  [${safePage + 1}/${totalPages}]` : ''}
+              </Hint>
             </Box>
 
-            {/* 下半区：三级菜单 */}
-            <Box height={MID_H - halfH} flexDirection="column" borderStyle="round" borderColor="cyan" paddingLeft={1} paddingRight={1}>
-              <Text>{menu.title}</Text>
-              <SelectInput
-                items={menu.items.map(it => ({ label: it.label, value: it.value }))}
-                onSelect={(item) => handleHistoryMenuAction(String(item.value))}
-              />
-              <Hint>↩ 执行 · q 返回</Hint>
+            {/* ── 消息区 ── */}
+            <Box height={MSGS_H} flexDirection="column" overflow="hidden">
+              {loadingMsgs && <Text color="yellow">加载消息中...</Text>}
+              {msgsErr && <Text color="red">错误: {msgsErr}</Text>}
+              {!loadingMsgs && !msgsErr && displayMsgs.length === 0 && (
+                <Text dimColor>无消息记录</Text>
+              )}
+              {pageMsgs.map((msg) => {
+                const text = extractTextFromContent(msg.content);
+                if (!text.trim()) return null;
+                const isUser = msg.type === 'user';
+                const isSystem = msg.type === 'system';
+                const roleLabel = isUser ? '👤 You' : isSystem ? '⚙ System' : '🤖 Assistant';
+                const roleColor = isUser ? 'green' : isSystem ? 'gray' : 'cyan';
+                return (
+                  <Box key={msg.id} flexDirection="column" marginBottom={1}>
+                    <Text color={roleColor} bold>{roleLabel}</Text>
+                    {isUser ? (
+                      <Text>{text}</Text>
+                    ) : (
+                      <Ansi>{applyMarkdown(text, theme)}</Ansi>
+                    )}
+                  </Box>
+                );
+              })}
             </Box>
           </Box>
         );

package/src/utils/auth.ts

@@ -88,7 +88,7 @@ const DEFAULT_API_KEY_HELPER_TTL = 5 * 60 * 1000
  * who runs `claude` in their terminal with an API key sees every CCD session
  * also use that key — and fail if it's stale/wrong-org.
  */
-function isManagedOAuthContext(): boolean {
+export function isManagedOAuthContext(): boolean {
   return (
     isEnvTruthy(process.env.CLAUDE_CODE_REMOTE) ||
     process.env.CLAUDE_CODE_ENTRYPOINT === 'claude-desktop'