Refresh flashgrep binaries, add desktop dev config, and skip ACP session reuse

Author: wgqqqqq

resources/flashgrep/flashgrep-aarch64-apple-darwin

@@ -708,7 +708,7 @@ async function main() {
     if (mode === 'desktop') {
       await ensureDesktopOpenSslIfNeeded();
       const desktopDir = path.join(ROOT_DIR, 'src/apps/desktop');
-      const tauriConfig = path.join(desktopDir, 'tauri.conf.json');
+      const tauriConfig = path.join(desktopDir, 'tauri.dev.conf.json');
       if (process.platform === 'win32') {
         // Running the generated .cmd shim directly via spawn is flaky on Windows.
         // Use cmd.exe with an explicit args array so the desktop app directory

resources/flashgrep/flashgrep-aarch64-unknown-linux-gnu

@@ -0,0 +1,54 @@
+{
+  "$schema": "https://schema.tauri.app/config/2",
+  "productName": "BitFun",
+  "identifier": "com.bitfun.desktop",
+  "build": {
+    "beforeDevCommand": "pnpm run dev:web",
+    "devUrl": "http://localhost:1422",
+    "beforeBuildCommand": "pnpm run build:web && pnpm run prepare:mobile-web",
+    "frontendDist": "../../../dist"
+  },
+  "bundle": {
+    "active": true,
+    "targets": "all",
+    "icon": [
+      "icons/icon.icns",
+      "icons/icon.ico",
+      "icons/icon.png"
+    ],
+    "resources": {
+      "../../mobile-web/dist": "mobile-web/dist",
+      "resources/worker_host.js": "resources/worker_host.js"
+    },
+    "linux": {
+      "deb": {
+        "depends": [
+          "libwebkit2gtk-4.1-0",
+          "libgtk-3-0"
+        ],
+        "files": {
+          "/usr/share/icons/hicolor/16x16/apps/bitfun-desktop.png": "icons/hicolor/16x16/apps/bitfun-desktop.png",
+          "/usr/share/icons/hicolor/32x32/apps/bitfun-desktop.png": "icons/hicolor/32x32/apps/bitfun-desktop.png",
+          "/usr/share/icons/hicolor/48x48/apps/bitfun-desktop.png": "icons/hicolor/48x48/apps/bitfun-desktop.png",
+          "/usr/share/icons/hicolor/64x64/apps/bitfun-desktop.png": "icons/hicolor/64x64/apps/bitfun-desktop.png",
+          "/usr/share/icons/hicolor/96x96/apps/bitfun-desktop.png": "icons/hicolor/96x96/apps/bitfun-desktop.png",
+          "/usr/share/icons/hicolor/128x128/apps/bitfun-desktop.png": "icons/hicolor/128x128/apps/bitfun-desktop.png",
+          "/usr/share/icons/hicolor/256x256/apps/bitfun-desktop.png": "icons/hicolor/256x256/apps/bitfun-desktop.png",
+          "/usr/share/icons/hicolor/512x512/apps/bitfun-desktop.png": "icons/hicolor/512x512/apps/bitfun-desktop.png"
+        },
+        "postInstallScript": "scripts/post-install-icons.sh"
+      },
+      "appimage": {
+        "bundleMediaFramework": false
+      }
+    }
+  },
+  "app": {
+    "windows": [],
+    "security": {
+      "csp": null
+    },
+    "macOSPrivateApi": true,
+    "withGlobalTauri": true
+  }
+}

resources/flashgrep/flashgrep-x86_64-apple-darwin

@@ -0,0 +1,86 @@
+import { afterEach, describe, expect, it } from 'vitest';
+import { flowChatStore } from '@/flow_chat/store/FlowChatStore';
+import type { FlowChatState, Session } from '@/flow_chat/types/flow-chat';
+import { WorkspaceKind, type WorkspaceInfo } from '@/shared/types';
+import { findReusableEmptySessionId } from './projectSessionWorkspace';
+
+const resetStore = () => {
+  flowChatStore.setState((): FlowChatState => ({
+    sessions: new Map(),
+    activeSessionId: null,
+  }));
+};
+
+const createWorkspace = (): WorkspaceInfo => ({
+  id: 'workspace-1',
+  name: 'BitFun',
+  rootPath: '/workspace/BitFun',
+  workspaceKind: WorkspaceKind.Normal,
+});
+
+const createSession = (overrides: Partial<Session> = {}): Session => ({
+  sessionId: 'session-1',
+  title: 'Session 1',
+  dialogTurns: [],
+  status: 'idle',
+  config: { agentType: 'agentic' },
+  createdAt: 1,
+  lastActiveAt: 1,
+  error: null,
+  isHistorical: false,
+  maxContextTokens: 128128,
+  mode: 'agentic',
+  workspacePath: '/workspace/BitFun',
+  workspaceId: 'workspace-1',
+  sessionKind: 'normal',
+  btwThreads: [],
+  isTransient: false,
+  ...overrides,
+});
+
+describe('findReusableEmptySessionId', () => {
+  afterEach(() => {
+    resetStore();
+  });
+
+  it('does not reuse an empty ACP session for a new code session', () => {
+    const workspace = createWorkspace();
+    const acpSession = createSession({
+      sessionId: 'acp-session',
+      config: { agentType: 'acp:codex' },
+      mode: 'acp:codex',
+      lastActiveAt: 10,
+    });
+
+    flowChatStore.setState(() => ({
+      sessions: new Map([[acpSession.sessionId, acpSession]]),
+      activeSessionId: acpSession.sessionId,
+    }));
+
+    expect(findReusableEmptySessionId(workspace, 'agentic')).toBeNull();
+  });
+
+  it('still reuses a matching empty code session when ACP sessions also exist', () => {
+    const workspace = createWorkspace();
+    const codeSession = createSession({
+      sessionId: 'code-session',
+      lastActiveAt: 5,
+    });
+    const acpSession = createSession({
+      sessionId: 'acp-session',
+      config: { agentType: 'acp:codex' },
+      mode: 'acp:codex',
+      lastActiveAt: 20,
+    });
+
+    flowChatStore.setState(() => ({
+      sessions: new Map([
+        [codeSession.sessionId, codeSession],
+        [acpSession.sessionId, acpSession],
+      ]),
+      activeSessionId: acpSession.sessionId,
+    }));
+
+    expect(findReusableEmptySessionId(workspace, 'agentic')).toBe(codeSession.sessionId);
+  });
+});

resources/flashgrep/flashgrep-x86_64-unknown-linux-gnu

@@ -1,5 +1,6 @@
 import { flowChatStore } from '@/flow_chat/store/FlowChatStore';
 import type { Session } from '@/flow_chat/types/flow-chat';
+import { isAcpFlowSession } from '@/flow_chat/utils/acpSession';
 import { WorkspaceKind, isRemoteWorkspace, type WorkspaceInfo } from '@/shared/types';
 
 type SessionDisplayBucket = 'code' | 'cowork' | 'claw';
@@ -53,6 +54,9 @@ function isEmptyReusableSession(session: Session, workspace: WorkspaceInfo, buck
   if (session.sessionKind !== 'normal') {
     return false;
   }
+  if (isAcpFlowSession(session)) {
+    return false;
+  }
   if (session.isHistorical) {
     return false;
   }