bingocode 1.0.12 → 1.0.14

package/package.json

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

package/src/manager/CliMenuManager.tsx

@@ -8,6 +8,7 @@ import { LogoV2 } from '../components/LogoV2/LogoV2.tsx';
 import { CondensedLogo } from '../components/LogoV2/CondensedLogo.tsx';
 import fs from 'fs';
 import path from 'path';
+import os from 'os';
 import { ensureSingletonLocalServer } from '../server/ensureSingletonLocalServer.ts';
 // 新增：通用 UI 元素与顶部工具栏
 import { TopBar, BottomBar, Panel, Hint, Kbd, SecondaryMenu } from '../manager/CliMenuUi.tsx';
@@ -20,7 +21,8 @@ import { useTheme } from '../components/design-system/ThemeProvider.js';
 // 配置相关（仅使用可用接口）
 import { getGlobalConfig, saveGlobalConfig } from '../utils/config.ts';
 
-const MARKED_FILE = path.join(process.cwd(), 'markedSessions.json');
+// markedSessions 存到 ~/.claude-cli/ 固定目录，不受 cwd 影响
+const MARKED_FILE = path.join(os.homedir(), '.claude-cli', 'markedSessions.json');
 
 // 固定尺寸视口（可用环境变量覆盖）
 const VIEW_W = Number(process.env.CLI_VIEW_W || 96);
@@ -182,7 +184,7 @@ export const CliMenuManager: React.FC = () => {
     (async () => {
       try {
         if (apiUrl) return;
-        const entry = path.resolve(process.cwd(), 'src/server/index.ts');
+        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);
@@ -246,7 +248,8 @@ export const CliMenuManager: React.FC = () => {
       const fsReq = require('fs');
       const pathReq = require('path');
       const { spawn } = require('child_process');
-      const pkgPath = pathReq.resolve(process.cwd(), 'package.json');
+      // 用 import.meta.dir 定位包根，避免 process.cwd() 指向用户目录
+      const pkgPath = pathReq.resolve(import.meta.dir, '../../package.json');
       const pkgJson = JSON.parse(fsReq.readFileSync(pkgPath, 'utf-8'));
       const bins = pkgJson.bin || {};
       const isWin = process.platform === 'win32';
@@ -254,9 +257,10 @@ export const CliMenuManager: React.FC = () => {
         ? (bins['claude-haha'] ? 'claude-haha' : (bins['claude'] ? 'claude' : Object.keys(bins)[0]))
         : (bins['claude-linux'] ? 'claude-linux' : (bins['claude'] ? 'claude' : Object.keys(bins)[0]));
       const spawnCmd = isWin ? 'cmd' : 'sh';
-      const spawnArgs = isWin ? ['/c', 'start', 'cmd', '/k', 'bun bingocode'] : ['-c', `./${binName}`];
+      // Windows 直接调全局 bingocode 命令，不用 bun 前缀
+      const spawnArgs = isWin ? ['/c', 'start', 'cmd', '/k', 'bingocode'] : ['-c', `${binName}`];
       spawn(spawnCmd, spawnArgs, {
-        cwd: process.cwd(),
+        cwd: process.env.CALLER_DIR || process.cwd(),
         env: process.env,
         detached: true,
         stdio: 'ignore'
@@ -525,7 +529,8 @@ export const CliMenuManager: React.FC = () => {
       const fsReq = require('fs');
       const pathReq = require('path');
       const { spawn } = require('child_process');
-      const pkgPath = pathReq.resolve(process.cwd(), 'package.json');
+      // 用 import.meta.dir 定位包根，避免 process.cwd() 指向用户目录
+      const pkgPath = pathReq.resolve(import.meta.dir, '../../package.json');
       const pkgJson = JSON.parse(fsReq.readFileSync(pkgPath, 'utf-8'));
       const bins = pkgJson.bin || {};
       const isWin = process.platform === 'win32';
@@ -533,11 +538,12 @@ export const CliMenuManager: React.FC = () => {
         ? (bins['claude-haha'] ? 'claude-haha' : (bins['claude'] ? 'claude' : Object.keys(bins)[0]))
         : (bins['claude-linux'] ? 'claude-linux' : (bins['claude'] ? 'claude' : Object.keys(bins)[0]));
       const spawnCmd = isWin ? 'cmd' : 'sh';
+      // Windows 直接调全局 bingocode 命令，不用 bun 前缀
       const spawnArgs = isWin
-        ? ['/c', 'start', 'cmd', '/k', `bun bingocode --resume ${sessionId}`]
-        : ['-c', `./${binName} --resume ${sessionId}`];
+        ? ['/c', 'start', 'cmd', '/k', `bingocode --resume ${sessionId}`]
+        : ['-c', `${binName} --resume ${sessionId}`];
       spawn(spawnCmd, spawnArgs, {
-        cwd: process.cwd(),
+        cwd: process.env.CALLER_DIR || process.cwd(),
         env: process.env,
         detached: true,
         stdio: 'ignore'
@@ -674,24 +680,7 @@ export const CliMenuManager: React.FC = () => {
             setSelectedHistory(null);
             setMsgsPage(0);
           } else if (item.value === '__continue') {
-            try {
-              const fsReq = require('fs');
-              const pathReq = require('path');
-              const { spawn } = require('child_process');
-              const pkgPath = pathReq.resolve(process.cwd(), 'package.json');
-              const pkgJson = JSON.parse(fsReq.readFileSync(pkgPath, 'utf-8'));
-              const bins = pkgJson.bin || {};
-              const isWin = process.platform === 'win32';
-              let binName = isWin
-                ? bins['claude-haha'] ? 'claude-haha' : bins['claude'] ? 'claude' : Object.keys(bins)[0]
-                : bins['claude-linux'] ? 'claude-linux' : bins['claude'] ? 'claude' : Object.keys(bins)[0];
-              const spawnCmd = isWin ? 'cmd' : 'sh';
-              const spawnArgs = isWin
-                ? ['/c', binName, '--resume', selectedHistory.id]
-                : ['-c', `./${binName} --resume ${selectedHistory.id}`];
-              // 静默启动继续会话
-              resumeSession(selectedHistory.id);
-            } catch { }
+            resumeSession(selectedHistory.id);
           } else if (item.value === '__delete') {
             setHistoryMenuStage('deleteConfirm');
           } else if (item.value === '__toggle_mark') {