Compare commits

..

8 Commits

Author SHA1 Message Date
rdmclin2 6d1a5eb904 chore: update neon webSocketConstructor ws 2026-04-21 16:30:34 +08:00
rdmclin2 a76092c124 chore: add test timeout 2026-04-19 23:52:30 +08:00
rdmclin2 98f4e82502 fix: bot status 2026-04-19 23:51:30 +08:00
rdmclin2 464852bafd feat: support bot status list refresh 2026-04-19 23:27:27 +08:00
rdmclin2 9b58b63d8d feat: add bot connection status and refresh status 2026-04-19 23:19:43 +08:00
rdmclin2 c8c0eb1d64 feat: add bot status tag 2026-04-19 23:07:00 +08:00
rdmclin2 5d3fca515b feat: add dormant status 2026-04-19 22:08:09 +08:00
rdmclin2 7d2c113f4a fix: local webhook typing 2026-04-17 16:01:23 +08:00
1500 changed files with 9753 additions and 102123 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ LobeChat agents can answer inside external chat platforms. Inbound messages flow
`supportsMarkdown=false` ⇒ outbound markdown is stripped to plain text via `stripMarkdown` and the AI is told not to use markdown. `supportsMessageEdit=false` ⇒ no progress edits — only the final reply is sent.
**Multi-mode connection** — Slack/Feishu/Lark/QQ ship as websocket but support `webhook` per-provider via `settings.connectionMode`. The runtime always merges schema defaults into stored settings before resolving the mode (`resolveBotProviderConfig` / `resolveConnectionMode` in `platforms/utils.ts`), so the schema's `field.default` is the source of truth — set it correctly when adding a new multi-mode platform.
**Multi-mode connection** — Slack/Feishu/Lark/QQ shipped as websocket but support `webhook` per-provider via `settings.connectionMode`. Legacy rows without that field stay on `webhook` (see `LEGACY_WEBHOOK_PLATFORMS` in `platforms/utils.ts`) — **never add new platforms to that list**.
## Inbound Flow (one webhook → reply)
-155
View File
@@ -1,155 +0,0 @@
---
name: docs-changelog
description: 'Writing guide for website changelog pages under docs/changelog/*.mdx. Use when creating or editing product update posts in EN/ZH. Not for GitHub Release notes.'
---
# Docs Changelog Writing Guide
## Scope Boundary (Important)
This skill is only for changelog pages in:
- `docs/changelog/*.mdx`
This skill is **not** for GitHub Releases.\
If the user asks for release PR body / GitHub Release notes, load `../version-release/SKILL.md`.
## Mandatory Companion Skills
For every docs changelog task, you MUST load:
- `../microcopy/SKILL.md`
- `../i18n/SKILL.md` (when EN/ZH pair is involved)
## File and Naming Convention
Use date-based file names:
- English: `docs/changelog/YYYY-MM-DD-topic.mdx`
- Chinese: `docs/changelog/YYYY-MM-DD-topic.zh-CN.mdx`
EN and ZH files must exist as a pair and describe the same release facts.
## Frontmatter Requirements
Each file should include:
```md
---
title: <Title>
description: <1 sentence summary>
tags:
- <Tag 1>
- <Tag 2>
---
```
Rules:
1. `title` should match the H1 title in meaning.
2. `description` should be concise and user-facing.
3. `tags` should be feature-oriented, not internal-team labels.
## Content Structure (Recommended)
Use this shape unless the user requests otherwise:
1. `# <Title>`
2. Opening paragraph (2-4 sentences): user-visible impact
3. 1-3 capability sections (optional `##` headings)
4. `## Improvements and fixes` / `## 体验优化与修复` with concise bullets
Keep heading count low and avoid heading-per-bullet structure.
## Writing Rules
1. Keep all claims factual and tied to actual shipped changes.
2. Explain user value first, implementation second.
3. Prefer natural narrative paragraphs over pure bullet dumps.
4. Avoid marketing exaggeration and vague adjectives.
5. Keep internal terms consistent across EN/ZH files.
6. Keep EN/ZH section order aligned and scope-aligned.
## EN/ZH Synchronization Rules
When generating bilingual changelogs:
1. Keep the same key facts in the same order.
2. Localize naturally; do not do literal sentence-by-sentence translation.
3. If one version has an `Improvements and fixes` bullet list, the other should have equivalent list intent.
4. Do not introduce capabilities in only one language unless explicitly requested.
## Length Guidance
- Small update: 3-5 short paragraphs total
- Medium update: 4-7 short paragraphs + concise fix bullets
- Large update: 6-10 short paragraphs split into 2-4 sections
Do not pad content when changes are limited.
## Authoring Workflow
1. Collect source facts from PRs/commits/issues.
2. Group changes by user workflow (not by internal module path).
3. Draft EN and ZH versions with aligned structure.
4. Verify terminology using `microcopy`/`i18n` guidance.
5. Final pass: remove AI-like filler and tighten sentences.
## Docs Changelog Template (English)
```md
---
title: <Feature title>
description: <One-sentence summary for users>
tags:
- <Tag A>
- <Tag B>
---
# <Feature title>
<Opening paragraph: what changed for users and why it matters.>
<Optional section paragraph for key capability 1.>
<Optional section paragraph for key capability 2.>
## Improvements and fixes
- <Fix or optimization 1>
- <Fix or optimization 2>
```
## Docs Changelog Template (Chinese)
```md
---
title: <功能标题>
description: <一句话说明>
tags:
- <标签 A>
- <标签 B>
---
# <功能标题>
<开场段:这次更新给用户带来的直接变化。>
<可选能力段 1。>
<可选能力段 2。>
## 体验优化与修复
- <优化或修复 1>
- <优化或修复 2>
```
## Quick Checklist
- [ ] File path matches `docs/changelog` naming convention
- [ ] EN and ZH versions both exist and match in facts
- [ ] Opening paragraph explains user-facing outcome
- [ ] Main body is narrative-first, not bullet-only
- [ ] `Improvements and fixes` section is concise and concrete
- [ ] No fabricated claims or unsupported scope
@@ -1,83 +0,0 @@
---
name: heterogeneous-agent
description: Guide for implementing and debugging LobeHub heterogeneous agent integrations such as Claude Code, Codex, and future external CLI agents. Use when working on adapter event mapping, Electron IPC transport, renderer persistence, tool-call chaining, subagent threads, resume/session handling, or regressions like mixed multi-tool messages, broken step boundaries, stuck tool loading, and orphan tool messages. Triggers on 'heterogeneous agent', 'hetero agent', '异构 agent', 'claude code adapter', 'codex adapter', 'external agent CLI', '孤立 tool 消息', 'raw Codex trace', or adapter/executor bugs.
---
# Heterogeneous Agent Development
Use this skill when the bug or feature lives in the external CLI agent pipeline, not the normal server-side agent runtime.
## Use This Skill For
- Adding or changing a driver under `apps/desktop/src/main/modules/heterogeneousAgent/drivers/`
- Editing an adapter under `packages/heterogeneous-agents/src/adapters/`
- Debugging `heteroAgentRawLine` transport, `window.__HETERO_AGENT_TRACE`, or `executeHeterogeneousAgent`
- Fixing Claude Code stream-json bugs such as duplicate partial/full chunks, broken `message.id` boundaries, missing `tool_result`, TodoWrite state drift, or subagent thread routing
- Fixing Codex JSONL bugs such as mixed multi-tool messages, broken turn boundaries, or missing tool-result mapping
- Fixing step-boundary, tool persistence, subagent thread, or resume bugs in Claude Code / Codex flows
- Reproducing multi-tool mixing, orphan tool messages, or stuck tool-result loading
## Pipeline Map
1. CLI raw stdout / JSONL
2. Electron main spawns the CLI and broadcasts `heteroAgentRawLine`
3. Adapter maps raw provider events into `HeterogeneousAgentEvent`
4. `executeHeterogeneousAgent` persists assistant/tool messages and forwards stream events
5. `createGatewayEventHandler` hydrates the UI
6. Only after this path looks correct should you move on to `agent-tracing` or context-engine debugging
## Read These Files First
- `apps/desktop/src/main/controllers/HeterogeneousAgentCtr.ts`
- `apps/desktop/src/main/modules/heterogeneousAgent/drivers/claudeCode.ts`
- `apps/desktop/src/main/modules/heterogeneousAgent/drivers/codex.ts`
- `packages/heterogeneous-agents/src/adapters/claudeCode.ts`
- `packages/heterogeneous-agents/src/adapters/codex.ts`
- `src/store/chat/slices/aiChat/actions/heterogeneousAgentExecutor.ts`
- `src/store/chat/slices/aiChat/actions/__tests__/heterogeneousAgentExecutor.test.ts`
## Default Debug Order
1. Prove whether the raw CLI output is correct before touching UI code.
2. If raw output is correct, compare it with adapter output. In dev, `executeHeterogeneousAgent` exposes `window.__HETERO_AGENT_TRACE`.
3. If adapted events look correct, inspect `persistToolBatch`, `persistToolResult`, step transitions, and subagent routing.
4. Turn the repro into a focused test before fixing.
5. Only after the transport/adapter/executor path looks sound should you debug later-stage message processing.
## Critical Invariants
- One raw tool item must map to one stable `ToolCallPayload.id`.
- A new main-agent step must emit a boundary signal before events are forwarded to the new assistant.
- In Claude Code, multiple assistant events with the same `message.id` are one turn, not multiple turns.
- In Claude Code, `tool_result` lives in `type: 'user'` events, not assistant events.
- In Claude Code partial mode, `message_delta.usage` is authoritative; do not trust echoed usage on every assistant block.
- `persistToolBatch` must pre-register assistant `tools[]` before creating tool messages.
- Every tool message must keep `parentId` equal to the owning assistant and `tool_call_id` equal to the tool id.
- `tool_result` must resolve an existing `toolMsgIdByCallId`.
- Subagent chunks must stay in thread scope and must not be forwarded into the main assistant stream.
- Never clear the global `toolMsgIdByCallId` map at main step boundaries.
## Common Bug Patterns
- Claude Code duplicates text or thinking:
check whether partial deltas and the later full assistant block are both being emitted.
- Claude Code opens too many assistant messages:
check whether the adapter is cutting steps on every assistant event instead of only on `message.id` changes.
- Claude Code tool results never land:
check whether `type: 'user'` `tool_result` blocks are being ignored because the code only inspects assistant events.
- Claude Code TodoWrite cards look stale:
check whether synthesized `pluginState.todos` is being attached at tool-result time.
- Claude Code subagent transcript leaks into the main bubble:
check `parent_tool_use_id` handling and whether subagent chunks are being forwarded to the main gateway handler.
- Multiple Codex tools collapse into one assistant message:
first check whether the adapter emits a usable step boundary such as `newStep` or an equivalent turn-change signal.
- Orphan tool messages:
first check step-transition ordering and whether `persistToolBatch` Phase 1 ran before tool message creation.
- Tool bubble stays loading:
look for `tool_result for unknown toolCallId` and missing `result_msg_id` backfill.
- Subagent tools show up in the main bubble:
check for subagent chunks reaching the main gateway handler.
## References
- For commands, trace capture, invariants, and focused test commands, read [references/debug-workflow.md](./references/debug-workflow.md).
@@ -1,246 +0,0 @@
# Heterogeneous Agent Debug Workflow
## Contents
1. Pipeline map
2. Capture raw CLI traces first
3. Compare raw and adapted events
4. Check step boundaries before persistence
5. Check tool persistence invariants
6. Focused tests
7. Repro-to-fix workflow
## 1. Pipeline Map
```
CLI raw stdout
-> HeterogeneousAgentCtr (Electron main)
-> heteroAgentRawLine broadcast
-> createAdapter(...)
-> executeHeterogeneousAgent(...)
-> persistToolBatch / persistToolResult
-> createGatewayEventHandler(...)
-> UI hydration
```
Start at the leftmost broken layer. Do not jump straight to UI rendering unless raw and adapted events already look correct.
## 2. Capture Raw CLI Traces First
### Codex raw JSONL
Use a read-only prompt and save traces under the repo-local scratch directory `.heerogeneous-tracing/`.
```bash
ts=$(date +%Y%m%d-%H%M%S)
out=".heerogeneous-tracing/codex-${ts}.jsonl"
last=".heerogeneous-tracing/codex-${ts}.last.txt"
cat << 'EOF' | codex exec --json --skip-git-repo-check --sandbox read-only -C "$PWD" -o "$last" - > "$out"
You are being run only to collect a raw Codex JSON event trace.
Do not modify any files.
Use at least 4 separate shell tool invocations, one invocation per command.
Run a short sequence of read-only repo checks and then reply with a one-sentence summary.
EOF
```
What to look for in the JSONL:
- `thread.started`
- `turn.started`
- `item.started` / `item.completed`
- `item.type === 'command_execution'`
- `item.type === 'agent_message'`
- `turn.completed`
If raw Codex already merges tools into one item, the adapter is innocent. If raw Codex emits independent items but UI collapses them, the bug is downstream.
If the repo already contains useful traces under `.heerogeneous-tracing/`, inspect them before reproducing.
### Claude Code raw NDJSON
Mirror the arguments from `apps/desktop/src/main/modules/heterogeneousAgent/drivers/claudeCode.ts`.
- `-p`
- `--input-format stream-json`
- `--output-format stream-json`
- `--verbose`
- `--include-partial-messages`
- `--permission-mode bypassPermissions`
You can capture a local raw trace like this:
```bash
ts=$(date +%Y%m%d-%H%M%S)
out=".heerogeneous-tracing/claude-${ts}.ndjson"
cat << 'EOF' | claude -p \
--input-format stream-json \
--output-format stream-json \
--verbose \
--include-partial-messages \
--permission-mode bypassPermissions \
> "$out"
{"type":"user","message":{"role":"user","content":[{"type":"text","text":"Do a few read-only repo checks, use several tool calls, and then summarize briefly."}]}}
EOF
```
What to look for in Claude Code raw traces:
- `type: 'system', subtype: 'init'`
- `type: 'assistant'` blocks for `thinking`, `tool_use`, and `text`
- `type: 'user'` blocks containing `tool_result`
- `type: 'stream_event'` with `message_start`, `content_block_delta`, and `message_delta`
- `type: 'result'`
- `type: 'rate_limit_event'`
Important Claude Code semantics:
- Each content block often arrives as its own assistant event.
- Multiple assistant events can share the same `message.id`; that is still one turn.
- `message.id` change is the main-step boundary.
- Partial deltas arrive before the later full assistant block.
- `message_delta.usage` is the authoritative per-turn usage.
- Subagent events are tagged with `parent_tool_use_id`.
If the repo already contains useful references, inspect these first:
- `.heerogeneous-tracing/cc-monitor-real-trace.jsonl`
- `.heerogeneous-tracing/cc-stream-chain-reference.md`
If you only need boundary semantics or tool persistence behavior, prefer existing adapter tests under:
- `packages/heterogeneous-agents/src/adapters/claudeCode.test.ts`
- `packages/heterogeneous-agents/src/adapters/claudeCode.e2e.test.ts`
## 3. Compare Raw And Adapted Events
In dev builds, `executeHeterogeneousAgent` stores raw lines plus adapted events on:
- `window.__HETERO_AGENT_TRACE`
Use that trace to compare:
- raw `item.started` / `item.completed`
- adapted `stream_chunk { chunkType: 'tools_calling' }`
- adapted `tool_result`
- adapted `tool_end`
For Codex, the usual mapping is:
- raw `item.started(command_execution)` -> `tools_calling` + `tool_start`
- raw `item.completed(command_execution)` -> `tool_result` + `tool_end`
- raw `item.completed(agent_message)` -> `stream_chunk(text)`
If the raw trace is right but adapted events are wrong, fix the adapter before touching persistence.
## 4. Check Step Boundaries Before Persistence
This is the first thing to verify for "mixed tools in one assistant" bugs.
### Claude Code
Claude Code step boundaries are keyed off assistant `message.id` changes. The adapter should emit:
- `stream_end`
- `stream_start { newStep: true }`
Also verify these Claude-specific invariants:
- the first assistant after init does not open a new step
- repeated assistant events with the same `message.id` do not open a new step
- partial `content_block_delta` text/thinking does not get duplicated by the later full assistant event
- `tool_result` from `type: 'user'` updates the matching tool row
- `parent_tool_use_id` creates thread-scoped subagent chunks instead of main-stream chunks
- TodoWrite `tool_use.input` is converted into synthesized `pluginState.todos` on `tool_result`
Good references:
- `packages/heterogeneous-agents/src/adapters/claudeCode.ts`
- `packages/heterogeneous-agents/src/adapters/claudeCode.test.ts`
### Codex
Codex raw traces usually provide turn-level boundaries through:
- `turn.started`
- `turn.completed`
The executor only cuts a new assistant message when it receives a step-boundary signal it understands. If the adapter emits `stream_start` without `newStep`, multiple Codex tools and text chunks can accumulate under the same assistant longer than intended.
Relevant files:
- `packages/heterogeneous-agents/src/adapters/codex.ts`
- `src/store/chat/slices/aiChat/actions/heterogeneousAgentExecutor.ts`
## 5. Check Tool Persistence Invariants
Read `persistToolBatch` and `persistToolResult` before changing UI code.
### `persistToolBatch`
The expected order is:
1. Pre-register assistant `tools[]`
2. Create `role: 'tool'` messages
3. Backfill `result_msg_id` onto assistant `tools[]`
If tool rows are created before assistant `tools[]` are registered, orphan tool messages are likely.
### `persistToolResult`
`tool_result` must resolve the tool row through `toolMsgIdByCallId`.
Warning signs:
- `tool_result for unknown toolCallId`
- tool rows with empty content forever
- missing `result_msg_id`
For Claude Code, remember that tool results originate from raw `type: 'user'` events.
### Main vs subagent scope
- Main-agent tool state is per-step.
- `toolMsgIdByCallId` is global across main and subagent scopes.
- Subagent chunks must not be forwarded into the main gateway handler.
If subagent events leak to the main handler, the main bubble can inherit the wrong `tools[]` and content.
## 6. Focused Tests
Run the smallest useful test set first.
```bash
bunx vitest run --silent='passed-only' 'packages/heterogeneous-agents/src/adapters/codex.test.ts'
bunx vitest run --silent='passed-only' 'packages/heterogeneous-agents/src/adapters/claudeCode.test.ts'
bunx vitest run --silent='passed-only' 'src/store/chat/slices/aiChat/actions/__tests__/heterogeneousAgentExecutor.test.ts'
```
Especially useful places:
- `packages/heterogeneous-agents/src/adapters/codex.test.ts`
- `packages/heterogeneous-agents/src/adapters/claudeCode.test.ts`
- `src/store/chat/slices/aiChat/actions/__tests__/heterogeneousAgentExecutor.test.ts`
Claude Code-specific assertions worth adding when fixing bugs:
- same `message.id` does not emit `newStep`
- changed `message.id` does emit `stream_end` plus `stream_start { newStep: true }`
- partial text/thinking is emitted once
- `tool_result` from `user` events reaches the right tool row
- subagent chunks carry `subagent.parentToolCallId`
- TodoWrite result synthesizes `pluginState.todos`
When the bug comes from a real trace, distill it into the closest existing test file instead of relying on manual UI-only repros.
## 7. Repro-To-Fix Workflow
1. Capture a raw trace and save it under `.heerogeneous-tracing/`.
2. Confirm whether the bug appears in raw events, adapted events, or persistence.
3. Add or update the narrowest failing test near the broken layer.
4. Fix the smallest layer that can explain the symptom.
5. Re-run focused tests.
6. Only then do an Electron smoke test with the `local-testing` skill if UI confirmation is still needed.
Do not start with a broad Electron repro if a raw trace or adapter test can prove the fault zone faster.
+1 -1
View File
@@ -5,7 +5,7 @@ description: Internationalization guide using react-i18next. Use when adding tra
# LobeHub Internationalization Guide
- Default language: English (en-US)
- Default language: Chinese (zh-CN)
- Framework: react-i18next
- **Only edit files in `src/locales/default/`** - Never edit JSON files in `locales/`
- Run `pnpm i18n` to generate translations (or manually translate zh-CN/en-US for dev preview)
-57
View File
@@ -30,63 +30,6 @@ This is NON-NEGOTIABLE. Skipping Linear comments is a workflow violation.
When creating issues with `mcp__linear-server__create_issue`, **MUST add the `claude code` label**.
## Creating Sub-issue Trees
When breaking a parent issue into a tree of sub-issues (e.g., task decomposition for LOBE-xxx), follow these rules — they work around real limitations of the Linear MCP tools.
### 1. ALWAYS prefix titles with an ordering index
The Linear Sub-issues panel displays children by `sortOrder`, which **defaults to newest-first** (most recently created appears on top). Neither parallel nor serial creation will produce the intended top-to-bottom reading order, and the MCP `save_issue` tool does **not expose a `sortOrder` parameter** — you cannot set order at create time.
**Workaround**: encode execution order in the title itself:
```plaintext
[1] [db] add schema fields
[2] [db] new table + repository
[3] [service] business logic layer
[4] [api] REST endpoints
[4.1] [sdk] client SDK wrapper
[4.1.1] [app] consumer integration
[4.1.2] [app] UI surface
[4.2] [ui] dashboard page
```
Even when the panel shuffles, the reader can mentally reconstruct the dependency graph at a glance. Dotted numbering `[n.m.k]` should mirror the parent-child nesting so the index and the tree agree.
### 2. Nest sub-issues by logical parent-child, not flat under the root
Linear supports **unlimited sub-issue depth**. A flat list of 8+ siblings under one root is hard to scan. Group by main-subordinate logic:
- Core service → its SDK → SDK consumers
- Don't create a sibling when a child is more accurate
Use `parentId: "LOBE-xxxx"` at creation (or `save_issue` to move). Moving an issue's parent does not disturb its `blockedBy` relations.
### 3. Sub-issue creation order is dictated by `blockedBy`
`blockedBy` requires the blocker to exist first (you need its LOBE-id). So:
1. **Topologically sort** the DAG — leaves (no deps) first, roots last
2. Create issues with zero deps in the first wave
3. Create dependent issues only after collecting the blocker IDs from prior responses
4. `blockedBy` is **append-only**; passing it again does not overwrite — safe to re-run
### 4. Don't waste rounds trying to parallelize
MCP tool calls in a single message look parallel but execute sequentially on the server, and you still need blocker IDs from earlier responses. Just issue calls in dependency order; optimizing for parallelism gains nothing here.
### 5. Keep each sub-issue description self-contained
Each sub-issue should state:
- Goal (12 lines)
- Key files to touch
- Concrete changes / acceptance criteria
- Dependencies (link to blocker issues by `LOBE-xxxx`)
- Validation steps
The implementer may open only the sub-issue, not the parent — don't rely on context that lives only in the parent description.
## Completion Comment Format
Every completed issue MUST have a comment summarizing work done:
-4
View File
@@ -173,10 +173,6 @@ agent-browser state save auth.json
agent-browser state load auth.json
```
### LobeHub dev server — inject better-auth cookie
`agent-browser --headed` on macOS can create an off-screen Chromium window, blocking manual login. For a local LobeHub dev server (e.g. `localhost:3011`), copy the `better-auth.session_token` cookie out of a **Network request** in the user's own Chrome DevTools and load it via `state load`. See [references/agent-browser-login.md](./references/agent-browser-login.md) for the full recipe.
## Semantic Locators (Alternative to Refs)
```bash
@@ -1,110 +0,0 @@
# Log `agent-browser` into a local LobeHub dev server
`agent-browser --headed` on macOS often creates the Chromium window off-screen — the user can't see or interact with it, so manual login inside the agent-browser session fails. Instead of sharing the user's real Chrome profile, copy the **better-auth session cookie** out of a request in DevTools and inject it into the agent-browser session as a Playwright-style state file.
## When to use
- You need `agent-browser` to reach an authenticated page on `http://localhost:<port>` (e.g. `localhost:3011`).
- The user already has a logged-in tab of the same dev server in their own Chrome.
- Spawning a headed Chromium to let the user log in manually is unreliable (window off-screen, no interaction).
Do **not** use this on production URLs — only local dev. Treat the cookie as a secret: don't paste it into shared logs, PRs, or commit it anywhere.
## Step 1 — Ask the user to copy the cookie from a Network request, NOT `document.cookie`
`document.cookie` will not return HttpOnly cookies, which is exactly where better-auth puts its session. Instruct the user:
1. Open the logged-in tab (`http://localhost:<port>/…`) in their own Chrome.
2. `Cmd+Option+I`**Network** tab.
3. Refresh, click any same-origin request (e.g. the top-level document request).
4. In the right pane under **Request Headers**, right-click the `Cookie:` line → **Copy value** (or copy the entire header).
5. Paste the string into chat.
You only need the better-auth pieces. Everything else (Clerk, `LOBE_LOCALE`, HMR hash, theme vars) is noise and can stay. The minimum viable set is:
```
better-auth.session_token=<value>; better-auth.state=<value>
```
## Step 2 — Build a Playwright-style state file
`agent-browser state load` expects Playwright's `storageState` format: a JSON with a `cookies` array and an `origins` array.
```bash
cat > /tmp/mkstate.py << 'PY'
import json, sys, time
# Read the Cookie header from stdin (allows optional "Cookie: " prefix).
raw = sys.stdin.read().strip()
if raw.lower().startswith("cookie:"):
raw = raw.split(":", 1)[1].strip()
# Keep only better-auth cookies. Extend this set if the app genuinely needs more.
WANTED = {"better-auth.session_token", "better-auth.state"}
cookies = []
exp = int(time.time()) + 30 * 24 * 3600 # 30 days
for pair in raw.split("; "):
if "=" not in pair:
continue
name, _, value = pair.partition("=")
if name not in WANTED:
continue
cookies.append({
"name": name,
"value": value,
"domain": "localhost",
"path": "/",
"expires": exp,
"httpOnly": False,
"secure": False,
"sameSite": "Lax",
})
if not cookies:
sys.stderr.write("no better-auth cookies found in input\n")
sys.exit(1)
print(json.dumps({"cookies": cookies, "origins": []}, indent=2))
PY
# Feed the copied Cookie header in via env var or heredoc.
printf '%s' "$COOKIE_HEADER" | python3 /tmp/mkstate.py > /tmp/state.json
```
**Note on `httpOnly`**: the real cookie in the user's browser is HttpOnly, but `storageState` doesn't enforce the flag on load — it just attaches the value. Storing with `httpOnly: false` is fine for local dev and sidesteps a CDP-context quirk where HttpOnly cookies sometimes fail to attach.
## Step 3 — Load state and navigate
```bash
SESSION="my-test" # any stable session name
agent-browser --session "$SESSION" state load /tmp/state.json
agent-browser --session "$SESSION" open "http://localhost:3011/"
agent-browser --session "$SESSION" get url
# Expect NOT /signin?callbackUrl=… — if you still see signin, cookie didn't apply.
```
## Step 4 — Verify
```bash
agent-browser --session "$SESSION" snapshot -i | head -20
# Look for the user's avatar/name in the sidebar, or absence of the signin form.
```
## Common failure modes
| Symptom | Cause | Fix |
| ----------------------------------------------- | ----------------------------------------------------------------------- | ---------------------------------------------------- |
| Still redirects to `/signin` after `state load` | User pasted from `document.cookie` → missed HttpOnly session | Re-pull from Network request Headers, not console |
| `state load` reports 0 cookies | Separator wrong, or user pasted URL-decoded value | Keep the raw `Cookie:` header as-is; split on `"; "` |
| Login works briefly then expires | `better-auth.session_token` rotated (user logged out / signed in again) | Re-copy and re-load |
| Domain mismatch | Use `domain: "localhost"` literally, no leading dot for local dev | — |
## Scope
Only covers authenticating an **agent-browser** session into a **local** LobeHub dev server. It does not:
- Work for production — production cookies are `Secure; HttpOnly; Domain=.lobehub.com` and must be delivered over HTTPS.
- Replace real OAuth flows — tests that must exercise the login UI need a real Chromium with `--remote-debugging-port` or a bot account.
- Flow cookies back to the user's Chrome — injection is one-way (into agent-browser only).
+36 -73
View File
@@ -1,76 +1,64 @@
---
name: modal
description: MUST use when creating, editing, or writing modal dialogs or imperative modals. Prefer createModal / useModalContext / confirmModal from @lobehub/ui/base-ui; root @lobehub/ui is legacy (antd Modal). Covers patterns, ModalHost, and migration notes.
description: Modal imperative API guide. Use when creating modal dialogs using createModal from @lobehub/ui. Triggers on modal component implementation or dialog creation tasks.
user-invocable: false
---
# Modal Imperative API Guide
## Recommended: `@lobehub/ui/base-ui`
Use `createModal` from `@lobehub/ui` for imperative modal dialogs.
New code should use the **base-ui** modal stack (headless primitives, not antd `Modal`):
## Why Imperative?
- `createModal`, `confirmModal`, `ModalHost` from `@lobehub/ui/base-ui`
- `useModalContext` from `@lobehub/ui/base-ui` inside modal **content**
| Mode | Characteristics | Recommended |
| ----------- | ------------------------------------- | ----------- |
| Declarative | Need `open` state, render `<Modal />` | ❌ |
| Imperative | Call function directly, no state | ✅ |
Body slot: pass **`content`** (or `children`; runtime uses `content ?? children`).
### Global `ModalHost` (required)
Base-ui `createModal` renders through a **separate** host from the root package. The app must mount **`ModalHost`** from `@lobehub/ui/base-ui` once near the root (e.g. next to other global hosts). Without it, `createModal` calls will not appear.
If the project only mounts `ModalHost` from `@lobehub/ui`, add a second lazy `ModalHost` from `@lobehub/ui/base-ui` until all imperative modals are migrated.
### Why imperative?
| Mode | Characteristics | Recommended |
| ----------- | ------------------------------------ | ----------- |
| Declarative | `open` state + `<Modal />` | ❌ |
| Imperative | Call `createModal()`, no local state | ✅ |
### File structure
## File Structure
```
features/
└── MyFeatureModal/
├── index.tsx # export createXxxModal
└── MyFeatureContent.tsx # modal body
├── index.tsx # Export createXxxModal
└── MyFeatureContent.tsx # Modal content
```
### 1. Content (`MyFeatureContent.tsx`)
## Implementation
### 1. Content Component (`MyFeatureContent.tsx`)
```tsx
'use client';
import { useModalContext } from '@lobehub/ui/base-ui';
import { useModalContext } from '@lobehub/ui';
import { useTranslation } from 'react-i18next';
export const MyFeatureContent = () => {
const { t } = useTranslation('namespace');
const { close } = useModalContext();
const { close } = useModalContext(); // Optional: get close method
return <div>{/* ... */}</div>;
return <div>{/* Modal content */}</div>;
};
```
### 2. `createModal` (`index.tsx`)
### 2. Export createModal (`index.tsx`)
```tsx
'use client';
import { createModal } from '@lobehub/ui/base-ui';
import { t } from 'i18next';
import { createModal } from '@lobehub/ui';
import { t } from 'i18next'; // Note: use i18next, not react-i18next
import { MyFeatureContent } from './MyFeatureContent';
export const createMyFeatureModal = () =>
createModal({
content: <MyFeatureContent />,
allowFullscreen: true,
children: <MyFeatureContent />,
destroyOnHidden: false,
footer: null,
maskClosable: true,
styles: {
content: { overflow: 'hidden', padding: 0 },
},
styles: { body: { overflow: 'hidden', padding: 0 } },
title: t('myFeature.title', { ns: 'setting' }),
width: 'min(80%, 800px)',
});
@@ -88,52 +76,27 @@ const handleOpen = useCallback(() => {
return <Button onClick={handleOpen}>Open</Button>;
```
### i18n
## i18n Handling
- **Content**: `useTranslation` in components.
- **`createModal` options**: `import { t } from 'i18next'` where hooks are unavailable.
- **Content component**: `useTranslation` hook (React context)
- **createModal params**: `import { t } from 'i18next'` (non-hook, imperative)
### `useModalContext`
## useModalContext Hook
```tsx
const { close, setCanDismissByClickOutside } = useModalContext();
```
### Common options (base-ui)
## Common Config
`ImperativeModalProps` builds on `BaseModalProps`: `title`, `width`, `maskClosable`, `open`, `onOpenChange`, `footer`, `styles` / `classNames` (keys: `backdrop`, `popup`, `header`, `title`, `close`, `content`, …).
| Property | Notes |
| -------------- | ---------------------------------------- |
| `content` | Main body (preferred name vs `children`) |
| `maskClosable` | Click outside to dismiss |
| `styles.*` | Semantic regions, not antd `styles.body` |
### Confirm
```tsx
import { confirmModal } from '@lobehub/ui/base-ui';
confirmModal({
title: '…',
content: '…',
okText: '…',
cancelText: '…',
onOk: async () => {},
});
```
---
## Legacy: `@lobehub/ui` (root)
Older call sites use **`createModal` from `@lobehub/ui`**, which is typed as **antd `Modal` props** (`children`, `allowFullscreen`, `getContainer`, `destroyOnHidden`, `styles.body`, etc.). Prefer migrating new work to **`@lobehub/ui/base-ui`**.
Examples (legacy): `src/features/SkillStore/index.tsx`, `src/features/LibraryModal/CreateNew/index.tsx`.
---
| Property | Type | Description |
| ----------------- | ------------------- | ------------------------ |
| `allowFullscreen` | `boolean` | Allow fullscreen mode |
| `destroyOnHidden` | `boolean` | Destroy content on close |
| `footer` | `ReactNode \| null` | Footer content |
| `width` | `string \| number` | Modal width |
## Examples
- Base-ui (preferred): follow sections above; ensure **base-ui `ModalHost`** is mounted.
- Legacy: `src/features/SkillStore/index.tsx`, `src/features/LibraryModal/CreateNew/index.tsx`
- `src/features/SkillStore/index.tsx`
- `src/features/LibraryModal/CreateNew/index.tsx`
+1 -1
View File
@@ -67,7 +67,7 @@ import { dynamicElement, redirectElement, ErrorBoundary } from '@/utils/router';
element: dynamicElement(() => import('./chat'), 'Desktop > Chat');
element: redirectElement('/settings/profile');
errorElement: <ErrorBoundary />;
errorElement: <ErrorBoundary resetPath="/chat" />;
```
### Navigation
+44 -203
View File
@@ -1,27 +1,10 @@
---
name: version-release
description: "Version release workflow. Use when the user mentions 'release', 'hotfix', 'version upgrade', 'weekly release', or '发版'/'发布'/'小班车'. This skill is for release process and GitHub Release notes (not docs/changelog page writing)."
description: "Version release workflow. Use when the user mentions 'release', 'hotfix', 'version upgrade', 'weekly release', or '发版'/'发布'/'小班车'. Provides guides for Minor Release and Patch Release workflows."
---
# Version Release Workflow
## Scope Boundary (Important)
This skill is only for:
1. Release branch / PR workflow
2. CI trigger constraints (`auto-tag-release.yml`)
3. GitHub Release note writing
This skill is **not** for writing `docs/changelog/*.mdx`.\
If the user asks for website changelog pages, load `../docs-changelog/SKILL.md`.
## Mandatory Companion Skill
For every `/version-release` execution, you MUST load and apply:
- `../microcopy/SKILL.md`
## Overview
The primary development branch is **canary**. All day-to-day development happens on canary. When releasing, canary is merged into main. After merge, `auto-tag-release.yml` automatically handles tagging, version bumping, creating a GitHub Release, and syncing back to the canary branch.
@@ -35,7 +18,7 @@ Only two release types are used in practice (major releases are extremely rare a
## Minor Release Workflow
Used to publish a new minor version (e.g. `v2.2.0`), roughly every 4 weeks.
Used to publish a new minor version (e.g. v2.2.0), roughly every 4 weeks.
### Steps
@@ -48,7 +31,7 @@ git checkout -b release/v{version}
git push -u origin release/v{version}
```
2. **Determine the version number** — Read the current version from `package.json` and compute the next minor version (e.g. 2.1.x -> 2.2.0)
2. **Determine the version number** — Read the current version from `package.json` and compute the next minor version (e.g. 2.1.x 2.2.0)
3. **Create a PR to main**
@@ -60,10 +43,9 @@ gh pr create \
--body "## 📦 Release v{version} ..."
```
> \[!IMPORTANT]
> The PR title must strictly match the `🚀 release: v{x.y.z}` format. CI uses a regex on this title to determine the exact version number.
> \[!IMPORTANT]: The PR title must strictly match the `🚀 release: v{x.y.z}` format. CI uses a regex on this title to determine the exact version number.
4. **Automatic trigger after merge**: `auto-tag-release` detects the title format and uses the version number from the title to complete the release.
4. **Automatic trigger after merge**: auto-tag-release detects the title format and uses the version number from the title to complete the release.
### Scripts
@@ -78,7 +60,7 @@ Version number is automatically bumped by patch +1. There are 4 common scenarios
| Scenario | Source Branch | Branch Naming | Description |
| ------------------- | ------------- | ----------------------------- | ------------------------------------------------ |
| Weekly Release | canary | `release/weekly-{YYYYMMDD}` | Weekly release train, canary -> main |
| Weekly Release | canary | `release/weekly-{YYYYMMDD}` | Weekly release train, canary main |
| Bug Hotfix | main | `hotfix/v{version}-{hash}` | Emergency bug fix |
| New Model Launch | canary | Community PR merged directly | New model launch, triggered by PR title prefix |
| DB Schema Migration | main | `release/db-migration-{name}` | Database migration, requires dedicated changelog |
@@ -91,19 +73,19 @@ All scenarios auto-bump patch +1. Patch PR titles do not need a version number.
bun run hotfix:branch # Hotfix scenario
```
## Auto-Release Trigger Rules (`auto-tag-release.yml`)
## Auto-Release Trigger Rules (auto-tag-release.yml)
After a PR is merged into main, CI determines whether to release based on the following priority:
### 1. Minor Release (Exact Version)
PR title matches `🚀 release: v{x.y.z}` -> uses the version number from the title.
PR title matches `🚀 release: v{x.y.z}` uses the version number from the title.
### 2. Patch Release (Auto patch +1)
Triggered by the following priority:
- **Branch name match**: `hotfix/*` or `release/*` -> triggers directly (skips title detection)
- **Branch name match**: `hotfix/*` or `release/*` triggers directly (skips title detection)
- **Title prefix match**: PRs with the following title prefixes will trigger:
- `style` / `💄 style`
- `feat` / `✨ feat`
@@ -114,205 +96,64 @@ Triggered by the following priority:
### 3. No Trigger
PRs that don't match any conditions above (e.g. `docs`, `chore`, `ci`, `test`) will not trigger a release when merged into main.
PRs that don't match any of the above conditions (e.g. `docs`, `chore`, `ci`, `test` prefixes) will not trigger a release when merged into main.
## Post-Release Automated Actions
1. **Bump `package.json`** — commits `🔖 chore(release): release version v{x.y.z} [skip ci]`
1. **Bump package.json** — commits `🔖 chore(release): release version v{x.y.z} [skip ci]`
2. **Create annotated tag**`v{x.y.z}`
3. **Create GitHub Release**
4. **Dispatch `sync-main-to-canary`** — syncs main back to canary
4. **Dispatch sync-main-to-canary** — syncs main back to the canary branch
## Agent Action Guide
## Claude Action Guide
When the user requests a release:
### Minor Release
1. Read `package.json` to get the current version and compute the next minor version
2. Create a `release/v{version}` branch from canary
3. Push and create a PR — **title must be `🚀 release: v{version}`**
4. Inform the user that merging the PR will automatically trigger the release
### Precheck
Before creating the release branch, verify the source branch:
- **Weekly Release** (`release/weekly-*`): must branch from `canary`
- **All other release/hotfix branches**: must branch from `main`; run `git merge-base --is-ancestor main <branch> && echo OK`
- If the branch is based on the wrong source, recreate from the correct base
### Minor Release
1. Read `package.json` to get the current version and compute the next minor version
2. Create a `release/v{version}` branch from canary
3. Push and create PR — **title must be `🚀 release: v{version}`**
4. Inform the user that merge will auto-trigger release
- **All other release/hotfix branches**: must branch from `main` run `git merge-base --is-ancestor main <branch> && echo OK` to confirm
- If the branch is based on the wrong source, delete and recreate from the correct base
### Patch Release
Choose workflow by scenario (see `reference/patch-release-scenarios.md`):
Choose the appropriate workflow based on the scenario (see `reference/patch-release-scenarios.md`):
- **Weekly Release**: create `release/weekly-{YYYYMMDD}` from canary; use `git log main..canary` for release note inputs; title like `🚀 release: 20260222`
- **Bug Hotfix**: create `hotfix/` from main; use gitmoji prefix title (e.g. `🐛 fix: ...`)
- **New Model Launch**: community PRs trigger automatically via title prefix (`feat` / `style`)
- **DB Migration**: create `release/db-migration-{name}` from main; cherry-pick migration commits; include dedicated migration notes
- **Weekly Release**: Create a `release/weekly-{YYYYMMDD}` branch from canary, scan `git log main..canary` to write the changelog, title like `🚀 release: 20260222`
- **Bug Hotfix**: Create a `hotfix/` branch from main, use a gitmoji prefix title (e.g. `🐛 fix: ...`)
- **New Model Launch**: Community PRs trigger automatically via title prefix (`feat` / `style`), no extra steps needed
- **DB Migration**: Create a `release/db-migration-{name}` branch from main, cherry-pick migration commits, write a dedicated migration changelog
### Hard Rules
### Important Notes
- **Do NOT** manually modify `package.json` version
- **Do NOT** manually create tags
- Minor PR title format is strict
- Patch PRs do not need explicit version number
- Keep release facts accurate; do not invent metrics or availability statements
- **Do NOT manually modify the version in package.json** — CI will auto-bump it
- **Do NOT manually create tags** — CI will create them automatically
- The Minor Release PR title format is a hard requirement — incorrect format will not use the specified version number
- Patch PRs do not need a version number — CI auto-bumps patch +1
- All release PRs must include a user-facing changelog
## GitHub Release Changelog Standard (Long-Form Style)
## Changelog Writing Guidelines
Use this section for writing **GitHub Release notes** (or release PR body when the PR body is intended to become release notes).\
Do not use this as `docs/changelog` page guidance.
All release PR bodies (both Minor and Patch) must include a user-facing changelog. Scan changes via `git log main..canary --oneline` or `git diff main...canary --stat`, then write following the format below.
### Positioning
### Format Reference
This release-note style is:
- Weekly Release: See `reference/changelog-example/weekly-release.md`
- DB Migration: See `reference/changelog-example/db-migration.md`
1. **Data-backed at the top** (date, range, key metrics)
2. **Narrative first, then structured detail**
3. **Deep but scannable** (clear sectioning + compact bullets)
4. **Contributor-forward** (credits are part of the release story)
### Writing Tips
### Required Inputs Before Writing
Collect these inputs first:
1. Compare range (`<prev_tag>...<current_tag>`)
2. Release metrics (commits, merged PRs, resolved issues, contributors, optional files/insertions/deletions)
3. High-impact changes by domain (core loop, platform/gateway, UX, tooling, security, reliability)
4. Contributor list (with standout contributions if known)
5. Known risks / migrations / rollout notes (if any)
If metrics cannot be reliably computed, omit unknown numbers instead of guessing.
### Canonical Structure
Follow this section order unless the user asks otherwise:
1. `# 🚀 LobeHub v<x.y.z> (<YYYYMMDD>)`
2. Metadata lines:
- `Release Date`
- `Since <Previous Version>` metrics
3. One quoted release thesis (single paragraph, 1-2 lines)
4. `## ✨ Highlights` (6-12 bullets for major releases; 3-8 for weekly)
5. Domain blocks with optional `###` subsections:
- `## 🏗️ Core Agent & Architecture` (or equivalent product core)
- `## 📱 Platforms / Integrations`
- `## 🖥️ CLI & User Experience`
- `## 🔧 Tooling`
- `## 🔒 Security & Reliability`
- `## 📚 Documentation` (optional if meaningful)
6. `## 👥 Contributors`
7. `**Full Changelog**: <prev>...<current>`
Use `---` separators between major blocks for long releases.
### Writing Rules (Hard)
1. **No fabricated metrics**: all numbers must be traceable.
2. **No vague headline bullets**: each bullet must include capability + impact.
3. **No internal-only framing**: phrase from user/operator perspective.
4. **Security must be explicit** when security-sensitive fixes are present.
5. **PR/issue linkage**: use `(#1234)` when IDs are available.
6. **Terminology consistency**: same feature/provider name across sections.
7. **Do not bury migration or breaking changes**: elevate to dedicated section or callout.
### Style Rules (Long-Form)
1. Start with an "everyday use" framing, not implementation internals.
2. Mix narrative sentence + evidence bullets.
3. Keep bullets compact but informative:
- Good: `**Fast Mode (`/fast`)** — Priority routing for OpenAI and Anthropic, reducing latency on supported models. (#6875, #6960)`
4. Use bold only for capability names, not for whole sentences.
5. Keep heading depth <= 3 levels.
### Release Size Heuristics
- **Minor / major milestone release**
- Include full structure with multiple domain blocks.
- `Highlights` usually 8-12 bullets.
- **Weekly patch release**
- Keep full skeleton but reduce subsection count.
- `Highlights` usually 4-8 bullets.
- **DB migration release**
- Keep concise.
- Must include `Migration overview`, operator impact, and rollback/backup note.
### GitHub Release Changelog Template
```md
# 🚀 LobeHub v<x.y.z> (<YYYYMMDD>)
**Release Date:** <Month DD, YYYY>
**Since <Previous Version>:** <N commits> · <N merged PRs> · <N resolved issues> · <N contributors>
> <One release thesis sentence: what this release unlocks in practice.>
---
## ✨ Highlights
- **<Capability A>** — <What changed and why it matters>. (#1234)
- **<Capability B>** — <What changed and why it matters>. (#2345)
- **<Capability C>** — <What changed and why it matters>. (#3456)
---
## 🏗️ Core Product & Architecture
### <Subdomain>
- <Concrete change + impact>. (#...)
- <Concrete change + impact>. (#...)
---
## 📱 Platforms / Integrations
- <Platform update + impact>. (#...)
- <Compatibility/reliability fix + impact>. (#...)
---
## 🖥️ CLI & User Experience
- <User-facing workflow improvement>. (#...)
- <Quality-of-life fix>. (#...)
---
## 🔧 Tooling
- <Tool/runtime improvement>. (#...)
---
## 🔒 Security & Reliability
- **Security:** <hardening or vulnerability fix>. (#...)
- **Reliability:** <stability/performance behavior improvement>. (#...)
---
## 👥 Contributors
**<N merged PRs>** from **<N contributors>** across **<N commits>**.
### Community Contributors
- @<username> - <notable contribution area>
- @<username> - <notable contribution area>
---
**Full Changelog**: <previous_tag>...<current_tag>
```
### Quick Checklist
- [ ] Uses top metadata and a clear release thesis
- [ ] Includes `Highlights` plus domain-grouped sections
- [ ] Every major bullet states both change and user/operator impact
- [ ] Security and reliability updates are explicitly surfaced (when present)
- [ ] Contributor credits and compare range are included
- [ ] All numbers and claims are verifiable
- **User-facing**: Describe changes that users can perceive, not internal implementation details
- **Clear categories**: Group by features, models/providers, desktop, stability/fixes, etc.
- **Highlight key items**: Use `**bold**` for important feature names
- **Credit contributors**: Collect all committers via `git log` and list alphabetically
- **Flexible categories**: Choose categories based on actual changes — no need to force-fit all categories
@@ -1,60 +1,20 @@
# 🚀 LobeHub v2.1.50 (20260416)
# DB Schema Migration Changelog Example
**Release Date:** April 20, 2026\
**Migration Scope:** Agent benchmark data model bootstrap (5 new tables, 2 new indexes)
> This release introduces a schema foundation for benchmark execution and reporting, so agent evaluation data is stored as a complete lifecycle instead of fragmented records.
A changelog reference for database migration release PR bodies.
---
## ✨ Highlights
This release includes a **database schema migration** involving **5 new tables** for the Agent Evaluation Benchmark system.
- **Benchmark Lifecycle Schema** — Added a relational model that tracks benchmark setup, runs, per-topic execution, and record outputs end-to-end.
- **Queryability Upgrade** — Added indexes for run status and benchmark-topic joins, improving operational queries in dashboard and debugging workflows.
- **Safer Operator Rollout** — Migration is startup-driven and backward-compatible with existing non-benchmark chat workflows.
### Migration: Add Agent Evaluation Benchmark Tables
---
- Added 5 new tables: `agent_eval_benchmarks`, `agent_eval_datasets`, `agent_eval_records`, `agent_eval_runs`, `agent_eval_run_topics`
## 🗄️ Migration Overview
### Notes for Self-hosted Users
Added tables:
- The migration runs automatically on application startup
- No manual intervention required
- `agent_eval_benchmarks`
- `agent_eval_datasets`
- `agent_eval_runs`
- `agent_eval_run_topics`
- `agent_eval_records`
The migration owner: @{pr-author} — responsible for this database schema change, reach out for any migration-related issues.
Added indexes:
- `idx_agent_eval_runs_status_created_at`
- `idx_agent_eval_run_topics_run_id_topic_id`
These additions close a previous gap where benchmark data existed in partial forms but lacked a stable relational backbone for auditing and historical analysis.
---
## ⚙️ Operator Notes
- Migration runs automatically on application startup.
- No manual SQL is required in standard deployment paths.
- Schedule rollout in a low-traffic window and take a backup snapshot before deployment.
- If migration fails, do not retry repeatedly; inspect migration logs and lock state first.
---
## 🔒 Reliability & Risk
- Existing chat/session paths are unaffected unless benchmark features are enabled.
- Migration is additive (new tables/indexes only), minimizing downgrade risk to existing entities.
- Rollback should follow your standard DB restore or migration rollback policy if your environment requires strict reversibility.
---
## 👥 Owner
Migration owner: @{pr-author}
The migration owner is responsible for rollout follow-up and incident handling for this schema change.
> **Note for Claude**: Replace `{pr-author}` with the actual PR author. Retrieve via `gh pr view <number> --json author --jq '.author.login'` or from commit metadata. Do not hardcode a username.
> **Note for Claude**: Replace `{pr-author}` with the actual PR author. Retrieve via `gh pr view <number> --json author --jq '.author.login'` or `git log` commit author. Do NOT hardcode a username.
@@ -1,80 +1,46 @@
# 🚀 LobeHub v2.1.50 (20260420)
# Patch Release (Weekly) Changelog Example
**Release Date:** April 20, 2026\
**Since v2026.04.13:** 96 commits · 58 merged PRs · 31 resolved issues · 17 contributors
> This weekly release focuses on reducing friction in everyday agent work: faster model routing, smoother gateway behavior, stronger task continuity, and clearer operator diagnostics when something goes wrong.
A real-world changelog reference for weekly patch release PR bodies.
---
## ✨ Highlights
This release includes **82 commits** , Key updates are below.
- **Gateway Session Recovery** — Agent sessions now recover more reliably after short network interruptions, so long-running tasks continue with less manual retry. (#10121, #10133)
- **Fast Model Routing** — Expanded low-latency routing for priority model tiers, reducing wait time in high-frequency generation workflows. (#10102, #10117)
- **Agent Task Workspace** — Running tasks now remain isolated from main chat state, which keeps primary conversations cleaner while background work progresses. (#10088)
- **Provider Coverage Update** — Added support for new model variants across OpenAI-compatible and regional providers, improving fallback options in production. (#10094, #10109)
- **Desktop Attachment Flow** — File and screenshot attachment behavior is more predictable in desktop sessions, especially for mixed text + media prompts. (#10073)
- **Security Hardening Pass** — Closed multiple input validation gaps in webhook and file-path handling paths. (#10141, #10152)
### New Features and Enhancements
---
- Added **Agent Benchmark** support for more systematic agent performance evaluation.
- Introduced the **video generation** feature end-to-end, including entry points, sidebar "new" badge support, and skeleton loading for topic switching.
- Expanded memory capabilities: support for memory effort/tool permission configuration and improved timeout calculation for memory analysis tasks.
- Added desktop editor support for image upload via file picker.
## 🏗️ Core Agent & Architecture
### Models and Provider Expansion
### Agent loop and context handling
- Added a new provider: **Straico**.
- Added/updated support for:
- Claude Sonnet 4.6
- Gemini 3.1 Pro Preview
- Qwen3.5 series
- Grok Imagine (`grok-imagine-image`)
- MiniMax 2.5
- Added related i18n copy and model parameter adaptations.
- Improved context compaction thresholds to reduce mid-task exits under tight token budgets. (#10079)
- Added better diagnostics for tool-call truncation and recovery behavior during streamed responses. (#10106)
- Refined delegate task activity propagation to improve parent-child task status consistency. (#10098)
### Desktop Improvements
### Provider and model behavior
- Integrated `electron-liquid-glass` (macOS Tahoe).
- Improved DMG background assets and desktop release workflow.
- Unified provider-side timeout handling in fallback chains to reduce false failure classification. (#10097)
- Updated reasoning-model defaults and response normalization for better cross-provider consistency. (#10109)
### Stability, Security, and UX Fixes
---
- Fixed multiple video generation pipeline issues: precharge refund handling, webhook token verification, pricing parameter usage, asset cleanup, and type safety.
- Fixed `sanitizeFileName` path traversal risks and added unit tests.
- Fixed MCP media URL generation with duplicated `APP_URL` prefix.
- Fixed Qwen3 embedding failures caused by batch-size limits.
- Fixed multiple UI/interaction issues, including mobile header agent selector/topic count, ChatInput scrolling behavior, and tooltip stacking context.
- Fixed missing `@napi-rs/canvas` native bindings in Docker standalone builds.
- Improved GitHub Copilot authentication retry behavior and response error handling in edge cases.
## 📱 Gateway & Platform Integrations
### Credits
- Gateway now drains in-flight events more safely before restart, reducing duplicate notification bursts. (#10125)
- Discord and Slack adapters received retry/backoff tuning for unstable webhook windows. (#10091, #10119)
- WeCom callback-mode message state persistence now uses safer atomic updates. (#10114)
Huge thanks to these contributors (alphabetical):
---
## 🖥️ CLI & User Experience
- Improved slash command discoverability in CLI and gateway contexts with clearer hint messages. (#10086)
- `/model` switching feedback now returns clearer success/failure states in cross-platform chats. (#10108)
- Setup flow now warns earlier about missing provider credentials in first-run scenarios. (#10115)
---
## 🔧 Tooling
- MCP registration flow now validates duplicate tool names before activation, reducing runtime conflicts. (#10093)
- Browser tooling improved stale-session cleanup to prevent orphaned local resources. (#10112)
---
## 🔒 Security & Reliability
- **Security:** Hardened path sanitization for uploaded assets and webhook callback validation. (#10141, #10152)
- **Reliability:** Reduced empty-response retry storms by refining retry-classification conditions. (#10130)
- **Reliability:** Improved timeout defaults for long-running background processes in constrained environments. (#10122)
---
## 👥 Contributors
**58 merged PRs** from **17 contributors** across **96 commits**.
### Community Contributors
- @alice-example - Gateway recovery and retry improvements
- @bob-example - Provider fallback normalization
- @charlie-example - Desktop media attachment flow
- @dora-example - Webhook validation hardening
---
**Full Changelog**: v2026.04.13...v2026.04.20
@AmAzing129 @Coooolfan @Innei @ONLY-yours @Zhouguanyang @arvinxx @eaten-cake @hezhijie0327 @nekomeowww @rdmclin2 @rivertwilight @sxjeru @tjx666
-5
View File
@@ -136,11 +136,6 @@ OPENAI_API_KEY=sk-xxxxxxxxx
# MOONSHOT_API_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
# ## Kimi Code Plan ####
# KIMICODINGPLAN_PROXY_URL=https://api.kimi.com/coding
# KIMICODINGPLAN_API_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
# ## Minimax AI ####
# MINIMAX_API_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+21 -61
View File
@@ -1,7 +1,7 @@
name: Release ModelBank
permissions:
contents: read
contents: write
id-token: write
on:
@@ -41,12 +41,15 @@ jobs:
publish:
name: Publish ModelBank
if: ${{ github.event_name == 'workflow_dispatch' }}
needs: build
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v6
with:
token: ${{ secrets.GITHUB_TOKEN }}
- name: Setup Node.js
uses: actions/setup-node@v6
@@ -60,70 +63,27 @@ jobs:
- name: Install dependencies
run: pnpm install
- name: Bump patch version
id: version
run: |
npm version patch --no-git-tag-version --prefix packages/model-bank
echo "version=$(node -p 'require(\"./packages/model-bank/package.json\").version')" >> "$GITHUB_OUTPUT"
- name: Build package
run: pnpm --filter model-bank build
- name: Prepare publish package
id: version
run: |
BASE_VERSION=$(node -p "require('./packages/model-bank/package.json').version.split('.').slice(0, 2).join('.')")
MODEL_BANK_VERSION="${BASE_VERSION}.$(date -u +%Y%m%d%H%M%S)"
export MODEL_BANK_VERSION
node <<'NODE'
const fs = require('node:fs');
const packagePath = 'packages/model-bank/package.json';
const packageJson = JSON.parse(fs.readFileSync(packagePath, 'utf8'));
const toDistExport = (sourcePath) => sourcePath.replace('./src/', './dist/').replace(/\.ts$/, '.mjs');
packageJson.version = process.env.MODEL_BANK_VERSION;
packageJson.type = 'module';
packageJson.main = './dist/index.mjs';
packageJson.types = './dist/index.d.mts';
packageJson.files = ['dist'];
packageJson.repository = {
type: 'git',
url: 'https://github.com/lobehub/lobehub',
directory: 'packages/model-bank',
};
packageJson.exports = Object.fromEntries(
Object.entries(packageJson.exports).map(([key, value]) => {
if (typeof value !== 'string') return [key, value];
const distPath = toDistExport(value);
return [
key,
{
types: distPath.replace(/\.mjs$/, '.d.mts'),
import: distPath,
default: distPath,
},
];
}),
);
delete packageJson.private;
delete packageJson.devDependencies;
delete packageJson.scripts;
if (packageJson.dependencies) {
delete packageJson.dependencies['@lobechat/business-const'];
if (Object.keys(packageJson.dependencies).length === 0) {
delete packageJson.dependencies;
}
}
fs.writeFileSync(packagePath, `${JSON.stringify(packageJson, null, 2)}\n`);
NODE
echo "version=${MODEL_BANK_VERSION}" >> "$GITHUB_OUTPUT"
echo "Prepared model-bank@${MODEL_BANK_VERSION}"
- name: Publish to npm
run: npm publish --provenance --access public
run: npm publish --provenance
working-directory: packages/model-bank
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Commit version bump
env:
MODEL_BANK_VERSION: ${{ steps.version.outputs.version }}
run: |
git config user.name "lobehubbot"
git config user.email "i@lobehub.com"
git add packages/model-bank/package.json
git commit -m "🔖 chore(model-bank): release v${MODEL_BANK_VERSION}"
git push
+3 -3
View File
@@ -97,8 +97,8 @@ jobs:
if: needs.check-duplicate-run.outputs.should_skip != 'true'
strategy:
matrix:
shard: [1, 2, 3]
name: Test App (shard ${{ matrix.shard }}/3)
shard: [1, 2]
name: Test App (shard ${{ matrix.shard }}/2)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
@@ -110,7 +110,7 @@ jobs:
run: pnpm install
- name: Run tests
run: bunx vitest --coverage --silent='passed-only' --reporter=default --reporter=blob --shard=${{ matrix.shard }}/3
run: bunx vitest --coverage --silent='passed-only' --reporter=default --reporter=blob --shard=${{ matrix.shard }}/2
- name: Upload blob report
if: ${{ !cancelled() }}
+1 -1
View File
@@ -146,4 +146,4 @@ apps/desktop/resources/cli-package.json
# Superpowers plugin brainstorm/spec outputs (local only; do not commit)
.superpowers/
.heerogeneous-tracing
docs/superpowers/
+4 -6
View File
@@ -6,11 +6,7 @@
},
"editor.formatOnSave": true,
// don't show errors, but fix when save and git pre commit
"eslint.rules.customizations": [
{ "rule": "simple-import-sort/exports", "severity": "off" },
{ "rule": "perfectionist/sort-interfaces", "severity": "off" },
{ "rule": "simple-import-sort/imports", "severity": "off" }
],
"eslint.rules.customizations": [],
"eslint.validate": [
"json",
"javascript",
@@ -20,7 +16,7 @@
// support mdx
"mdx"
],
"js/ts.tsdk.path": "node_modules/typescript/lib",
"mdx.server.enable": false,
"npm.packageManager": "pnpm",
"search.exclude": {
"**/node_modules": true,
@@ -48,7 +44,9 @@
// make stylelint work with tsx antd-style css template string
"typescriptreact"
],
"typescript.tsdk": "node_modules/typescript/lib",
"vitest.disableWorkspaceWarning": true,
"vitest.maximumConfigs": 10,
"workbench.editor.customLabels.patterns": {
"**/app/**/[[]*[]]/[[]*[]]/page.tsx": "${dirname(2)}/${dirname(1)}/${dirname} • page component",
"**/app/**/[[]*[]]/page.tsx": "${dirname(1)}/${dirname} • page component",
-94
View File
@@ -2,100 +2,6 @@
# Changelog
## [Version 2.1.51](https://github.com/lobehub/lobe-chat/compare/v0.0.0-nightly.pr13850.8503...v2.1.51)
<sup>Released on **2026-04-16**</sup>
#### 👷 Build System
- **database**: add document history schema.
- **database**: add document history schema.
#### 🐛 Bug Fixes
- **misc**: fix minify cli.
- **misc**: recent delete.
- **deps**: pin @react-pdf/image to 3.0.4 to avoid privatized @react-pdf/svg.
- **database**: enforce document history ownership and pagination.
#### ✨ Features
- **database**: add document history table and update related models.
<br/>
<details>
<summary><kbd>Improvements and Fixes</kbd></summary>
#### Build System
- **database**: add document history schema, closes [#13789](https://github.com/lobehub/lobe-chat/issues/13789) ([c1174d3](https://github.com/lobehub/lobe-chat/commit/c1174d3))
- **database**: add document history schema ([e3eef04](https://github.com/lobehub/lobe-chat/commit/e3eef04))
#### What's fixed
- **misc**: fix minify cli, closes [#13888](https://github.com/lobehub/lobe-chat/issues/13888) ([cb4ad01](https://github.com/lobehub/lobe-chat/commit/cb4ad01))
- **misc**: recent delete, closes [#13878](https://github.com/lobehub/lobe-chat/issues/13878) ([85227cf](https://github.com/lobehub/lobe-chat/commit/85227cf))
- **deps**: pin @react-pdf/image to 3.0.4 to avoid privatized @react-pdf/svg ([d526b40](https://github.com/lobehub/lobe-chat/commit/d526b40))
- **database**: enforce document history ownership and pagination ([b9c4b87](https://github.com/lobehub/lobe-chat/commit/b9c4b87))
#### What's improved
- **database**: add document history table and update related models ([64fc6d4](https://github.com/lobehub/lobe-chat/commit/64fc6d4))
</details>
<div align="right">
[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
</div>
## [Version 2.1.50](https://github.com/lobehub/lobe-chat/compare/v2.1.49...v2.1.50)
<sup>Released on **2026-04-16**</sup>
#### 👷 Build System
- **database**: add document history schema.
- **database**: add document history schema.
#### 🐛 Bug Fixes
- **deps**: pin @react-pdf/image to 3.0.4 to avoid privatized @react-pdf/svg.
- **database**: enforce document history ownership and pagination.
#### ✨ Features
- **database**: add document history table and update related models.
<br/>
<details>
<summary><kbd>Improvements and Fixes</kbd></summary>
#### Build System
- **database**: add document history schema, closes [#13789](https://github.com/lobehub/lobe-chat/issues/13789) ([c1174d3](https://github.com/lobehub/lobe-chat/commit/c1174d3))
- **database**: add document history schema ([e3eef04](https://github.com/lobehub/lobe-chat/commit/e3eef04))
#### What's fixed
- **deps**: pin @react-pdf/image to 3.0.4 to avoid privatized @react-pdf/svg ([d526b40](https://github.com/lobehub/lobe-chat/commit/d526b40))
- **database**: enforce document history ownership and pagination ([b9c4b87](https://github.com/lobehub/lobe-chat/commit/b9c4b87))
#### What's improved
- **database**: add document history table and update related models ([64fc6d4](https://github.com/lobehub/lobe-chat/commit/64fc6d4))
</details>
<div align="right">
[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
</div>
### [Version 2.1.45](https://github.com/lobehub/lobe-chat/compare/v2.1.44...v2.1.45)
<sup>Released on **2026-03-26**</sup>
+1 -1
View File
@@ -1,6 +1,6 @@
.\" Code generated by `npm run man:generate`; DO NOT EDIT.
.\" Manual command details come from the Commander command tree.
.TH LH 1 "" "@lobehub/cli 0.0.8" "User Commands"
.TH LH 1 "" "@lobehub/cli 0.0.7" "User Commands"
.SH NAME
lh \- LobeHub CLI \- manage and connect to LobeHub services
.SH SYNOPSIS
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@lobehub/cli",
"version": "0.0.8",
"version": "0.0.7",
"type": "module",
"bin": {
"lh": "./dist/index.js",
+2 -7
View File
@@ -56,7 +56,7 @@ export function registerTaskCommand(program: Command) {
const client = await getTrpcClient();
const input: Record<string, any> = {};
if (options.status) input.statuses = [options.status];
if (options.status) input.status = options.status;
if (options.root) input.parentTaskId = null;
if (options.parent) input.parentTaskId = options.parent;
if (options.agent) input.assigneeAgentId = options.agent;
@@ -466,12 +466,7 @@ export function registerTaskCommand(program: Command) {
: act.priority === 'normal'
? pc.yellow(' [normal]')
: '';
const resolvedLabel = act.resolvedAction
? act.resolvedComment
? `${act.resolvedAction}: ${act.resolvedComment}`
: act.resolvedAction
: '';
const resolved = resolvedLabel ? pc.green(` ✏️ ${resolvedLabel}`) : '';
const resolved = act.resolvedAction ? pc.green(` ✏️ ${act.resolvedAction}`) : '';
const typeLabel = pc.dim(`[${act.briefType}]`);
console.log(
` ${icon} ${pc.dim(ago.padStart(7))} Brief ${typeLabel} ${act.title}${pri}${resolved}${idSuffix}`,
+1 -1
View File
@@ -9,7 +9,7 @@ export default defineConfig({
entry: ['src/index.ts'],
fixedExtension: false,
format: ['esm'],
minify: !!process.env.MINIFY,
minify: true,
outputOptions: {
codeSplitting: false,
},
-4
View File
@@ -1,7 +1,3 @@
## 专题文档
- [桌面端全屏 Overlay 截图方案设计与集成说明](./WindowOverlayCapture.md)
## 核心框架组件目录架构
### 主进程核心组件
-502
View File
@@ -1,502 +0,0 @@
# 桌面端全屏 Overlay 截图方案设计与集成说明
| 字段 | 内容 |
| ------------ | ----------------------------------------------------- |
| 状态 | 已完成技术预研与 demo 验证 |
| 最后更新 | 2026-04-14 |
| 适用范围 | Electron 桌面端全屏遮罩、窗口高亮、点击截窗、区域截图 |
| 当前验证载体 | `tmp/electron-window-overlay-demo` |
| 目标读者 | 后续将该能力接入 LobeHub Desktop 主业务的开发者 |
## 1. 文档目标
本文档用于沉淀以下内容:
| 目标 | 说明 |
| -------------------- | ------------------------------------------------------------- |
| 记录方案演进 | 保存从纯 Electron、native、自研、开源库到最终 demo 的决策过程 |
| 固化关键技术结论 | 明确哪些能力 Electron 可做,哪些能力必须借助额外库 |
| 提供业务接入蓝图 | 指出应修改的真实仓库文件、模块边界、IPC 设计与 UI 接入点 |
| 降低后续重复调研成本 | 使后续实现可以直接沿用本文档,不必重新验证底层假设 |
## 2. 需求回顾
| 需求项 | 结论 |
| ----------------------------------- | --------------------------------------------------- |
| 新增一个 “全屏” 入口 | 需要,但本质上是一个覆盖整块屏幕的透明 overlay 窗口 |
| 覆盖用户整个 screen | 需要,且在 macOS 上要覆盖菜单栏与 Dock 所在区域 |
| 获取系统窗口几何信息 | 需要,至少需要 `appName + bounds + windowId` |
| 在 overlay 上高亮窗口边框并显示 Tag | 需要 |
| 点击高亮窗口即截图该窗口 | 需要 |
| 拖拽任意区域截图 | 需要 |
| 输出先写入剪贴板 | 需要,作为 MVP |
| 避免自研 native addon | 明确要求避免 |
| 跨平台预留 | 需要,至少不能被 macOS-only 自研方案锁死 |
## 3. 关键术语澄清
### 3.1 “压住 macOS 菜单栏与 Dock” 的准确含义
这里的含义不是 “调用系统 fullscreen API”,而是:
| 项目 | 含义 |
| -------- | ------------------------------------------------------------ |
| 覆盖范围 | 窗口尺寸必须基于 `display.bounds`,而不是 `display.workArea` |
| Z 轴层级 | 窗口需要位于普通应用窗口之上,并且进入菜单栏所在区域 |
| 视觉效果 | 用户看到的是整块屏幕都被半透明遮罩覆盖 |
必须区分以下两件事:
| 易混概念 | 实际含义 |
| ----------------------------------- | ---------------------------------------------------- |
| `app.dock.hide()` | 仅隐藏应用在 Dock 中的图标,不会隐藏系统 Dock 栏本身 |
| `BrowserWindow.setFullScreen(true)` | 更接近原生全屏行为,未必适合作为截图 overlay |
## 4. 预研结论总览
### 4.1 方案对比
| 方案 | 能否覆盖菜单栏 / Dock | 能否拿到系统窗口 bounds | 能否按窗口截图 | 跨平台性 | 结论 |
| ------------------------------------- | --------------------: | ----------------------: | -----------------: | -------: | -------------------------- |
| 纯 Electron `desktopCapturer` | 是 | 否 | 部分可做,但不精确 | 高 | 不足以满足需求 |
| 自研 native addon | 是 | 是 | 是 | 中 | 能做,但被明确拒绝 |
| 参考 Claude.app 的 native quick entry | 是 | 是 | 是 | 低到中 | 可借鉴思路,不适合直接照搬 |
| `node-screenshots` 单库 | 是 | 是 | 是 | 中到高 | 核心方案成立 |
| `node-screenshots + get-windows` | 是 | 是 | 是 | 中到高 | 当前最终方案 |
### 4.2 最终选型
| 能力 | 最终实现 |
| --------------------- | -------------------------- |
| 全屏 overlay 窗口 | Electron `BrowserWindow` |
| 系统窗口枚举 | `node-screenshots` |
| 指定窗口截图 | `node-screenshots` |
| 隐藏 / 伪关闭窗口过滤 | `get-windows` 作为白名单 |
| 区域截图 | Electron `desktopCapturer` |
| 输出介质 | `clipboard.writeImage()` |
## 5. 对 Claude.app 的观察结论
本轮曾直接检查过本机解包后的 Claude.app 产物,结论如下:
| 观察对象 | 结论 |
| ------------------ | ------------------------------------------------------------------------------------------------ |
| `quick_window` | 不是全屏 overlay;它是小尺寸 `panel` 弹窗 |
| `nativeQuickEntry` | Claude.app 存在原生 quick entry 能力,说明其真实覆盖式入口并不完全依赖纯 Electron |
| `cu-glow` | 这是最接近本需求的 Electron overlay 实现:使用 `display.bounds`、透明窗、`screen-saver` 置顶层级 |
据此可以得出两个重要判断:
| 判断 | 含义 |
| -------------------------------------------- | ---- |
| Electron 可以做 “整屏遮罩” | 成立 |
| Claude 的 “整屏入口” 并不等于 `quick_window` | 成立 |
## 6. 当前 demo 的最终方案
### 6.1 架构图
```text
┌──────────────────────────────┐
│ Tray / Menu / Future Action │
└──────────────┬───────────────┘
│ startOverlaySession
┌────────────────────────────────────────────┐
│ Main Process │
│ │
│ 1. 选定当前光标所在 display │
│ 2. 枚举窗口:node-screenshots │
│ 3. 过滤隐藏窗口:get-windows 白名单 │
│ 4. 创建整屏 overlay BrowserWindow │
└──────────────┬─────────────────────────────┘
│ preload / IPC
┌────────────────────────────────────────────┐
│ Overlay Renderer │
│ │
│ 1. 渲染窗口高亮框与左上角 tag │
│ 2. 点击窗口 => captureWindow(windowId) │
│ 3. 拖拽区域 => captureRect(rect) │
└──────────────┬─────────────────────────────┘
│ IPC
┌────────────────────────────────────────────┐
│ Main Process Capture Path │
│ │
│ Window: node-screenshots.captureImage() │
│ Region: desktopCapturer + crop │
│ Output: clipboard.writeImage() │
└────────────────────────────────────────────┘
```
### 6.2 demo 文件职责
| 文件 | 作用 |
| -------------------------------------------------------------------------------------------------------------------- | -------------------------------------------- |
| [`tmp/electron-window-overlay-demo/main.mjs`](../../tmp/electron-window-overlay-demo/main.mjs) | 主进程入口;创建 overlay,枚举窗口,执行截图 |
| [`tmp/electron-window-overlay-demo/preload.cjs`](../../tmp/electron-window-overlay-demo/preload.cjs) | 为 overlay renderer 暴露 IPC bridge |
| [`tmp/electron-window-overlay-demo/renderer/index.html`](../../tmp/electron-window-overlay-demo/renderer/index.html) | overlay 渲染宿主页 |
| [`tmp/electron-window-overlay-demo/renderer/app.js`](../../tmp/electron-window-overlay-demo/renderer/app.js) | 窗口高亮、点击截窗、拖拽截区交互 |
| [`tmp/electron-window-overlay-demo/renderer/styles.css`](../../tmp/electron-window-overlay-demo/renderer/styles.css) | 遮罩视觉样式 |
| [`tmp/electron-window-overlay-demo/README.md`](../../tmp/electron-window-overlay-demo/README.md) | demo 的运行说明 |
## 7. 全屏 overlay 的关键实现参数
### 7.1 必要窗口参数
| 参数 / 调用 | 用途 | 必要性 |
| ----------------------------------- | ---------------------------------- | ------ |
| `x/y/width/height = display.bounds` | 覆盖整块屏幕,包括菜单栏区域 | 必需 |
| `transparent: true` | 允许渲染半透明遮罩 | 必需 |
| `frame: false` | 去除系统边框 | 必需 |
| `skipTaskbar: true` | 避免出现在任务栏 / Dock 窗口列表中 | 建议 |
| `hasShadow: false` | 避免覆盖层产生自身投影 | 建议 |
| `focusable: true` | 允许接收鼠标交互 | 必需 |
| `fullscreenable: false` | 避免进入原生 fullscreen 流程 | 建议 |
| `enableLargerThanScreen: true` | 提升跨平台稳健性 | 建议 |
| `type: 'panel'`macOS) | 更接近工具层窗口行为 | 建议 |
### 7.2 必要层级调用
| 调用 | 作用 |
| ---------------------------------------------------------------- | --------------------------------- |
| `setAlwaysOnTop(true, 'screen-saver')` | 让窗口位于更高层级 |
| `setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true })` | 避免 Space / 全屏窗口场景下不可见 |
| `setHiddenInMissionControl(true)` | 降低该窗口对系统窗口管理的干扰 |
### 7.3 重要结论
| 结论 | 说明 |
| ------------------------- | ------------------------------------------- |
| `display.workArea` 不可用 | 它会排除菜单栏 / Dock 区域 |
| `display.bounds` 必须使用 | 只有它能覆盖整个 display |
| `screen-saver` 层级有效 | 这是当前 macOS 上最接近需求的 Electron 方案 |
## 8. 系统窗口枚举与过滤策略
### 8.1 为什么不能只用 Electron
| Electron 能力 | 缺口 |
| --------------------------------------------------- | --------------------------------------------------------- |
| `desktopCapturer.getSources({ types: ['window'] })` | 能列出可捕获源,但没有稳定的窗口 bounds 用于 overlay 画框 |
| `DesktopCapturerSource.thumbnail` | 可截图缩略图,但不适合 “按原窗口精确高亮 + 点击即截” |
因此,纯 Electron 不足以完成 “系统窗口高亮 + 点击截窗”。
### 8.2 `node-screenshots` 的职责
| API | 用途 |
| --------------------------------- | -------------- |
| `Window.all()` | 枚举系统窗口 |
| `window.id()` | 稳定识别窗口 |
| `window.appName()` | 获取应用名 |
| `window.title()` | 获取标题 |
| `window.x()/y()/width()/height()` | 获取几何信息 |
| `window.captureImage()` | 截取该窗口图像 |
### 8.3 `get-windows` 的职责
`get-windows` 在当前方案中不负责截图,而只负责 “第二层白名单过滤”。
| 问题 | 处理方式 |
| ------------------------------------------ | ------------------------------------------------------------- |
| 某些应用逻辑上已隐藏,但底层枚举仍可能残留 | 只保留同时出现在 `get-windows``node-screenshots` 中的窗口 |
| Electron 自身的假关闭 /hide 行为 | 该白名单对这类情况更稳 |
### 8.4 当前过滤规则
| 规则 | 目的 |
| ------------------------------------------------ | ---------------------------- |
| `isMinimized() === false` | 排除最小化窗口 |
| 最小尺寸阈值:`80x60` | 排除菜单栏控件、过小悬浮面板 |
| 排除 `Dock` / `Window Server` / `Control Centre` | 排除系统 UI |
| 排除 demo 自身窗口 | 避免 overlay 自我高亮 |
| 必须与目标 display 相交 | 只画当前屏幕可见窗口 |
| 必须出现在 `get-windows` 白名单中 | 排除隐藏 / 伪关闭残留窗口 |
## 9. 截图路径设计
### 9.1 点击窗口截图
```text
点击高亮框
└───> renderer 发送 windowId
└───> main 查找对应 node-screenshots Window
└───> overlay.hide()
└───> captureImage()
└───> PNG Buffer
└───> nativeImage
└───> clipboard.writeImage()
```
### 9.2 拖拽区域截图
```text
拖拽区域
└───> renderer 发送全局 rect
└───> main 隐藏 overlay
└───> desktopCapturer 获取目标 display 图像
└───> 按 scaleFactor 计算 cropRect
└───> clipboard.writeImage()
```
### 9.3 为什么两条路径采用不同技术
| 路径 | 技术 | 原因 |
| ---------- | ------------------ | --------------------------------- |
| 按窗口截图 | `node-screenshots` | 它天然理解 “窗口” 这一对象 |
| 按区域截图 | `desktopCapturer` | 区域本质上是 display 上的矩形裁剪 |
## 10. 权限与平台边界
### 10.1 macOS 权限
| 权限 | 是否需要 | 用途 |
| ---------------- | ---------------- | ----------------------------------------------------- |
| Screen Recording | 需要 | 窗口截图、区域截图 |
| Accessibility | 当前方案不强依赖 | `get-windows` 已使用 `accessibilityPermission: false` |
### 10.2 当前已知平台边界
| 平台 / 场景 | 状态 | 说明 |
| ------------- | -------- | --------------------------------------------------------------------- |
| macOS | 已验证 | 当前主要验证平台 |
| Windows | 理论可行 | `node-screenshots` / `get-windows` 均支持,但尚未在本仓库内做实机验证 |
| Linux X11 | 理论可行 | 需要单独验证打包与权限 |
| Linux Wayland | 风险较高 | 上游库虽宣称支持,但必须做专项验证 |
### 10.3 特殊窗口风险
| 风险类型 | 当前处理 |
| ---------------------- | -------------------------------------------------------------- |
| 菜单栏状态窗 / 面板 | 通过尺寸阈值与排除名单降低噪音 |
| 系统 UI | 通过应用名黑名单排除 |
| 某些应用截图结果为黑图 | 已观察到个别状态面板存在此现象,应在业务层继续限制候选窗口类别 |
## 11. 已完成验证
| 验证项 | 结果 | 产物 |
| ----------------------------------- | ---- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
| overlay 覆盖整屏 | 通过 | [`tmp/electron-window-overlay-demo/.cache/window-overlay-visual.png`](../../tmp/electron-window-overlay-demo/.cache/window-overlay-visual.png) |
| `node-screenshots` 直接截图普通窗口 | 通过 | [`tmp/electron-window-overlay-demo/.cache/cursor-direct.png`](../../tmp/electron-window-overlay-demo/.cache/cursor-direct.png) |
| 点击高亮窗口后写入剪贴板 | 通过 | [`tmp/electron-window-overlay-demo/.cache/window-capture-probe-final.png`](../../tmp/electron-window-overlay-demo/.cache/window-capture-probe-final.png) |
| 拖拽区域截图 | 通过 | [`tmp/electron-window-overlay-demo/.cache/self-test-clipboard-final.png`](../../tmp/electron-window-overlay-demo/.cache/self-test-clipboard-final.png) |
## 12. 推荐的业务接入方式
### 12.1 总体建议
| 维度 | 建议 |
| -------------------- | ---------------------------------------------------------------------------------- |
| overlay 窗口生命周期 | 不建议直接挂进现有 `BrowserManager` 的常规窗口体系 |
| 原因 | overlay 是瞬态、全屏、平台特化、不可持久化的工具窗口,与主业务窗口生命周期明显不同 |
| 推荐做法 | 新增独立主进程模块管理 overlay;渲染内容仍建议走现有 SPA 路由体系 |
### 12.2 为什么不直接复用 `BrowserManager`
| 观察 | 影响 |
| ----------------------------------------- | ------------------------------- |
| `Browser` 默认承担普通业务窗口职责 | overlay 并非普通业务窗口 |
| `WindowStateManager` 倾向保存窗口状态 | overlay 不应持久化位置与大小 |
| `BrowserManager` 以 “可复用业务窗口” 建模 | overlay 更接近 “一次性工具会话” |
因此,更合理的做法是:
```text
┌────────────────────────────┐
│ BrowserManager │ 负责常规业务窗口
└────────────────────────────┘
┌────────────────────────────┐
│ CaptureOverlayManager │ 负责全屏截图 overlay 会话
└────────────────────────────┘
```
## 13. 建议的生产代码落点
### 13.1 主进程
| 建议文件 | 作用 |
| ---------------------------------------------------------------------- | ------------------------------------------------------------------ |
| `apps/desktop/src/main/modules/screenCapture/CaptureOverlayManager.ts` | 创建 / 销毁 overlay 窗口;管理一次截图会话 |
| `apps/desktop/src/main/modules/screenCapture/WindowSourceService.ts` | 封装 `node-screenshots + get-windows` 的窗口枚举与过滤 |
| `apps/desktop/src/main/modules/screenCapture/CaptureService.ts` | 封装窗口截图、区域截图、剪贴板输出 |
| `apps/desktop/src/main/modules/screenCapture/permission.ts` | 封装 macOS 屏幕录制权限检查 |
| `apps/desktop/src/main/controllers/ScreenCaptureCtr.ts` | 对 renderer 暴露 `start / captureRect / captureWindow / close` IPC |
| `apps/desktop/src/main/controllers/registry.ts` | 注册 `ScreenCaptureCtr` |
### 13.2 IPC 类型
| 建议文件 | 作用 |
| --------------------------------------------------------- | ------------------------------------------------- |
| `packages/electron-client-ipc/src/types/screenCapture.ts` | 定义 overlay 会话、窗口元数据、截图参数与返回结果 |
| `packages/electron-client-ipc/src/types/index.ts` | 导出新类型 |
建议定义的核心类型:
| 类型名 | 用途 |
| -------------------------- | --------------------------------------------------- |
| `ScreenCaptureDisplayInfo` | display id / bounds / scaleFactor |
| `ScreenCaptureWindowInfo` | `windowId/appName/title/bounds/overlayBounds/order` |
| `ScreenCaptureSession` | `display + windows` |
| `CaptureRectParams` | 全局屏幕坐标的矩形 |
| `ScreenCaptureStartResult` | 权限状态、会话状态、错误信息 |
| `ScreenCaptureOutput` | `clipboard`、后续可扩展 `file``attachment` |
### 13.3 Preload 与 renderer service
| 建议文件 | 作用 |
| ----------------------------------------- | -------------------------------------------------- |
| `apps/desktop/src/preload/electronApi.ts` | 通常无需特殊改造;沿用统一 `invoke` 即可 |
| `src/services/electron/screenCapture.ts` | 前端统一调用 `ensureElectronIpc().screenCapture.*` |
### 13.4 Renderer 路由
生产环境存在两种可选实现:
| 方案 | 优点 | 缺点 | 建议 |
| ------------------ | -------------------------------- | -------------------------------- | ---------------- |
| 独立静态 HTML 页面 | 轻量、与业务隔离、最接近 demo | 与现有 React/i18n / 业务状态脱节 | 仅适合 spike |
| 独立桌面 SPA 路由 | 可复用现有构建、i18n、业务事件链 | 需要维护 desktop router 双配置 | **推荐生产使用** |
若采用 SPA 路由,建议新增:
| 建议文件 | 作用 |
| ------------------------------------------------------- | ------------------------------------ |
| `src/routes/(desktop)/screen-capture-overlay/index.tsx` | overlay 页面入口;仅负责挂载 UI 组件 |
| `src/features/DesktopScreenCaptureOverlay/*` | 业务组件、hooks、样式 |
| `src/spa/router/desktopRouter.config.tsx` | 动态路由配置 |
| `src/spa/router/desktopRouter.config.desktop.tsx` | 同步路由配置 |
必须注意:
| 规则 | 说明 |
| -------------------------------- | ------------------------------------ |
| 两份 desktop router 必须同时更新 | 否则 Electron 本地构建可能出现空白页 |
| overlay route 应保持极薄 | 不在 route 文件中堆叠业务逻辑 |
## 14. 托盘入口的真实接入点
若要从托盘启动 overlay,会涉及以下文件:
| 文件 | 作用 |
| ----------------------------------------------- | -------------------- |
| `apps/desktop/src/main/menus/impls/macOS.ts` | macOS 托盘菜单模板 |
| `apps/desktop/src/main/menus/impls/windows.ts` | Windows 托盘菜单模板 |
| `apps/desktop/src/main/menus/impls/linux.ts` | Linux 托盘菜单模板 |
| `apps/desktop/src/main/locales/default/menu.ts` | 托盘菜单文案 |
推荐新增文案键:
| Key | 语义 |
| -------------------------- | ------------------------ |
| `tray.captureScreen` | 启动截图 overlay |
| `tray.captureScreenWindow` | 启动窗口截图模式(可选) |
## 15. 业务接入分阶段计划
### 阶段一:桌面主进程能力落地
| 步骤 | 目标 |
| ---- | ---------------------------------------------------------------------------------- |
| 1 | 将 `node-screenshots``get-windows` 加入 `apps/desktop/package.json#dependencies` |
| 2 | 新建 `screenCapture` 主进程模块与 controller |
| 3 | 跑通托盘菜单触发 overlay |
| 4 | 继续以剪贴板为唯一输出 |
### 阶段二:接回现有业务 UI
| 步骤 | 目标 |
| ---- | -------------------------------------------------- |
| 1 | 新增桌面专用 overlay route /feature |
| 2 | 将截图结果从 “仅写剪贴板” 升级为 “回传 attachment” |
| 3 | 支持从 chat 输入区触发 |
| 4 | 支持截图后自动插入当前会话 |
### 阶段三:体验完善
| 步骤 | 目标 |
| ---- | ------------------------------------ |
| 1 | 多 display 支持 |
| 2 | Hover 高亮 / 文案优化 |
| 3 | 保存文件、编辑器标注、OCR 等增强能力 |
| 4 | 平台差异补齐(尤其 Windows / Linux |
## 16. 依赖落点与版本建议
### 16.1 应加入的位置
| 文件 | 说明 |
| --------------------------- | --------------------------------- |
| `apps/desktop/package.json` | Electron 桌面运行时的真实依赖落点 |
### 16.2 建议依赖
| 包名 | 用途 | 当前 demo 使用版本 |
| ------------------ | --------------------------- | ------------------ |
| `node-screenshots` | 枚举窗口 + 窗口截图 | `^0.2.8` |
| `get-windows` | 白名单过滤隐藏 / 伪关闭窗口 | `^9.3.0` |
说明:
| 项目 | 结论 |
| ---------------------------- | ---- |
| 这不是 “纯 Electron” 方案 | 成立 |
| 这也不是 “自研 native addon” | 成立 |
| 当前依赖的是开源原生库 | 成立 |
## 17. 测试建议
建议避免写 “窗口列表快照” 这类低信号测试,优先做行为测试。
| 测试层级 | 建议内容 |
| -------------- | ---------------------------------------------------------- |
| 单元测试 | 过滤逻辑:尺寸阈值、系统应用排除、自身窗口排除、白名单交集 |
| 主进程集成测试 | 权限失败、overlay 会话生命周期、错误分支 |
| 手工验证 | 菜单栏覆盖、点击截窗、拖拽截区、隐藏窗口过滤 |
建议手工验证清单:
| 检查项 | 期望 |
| ------------------------ | ------------------------ |
| 当前活动屏幕启动 overlay | 只覆盖当前目标 display |
| 已隐藏的 Electron 子窗口 | 不再出现边框 |
| 点击普通应用窗口 | 剪贴板中得到该窗口图像 |
| 拖拽区域截图 | 剪贴板中得到对应裁剪区域 |
| 取消操作 | `Esc` 可关闭 overlay |
## 18. 当前已确认的非目标
| 非目标 | 说明 |
| ----------------------------------- | ----------------------------------------------------------------------- |
| 当前阶段支持全平台一致体验 | 尚未完成 |
| 当前阶段支持窗口标题绝对准确 | `get-windows` 在无额外权限时标题可为空;当前主要依赖 `node-screenshots` |
| 当前阶段支持多 display 同时 overlay | 尚未实现 |
| 当前阶段支持标注编辑器 | 未实现 |
## 19. 后续实现时的推荐决策
| 决策点 | 推荐 |
| ----------------------------------------------- | ------------------------ |
| overlay 窗口是否复用 `BrowserManager` | 不推荐 |
| renderer 是否走 SPA route | 推荐 |
| 主进程是否继续保留 “剪贴板优先” 输出 | 推荐,先保持最小可用闭环 |
| 是否继续保留 `desktopCapturer` 作为区域截图路径 | 推荐 |
| 是否用 `get-windows` 继续做白名单过滤 | 推荐 |
## 20. 实施摘要
```text
┌──────────────────────────────────────────────┐
│ 已验证的技术事实 │
├──────────────────────────────────────────────┤
│ 1. Electron 可以创建覆盖整块 display 的窗体 │
│ 2. 纯 Electron 无法独立完成系统窗口高亮 │
│ 3. node-screenshots 可完成窗口枚举与截窗 │
│ 4. get-windows 可帮助过滤隐藏 / 残留窗口 │
│ 5. 最终可形成“点击窗口即截图 + 拖拽截区”闭环 │
└──────────────────────────────────────────────┘
```
本文档可视为后续将该能力正式接入 `apps/desktop` 主业务的实施基线。
+1 -2
View File
@@ -112,7 +112,7 @@ const config = {
// Build and copy CLI bundle for embedding
console.info('📦 Building CLI for embedding...');
execSync('npm run build:cli', { stdio: 'inherit', cwd: __dirname });
execSync('npm run build', { stdio: 'inherit', cwd: path.resolve(__dirname, '../cli') });
const cliSrc = path.resolve(__dirname, '../cli/dist/index.js');
const cliDest = path.resolve(__dirname, 'resources/bin/lobe-cli.js');
await fs.copyFile(cliSrc, cliDest);
@@ -255,7 +255,6 @@ const config = {
generateUpdatesFilesForAllChannels: true,
linux: {
category: 'Utility',
icon: 'build/icon.png',
maintainer: 'electronjs.org',
target: ['AppImage', 'snap', 'deb', 'rpm', 'tar.gz'],
},
+7 -79
View File
@@ -1,7 +1,6 @@
import { readFileSync } from 'node:fs';
import path from 'node:path';
import { vanillaExtractPlugin } from '@vanilla-extract/vite-plugin';
import dotenv from 'dotenv';
import { defineConfig } from 'electron-vite';
import type { PluginOption, ViteDevServer } from 'vite';
@@ -16,69 +15,15 @@ import {
import { getExternalDependencies } from './native-deps.config.mjs';
/**
* Force `base: '/'` in renderer config. The `electron-vite` preset
* unconditionally rewrites base to `'./'` in production (with `enforce: 'pre'`),
* which produces relative asset URLs like `../../assets/...`. Those break in
* the popup window because its SPA URL (`/popup/agent/:aid/:tid`) is deep
* enough that relative resolution lands at `/popup/assets/...` instead of the
* actual `/assets/...`. Our `app://` protocol handler resolves absolute
* `/assets/...` correctly regardless of URL depth.
*/
function forceAbsoluteBasePlugin(): PluginOption {
return {
name: 'electron-desktop-force-base',
config(config) {
config.base = '/';
},
};
}
/**
* Rewrite SPA routes to their corresponding HTML entry so the electron-vite
* dev server serves the right HTML when root is the monorepo root.
*
* - `/popup/*` → `/apps/desktop/popup.html` (topic popup SPA)
* - `/`, `/index.html`, and everything else → `/apps/desktop/index.html`
* Rewrite `/` to `/apps/desktop/index.html` so the electron-vite dev server
* serves the desktop HTML entry when root is the monorepo root.
*/
function electronDesktopHtmlPlugin(): PluginOption {
return {
configureServer(server: ViteDevServer) {
server.middlewares.use((req, _res, next) => {
const rawUrl = req.url ?? '';
const pathname = rawUrl.split('?')[0];
// Explicit document-entry requests — always rewrite.
if (pathname === '/' || pathname === '/index.html') {
if (req.url === '/' || req.url === '/index.html') {
req.url = '/apps/desktop/index.html';
next();
return;
}
if (pathname === '/overlay' || pathname === '/overlay.html') {
req.url = '/apps/desktop/overlay.html';
next();
return;
}
if (pathname === '/popup.html') {
req.url = '/apps/desktop/popup.html';
next();
return;
}
// For SPA deep links (e.g. `/popup/agent/A/T`) rewrite to the popup
// HTML — but skip asset / module requests that happen to share the
// prefix (e.g. `/popup/@vite/client` would have been generated by a
// mis-resolved relative import).
const lastSegment = pathname.split('/').pop() ?? '';
const looksLikeAsset =
lastSegment.includes('.') ||
pathname.startsWith('/@') ||
pathname.startsWith('/src/') ||
pathname.startsWith('/node_modules/') ||
pathname.startsWith('/apps/') ||
pathname.startsWith('/packages/');
if (!looksLikeAsset && (pathname === '/popup' || pathname.startsWith('/popup/'))) {
req.url = '/apps/desktop/popup.html';
}
next();
});
@@ -98,8 +43,6 @@ const updateChannel = process.env.UPDATE_CHANNEL;
const desktopPackageJson = JSON.parse(
readFileSync(path.resolve(__dirname, 'package.json'), 'utf8'),
) as { version: string };
const electronRuntimeExternals = ['electron'];
const mainProcessRuntimeExternals = [...electronRuntimeExternals, 'node-mac-permissions'];
console.info(`[electron-vite.config.ts] Detected UPDATE_CHANNEL: ${updateChannel}`);
@@ -108,15 +51,10 @@ export default defineConfig({
build: {
minify: !isDev,
outDir: 'dist/main',
rolldownOptions: {
rollupOptions: {
// Native modules must be externalized to work correctly.
// bufferutil and utf-8-validate are optional peer deps of ws that may not be installed.
external: [
...mainProcessRuntimeExternals,
...getExternalDependencies(),
'bufferutil',
'utf-8-validate',
],
external: [...getExternalDependencies(), 'bufferutil', 'utf-8-validate'],
output: {
// Prevent debug package from being bundled into index.js to avoid side-effect pollution
manualChunks(id) {
@@ -150,9 +88,6 @@ export default defineConfig({
build: {
minify: !isDev,
outDir: 'dist/preload',
rolldownOptions: {
external: electronRuntimeExternals,
},
sourcemap: isDev ? 'inline' : false,
},
resolve: {
@@ -166,12 +101,8 @@ export default defineConfig({
root: ROOT_DIR,
build: {
outDir: path.resolve(__dirname, 'dist/renderer'),
rolldownOptions: {
input: {
main: path.resolve(__dirname, 'index.html'),
overlay: path.resolve(__dirname, 'overlay.html'),
popup: path.resolve(__dirname, 'popup.html'),
},
rollupOptions: {
input: path.resolve(__dirname, 'index.html'),
output: sharedRollupOutput,
},
},
@@ -181,14 +112,11 @@ export default defineConfig({
},
optimizeDeps: sharedOptimizeDeps,
plugins: [
forceAbsoluteBasePlugin(),
electronDesktopHtmlPlugin(),
vanillaExtractPlugin(),
...(sharedRendererPlugins({ platform: 'desktop' }) as PluginOption[]),
],
resolve: {
dedupe: ['react', 'react-dom'],
tsconfigPaths: true,
},
},
});
+1 -2
View File
@@ -36,8 +36,7 @@ export const nativeModules = [
// macOS-only native modules
...(isDarwin ? ['node-mac-permissions'] : []),
'@napi-rs/canvas',
'get-windows',
'node-screenshots',
// Add more native modules here as needed
];
/**
-15
View File
@@ -1,15 +0,0 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style>
* { margin: 0; padding: 0; box-sizing: border-box; }
html, body, #root { width: 100%; height: 100%; overflow: hidden; background: transparent; }
</style>
</head>
<body>
<div id="root"></div>
<script type="module" src="/apps/desktop/src/overlay/entry.tsx"></script>
</body>
</html>
+5 -11
View File
@@ -11,7 +11,7 @@
"author": "LobeHub",
"main": "./dist/main/index.js",
"scripts": {
"build:cli": "cd ../cli && cross-env MINIFY=1 bun run build",
"build:cli": "cd ../cli && bun run build",
"build:main": "cross-env NODE_OPTIONS=--max-old-space-size=8192 electron-vite build",
"build:run-unpack": "electron .",
"dev": "electron-vite dev",
@@ -42,10 +42,7 @@
"update-server": "sh scripts/update-test/run-test.sh"
},
"dependencies": {
"@lobehub/fluent-emoji": "^4.1.0",
"@napi-rs/canvas": "^0.1.70",
"get-windows": "^9.3.0",
"node-screenshots": "^0.2.8"
"@napi-rs/canvas": "^0.1.70"
},
"devDependencies": {
"@electron-toolkit/eslint-config-prettier": "^3.0.0",
@@ -67,8 +64,6 @@
"@types/semver": "^7.7.1",
"@types/set-cookie-parser": "^2.4.10",
"@typescript/native-preview": "7.0.0-dev.20251210.1",
"@vanilla-extract/css": "^1.17.4",
"@vanilla-extract/vite-plugin": "^5.1.0",
"async-retry": "^1.3.3",
"consola": "^3.4.2",
"cookie": "^1.1.1",
@@ -81,7 +76,7 @@
"electron-log": "^5.4.3",
"electron-store": "^8.2.0",
"electron-updater": "^6.6.2",
"electron-vite": "6.0.0-beta.1",
"electron-vite": "^5.0.0",
"electron-window-state": "^5.0.3",
"es-toolkit": "^1.43.0",
"eslint": "10.0.0",
@@ -101,14 +96,13 @@
"resolve": "^1.22.11",
"semver": "^7.7.3",
"set-cookie-parser": "^2.7.2",
"strip-ansi": "6.0.1",
"stylelint": "^15.11.0",
"superjson": "^2.2.6",
"tsx": "^4.21.0",
"typescript": "^5.9.3",
"undici": "^7.16.0",
"uuid": "^14.0.0",
"vite": "^8.0.9",
"uuid": "^13.0.0",
"vite": "^7.3.1",
"vitest": "^3.2.4",
"zod": "^3.25.76"
},
-5
View File
@@ -1,13 +1,8 @@
packages:
- '../cli'
- '../../packages/agent-gateway-client'
- '../../packages/const'
- '../../packages/electron-server-ipc'
- '../../packages/electron-client-ipc'
- '../../packages/file-loaders'
- '../../packages/desktop-bridge'
- '../../packages/device-gateway-client'
- '../../packages/local-file-shell'
- './stubs/business-const'
- './stubs/types'
- '.'
-114
View File
@@ -1,114 +0,0 @@
<!doctype html>
<html class="desktop">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style>
html,
body {
margin: 0;
height: 100%;
background: transparent;
}
html[data-theme='dark'] {
background: #141414;
}
html[data-theme='light'] {
background: #fafafa;
}
#loading-screen {
position: fixed;
inset: 0;
z-index: 99999;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
background: inherit;
gap: 12px;
}
@keyframes loading-draw {
0% {
stroke-dashoffset: 1000;
}
100% {
stroke-dashoffset: 0;
}
}
@keyframes loading-fill {
30% {
fill-opacity: 0.05;
}
100% {
fill-opacity: 1;
}
}
#loading-brand {
display: flex;
align-items: center;
gap: 12px;
color: #1f1f1f;
}
#loading-brand svg path {
fill: currentcolor;
fill-opacity: 0;
stroke: currentcolor;
stroke-dasharray: 1000;
stroke-dashoffset: 1000;
stroke-width: 0.25em;
animation:
loading-draw 2s cubic-bezier(0.4, 0, 0.2, 1) infinite,
loading-fill 2s cubic-bezier(0.4, 0, 0.2, 1) infinite;
}
html[data-theme='dark'] #loading-brand {
color: #f0f0f0;
}
</style>
</head>
<body>
<script>
(function () {
var theme = 'system';
try {
theme = localStorage.getItem('theme') || 'system';
} catch (_) {}
var systemTheme =
window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
? 'dark'
: 'light';
var resolvedTheme = theme === 'system' ? systemTheme : theme;
if (resolvedTheme === 'dark' || resolvedTheme === 'light') {
document.documentElement.setAttribute('data-theme', resolvedTheme);
}
var urlParams = new URLSearchParams(window.location.search);
var locale = urlParams.get('lng') || navigator.language || 'en-US';
document.documentElement.lang = locale;
var rtl = ['ar', 'arc', 'dv', 'fa', 'ha', 'he', 'khw', 'ks', 'ku', 'ps', 'ur', 'yi'];
document.documentElement.dir =
rtl.indexOf(locale.split('-')[0].toLowerCase()) >= 0 ? 'rtl' : 'ltr';
})();
</script>
<div id="loading-screen">
<div id="loading-brand" aria-label="Loading" role="status">
<svg
fill="currentColor"
fill-rule="evenodd"
height="40"
style="flex: none; line-height: 1"
viewBox="0 0 940 320"
xmlns="http://www.w3.org/2000/svg"
>
<title>LobeHub</title>
<path
d="M15 240.035V87.172h39.24V205.75h66.192v34.285H15zM183.731 242c-11.759 0-22.196-2.621-31.313-7.862-9.116-5.241-16.317-12.447-21.601-21.619-5.153-9.317-7.729-19.945-7.729-31.883 0-11.937 2.576-22.492 7.729-31.664 5.164-8.963 12.159-15.98 20.982-21.05l.619-.351c9.117-5.241 19.554-7.861 31.313-7.861s22.196 2.62 31.313 7.861c9.248 5.096 16.449 12.229 21.601 21.401 5.153 9.172 7.729 19.727 7.729 31.664 0 11.938-2.576 22.566-7.729 31.883-5.152 9.172-12.353 16.378-21.601 21.619-9.117 5.241-19.554 7.862-31.313 7.862zm0-32.975c4.36 0 8.191-1.092 11.494-3.275 3.436-2.184 6.144-5.387 8.126-9.609 1.982-4.367 2.973-9.536 2.973-15.505 0-5.968-.991-10.991-2.973-15.067-1.906-4.06-4.483-7.177-7.733-9.352l-.393-.257c-3.303-2.184-7.134-3.276-11.494-3.276-4.228 0-8.059 1.092-11.495 3.276-3.303 2.184-6.011 5.387-8.125 9.609-1.982 4.076-2.973 9.099-2.973 15.067 0 5.969.991 11.138 2.973 15.505 2.114 4.222 4.822 7.425 8.125 9.609 3.436 2.183 7.267 3.275 11.495 3.275zM295.508 78l-.001 54.042a34.071 34.071 0 016.541-5.781c6.474-4.367 14.269-6.551 23.385-6.551 9.777 0 18.629 2.475 26.557 7.424 7.872 4.835 14.105 11.684 18.7 20.546l.325.637c4.756 9.026 7.135 19.799 7.135 32.319 0 12.666-2.379 23.585-7.135 32.757-4.624 9.026-10.966 16.087-19.025 21.182-7.928 4.95-16.78 7.425-26.557 7.425-9.644 0-17.704-2.184-24.178-6.551-2.825-1.946-5.336-4.355-7.532-7.226l.001 11.812h-35.87V78h37.654zm21.998 74.684c-4.228 0-8.059 1.092-11.494 3.276-3.303 2.184-6.012 5.387-8.126 9.609-1.982 4.076-2.972 9.099-2.972 15.067 0 5.969.99 11.138 2.972 15.505 2.114 4.222 4.823 7.425 8.126 9.609 3.435 2.183 7.266 3.275 11.494 3.275s7.994-1.092 11.297-3.275c3.435-2.184 6.143-5.387 8.125-9.609 2.114-4.367 3.171-9.536 3.171-15.505 0-5.968-1.057-10.991-3.171-15.067-1.906-4.06-4.483-7.177-7.732-9.352l-.393-.257c-3.303-2.184-7.069-3.276-11.297-3.276zm105.335 38.653l.084.337a27.857 27.857 0 002.057 5.559c2.246 4.222 5.417 7.498 9.513 9.827 4.096 2.184 8.984 3.276 14.665 3.276 5.285 0 9.777-.801 13.477-2.403 3.579-1.632 7.1-4.025 10.564-7.182l.732-.679 19.818 22.711c-5.153 6.26-11.494 11.064-19.025 14.413-7.531 3.203-16.449 4.804-26.755 4.804-12.683 0-23.782-2.621-33.294-7.862-9.381-5.386-16.713-12.665-21.998-21.837-5.153-9.317-7.729-19.872-7.729-31.665 0-11.792 2.51-22.274 7.53-31.446 5.036-9.105 11.902-16.195 20.596-21.268l.61-.351c8.984-5.241 19.091-7.861 30.322-7.861 10.311 0 19.743 2.286 28.294 6.859l.64.347c8.72 4.659 15.656 11.574 20.809 20.746 5.153 9.172 7.729 20.309 7.729 33.411 0 1.294-.052 2.761-.156 4.4l-.042.623-.17 2.353c-.075 1.01-.151 1.973-.227 2.888h-78.044zm21.365-42.147c-4.492 0-8.456 1.092-11.891 3.276-3.303 2.184-5.879 5.314-7.729 9.39a26.04 26.04 0 00-1.117 2.79 30.164 30.164 0 00-1.121 4.499l-.058.354h43.96l-.015-.106c-.401-2.638-1.122-5.055-2.163-7.252l-.246-.503c-1.776-3.774-4.282-6.742-7.519-8.906l-.409-.266c-3.303-2.184-7.2-3.276-11.692-3.276zm111.695-62.018l-.001 57.432h53.51V87.172h39.24v152.863h-39.24v-59.617H555.9l.001 59.617h-39.24V87.172h39.24zM715.766 242c-8.72 0-16.581-1.893-23.583-5.678-6.87-3.785-12.287-9.681-16.251-17.688-3.832-8.153-5.747-18.417-5.747-30.791v-66.168h37.654v59.398c0 9.172 1.519 15.723 4.558 19.654 3.171 3.931 7.597 5.896 13.278 5.896 3.7 0 7.069-.946 10.108-2.839 3.038-1.892 5.483-4.877 7.332-8.953 1.85-4.222 2.775-9.609 2.775-16.16v-56.996h37.654v118.36h-35.871l.004-12.38c-2.642 3.197-5.682 5.868-9.12 8.012-7.002 4.222-14.599 6.333-22.791 6.333zM841.489 78l-.001 54.041a34.1 34.1 0 016.541-5.78c6.474-4.367 14.269-6.551 23.385-6.551 9.777 0 18.629 2.475 26.556 7.424 7.873 4.835 14.106 11.684 18.701 20.546l.325.637c4.756 9.026 7.134 19.799 7.134 32.319 0 12.666-2.378 23.585-7.134 32.757-4.624 9.026-10.966 16.087-19.026 21.182-7.927 4.95-16.779 7.425-26.556 7.425-9.645 0-17.704-2.184-24.178-6.551-2.825-1.946-5.336-4.354-7.531-7.224v11.81h-35.87V78h37.654zm21.998 74.684c-4.228 0-8.059 1.092-11.495 3.276-3.303 2.184-6.011 5.387-8.125 9.609-1.982 4.076-2.973 9.099-2.973 15.067 0 5.969.991 11.138 2.973 15.505 2.114 4.222 4.822 7.425 8.125 9.609 3.436 2.183 7.267 3.275 11.495 3.275 4.228 0 7.993-1.092 11.296-3.275 3.435-2.184 6.144-5.387 8.126-9.609 2.114-4.367 3.171-9.536 3.171-15.505 0-5.968-1.057-10.991-3.171-15.067-1.906-4.06-4.484-7.177-7.733-9.352l-.393-.257c-3.303-2.184-7.068-3.276-11.296-3.276z"
/>
</svg>
</div>
</div>
<div id="root" style="height: 100%"></div>
<script>
window.__SERVER_CONFIG__ = undefined;
</script>
<script type="module" src="/src/spa/entry.popup.tsx"></script>
</body>
</html>
+1 -2
View File
@@ -86,6 +86,5 @@
"window.minimize": "تصغير",
"window.title": "نافذة",
"window.toggleFullscreen": "تبديل وضع ملء الشاشة",
"window.zoom": "تكبير",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "تكبير"
}
@@ -86,6 +86,5 @@
"window.minimize": "Минимизирай",
"window.title": "Прозорец",
"window.toggleFullscreen": "Превключи на цял екран",
"window.zoom": "Мащаб",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "Мащаб"
}
@@ -86,6 +86,5 @@
"window.minimize": "Minimieren",
"window.title": "Fenster",
"window.toggleFullscreen": "Vollbild umschalten",
"window.zoom": "Zoom",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "Zoom"
}
@@ -15,11 +15,6 @@
"fullDiskAccess.openSettings": "Open Settings",
"fullDiskAccess.skip": "Later",
"fullDiskAccess.title": "Full Disk Access Required",
"screenCaptureAccess.cancel": "Later",
"screenCaptureAccess.detail": "Open System Settings, enable Screen Recording for LobeHub, then try Quick Composer again.",
"screenCaptureAccess.message": "Quick Composer needs Screen Recording permission before it can capture screenshots.",
"screenCaptureAccess.openSettings": "Open Settings",
"screenCaptureAccess.title": "Screen Recording Permission Required",
"update.downloadAndInstall": "Download and Install",
"update.downloadComplete": "Download Complete",
"update.downloadCompleteMessage": "Update downloaded. Install now?",
@@ -71,8 +71,6 @@
"macOS.services": "Services",
"macOS.unhide": "Show All",
"tray.open": "Open {{appName}}",
"tray.openMiniToolbar": "Quick Composer",
"tray.quickChat": "Quick Chat",
"tray.quit": "Quit",
"tray.show": "Show {{appName}}",
"view.forceReload": "Force Reload",
@@ -86,6 +86,5 @@
"window.minimize": "Minimizar",
"window.title": "Ventana",
"window.toggleFullscreen": "Alternar pantalla completa",
"window.zoom": "Zoom",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "Zoom"
}
@@ -86,6 +86,5 @@
"window.minimize": "کوچک کردن",
"window.title": "پنجره",
"window.toggleFullscreen": "تغییر به حالت تمام صفحه",
"window.zoom": "زوم",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "زوم"
}
@@ -86,6 +86,5 @@
"window.minimize": "Réduire",
"window.title": "Fenêtre",
"window.toggleFullscreen": "Basculer en plein écran",
"window.zoom": "Zoom",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "Zoom"
}
@@ -86,6 +86,5 @@
"window.minimize": "Minimizza",
"window.title": "Finestra",
"window.toggleFullscreen": "Attiva/disattiva schermo intero",
"window.zoom": "Zoom",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "Zoom"
}
@@ -86,6 +86,5 @@
"window.minimize": "最小化",
"window.title": "ウィンドウ",
"window.toggleFullscreen": "フルスクリーン切替",
"window.zoom": "ズーム",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "ズーム"
}
@@ -86,6 +86,5 @@
"window.minimize": "최소화",
"window.title": "창",
"window.toggleFullscreen": "전체 화면 전환",
"window.zoom": "줌",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "줌"
}
@@ -86,6 +86,5 @@
"window.minimize": "Minimaliseren",
"window.title": "Venster",
"window.toggleFullscreen": "Schakel volledig scherm in/uit",
"window.zoom": "Inzoomen",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "Inzoomen"
}
@@ -86,6 +86,5 @@
"window.minimize": "Zminimalizuj",
"window.title": "Okno",
"window.toggleFullscreen": "Przełącz tryb pełnoekranowy",
"window.zoom": "Powiększenie",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "Powiększenie"
}
@@ -86,6 +86,5 @@
"window.minimize": "Minimizar",
"window.title": "Janela",
"window.toggleFullscreen": "Alternar Tela Cheia",
"window.zoom": "Zoom",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "Zoom"
}
@@ -86,6 +86,5 @@
"window.minimize": "Свернуть",
"window.title": "Окно",
"window.toggleFullscreen": "Переключить полноэкранный режим",
"window.zoom": "Масштаб",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "Масштаб"
}
@@ -86,6 +86,5 @@
"window.minimize": "Küçült",
"window.title": "Pencere",
"window.toggleFullscreen": "Tam Ekrana Geç",
"window.zoom": "Yakınlaştır",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "Yakınlaştır"
}
@@ -86,6 +86,5 @@
"window.minimize": "Thu nhỏ",
"window.title": "Cửa sổ",
"window.toggleFullscreen": "Chuyển đổi toàn màn hình",
"window.zoom": "Thu phóng",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "Thu phóng"
}
@@ -15,11 +15,6 @@
"fullDiskAccess.openSettings": "打开设置",
"fullDiskAccess.skip": "稍后",
"fullDiskAccess.title": "需要完全磁盘访问权限",
"screenCaptureAccess.cancel": "稍后",
"screenCaptureAccess.detail": "请打开系统设置,为 LobeHub 开启“屏幕录制”权限,然后再次尝试 Quick Composer。",
"screenCaptureAccess.message": "Quick Composer 需要“屏幕录制”权限后才能进行截图。",
"screenCaptureAccess.openSettings": "打开设置",
"screenCaptureAccess.title": "需要屏幕录制权限",
"update.downloadAndInstall": "下载并安装",
"update.downloadComplete": "下载完成",
"update.downloadCompleteMessage": "已下载更新。现在安装吗?",
@@ -48,7 +48,6 @@
"file.newAgent": "新建助手",
"file.newAgentGroup": "新建助手组",
"file.newPage": "新建页面",
"file.newTab": "新建标签页",
"file.newTopic": "新建话题",
"file.preferences": "设置…",
"file.quit": "退出",
@@ -72,8 +71,6 @@
"macOS.services": "服务",
"macOS.unhide": "全部显示",
"tray.open": "打开 {{appName}}",
"tray.openMiniToolbar": "Quick Composer",
"tray.quickChat": "快捷聊天",
"tray.quit": "退出",
"tray.show": "显示 {{appName}}",
"view.forceReload": "强制重新加载",
@@ -86,6 +86,5 @@
"window.minimize": "最小化",
"window.title": "視窗",
"window.toggleFullscreen": "切換全螢幕",
"window.zoom": "縮放",
"tray.openMiniToolbar": "Quick Composer"
"window.zoom": "縮放"
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 807 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 738 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 704 B

@@ -1,51 +0,0 @@
#!/usr/bin/env node
/**
* Generate the macOS tray template icon set (black + alpha).
*
* Template images must contain only black pixels and an alpha channel;
* macOS then recolors them automatically based on the menu bar theme.
*
* Renders two files in apps/desktop/resources:
* - trayTemplate.png (@1x, 18x18)
* - trayTemplate@2x.png (@2x, 36x36)
*
* Run: bun run apps/desktop/scripts/generate-tray-template.mjs
*/
import { mkdir } from 'node:fs/promises';
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import sharp from 'sharp';
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const outDir = path.resolve(__dirname, '..', 'resources');
// Silhouette derived from the LobeHub logo. Eyes and mouth are cut as
// transparent holes via fill-rule=evenodd so they remain visible when
// macOS tints the entire shape in a single color.
const svg = `<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 320">
<path fill="#000" d="M172.997 19.016c-14.027 0-19.5-11.5-41-11-23.394 0-34 13-45.5 23-1.958 1.702-11.5 7-16 9-19.683 8.748-34.5 21.5-34.5 40.5 0 20.711 17.461 37.5 39 37.5 3.536 0 6.963-.453 10.22-1.301 8.7 10.539 22.179 16.658 37.28 17.301 23.5 1 31-15.25 44.5-8.5 9.259 4.629 13.83 8.5 28.5 8.5 17.108 0 25.057-5.233 30-11 9-10.5 22.879-4 31.5-4 18.778 0 34-14.551 34-32.5 0-17.95-15.222-32.5-34-32.5-5.15 0-14.856 1.27-17-7-3.5-13.5-20.148-29-44-29-9.318 0-17.691 1-23 1z"/>
<path fill="#000" fill-rule="evenodd" d="M294 172.519c0 75.655-59.442 128.5-134 128.5-74.558 0-134-53.845-134-129.5 0-22.5 5-32.141 31.5-35.671 47.5-6.329 72.542-3.829 102.5-3.829 29.959 0 72.556-1.27 102.5 3.829 24.5 4.171 30 8.671 31.5 36.671zM101 221.012c15.464 0 28-12.536 28-28s-12.536-28-28-28-28 12.536-28 28 12.536 28 28 28zM219 221.012c15.464 0 28-12.536 28-28s-12.536-28-28-28-28 12.536-28 28 12.536 28 28 28zM159.75 242.51c-28.25 0-35.75 3.5-35.75 3.5s3.5 27 35.75 27 35.75-27 35.75-27-7.5-3.5-35.75-3.5z"/>
</svg>
`;
async function render(size, outFile) {
const buf = Buffer.from(svg);
await sharp(buf, { density: Math.max(72, size * 12) })
.resize(size, size, { fit: 'contain', background: { r: 0, g: 0, b: 0, alpha: 0 } })
.png()
.toFile(outFile);
console.log(`wrote ${path.relative(process.cwd(), outFile)} (${size}x${size})`);
}
async function main() {
await mkdir(outDir, { recursive: true });
await render(18, path.join(outDir, 'trayTemplate.png'));
await render(36, path.join(outDir, 'trayTemplate@2x.png'));
}
main().catch((err) => {
console.error(err);
process.exit(1);
});
-14
View File
@@ -66,20 +66,6 @@ export const windowTemplates = {
titleBarStyle: 'hidden',
width: 900,
},
// Dedicated single-topic popup window. Loads the popup.html SPA entry
// (no sidebar / portal), one window per (scope, id) pair.
topicPopup: {
allowMultipleInstances: true,
autoHideMenuBar: true,
baseIdentifier: 'topicPopup',
basePath: '/popup',
height: 720,
keepAlive: false,
minWidth: 480,
parentIdentifier: 'app',
titleBarStyle: 'hidden',
width: 900,
},
} satisfies Record<string, WindowTemplate>;
export type AppBrowsersIdentifiers = keyof typeof appBrowsers;
+10 -10
View File
@@ -1,29 +1,29 @@
import path from 'node:path';
import { join } from 'node:path';
import { app } from 'electron';
export const mainDir = path.join(__dirname);
export const mainDir = join(__dirname);
export const preloadDir = path.join(mainDir, '../preload');
export const preloadDir = join(mainDir, '../preload');
export const resourcesDir = path.join(mainDir, '../../resources');
export const resourcesDir = join(mainDir, '../../resources');
export const buildDir = path.join(mainDir, '../../build');
export const buildDir = join(mainDir, '../../build');
export const binDir = app.isPackaged
? path.join(process.resourcesPath, 'bin')
: path.join(resourcesDir, 'bin');
? join(process.resourcesPath, 'bin')
: join(resourcesDir, 'bin');
const appPath = app.getAppPath();
export const rendererDir = path.join(appPath, 'dist', 'renderer');
export const rendererDir = join(appPath, 'dist', 'renderer');
export const userDataDir = app.getPath('userData');
export const appStorageDir = path.join(userDataDir, 'lobehub-storage');
export const appStorageDir = join(userDataDir, 'lobehub-storage');
// Legacy local database directory used in older desktop versions
export const legacyLocalDbDir = path.join(appStorageDir, 'lobehub-local-db');
export const legacyLocalDbDir = join(appStorageDir, 'lobehub-local-db');
// ------ Application storage directory ---- //
+5 -5
View File
@@ -1,16 +1,16 @@
import os from 'node:os';
import * as electronIs from 'electron-is';
import { dev, linux, macOS, windows } from 'electron-is';
import { getDesktopEnv } from '@/env';
export const isDev = electronIs.dev();
export const isDev = dev();
export const OFFICIAL_CLOUD_SERVER = getDesktopEnv().OFFICIAL_CLOUD_SERVER;
export const isMac = electronIs.macOS();
export const isWindows = electronIs.windows();
export const isLinux = electronIs.linux();
export const isMac = macOS();
export const isWindows = windows();
export const isLinux = linux();
function getIsMacTahoe(): boolean {
if (!isMac) return false;
+2 -2
View File
@@ -1,11 +1,11 @@
/**
* Application settings storage related constants
*/
import { DEFAULT_ELECTRON_DESKTOP_SHORTCUTS } from '@lobechat/const/desktopGlobalShortcuts';
import type { NetworkProxySettings } from '@lobechat/electron-client-ipc';
import { appStorageDir } from '@/const/dir';
import { UPDATE_CHANNEL } from '@/modules/updater/configs';
import { DEFAULT_SHORTCUTS_CONFIG } from '@/shortcuts';
import type { ElectronMainStore } from '@/types/store';
/**
@@ -35,7 +35,7 @@ export const STORE_DEFAULTS: ElectronMainStore = {
gatewayUrl: 'https://device-gateway.lobehub.com',
locale: 'auto',
networkProxy: defaultProxySettings,
shortcuts: DEFAULT_ELECTRON_DESKTOP_SHORTCUTS,
shortcuts: DEFAULT_SHORTCUTS_CONFIG,
storagePath: appStorageDir,
themeMode: 'system',
updateChannel: UPDATE_CHANNEL,
@@ -1,5 +1,4 @@
import type {
FocusTopicPopupParams,
InterceptRouteParams,
OpenSettingsWindowOptions,
WindowMinimumSizeParams,
@@ -16,21 +15,11 @@ export default class BrowserWindowsCtr extends ControllerModule {
static override readonly groupName = 'windows';
@shortcut('showApp')
toggleMainWindow() {
async toggleMainWindow() {
const mainWindow = this.app.browserManager.getMainWindow();
mainWindow.toggleVisible();
}
@shortcut('quickComposer')
async openQuickComposer() {
await this.app.screenCaptureManager.startSession();
}
@shortcut('quickChat')
openQuickChat() {
this.app.browserManager.openQuickChatPopup();
}
@IpcMethod()
async openSettingsWindow(options?: string | OpenSettingsWindowOptions) {
const normalizedOptions: OpenSettingsWindowOptions =
@@ -91,30 +80,6 @@ export default class BrowserWindowsCtr extends ControllerModule {
});
}
@IpcMethod()
setWindowAlwaysOnTop(flag: boolean) {
this.withSenderIdentifier((identifier) => {
this.app.browserManager.setWindowAlwaysOnTop(identifier, flag);
});
}
@IpcMethod()
isWindowAlwaysOnTop() {
return this.withSenderIdentifier((identifier) => {
return this.app.browserManager.isWindowAlwaysOnTop(identifier);
});
}
@IpcMethod()
listTopicPopups() {
return this.app.browserManager.listTopicPopups();
}
@IpcMethod()
focusTopicPopup(params: FocusTopicPopupParams) {
return this.app.browserManager.focusTopicPopup(params.identifier);
}
@IpcMethod()
setWindowSize(params: WindowSizeParams) {
this.withSenderIdentifier((identifier) => {
-420
View File
@@ -1,420 +0,0 @@
import { execFile } from 'node:child_process';
import { readFile } from 'node:fs/promises';
import path from 'node:path';
import { promisify } from 'node:util';
import type {
GitAheadBehind,
GitBranchInfo,
GitBranchListItem,
GitCheckoutResult,
GitLinkedPullRequestResult,
GitPullResult,
GitPushResult,
GitWorkingTreeFiles,
GitWorkingTreeStatus,
} from '@lobechat/electron-client-ipc';
import { detectRepoType, resolveGitDir } from '@/utils/git';
import { createLogger } from '@/utils/logger';
import { ControllerModule, IpcMethod } from './index';
const logger = createLogger('controllers:GitCtr');
export default class GitController extends ControllerModule {
static override readonly groupName = 'git';
@IpcMethod()
async detectRepoType(dirPath: string): Promise<'git' | 'github' | undefined> {
return detectRepoType(dirPath);
}
/**
* Read current git branch from `.git/HEAD`. Returns short sha on detached HEAD.
* Handles both standard `.git` directories and `.git` worktree pointer files.
*/
@IpcMethod()
async getGitBranch(dirPath: string): Promise<GitBranchInfo> {
try {
const gitDir = await resolveGitDir(dirPath);
if (!gitDir) return {};
const head = (await readFile(path.join(gitDir, 'HEAD'), 'utf8')).trim();
const refMatch = /^ref:\s*refs\/heads\/(.+)$/.exec(head);
if (refMatch) {
return { branch: refMatch[1] };
}
// Detached HEAD — HEAD file contains the full sha
if (/^[\da-f]{40}$/i.test(head)) {
return { branch: head.slice(0, 7), detached: true };
}
return {};
} catch {
return {};
}
}
/**
* Query `gh` CLI for an open pull request whose head branch matches `branch`.
* Returns status = 'gh-missing' when `gh` is not installed / not authenticated,
* so the UI can render a helpful tooltip instead of an error.
*/
@IpcMethod()
async getLinkedPullRequest(payload: {
branch: string;
path: string;
}): Promise<GitLinkedPullRequestResult> {
const { path: dirPath, branch } = payload;
if (!branch) {
return { pullRequest: null, status: 'ok' };
}
const execFileAsync = promisify(execFile);
try {
const { stdout } = await execFileAsync(
'gh',
[
'pr',
'list',
'--head',
branch,
'--state',
'open',
'--limit',
'5',
'--json',
'number,url,title,state',
],
{ cwd: dirPath, timeout: 8000 },
);
const parsed = JSON.parse(stdout.trim() || '[]') as Array<{
number: number;
state: string;
title: string;
url: string;
}>;
if (parsed.length === 0) {
return { pullRequest: null, status: 'ok' };
}
const [primary, ...rest] = parsed;
return {
extraCount: rest.length,
pullRequest: primary,
status: 'ok',
};
} catch (error: any) {
const code = error?.code;
const stderr: string = error?.stderr ?? '';
// `gh` binary not on PATH
if (code === 'ENOENT') {
return { pullRequest: null, status: 'gh-missing' };
}
// gh reports auth issues via stderr; treat as a soft-fail
if (/auth\s+login|not\s+logged\s+in|authentication/i.test(stderr)) {
return { pullRequest: null, status: 'gh-missing' };
}
logger.debug('[getLinkedPullRequest] failed', { branch, code, stderr });
return { pullRequest: null, status: 'error' };
}
}
/**
* List local git branches ordered by most recent commit.
* `current` is true for the checked-out branch.
*/
@IpcMethod()
async listGitBranches(dirPath: string): Promise<GitBranchListItem[]> {
const execFileAsync = promisify(execFile);
try {
const { stdout } = await execFileAsync(
'git',
[
'for-each-ref',
'--sort=-committerdate',
'--format=%(HEAD)%09%(refname:short)%09%(upstream:short)',
'refs/heads',
],
{ cwd: dirPath, timeout: 5000 },
);
return stdout
.replaceAll('\r', '')
.split('\n')
.filter((line) => line.length > 0)
.map((line) => {
// Line format: "<HEAD-marker>\t<branch>\t<upstream>" where HEAD-marker is '*' or ' '
const [head, name, upstream] = line.split('\t');
return {
current: head === '*',
name: name ?? '',
upstream: upstream || undefined,
};
})
.filter((b) => b.name);
} catch (error: any) {
logger.warn('[listGitBranches] git command failed', {
code: error?.code,
cwd: dirPath,
message: error?.message,
stderr: error?.stderr?.toString?.() ?? error?.stderr,
});
return [];
}
}
/**
* Bucket dirty files into added / modified / deleted via `git status --porcelain -z`.
* Each file is counted once: untracked (`??`) and staged-add (`A`) → added,
* any `D` in index or working tree → deleted, everything else (`M`/`R`/`C`/`T`/`U`) → modified.
*
* Uses `-z` so paths are NUL-terminated (no C-style quoting, no `\n` splitting bugs).
* Rename/copy entries (`R`/`C`) emit two NUL-separated tokens — dest path then source
* path — so the source token must be consumed to keep counts correct.
*/
@IpcMethod()
async getGitWorkingTreeStatus(dirPath: string): Promise<GitWorkingTreeStatus> {
const execFileAsync = promisify(execFile);
try {
const { stdout } = await execFileAsync('git', ['status', '--porcelain', '-z'], {
cwd: dirPath,
timeout: 5000,
});
const tokens = stdout.split('\0');
let added = 0;
let modified = 0;
let deleted = 0;
let i = 0;
while (i < tokens.length) {
const entry = tokens[i];
i++;
if (entry.length < 2) continue;
const x = entry[0];
const y = entry[1];
// R/C entries carry an extra source-path token we must consume.
if (x === 'R' || x === 'C') i++;
if (x === '?' && y === '?') {
added++;
} else if (x === '!' && y === '!') {
// ignored — skip
} else if (x === 'D' || y === 'D') {
deleted++;
} else if (x === 'A' || y === 'A') {
added++;
} else {
modified++;
}
}
const total = added + modified + deleted;
return { added, clean: total === 0, deleted, modified, total };
} catch {
return { added: 0, clean: true, deleted: 0, modified: 0, total: 0 };
}
}
/**
* Return dirty file paths bucketed into added / modified / deleted.
* Same classification as getGitWorkingTreeStatus, but with per-file paths.
*
* Uses `git status --porcelain -z` so paths are NUL-terminated and never C-quoted,
* which avoids misparsing filenames that legitimately contain ` -> `, quote chars,
* or newlines. For R/C entries the two NUL-separated tokens are `DEST\0SRC`; we
* report DEST (the current working-tree path) and discard SRC.
*/
@IpcMethod()
async getGitWorkingTreeFiles(dirPath: string): Promise<GitWorkingTreeFiles> {
const execFileAsync = promisify(execFile);
const added: string[] = [];
const modified: string[] = [];
const deleted: string[] = [];
try {
const { stdout } = await execFileAsync('git', ['status', '--porcelain', '-z'], {
cwd: dirPath,
timeout: 5000,
});
const tokens = stdout.split('\0');
let i = 0;
while (i < tokens.length) {
const entry = tokens[i];
i++;
if (entry.length < 3) continue;
const x = entry[0];
const y = entry[1];
const filePath = entry.slice(3);
// R/C entries carry an extra source-path token we must consume.
if (x === 'R' || x === 'C') i++;
if (!filePath) continue;
if (x === '?' && y === '?') {
added.push(filePath);
} else if (x === '!' && y === '!') {
// ignored — skip
} else if (x === 'D' || y === 'D') {
deleted.push(filePath);
} else if (x === 'A' || y === 'A') {
added.push(filePath);
} else {
modified.push(filePath);
}
}
return { added, deleted, modified };
} catch {
return { added: [], deleted: [], modified: [] };
}
}
/**
* Count commits HEAD is ahead/behind its upstream tracking ref.
* Returns `hasUpstream: false` when the branch has no upstream configured
* (e.g. local-only branches, or after the remote branch is deleted).
*
* Does a best-effort `git fetch` first so the result reflects what's
* actually on the remote — the renderer calls this via SWR with
* `revalidateOnFocus`, so the fetch piggybacks on window re-focus. Fetch
* failures (offline, no credentials, no `origin` remote) are swallowed so
* we still return whatever can be computed against the cached refs.
*/
@IpcMethod()
async getGitAheadBehind(dirPath: string): Promise<GitAheadBehind> {
const execFileAsync = promisify(execFile);
try {
await execFileAsync('git', ['fetch', '--no-tags', '--quiet', 'origin'], {
cwd: dirPath,
timeout: 10_000,
});
} catch {
// swallow — fall through to compute against cached refs
}
try {
const { stdout: upstreamOut } = await execFileAsync(
'git',
['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'],
{ cwd: dirPath, timeout: 5000 },
);
const upstream = upstreamOut.trim();
if (!upstream) return { ahead: 0, behind: 0, hasUpstream: false };
const { stdout } = await execFileAsync(
'git',
['rev-list', '--left-right', '--count', `${upstream}...HEAD`],
{ cwd: dirPath, timeout: 5000 },
);
const [behindStr, aheadStr] = stdout.trim().split(/\s+/);
const behind = Number.parseInt(behindStr ?? '0', 10) || 0;
const ahead = Number.parseInt(aheadStr ?? '0', 10) || 0;
// `git push -u origin HEAD` always targets origin/<current-branch-name>,
// which may differ from upstream (the branched-off-canary case).
let pushTarget: string | undefined;
let pushTargetExists = false;
try {
const { stdout: branchOut } = await execFileAsync(
'git',
['symbolic-ref', '--short', 'HEAD'],
{ cwd: dirPath, timeout: 5000 },
);
const branch = branchOut.trim();
if (branch) {
pushTarget = `origin/${branch}`;
try {
await execFileAsync(
'git',
['rev-parse', '--verify', '--quiet', `refs/remotes/${pushTarget}`],
{ cwd: dirPath, timeout: 5000 },
);
pushTargetExists = true;
} catch {
pushTargetExists = false;
}
}
} catch {
// detached HEAD — leave pushTarget undefined
}
return { ahead, behind, hasUpstream: true, pushTarget, pushTargetExists, upstream };
} catch {
// No upstream configured, detached HEAD, or git error — all treated as "no upstream"
return { ahead: 0, behind: 0, hasUpstream: false };
}
}
/**
* Check out (or create + check out) a branch.
* Relies on git itself to reject unsafe checkouts (dirty tree, non-fast-forward, etc.)
* and surfaces git's stderr so the UI can display a meaningful error.
*/
@IpcMethod()
async checkoutGitBranch(payload: {
branch: string;
create?: boolean;
path: string;
}): Promise<GitCheckoutResult> {
const { path: dirPath, branch, create } = payload;
if (!branch?.trim()) {
return { error: 'Branch name is required', success: false };
}
// Reject obviously invalid refs early to avoid a confusing git error
if (/[\s~^:?*[\\]/.test(branch) || branch.startsWith('-') || branch.includes('..')) {
return { error: `Invalid branch name: ${branch}`, success: false };
}
const execFileAsync = promisify(execFile);
const args = create ? ['checkout', '-b', branch] : ['checkout', branch];
try {
await execFileAsync('git', args, { cwd: dirPath, timeout: 10_000 });
return { success: true };
} catch (error: any) {
const stderr: string = (error?.stderr ?? error?.message ?? '').toString().trim();
logger.debug('[checkoutGitBranch] failed', { args, stderr });
return { error: stderr || 'git checkout failed', success: false };
}
}
/**
* Pull the current branch's upstream via fast-forward only.
*
* `--ff-only` avoids creating accidental merge commits when the local branch
* has diverged — in that case the user should resolve merge/rebase in their
* own terminal. For the common "just behind" case this is a safe one-click.
*/
@IpcMethod()
async pullGitBranch(payload: { path: string }): Promise<GitPullResult> {
const { path: dirPath } = payload;
const execFileAsync = promisify(execFile);
try {
const { stdout } = await execFileAsync('git', ['pull', '--ff-only'], {
cwd: dirPath,
timeout: 60_000,
});
const noop = /Already up to date/i.test(stdout);
return { noop, success: true };
} catch (error: any) {
const stderr: string = (error?.stderr ?? error?.message ?? '').toString().trim();
logger.debug('[pullGitBranch] failed', { stderr });
return { error: stderr || 'git pull failed', success: false };
}
}
/**
* Push the current branch to its same-named remote on `origin`.
*
* Uses `git push -u origin HEAD` instead of plain `git push` so the action
* works even when local branch name differs from the configured upstream
*/
@IpcMethod()
async pushGitBranch(payload: { path: string }): Promise<GitPushResult> {
const { path: dirPath } = payload;
const execFileAsync = promisify(execFile);
try {
const { stderr } = await execFileAsync('git', ['push', '-u', 'origin', 'HEAD'], {
cwd: dirPath,
timeout: 60_000,
});
// git push writes progress/status to stderr even on success
const noop = /Everything up-to-date/i.test(stderr);
return { noop, success: true };
} catch (error: any) {
const stderr: string = (error?.stderr ?? error?.message ?? '').toString().trim();
logger.debug('[pushGitBranch] failed', { stderr });
return { error: stderr || 'git push failed', success: false };
}
}
}
@@ -1,768 +0,0 @@
import type { ChildProcess } from 'node:child_process';
import { spawn } from 'node:child_process';
import { createHash, randomUUID } from 'node:crypto';
import { access, mkdir, readFile, writeFile } from 'node:fs/promises';
import path from 'node:path';
import type { Readable, Writable } from 'node:stream';
import type { HeterogeneousAgentSessionError } from '@lobechat/electron-client-ipc';
import {
CLAUDE_CODE_CLI_INSTALL_COMMANDS,
CLAUDE_CODE_CLI_INSTALL_DOCS_URL,
CODEX_CLI_INSTALL_COMMANDS,
CODEX_CLI_INSTALL_DOCS_URL,
HeterogeneousAgentSessionErrorCode,
} from '@lobechat/electron-client-ipc';
import { app as electronApp, BrowserWindow } from 'electron';
import { getHeterogeneousAgentDriver } from '@/modules/heterogeneousAgent';
import type {
HeterogeneousAgentImageAttachment,
HeterogeneousAgentParsedOutput,
} from '@/modules/heterogeneousAgent/types';
import { buildProxyEnv } from '@/modules/networkProxy/envBuilder';
import { detectHeterogeneousCliCommand } from '@/modules/toolDetectors';
import { createLogger } from '@/utils/logger';
import { ControllerModule, IpcMethod } from './index';
const logger = createLogger('controllers:HeterogeneousAgentCtr');
const CODEX_RESUME_THREAD_NOT_FOUND_PATTERNS = [
/no conversation found/i,
/thread .*not found/i,
/conversation .*not found/i,
/resume.*not found/i,
] as const;
const CLI_AUTH_REQUIRED_PATTERNS = [
/failed to authenticate/i,
/invalid authentication credentials/i,
/authentication[_ ]error/i,
/not authenticated/i,
/\bunauthorized\b/i,
/\b401\b/,
] as const;
const CODEX_RESUME_CWD_MISMATCH_PATTERNS = [
/working directory/i,
/\bcwd\b/i,
/different directory/i,
/directory.*mismatch/i,
] as const;
/** Directory under appStoragePath for caching downloaded files */
const FILE_CACHE_DIR = 'heteroAgent/files';
// ─── IPC types ───
interface StartSessionParams {
/** Agent type key (e.g., 'claude-code'). Defaults to 'claude-code'. */
agentType?: string;
/** Additional CLI arguments */
args?: string[];
/** Command to execute */
command: string;
/** Working directory */
cwd?: string;
/** Environment variables */
env?: Record<string, string>;
/** Session ID to resume (for multi-turn) */
resumeSessionId?: string;
}
interface StartSessionResult {
sessionId: string;
}
interface SendPromptParams {
/** Image attachments to include in the prompt (downloaded from url, cached by id) */
imageList?: HeterogeneousAgentImageAttachment[];
prompt: string;
sessionId: string;
}
interface CancelSessionParams {
sessionId: string;
}
interface StopSessionParams {
sessionId: string;
}
interface GetSessionInfoParams {
sessionId: string;
}
interface SessionInfo {
agentSessionId?: string;
}
// ─── Internal session tracking ───
interface AgentSession {
agentSessionId?: string;
agentType: string;
args: string[];
/**
* True when *we* initiated the kill (cancelSession / stopSession / before-quit).
* The `exit` handler uses this to route signal-induced non-zero exits through
* the `complete` broadcast instead of surfacing them as runtime errors —
* SIGINT(130) / SIGTERM(143) / SIGKILL(137) from our own kill paths are
* intentional, not agent failures.
*/
cancelledByUs?: boolean;
command: string;
cwd?: string;
env?: Record<string, string>;
process?: ChildProcess;
resumeSessionId?: string;
sessionId: string;
}
type SessionErrorPayload = HeterogeneousAgentSessionError | string;
/**
* External Agent Controller — manages external agent CLI processes via Electron IPC.
*
* Agent-agnostic: delegates spawn-plan construction and stdout framing to a
* per-agent driver so Claude Code, Codex, and future CLIs can differ in
* prompt transport, resume semantics, and raw stream shape without turning
* this controller into a giant `switch`.
*
* Lifecycle: startSession → sendPrompt → (heteroAgentRawLine broadcasts) → stopSession
*/
export default class HeterogeneousAgentCtr extends ControllerModule {
static override readonly groupName = 'heterogeneousAgent';
private sessions = new Map<string, AgentSession>();
private resolveSessionCommand(session: AgentSession): string {
const resolvedCommand = session.command.trim();
if (resolvedCommand) return resolvedCommand;
return session.agentType === 'codex' ? 'codex' : 'claude';
}
private buildCodexCliMissingError(session: AgentSession): HeterogeneousAgentSessionError {
const command = this.resolveSessionCommand(session);
return {
agentType: 'codex',
code: HeterogeneousAgentSessionErrorCode.CliNotFound,
command,
docsUrl: CODEX_CLI_INSTALL_DOCS_URL,
installCommands: CODEX_CLI_INSTALL_COMMANDS,
message: `Codex CLI was not found. Install it and make sure \`${command}\` can be executed.`,
};
}
private buildClaudeCodeCliMissingError(session: AgentSession): HeterogeneousAgentSessionError {
const command = this.resolveSessionCommand(session);
return {
agentType: 'claude-code',
code: HeterogeneousAgentSessionErrorCode.CliNotFound,
command,
docsUrl: CLAUDE_CODE_CLI_INSTALL_DOCS_URL,
installCommands: CLAUDE_CODE_CLI_INSTALL_COMMANDS,
message: `Claude Code CLI was not found. Install it and make sure \`${command}\` can be executed.`,
};
}
private buildCliMissingError(session: AgentSession): HeterogeneousAgentSessionError | undefined {
switch (session.agentType) {
case 'claude-code': {
return this.buildClaudeCodeCliMissingError(session);
}
case 'codex': {
return this.buildCodexCliMissingError(session);
}
default: {
return;
}
}
}
private buildCliAuthRequiredError(
session: AgentSession,
stderr: string,
): HeterogeneousAgentSessionError | undefined {
const command = this.resolveSessionCommand(session);
switch (session.agentType) {
case 'claude-code': {
return {
agentType: 'claude-code',
code: HeterogeneousAgentSessionErrorCode.AuthRequired,
command,
docsUrl: CLAUDE_CODE_CLI_INSTALL_DOCS_URL,
message:
'Claude Code could not authenticate. Sign in again or refresh its credentials, then retry.',
stderr,
};
}
case 'codex': {
return {
agentType: 'codex',
code: HeterogeneousAgentSessionErrorCode.AuthRequired,
command,
docsUrl: CODEX_CLI_INSTALL_DOCS_URL,
message:
'Codex could not authenticate. Sign in again or refresh its credentials, then retry.',
stderr,
};
}
default: {
return;
}
}
}
private getErrorMessage(error: unknown): string | undefined {
return typeof error === 'string'
? error
: error instanceof Error
? error.message
: typeof error === 'object' &&
error &&
'message' in error &&
typeof error.message === 'string'
? error.message
: undefined;
}
private buildCodexResumeError(
code:
| typeof HeterogeneousAgentSessionErrorCode.ResumeCwdMismatch
| typeof HeterogeneousAgentSessionErrorCode.ResumeThreadNotFound,
stderr: string,
session: AgentSession,
): HeterogeneousAgentSessionError {
const message =
code === HeterogeneousAgentSessionErrorCode.ResumeCwdMismatch
? 'The saved Codex thread can only be resumed from its original working directory.'
: 'The saved Codex thread could not be found, so it can no longer be resumed.';
return {
agentType: 'codex',
code,
command: session.command,
message,
resumeSessionId: session.resumeSessionId,
stderr,
workingDirectory: session.cwd,
};
}
private getCodexResumeError(
error: unknown,
session: AgentSession,
): HeterogeneousAgentSessionError | undefined {
if (session.agentType !== 'codex' || !session.resumeSessionId) return;
const message = this.getErrorMessage(error);
if (!message) return;
if (CODEX_RESUME_CWD_MISMATCH_PATTERNS.some((pattern) => pattern.test(message))) {
return this.buildCodexResumeError(
HeterogeneousAgentSessionErrorCode.ResumeCwdMismatch,
message,
session,
);
}
if (CODEX_RESUME_THREAD_NOT_FOUND_PATTERNS.some((pattern) => pattern.test(message))) {
return this.buildCodexResumeError(
HeterogeneousAgentSessionErrorCode.ResumeThreadNotFound,
message,
session,
);
}
}
private getCliAuthRequiredError(
error: unknown,
session: AgentSession,
): HeterogeneousAgentSessionError | undefined {
const message = this.getErrorMessage(error);
if (!message || !CLI_AUTH_REQUIRED_PATTERNS.some((pattern) => pattern.test(message))) return;
return this.buildCliAuthRequiredError(session, message);
}
private getSessionErrorPayload(error: unknown, session: AgentSession): SessionErrorPayload {
if (typeof error === 'object' && error && 'code' in error && error.code === 'ENOENT') {
const cliMissingError = this.buildCliMissingError(session);
if (cliMissingError) return cliMissingError;
}
const resumeError = this.getCodexResumeError(error, session);
if (resumeError) return resumeError;
const authRequiredError = this.getCliAuthRequiredError(error, session);
if (authRequiredError) return authRequiredError;
return error instanceof Error ? error.message : String(error);
}
private async getSpawnPreflightError(
session: AgentSession,
): Promise<HeterogeneousAgentSessionError | undefined> {
const defaultCommand =
session.agentType === 'claude-code'
? 'claude'
: session.agentType === 'codex'
? 'codex'
: undefined;
if (!defaultCommand) return;
const command = this.resolveSessionCommand(session);
const status =
command === defaultCommand
? await this.app.toolDetectorManager?.detect?.(defaultCommand, true)
: await detectHeterogeneousCliCommand(
session.agentType === 'claude-code' ? 'claude-code' : 'codex',
command,
);
const cliMissingError = this.buildCliMissingError(session);
if (!status || status.available || !cliMissingError) return;
return cliMissingError;
}
// ─── Broadcast ───
private broadcast<T>(channel: string, data: T) {
for (const win of BrowserWindow.getAllWindows()) {
if (!win.isDestroyed()) {
win.webContents.send(channel, data);
}
}
}
// ─── File cache ───
private get fileCacheDir(): string {
return path.join(this.app.appStoragePath, FILE_CACHE_DIR);
}
/**
* Derive a filesystem-safe cache key for attachments.
*
* Never use the raw image id as a path segment — upstream callers can persist
* arbitrary ids and path.join would treat traversal sequences as real
* directories. A stable hash preserves cache hits without trusting the id as a
* filename.
*/
private getImageCacheKey(imageId: string): string {
return createHash('sha256').update(imageId).digest('hex');
}
/**
* Download an image by URL, with local disk cache keyed by id.
*/
private async resolveImage(
image: HeterogeneousAgentImageAttachment,
): Promise<{ buffer: Buffer; mimeType: string }> {
const cacheDir = this.fileCacheDir;
const cacheKey = this.getImageCacheKey(image.id);
const metaPath = path.join(cacheDir, `${cacheKey}.meta`);
const dataPath = path.join(cacheDir, cacheKey);
// Check cache first
try {
const metaRaw = await readFile(metaPath, 'utf8');
const meta = JSON.parse(metaRaw);
const buffer = await readFile(dataPath);
logger.debug('Image cache hit:', image.id);
return { buffer, mimeType: meta.mimeType || 'image/png' };
} catch {
// Cache miss — download
}
logger.info('Downloading image:', image.id);
const res = await fetch(image.url);
if (!res.ok)
throw new Error(`Failed to download image ${image.id}: ${res.status} ${res.statusText}`);
const arrayBuffer = await res.arrayBuffer();
const buffer = Buffer.from(arrayBuffer);
const mimeType = res.headers.get('content-type') || 'image/png';
// Write to cache
await mkdir(cacheDir, { recursive: true });
await writeFile(dataPath, buffer);
await writeFile(metaPath, JSON.stringify({ id: image.id, mimeType }));
logger.debug('Image cached:', image.id, `${buffer.length} bytes`);
return { buffer, mimeType };
}
private guessImageExtension(
mimeType: string,
image: HeterogeneousAgentImageAttachment,
): string | undefined {
const knownByMime: Record<string, string> = {
'image/gif': '.gif',
'image/jpeg': '.jpg',
'image/png': '.png',
'image/webp': '.webp',
};
if (knownByMime[mimeType]) return knownByMime[mimeType];
try {
const pathname = new URL(image.url).pathname;
const ext = path.extname(pathname);
return ext || undefined;
} catch {
return undefined;
}
}
/**
* Materialize an image attachment into a stable local file path so CLIs like
* Codex can consume it through `--image <file>`.
*/
private async resolveCliImagePath(image: HeterogeneousAgentImageAttachment): Promise<string> {
const { buffer, mimeType } = await this.resolveImage(image);
const cacheKey = this.getImageCacheKey(image.id);
const ext = this.guessImageExtension(mimeType, image) || '';
const filePath = path.join(this.fileCacheDir, `${cacheKey}${ext}`);
try {
await access(filePath);
} catch {
await mkdir(this.fileCacheDir, { recursive: true });
await writeFile(filePath, buffer);
}
return filePath;
}
private async resolveCliImagePaths(
imageList: HeterogeneousAgentImageAttachment[] = [],
): Promise<string[]> {
const resolved = await Promise.all(
imageList.map(async (image) => {
try {
return await this.resolveCliImagePath(image);
} catch (err) {
logger.error(`Failed to materialize image ${image.id} for CLI:`, err);
return undefined;
}
}),
);
return resolved.filter(Boolean) as string[];
}
/**
* Build a stream-json user message with text + optional image content blocks.
*/
private async buildStreamJsonInput(
prompt: string,
imageList: HeterogeneousAgentImageAttachment[] = [],
): Promise<string> {
const content: any[] = [{ text: prompt, type: 'text' }];
for (const image of imageList) {
try {
const { buffer, mimeType } = await this.resolveImage(image);
content.push({
source: {
data: buffer.toString('base64'),
media_type: mimeType,
type: 'base64',
},
type: 'image',
});
} catch (err) {
logger.error(`Failed to resolve image ${image.id}:`, err);
}
}
return `${JSON.stringify({
message: { content, role: 'user' },
type: 'user',
})}\n`;
}
// ─── IPC methods ───
/**
* Create a session (stores config, process spawned on sendPrompt).
*/
@IpcMethod()
async startSession(params: StartSessionParams): Promise<StartSessionResult> {
const sessionId = randomUUID();
const agentType = params.agentType || 'claude-code';
getHeterogeneousAgentDriver(agentType);
this.sessions.set(sessionId, {
// If resuming, pre-set the agent session ID so sendPrompt adds --resume
agentSessionId: params.resumeSessionId,
agentType,
args: params.args || [],
command: params.command,
cwd: params.cwd,
env: params.env,
sessionId,
resumeSessionId: params.resumeSessionId,
});
logger.info('Session created:', { agentType, sessionId });
return { sessionId };
}
/**
* Send a prompt to an agent session.
*
* Spawns the CLI process with preset flags. Broadcasts each stdout line
* as an `heteroAgentRawLine` event — Renderer side parses and adapts.
*/
@IpcMethod()
async sendPrompt(params: SendPromptParams): Promise<void> {
const session = this.sessions.get(params.sessionId);
if (!session) throw new Error(`Session not found: ${params.sessionId}`);
const preflightError = await this.getSpawnPreflightError(session);
if (preflightError) {
this.broadcast('heteroAgentSessionError', {
error: preflightError,
sessionId: session.sessionId,
});
throw new Error(preflightError.message);
}
const driver = getHeterogeneousAgentDriver(session.agentType);
const spawnPlan = await driver.buildSpawnPlan({
args: session.args,
helpers: {
buildClaudeStreamJsonInput: (prompt, imageList) =>
this.buildStreamJsonInput(prompt, imageList),
resolveCliImagePaths: (imageList) => this.resolveCliImagePaths(imageList),
},
imageList: params.imageList ?? [],
prompt: params.prompt,
resumeSessionId: session.agentSessionId,
});
const useStdin = spawnPlan.stdinPayload !== undefined;
return new Promise<void>((resolve, reject) => {
const cliArgs = spawnPlan.args;
// Fall back to the user's Desktop so the process never inherits
// the Electron parent's cwd (which is `/` when launched from Finder).
const cwd = session.cwd || electronApp.getPath('desktop');
logger.info('Spawning agent:', session.command, cliArgs.join(' '), `(cwd: ${cwd})`);
// `detached: true` on Unix puts the child in a new process group so we
// can SIGINT/SIGKILL the whole tree (claude + any tool subprocesses)
// via `process.kill(-pid, sig)` on cancel. Without this, SIGINT to just
// the claude binary can leave bash/grep/etc. tool children running and
// the CLI hung waiting on them. Windows has different semantics — use
// taskkill /T /F there; no detached flag needed.
// Forward the user's proxy settings to the CLI. The main-process undici
// dispatcher doesn't reach child processes — they need env vars.
const proxyEnv = buildProxyEnv(this.app.storeManager.get('networkProxy'));
const proc = spawn(session.command, cliArgs, {
cwd,
detached: process.platform !== 'win32',
env: { ...process.env, ...proxyEnv, ...session.env },
stdio: [useStdin ? 'pipe' : 'ignore', 'pipe', 'pipe'],
});
// In stdin mode, write the prepared payload and close stdin.
if (useStdin && spawnPlan.stdinPayload !== undefined && proc.stdin) {
const stdin = proc.stdin as Writable;
stdin.write(spawnPlan.stdinPayload, () => {
stdin.end();
});
}
session.process = proc;
const streamProcessor = driver.createStreamProcessor();
const broadcastParsedOutputs = (parsedOutputs: HeterogeneousAgentParsedOutput[]) => {
for (const parsedOutput of parsedOutputs) {
if (parsedOutput.agentSessionId) {
session.agentSessionId = parsedOutput.agentSessionId;
}
this.broadcast('heteroAgentRawLine', {
line: parsedOutput.payload,
sessionId: session.sessionId,
});
}
};
// Stream stdout events as raw provider payloads to Renderer.
const stdout = proc.stdout as Readable;
stdout.on('data', (chunk: Buffer) => {
broadcastParsedOutputs(streamProcessor.push(chunk));
});
stdout.on('end', () => {
broadcastParsedOutputs(streamProcessor.flush());
});
// Capture stderr
const stderrChunks: string[] = [];
const stderr = proc.stderr as Readable;
stderr.on('data', (chunk: Buffer) => {
stderrChunks.push(chunk.toString('utf8'));
});
proc.on('error', (err) => {
logger.error('Agent process error:', err);
const sessionError = this.getSessionErrorPayload(err, session);
this.broadcast('heteroAgentSessionError', {
error: sessionError,
sessionId: session.sessionId,
});
reject(new Error(typeof sessionError === 'string' ? sessionError : sessionError.message));
});
proc.on('exit', (code, signal) => {
logger.info('Agent process exited:', { code, sessionId: session.sessionId, signal });
session.process = undefined;
// If *we* killed it (cancel / stop / before-quit), treat the non-zero
// exit as a clean shutdown — surfacing it as an error would make a
// user-initiated cancel look like an agent failure, and an Electron
// shutdown affecting OTHER running CC sessions would pollute their
// topics with a misleading "Agent exited with code 143" message.
if (session.cancelledByUs) {
this.broadcast('heteroAgentSessionComplete', { sessionId: session.sessionId });
resolve();
return;
}
if (code === 0) {
this.broadcast('heteroAgentSessionComplete', { sessionId: session.sessionId });
resolve();
} else {
const stderrOutput = stderrChunks.join('').trim();
const errorMsg = stderrOutput || `Agent exited with code ${code}`;
const sessionError = this.getSessionErrorPayload(errorMsg, session);
this.broadcast('heteroAgentSessionError', {
error: sessionError,
sessionId: session.sessionId,
});
reject(new Error(typeof sessionError === 'string' ? sessionError : sessionError.message));
}
});
});
}
/**
* Get session info (agent's internal session ID for multi-turn resume).
*/
@IpcMethod()
async getSessionInfo(params: GetSessionInfoParams): Promise<SessionInfo> {
const session = this.sessions.get(params.sessionId);
return { agentSessionId: session?.agentSessionId };
}
/**
* Signal the whole process tree spawned by this session.
*
* On Unix the child was spawned with `detached: true`, so negating the pid
* signals the process group — reaching tool subprocesses (bash, grep, etc.)
* that would otherwise orphan after a parent-only kill. Falls back to the
* direct signal if the group kill raises (ESRCH when the leader is already
* gone). On Windows we shell out to `taskkill /T /F` which walks the tree.
*/
private killProcessTree(proc: ChildProcess, signal: NodeJS.Signals): void {
if (!proc.pid || proc.killed) return;
if (process.platform === 'win32') {
try {
spawn('taskkill', ['/pid', String(proc.pid), '/T', '/F'], { stdio: 'ignore' });
} catch (err) {
logger.warn('taskkill failed:', err);
}
return;
}
try {
process.kill(-proc.pid, signal);
} catch {
try {
proc.kill(signal);
} catch {
// already exited
}
}
}
/**
* Cancel an ongoing session: SIGINT the CC tree, escalate to SIGKILL after
* 2s if the CLI hasn't exited (some tool calls swallow SIGINT). The
* `exit` handler on the spawned proc broadcasts completion and clears
* `session.process`, so the escalation is a no-op when the graceful path
* already landed.
*/
@IpcMethod()
async cancelSession(params: CancelSessionParams): Promise<void> {
const session = this.sessions.get(params.sessionId);
if (!session?.process || session.process.killed) return;
session.cancelledByUs = true;
const proc = session.process;
this.killProcessTree(proc, 'SIGINT');
setTimeout(() => {
if (session.process === proc && !proc.killed) {
logger.warn('Session did not exit after SIGINT, escalating to SIGKILL:', params.sessionId);
this.killProcessTree(proc, 'SIGKILL');
}
}, 2000);
}
/**
* Stop and clean up a session.
*/
@IpcMethod()
async stopSession(params: StopSessionParams): Promise<void> {
const session = this.sessions.get(params.sessionId);
if (!session) return;
if (session.process && !session.process.killed) {
session.cancelledByUs = true;
const proc = session.process;
this.killProcessTree(proc, 'SIGTERM');
setTimeout(() => {
if (session.process === proc && !proc.killed) {
this.killProcessTree(proc, 'SIGKILL');
}
}, 3000);
}
this.sessions.delete(params.sessionId);
}
@IpcMethod()
async respondPermission(): Promise<void> {
// No-op for CLI mode (permissions handled by --permission-mode flag)
}
/**
* Cleanup on app quit.
*/
afterAppReady() {
electronApp.on('before-quit', () => {
for (const [, session] of this.sessions) {
if (session.process && !session.process.killed) {
session.cancelledByUs = true;
this.killProcessTree(session.process, 'SIGTERM');
}
}
this.sessions.clear();
});
}
}
@@ -4,11 +4,12 @@ import { isEqual, merge } from 'es-toolkit/compat';
import { defaultProxySettings } from '@/const/store';
import { createLogger } from '@/utils/logger';
import type { ProxyTestResult } from '../modules/networkProxy';
import type {
ProxyTestResult} from '../modules/networkProxy';
import {
ProxyConfigValidator,
ProxyConnectionTester,
ProxyDispatcherManager,
ProxyDispatcherManager
} from '../modules/networkProxy';
import { ControllerModule, IpcMethod } from './index';
@@ -103,7 +104,7 @@ export default class NetworkProxyCtr extends ControllerModule {
} catch (error) {
const errorMessage = error instanceof Error ? error.message : 'Unknown error';
logger.error('Proxy connection test failed:', errorMessage);
throw new Error(`Connection failed: ${errorMessage}`, { cause: error });
throw new Error(`Connection failed: ${errorMessage}`);
}
}
@@ -3,7 +3,7 @@ import type {
ShowDesktopNotificationParams,
} from '@lobechat/electron-client-ipc';
import { app, Notification } from 'electron';
import * as electronIs from 'electron-is';
import { linux, macOS, windows } from 'electron-is';
import { getIpcContext } from '@/utils/ipc';
import { createLogger } from '@/utils/logger';
@@ -20,7 +20,7 @@ export default class NotificationCtr extends ControllerModule {
if (!Notification.isSupported()) return 'denied';
// Keep a stable status string for renderer-side UI mapping.
// Screen3 expects macOS to return 'authorized' when granted.
if (!electronIs.macOS()) return 'authorized';
if (!macOS()) return 'authorized';
// Electron 38 no longer exposes `systemPreferences.getNotificationSettings()` in types,
// and some runtimes don't provide it at all. Use the renderer's Notification.permission
@@ -43,7 +43,7 @@ export default class NotificationCtr extends ControllerModule {
// On macOS, ask permission via Web Notification API first when possible.
// This helps keep `Notification.permission` in sync for subsequent status checks.
if (electronIs.macOS()) {
if (macOS()) {
try {
const mainWindow = this.app.browserManager.getMainWindow().browserWindow;
await mainWindow.webContents.executeJavaScript('Notification.requestPermission()', true);
@@ -83,12 +83,12 @@ export default class NotificationCtr extends ControllerModule {
}
// On macOS, we may need to explicitly request notification permissions
if (electronIs.macOS()) {
if (macOS()) {
logger.debug('macOS detected, notification permissions should be handled by system');
}
// Set app user model ID on Windows
if (electronIs.windows()) {
if (windows()) {
app.setAppUserModelId('com.lobehub.chat');
logger.debug('Set Windows App User Model ID for notifications');
}
@@ -99,9 +99,7 @@ export default class NotificationCtr extends ControllerModule {
}
}
/**
* Show system desktop notification.
* By default notifications only appear when the main window is hidden or unfocused.
* High-priority callers can pass `force` to surface a banner even while focused.
* Show system desktop notification (only when window is hidden)
*/
@IpcMethod()
async showDesktopNotification(
@@ -119,16 +117,12 @@ export default class NotificationCtr extends ControllerModule {
// Check if window is hidden
const isWindowHidden = this.isMainWindowHidden();
if (!params.force && !isWindowHidden) {
if (!isWindowHidden) {
logger.debug('Main window is visible, skipping desktop notification');
return { reason: 'Window is visible', skipped: true, success: true };
}
if (params.requestAttention && isWindowHidden) {
this.requestUserAttention();
}
logger.info('Showing desktop notification:', params.title);
logger.info('Window is hidden, showing desktop notification:', params.title);
const notification = new Notification({
body: params.body,
@@ -142,7 +136,7 @@ export default class NotificationCtr extends ControllerModule {
// due to heavy gnome-shell processing. Using 'low' urgency routes notifications to the
// message tray instead, preventing the banner's X button from being shown.
// The urgency option is ignored on macOS and Windows.
urgency: electronIs.linux() ? 'low' : 'normal',
urgency: linux() ? 'low' : 'normal',
});
// Add more event listeners for debugging
@@ -184,45 +178,6 @@ export default class NotificationCtr extends ControllerModule {
}
}
private requestUserAttention(): void {
try {
const mainWindow = this.app.browserManager.getMainWindow().browserWindow;
if (mainWindow.isDestroyed()) return;
if (electronIs.macOS()) {
app.dock?.bounce?.('informational');
return;
}
mainWindow.flashFrame(true);
} catch (error) {
logger.error('Failed to request user attention:', error);
}
}
/**
* Set the app-level badge count (dock red dot on macOS, Unity counter on Linux,
* overlay icon on Windows). Pass 0 to clear.
*
* On macOS we pair `app.setBadgeCount` with `app.dock.setBadge` — the former
* keeps Electron's internal count (cross-platform), the latter is the
* reliable Dock repaint trigger. Note: macOS Focus Mode / DND suppresses the
* badge visually until the user exits Focus.
*/
@IpcMethod()
setBadgeCount(count: number): void {
try {
const next = Math.max(0, Math.floor(count));
app.setBadgeCount(next);
if (electronIs.macOS() && app.dock) {
app.dock.setBadge(next > 0 ? String(next) : '');
}
} catch (error) {
logger.error('Failed to set badge count:', error);
}
}
/**
* Check if the main window is hidden
*/
@@ -1,72 +0,0 @@
import type {
CapturePreviewResult,
CaptureRectParams,
OverlayCaptureUploadStatusPayload,
ScreenCaptureSubmitParams,
} from '@lobechat/electron-client-ipc';
import type { OverlaySnapshotPayload } from '@/modules/screenCapture/ScreenCaptureManager';
import { createLogger } from '@/utils/logger';
import { ControllerModule, IpcMethod } from './index';
const logger = createLogger('controllers:ScreenCaptureCtr');
export default class ScreenCaptureCtr extends ControllerModule {
static override readonly groupName = 'screenCapture';
@IpcMethod()
async traceOverlayEvent(payload: { data?: unknown; event: string }): Promise<void> {
console.info('[screenCapture:overlay]', payload.event, payload.data ?? '');
}
@IpcMethod()
async previewWindow(windowId: number): Promise<CapturePreviewResult> {
logger.debug(`previewWindow request: ${windowId}`);
return this.app.screenCaptureManager.handlePreviewWindow(windowId);
}
@IpcMethod()
async previewRect(params: CaptureRectParams): Promise<CapturePreviewResult> {
logger.debug(`previewRect request: ${JSON.stringify(params)}`);
return this.app.screenCaptureManager.handlePreviewRect(params);
}
@IpcMethod()
async submit(params: ScreenCaptureSubmitParams): Promise<void> {
logger.debug(`submit request: prompt-len=${params.prompt.length}`);
await this.app.screenCaptureManager.handleSubmit(params);
}
/**
* Status update reported by the main renderer after it finishes (or fails)
* uploading a capture's bytes. Forwarded to the overlay to drive the send
* button's enabled state.
*/
@IpcMethod()
async reportUploadStatus(payload: OverlayCaptureUploadStatusPayload): Promise<void> {
logger.debug(
`reportUploadStatus captureId=${payload.captureId} status=${payload.status} fileId=${payload.fileId ?? '-'}`,
);
this.app.screenCaptureManager.reportUploadStatus(payload);
}
@IpcMethod()
async close(): Promise<void> {
logger.debug('close overlay request');
this.app.screenCaptureManager.close();
}
/**
* Renderer-driven snapshot of agents/models for the overlay selector. The
* main renderer pushes this whenever its data layer (TRPC stores) reports
* a change; main process only caches and forwards — it does not fetch.
*/
@IpcMethod()
async publishOverlaySnapshot(payload: OverlaySnapshotPayload): Promise<void> {
logger.debug(
`publishOverlaySnapshot — agents=${payload.agents?.length ?? 0} models=${payload.models?.length ?? 0}`,
);
this.app.screenCaptureManager.publishOverlaySnapshot(payload);
}
}
+16 -4
View File
@@ -1,12 +1,13 @@
import { readFile } from 'node:fs/promises';
import path from 'node:path';
import process from 'node:process';
import type { ElectronAppState, ThemeMode } from '@lobechat/electron-client-ipc';
import { app, dialog, nativeTheme, shell } from 'electron';
import * as electronIs from 'electron-is';
import { macOS } from 'electron-is';
import { pathExists, readdir } from 'fs-extra';
import { legacyLocalDbDir } from '@/const/dir';
import { detectRepoType } from '@/utils/git';
import { createLogger } from '@/utils/logger';
import {
getAccessibilityStatus,
@@ -103,7 +104,7 @@ export default class SystemController extends ControllerModule {
return 'granted';
}
if (!electronIs.macOS()) {
if (!macOS()) {
logger.info('[FullDiskAccess] Not macOS, returning granted');
return 'granted';
}
@@ -184,7 +185,7 @@ export default class SystemController extends ControllerModule {
}
const folderPath = result.filePaths[0];
const repoType = await detectRepoType(folderPath);
const repoType = await this.detectRepoType(folderPath);
return { path: folderPath, repoType };
}
@@ -234,6 +235,17 @@ export default class SystemController extends ControllerModule {
}
}
private async detectRepoType(dirPath: string): Promise<'git' | 'github' | undefined> {
const gitConfigPath = path.join(dirPath, '.git', 'config');
try {
const config = await readFile(gitConfigPath, 'utf8');
if (config.includes('github.com')) return 'github';
return 'git';
} catch {
return undefined;
}
}
private async setSystemThemeMode(themeMode: ThemeMode) {
nativeTheme.themeSource = themeMode;
}
@@ -1,19 +1,8 @@
import { execFile } from 'node:child_process';
import { promisify } from 'node:util';
import type {
ClaudeAuthStatus,
DetectHeterogeneousAgentCommandParams,
} from '@lobechat/electron-client-ipc';
import type { ToolCategory, ToolStatus } from '@/core/infrastructure/ToolDetectorManager';
import { detectHeterogeneousCliCommand } from '@/modules/toolDetectors';
import { createLogger } from '@/utils/logger';
import { ControllerModule, IpcMethod } from './index';
const execFilePromise = promisify(execFile);
const logger = createLogger('controllers:ToolDetectorCtr');
/**
@@ -38,14 +27,6 @@ export default class ToolDetectorCtr extends ControllerModule {
return this.manager.detect(name, force);
}
@IpcMethod()
async detectHeterogeneousAgentCommand(
params: DetectHeterogeneousAgentCommandParams,
): Promise<ToolStatus> {
logger.debug('Detecting heterogeneous agent command:', params);
return detectHeterogeneousCliCommand(params.agentType, params.command);
}
/**
* Detect all registered tools
*/
@@ -131,24 +112,4 @@ export default class ToolDetectorCtr extends ControllerModule {
priority: detector.priority,
}));
}
/**
* Get Claude Code CLI auth/account status by running `claude auth status --json`.
* Returns null if the CLI is unavailable or the command fails.
*/
@IpcMethod()
async getClaudeAuthStatus(command = 'claude'): Promise<ClaudeAuthStatus | null> {
const resolvedCommand = command.trim() || 'claude';
try {
const { stdout } = await execFilePromise(resolvedCommand, ['auth', 'status', '--json'], {
timeout: 5000,
windowsHide: true,
});
return JSON.parse(stdout.trim()) as ClaudeAuthStatus;
} catch (error) {
logger.debug('Failed to get claude auth status:', error);
return null;
}
}
}
@@ -64,7 +64,7 @@ vi.mock('@/const/env', () => ({
let randomBytesCounter = 0;
vi.mock('node:crypto', () => ({
default: {
randomBytes: vi.fn((_size: number) => {
randomBytes: vi.fn((size: number) => {
randomBytesCounter++;
return {
toString: vi.fn(() => `mock-random-${randomBytesCounter}`),
@@ -30,7 +30,6 @@ const mockMinimizeWindow = vi.fn();
const mockMaximizeWindow = vi.fn();
const mockIsWindowMaximized = vi.fn();
const mockRetrieveByIdentifier = vi.fn();
const mockStartSession = vi.fn();
const testSenderIdentifierString: string = 'test-window-event-id';
const mockGetIdentifierByWebContents = vi.fn(() => testSenderIdentifierString);
@@ -67,9 +66,6 @@ const mockApp = {
},
),
},
screenCaptureManager: {
startSession: mockStartSession,
},
} as unknown as App;
describe('BrowserWindowsCtr', () => {
@@ -82,21 +78,10 @@ describe('BrowserWindowsCtr', () => {
});
describe('toggleMainWindow', () => {
it('should toggle the main window visibility', () => {
browserWindowsCtr.toggleMainWindow();
it('should get the main window and toggle its visibility', async () => {
await browserWindowsCtr.toggleMainWindow();
expect(mockGetMainWindow).toHaveBeenCalled();
expect(mockToggleVisible).toHaveBeenCalled();
expect(mockStartSession).not.toHaveBeenCalled();
});
});
describe('openQuickComposer', () => {
it('should start the quick composer session', async () => {
await browserWindowsCtr.openQuickComposer();
expect(mockStartSession).toHaveBeenCalled();
expect(mockGetMainWindow).not.toHaveBeenCalled();
expect(mockToggleVisible).not.toHaveBeenCalled();
});
});
@@ -1,511 +0,0 @@
import { EventEmitter } from 'node:events';
import { access, mkdtemp, readdir, readFile, rm, unlink, writeFile } from 'node:fs/promises';
import { tmpdir } from 'node:os';
import path from 'node:path';
import { PassThrough } from 'node:stream';
import { HeterogeneousAgentSessionErrorCode } from '@lobechat/electron-client-ipc';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import HeterogeneousAgentCtr from '../HeterogeneousAgentCtr';
const FAKE_DESKTOP_PATH = '/Users/fake/Desktop';
vi.mock('electron', () => ({
BrowserWindow: { getAllWindows: () => [] },
app: {
getPath: vi.fn((name: string) => (name === 'desktop' ? FAKE_DESKTOP_PATH : `/fake/${name}`)),
on: vi.fn(),
},
ipcMain: { handle: vi.fn() },
}));
vi.mock('@/utils/logger', () => ({
createLogger: () => ({
debug: vi.fn(),
error: vi.fn(),
info: vi.fn(),
verbose: vi.fn(),
warn: vi.fn(),
}),
}));
// Captures the most recent spawn() call so sendPrompt tests can assert on argv.
const spawnCalls: Array<{ args: string[]; command: string; options: any }> = [];
let nextFakeProc: any = null;
const { execFileMock } = vi.hoisted(() => ({
execFileMock: vi.fn(),
}));
vi.mock('node:child_process', async (importOriginal) => {
const actual = (await importOriginal()) as Record<string, unknown>;
return {
...actual,
execFile: execFileMock,
spawn: (command: string, args: string[], options: any) => {
spawnCalls.push({ args, command, options });
nextFakeProc?.__start?.();
return nextFakeProc;
},
};
});
/**
* Build a fake ChildProcess that immediately exits cleanly. Records every
* stdin write on the returned `writes` array so tests can inspect the payload.
*/
const createFakeProc = ({
exitCode = 0,
stdoutLines = [],
}: {
exitCode?: number;
stdoutLines?: string[];
} = {}) => {
const proc = new EventEmitter() as any;
const stdout = new PassThrough();
const stderr = new PassThrough();
const writes: string[] = [];
proc.stdout = stdout;
proc.stderr = stderr;
proc.stdin = {
end: vi.fn(),
write: vi.fn((chunk: string, cb?: () => void) => {
writes.push(chunk);
cb?.();
return true;
}),
};
proc.kill = vi.fn();
proc.killed = false;
let started = false;
proc.__start = () => {
if (started) return;
started = true;
// Exit asynchronously so the Promise returned by sendPrompt resolves cleanly.
setImmediate(() => {
for (const line of stdoutLines) {
stdout.write(line);
}
stdout.end();
stderr.end();
proc.emit('exit', exitCode);
});
};
return { proc, writes };
};
const getFlagValues = (args: string[], flag: string) =>
args.flatMap((arg, index) => (arg === flag ? [args[index + 1]] : []));
describe('HeterogeneousAgentCtr', () => {
let appStoragePath: string;
beforeEach(async () => {
appStoragePath = await mkdtemp(path.join(tmpdir(), 'lobehub-hetero-'));
});
afterEach(async () => {
await rm(appStoragePath, { force: true, recursive: true });
});
describe('resolveImage', () => {
it('stores traversal-looking ids inside the cache root via a stable hash key', async () => {
const ctr = new HeterogeneousAgentCtr({
appStoragePath,
storeManager: { get: vi.fn() },
} as any);
const cacheDir = path.join(appStoragePath, 'heteroAgent/files');
const escapedTargetName = `${path.basename(appStoragePath)}-outside-storage`;
const escapePath = path.join(cacheDir, `../../../${escapedTargetName}`);
try {
await unlink(escapePath);
} catch {
// best-effort cleanup
}
await (ctr as any).resolveImage({
id: `../../../${escapedTargetName}`,
url: 'data:text/plain;base64,T1VUU0lERQ==',
});
const cacheEntries = await readdir(cacheDir);
expect(cacheEntries).toHaveLength(2);
expect(cacheEntries.every((entry) => /^[a-f0-9]{64}(?:\.meta)?$/.test(entry))).toBe(true);
await expect(access(escapePath)).rejects.toThrow();
try {
await unlink(escapePath);
} catch {
// best-effort cleanup
}
});
it('does not trust pre-seeded out-of-root traversal cache files as cache hits', async () => {
const ctr = new HeterogeneousAgentCtr({
appStoragePath,
storeManager: { get: vi.fn() },
} as any);
const cacheDir = path.join(appStoragePath, 'heteroAgent/files');
const traversalId = '../../preexisting-secret';
const outOfRootDataPath = path.join(cacheDir, traversalId);
const outOfRootMetaPath = path.join(cacheDir, `${traversalId}.meta`);
await writeFile(outOfRootDataPath, 'SECRET');
await writeFile(
outOfRootMetaPath,
JSON.stringify({ id: traversalId, mimeType: 'text/plain' }),
);
const result = await (ctr as any).resolveImage({
id: traversalId,
url: 'data:text/plain;base64,SUdOT1JFRA==',
});
expect(Buffer.from(result.buffer).toString('utf8')).toBe('IGNORED');
expect(result.mimeType).toBe('text/plain');
await expect(readFile(outOfRootDataPath, 'utf8')).resolves.toBe('SECRET');
});
});
describe('sendPrompt (claude-code)', () => {
beforeEach(() => {
spawnCalls.length = 0;
execFileMock.mockReset();
});
const runSendPrompt = async (
prompt: string,
sessionOverrides: Record<string, any> = {},
stdoutLines: string[] = [],
) => {
const { proc, writes } = createFakeProc({ stdoutLines });
nextFakeProc = proc;
const ctr = new HeterogeneousAgentCtr({
appStoragePath,
storeManager: { get: vi.fn() },
} as any);
const { sessionId } = await ctr.startSession({
agentType: 'claude-code',
command: 'claude',
...sessionOverrides,
});
await ctr.sendPrompt({ prompt, sessionId });
const { args: cliArgs, command, options } = spawnCalls[0];
return { cliArgs, command, ctr, options, sessionId, writes };
};
it('passes prompt via stdin stream-json — never as a positional arg', async () => {
const prompt = '-- 这是破折号测试 --help';
const { cliArgs, writes } = await runSendPrompt(prompt);
// Prompt must never appear in argv (that is what previously broke CC's arg parser).
expect(cliArgs).not.toContain(prompt);
// Stream-json input must be wired up.
expect(cliArgs).toContain('--input-format');
expect(cliArgs).toContain('--output-format');
expect(cliArgs.filter((a) => a === 'stream-json')).toHaveLength(2);
// Exactly one stdin write, carrying the prompt as a user message JSON line.
expect(writes).toHaveLength(1);
const line = writes[0].trimEnd();
expect(line.endsWith('\n') || writes[0].endsWith('\n')).toBe(true);
const msg = JSON.parse(line);
expect(msg).toMatchObject({
message: {
content: [{ text: prompt, type: 'text' }],
role: 'user',
},
type: 'user',
});
});
it.each([
'-flag-looking-prompt',
'--help please',
'- dash at start',
'-p -- mixed',
'normal prompt with -dash- inside',
])('accepts dash-containing prompt without leaking to argv: %s', async (prompt) => {
const { cliArgs, writes } = await runSendPrompt(prompt);
expect(cliArgs).not.toContain(prompt);
expect(writes).toHaveLength(1);
const msg = JSON.parse(writes[0].trimEnd());
expect(msg.message.content[0].text).toBe(prompt);
});
it('falls back to the user Desktop when no cwd is supplied', async () => {
const { options } = await runSendPrompt('hello');
// When launched from Finder the Electron parent cwd is `/` — the
// controller must override that with the user's Desktop so CC writes
// land somewhere sensible.
expect(options.cwd).toBe(FAKE_DESKTOP_PATH);
});
it('respects an explicit cwd passed to startSession', async () => {
const explicitCwd = '/Users/fake/projects/my-repo';
const { options } = await runSendPrompt('hello', { cwd: explicitCwd });
expect(options.cwd).toBe(explicitCwd);
});
it('captures the Claude Code session id from stream-json init events', async () => {
const { ctr, sessionId } = await runSendPrompt('hello', {}, [
`${JSON.stringify({ session_id: 'sess_cc_123', subtype: 'init', type: 'system' })}\n`,
]);
await expect(ctr.getSessionInfo({ sessionId })).resolves.toEqual({
agentSessionId: 'sess_cc_123',
});
});
});
describe('sendPrompt (codex)', () => {
beforeEach(() => {
spawnCalls.length = 0;
execFileMock.mockReset();
});
const runSendPrompt = async (
prompt: string,
sessionOverrides: Record<string, any> = {},
stdoutLines: string[] = [],
sendPromptOverrides: Partial<{ imageList: Array<{ id: string; url: string }> }> = {},
) => {
const { proc, writes } = createFakeProc({ stdoutLines });
nextFakeProc = proc;
const ctr = new HeterogeneousAgentCtr({
appStoragePath,
storeManager: { get: vi.fn() },
} as any);
const { sessionId } = await ctr.startSession({
agentType: 'codex',
command: 'codex',
...sessionOverrides,
});
await ctr.sendPrompt({ prompt, sessionId, ...sendPromptOverrides });
const { args: cliArgs, command, options } = spawnCalls[0];
return { cliArgs, command, ctr, options, sessionId, writes };
};
it('fails fast when Codex CLI is unavailable instead of attempting spawn', async () => {
const detect = vi.fn().mockResolvedValue({ available: false });
const ctr = new HeterogeneousAgentCtr({
appStoragePath,
storeManager: { get: vi.fn() },
toolDetectorManager: { detect },
} as any);
const { sessionId } = await ctr.startSession({
agentType: 'codex',
command: 'codex',
});
await expect(ctr.sendPrompt({ prompt: 'hello', sessionId })).rejects.toThrow(
'Codex CLI was not found',
);
expect(detect).toHaveBeenCalledWith('codex', true);
expect(spawnCalls).toHaveLength(0);
});
it('fails fast when Claude Code CLI is unavailable instead of attempting spawn', async () => {
const detect = vi.fn().mockResolvedValue({ available: false });
const ctr = new HeterogeneousAgentCtr({
appStoragePath,
storeManager: { get: vi.fn() },
toolDetectorManager: { detect },
} as any);
const { sessionId } = await ctr.startSession({
agentType: 'claude-code',
command: 'claude',
});
await expect(ctr.sendPrompt({ prompt: 'hello', sessionId })).rejects.toThrow(
'Claude Code CLI was not found',
);
expect(detect).toHaveBeenCalledWith('claude', true);
expect(spawnCalls).toHaveLength(0);
});
it('fails fast when a customized Claude command is unavailable instead of checking the default detector', async () => {
execFileMock.mockImplementation(
(
file: string,
_args: string[],
optionsOrCallback: unknown,
callback?: (error: Error | null, stdout: string, stderr: string) => void,
) => {
const resolvedCallback =
typeof optionsOrCallback === 'function' ? optionsOrCallback : callback;
resolvedCallback?.(
Object.assign(new Error(`${file} not found`), { code: 'ENOENT' }),
'',
'',
);
},
);
const detect = vi.fn().mockResolvedValue({ available: true });
const ctr = new HeterogeneousAgentCtr({
appStoragePath,
storeManager: { get: vi.fn() },
toolDetectorManager: { detect },
} as any);
const { sessionId } = await ctr.startSession({
agentType: 'claude-code',
command: 'claude-alt',
});
await expect(ctr.sendPrompt({ prompt: 'hello', sessionId })).rejects.toThrow(
'Claude Code CLI was not found',
);
expect(detect).not.toHaveBeenCalled();
expect(spawnCalls).toHaveLength(0);
});
it('passes prompt via stdin to codex exec instead of argv', async () => {
const prompt = '--run a shell-like prompt safely';
const { cliArgs, command, writes } = await runSendPrompt(prompt);
expect(command).toBe('codex');
expect(cliArgs).not.toContain(prompt);
expect(cliArgs).toEqual(
expect.arrayContaining(['exec', '--json', '--skip-git-repo-check', '--full-auto', '-']),
);
expect(writes).toEqual([prompt]);
});
it('materializes image attachments into local files and forwards them via --image', async () => {
const imageList = [
{ id: 'image-1', url: 'data:image/png;base64,UE5HX1RFU1Q=' },
{ id: 'image-2', url: 'data:image/jpeg;base64,SlBFR19URVNU' },
];
const { cliArgs, writes } = await runSendPrompt('describe these screenshots', {}, [], {
imageList,
});
const imagePaths = getFlagValues(cliArgs, '--image');
expect(cliArgs).not.toContain('describe these screenshots');
expect(cliArgs.filter((arg) => arg === '--image')).toHaveLength(2);
expect(imagePaths).toHaveLength(2);
expect(imagePaths[0]).toMatch(/\.png$/);
expect(imagePaths[1]).toMatch(/\.jpg$/);
expect(
imagePaths.every((filePath) =>
filePath.startsWith(path.join(appStoragePath, 'heteroAgent/files')),
),
).toBe(true);
await expect(
Promise.all(imagePaths.map((filePath) => readFile(filePath, 'utf8'))),
).resolves.toEqual(['PNG_TEST', 'JPEG_TEST']);
expect(writes).toEqual(['describe these screenshots']);
});
it('skips images that fail to materialize and still forwards the remaining --image args', async () => {
const imageList = [
{ id: 'good-image', url: 'data:image/png;base64,VkFMSURfSU1BR0U=' },
{ id: 'bad-image', url: 'bad://broken-image' },
];
const { cliArgs, writes } = await runSendPrompt('inspect the valid screenshot only', {}, [], {
imageList,
});
const imagePaths = getFlagValues(cliArgs, '--image');
expect(cliArgs.filter((arg) => arg === '--image')).toHaveLength(1);
expect(imagePaths).toHaveLength(1);
expect(imagePaths[0]).toMatch(/\.png$/);
await expect(readFile(imagePaths[0], 'utf8')).resolves.toBe('VALID_IMAGE');
expect(writes).toEqual(['inspect the valid screenshot only']);
});
it('uses codex exec resume syntax when continuing an existing thread', async () => {
const { cliArgs } = await runSendPrompt('continue', { resumeSessionId: 'thread_abc' });
expect(cliArgs.slice(0, 2)).toEqual(['exec', 'resume']);
expect(cliArgs).toContain('thread_abc');
expect(cliArgs).not.toContain('--resume');
expect(cliArgs.at(-1)).toBe('-');
});
it('captures the Codex thread id from json output for later resume', async () => {
const { ctr, sessionId } = await runSendPrompt('hello', {}, [
`${JSON.stringify({ thread_id: 'thread_codex_123', type: 'thread.started' })}\n`,
]);
await expect(ctr.getSessionInfo({ sessionId })).resolves.toEqual({
agentSessionId: 'thread_codex_123',
});
});
it('classifies stale Codex resume stderr as a structured resume error', () => {
const ctr = new HeterogeneousAgentCtr({
appStoragePath,
storeManager: { get: vi.fn() },
} as any);
const payload = (ctr as any).getSessionErrorPayload(
'No conversation found for thread thread_stale_123',
{
agentSessionId: 'thread_stale_123',
agentType: 'codex',
args: [],
command: 'codex',
cwd: '/Users/fake/projects/repo',
resumeSessionId: 'thread_stale_123',
sessionId: 'session-1',
},
);
expect(payload).toEqual({
agentType: 'codex',
code: HeterogeneousAgentSessionErrorCode.ResumeThreadNotFound,
command: 'codex',
message: 'The saved Codex thread could not be found, so it can no longer be resumed.',
resumeSessionId: 'thread_stale_123',
stderr: 'No conversation found for thread thread_stale_123',
workingDirectory: '/Users/fake/projects/repo',
});
});
it('classifies CLI authentication failures as auth-required errors', () => {
const ctr = new HeterogeneousAgentCtr({
appStoragePath,
storeManager: { get: vi.fn() },
} as any);
const payload = (ctr as any).getSessionErrorPayload(
'Failed to authenticate. API Error: 401 {"type":"error","error":{"type":"authentication_error","message":"Invalid authentication credentials"}}',
{
agentType: 'claude-code',
args: [],
command: 'claude',
sessionId: 'session-1',
},
);
expect(payload).toEqual({
agentType: 'claude-code',
code: HeterogeneousAgentSessionErrorCode.AuthRequired,
command: 'claude',
docsUrl: 'https://docs.anthropic.com/en/docs/claude-code/setup',
message:
'Claude Code could not authenticate. Sign in again or refresh its credentials, then retry.',
stderr:
'Failed to authenticate. API Error: 401 {"type":"error","error":{"type":"authentication_error","message":"Invalid authentication credentials"}}',
});
});
});
});
@@ -34,9 +34,6 @@ vi.mock('electron', () => {
},
Notification: MockNotification,
app: {
dock: {
bounce: vi.fn(),
},
setAppUserModelId: vi.fn(),
},
};
@@ -51,7 +48,6 @@ vi.mock('electron-is', () => ({
// Mock browserManager
const mockBrowserWindow = {
flashFrame: vi.fn(),
focus: vi.fn(),
isDestroyed: vi.fn(() => false),
isFocused: vi.fn(() => true),
@@ -185,24 +181,6 @@ describe('NotificationCtr', () => {
expect(result).toEqual({ success: true });
});
it('should show notification when force is true even if window is visible and focused', async () => {
const { Notification } = await import('electron');
vi.mocked(Notification.isSupported).mockReturnValue(true);
mockBrowserWindow.isVisible.mockReturnValue(true);
mockBrowserWindow.isFocused.mockReturnValue(true);
mockBrowserWindow.isMinimized.mockReturnValue(false);
const promise = controller.showDesktopNotification({
...params,
force: true,
});
vi.advanceTimersByTime(100);
const result = await promise;
expect(Notification).toHaveBeenCalled();
expect(result).toEqual({ success: true });
});
it('should use low urgency on Linux to prevent GNOME Shell freeze', async () => {
const { linux } = await import('electron-is');
const { Notification } = await import('electron');
@@ -274,40 +252,6 @@ describe('NotificationCtr', () => {
);
});
it('should request window attention when requested and window is hidden', async () => {
const { Notification } = await import('electron');
vi.mocked(Notification.isSupported).mockReturnValue(true);
mockBrowserWindow.isVisible.mockReturnValue(false);
const promise = controller.showDesktopNotification({
...params,
requestAttention: true,
});
vi.advanceTimersByTime(100);
await promise;
expect(mockBrowserWindow.flashFrame).toHaveBeenCalledWith(true);
});
it('should bounce dock on macOS when attention is requested', async () => {
const { app, Notification } = await import('electron');
const { macOS } = await import('electron-is');
vi.mocked(macOS).mockReturnValue(true);
vi.mocked(Notification.isSupported).mockReturnValue(true);
mockBrowserWindow.isVisible.mockReturnValue(false);
const promise = controller.showDesktopNotification({
...params,
requestAttention: true,
});
vi.advanceTimersByTime(100);
await promise;
expect(app.dock.bounce).toHaveBeenCalledWith('informational');
vi.mocked(macOS).mockReturnValue(false);
});
it('should register click handler to show main window', async () => {
const { Notification } = await import('electron');
vi.mocked(Notification.isSupported).mockReturnValue(true);
@@ -19,7 +19,7 @@ const mockGetShortcutsConfig = vi.fn().mockReturnValue({
toggleMainWindow: 'CommandOrControl+Shift+L',
openSettings: 'CommandOrControl+,',
});
const mockUpdateShortcutConfig = vi.fn().mockImplementation((_id, _accelerator) => {
const mockUpdateShortcutConfig = vi.fn().mockImplementation((id, accelerator) => {
// Simply mock a successful update
return true;
});
@@ -43,14 +43,14 @@ const mockApp = {
} as unknown as App;
describe('UploadFileCtr', () => {
let _controller: UploadFileCtr;
let controller: UploadFileCtr;
beforeEach(() => {
vi.clearAllMocks();
ipcHandlers.clear();
ipcMainHandleMock.mockClear();
(IpcHandler.getInstance() as any).registeredChannels?.clear();
_controller = new UploadFileCtr(mockApp);
controller = new UploadFileCtr(mockApp);
});
describe('uploadFile', () => {
+2 -5
View File
@@ -1,7 +1,6 @@
import type { DesktopHotkeyId } from '@lobechat/types';
import type { App } from '@/core/App';
import { IoCContainer } from '@/core/infrastructure/IoCContainer';
import type { ShortcutActionType } from '@/shortcuts';
import { IpcService } from '@/utils/ipc';
const shortcutDecorator = (name: string) => (target: any, methodName: string, descriptor?: any) => {
@@ -16,9 +15,7 @@ const shortcutDecorator = (name: string) => (target: any, methodName: string, de
/**
* shortcut inject decorator
*/
type DesktopHotkeyIdCompatible = DesktopHotkeyId | 'quickComposer';
export const shortcut = (method: DesktopHotkeyIdCompatible) => shortcutDecorator(method);
export const shortcut = (method: ShortcutActionType) => shortcutDecorator(method);
const protocolDecorator =
(urlType: string, action: string) => (target: any, methodName: string, descriptor?: any) => {
@@ -5,8 +5,6 @@ import BrowserWindowsCtr from './BrowserWindowsCtr';
import CliCtr from './CliCtr';
import DevtoolsCtr from './DevtoolsCtr';
import GatewayConnectionCtr from './GatewayConnectionCtr';
import GitCtr from './GitCtr';
import HeterogeneousAgentCtr from './HeterogeneousAgentCtr';
import LocalFileCtr from './LocalFileCtr';
import McpCtr from './McpCtr';
import McpInstallCtr from './McpInstallCtr';
@@ -15,7 +13,6 @@ import NetworkProxyCtr from './NetworkProxyCtr';
import NotificationCtr from './NotificationCtr';
import RemoteServerConfigCtr from './RemoteServerConfigCtr';
import RemoteServerSyncCtr from './RemoteServerSyncCtr';
import ScreenCaptureCtr from './ScreenCaptureCtr';
import ShellCommandCtr from './ShellCommandCtr';
import ShortcutController from './ShortcutCtr';
import SystemController from './SystemCtr';
@@ -25,13 +22,11 @@ import UpdaterCtr from './UpdaterCtr';
import UploadFileCtr from './UploadFileCtr';
export const controllerIpcConstructors = [
HeterogeneousAgentCtr,
AuthCtr,
BrowserWindowsCtr,
CliCtr,
DevtoolsCtr,
GatewayConnectionCtr,
GitCtr,
LocalFileCtr,
McpCtr,
McpInstallCtr,
@@ -40,7 +35,6 @@ export const controllerIpcConstructors = [
NotificationCtr,
RemoteServerConfigCtr,
RemoteServerSyncCtr,
ScreenCaptureCtr,
ShellCommandCtr,
ShortcutController,
SystemController,
+9 -12
View File
@@ -1,11 +1,11 @@
import os from 'node:os';
import path from 'node:path';
import { join } from 'node:path';
import type { ElectronIPCEventHandler } from '@lobechat/electron-server-ipc';
import { ElectronIPCServer } from '@lobechat/electron-server-ipc';
import { app, nativeTheme, protocol } from 'electron';
import installExtension, { REACT_DEVELOPER_TOOLS } from 'electron-devtools-installer';
import * as electronIs from 'electron-is';
import { macOS, windows } from 'electron-is';
import { name } from '@/../../package.json';
import { binDir, buildDir } from '@/const/dir';
@@ -14,11 +14,9 @@ import { ELECTRON_BE_PROTOCOL_SCHEME } from '@/const/protocol';
import type { IControlModule } from '@/controllers';
import AuthCtr from '@/controllers/AuthCtr';
import { generateCliWrapper, getCliWrapperDir } from '@/modules/cliEmbedding';
import { ScreenCaptureManager } from '@/modules/screenCapture/ScreenCaptureManager';
import {
astSearchDetectors,
browserAutomationDetectors,
cliAgentDetectors,
contentSearchDetectors,
fileSearchDetectors,
type IToolDetector,
@@ -63,7 +61,6 @@ export class App {
protocolManager: ProtocolManager;
rendererUrlManager: RendererUrlManager;
toolDetectorManager: ToolDetectorManager;
screenCaptureManager: ScreenCaptureManager;
chromeFlags: string[] = ['OverlayScrollbar', 'FluentOverlayScrollbar', 'FluentScrollbar'];
/**
@@ -143,7 +140,6 @@ export class App {
this.staticFileServerManager = new StaticFileServerManager(this);
this.protocolManager = new ProtocolManager(this);
this.toolDetectorManager = new ToolDetectorManager(this);
this.screenCaptureManager = new ScreenCaptureManager(this);
// Register built-in tool detectors
this.registerBuiltinToolDetectors();
@@ -194,7 +190,6 @@ export class App {
const detectorCategories: Partial<Record<ToolCategory, IToolDetector[]>> = {
'runtime-environment': runtimeEnvironmentDetectors,
'cli-agents': cliAgentDetectors,
'ast-search': astSearchDetectors,
'browser-automation': browserAutomationDetectors,
'content-search': contentSearchDetectors,
@@ -249,8 +244,10 @@ export class App {
await this.browserManager.initializeBrowsers();
// Initialize tray manager on all platforms (macOS menu bar, Windows / Linux tray).
this.trayManager.initializeTrays();
// Initialize tray manager
if (process.platform === 'win32') {
this.trayManager.initializeTrays();
}
// Initialize updater manager
await this.updaterManager.initialize();
@@ -259,7 +256,7 @@ export class App {
this.isQuiting = false;
app.on('window-all-closed', () => {
if (electronIs.windows() || process.platform === 'linux') {
if (windows() || process.platform === 'linux') {
logger.info(`All windows closed, quitting application (${process.platform})`);
app.quit();
}
@@ -421,8 +418,8 @@ export class App {
logger.debug('Setting up dev branding');
app.setName('lobehub-desktop-dev');
if (electronIs.macOS()) {
app.dock!.setIcon(path.join(buildDir, 'icon-dev.png'));
if (macOS()) {
app.dock!.setIcon(join(buildDir, 'icon-dev.png'));
}
};
+8 -27
View File
@@ -1,10 +1,10 @@
import console from 'node:console';
import path from 'node:path';
import { join } from 'node:path';
import { APP_WINDOW_MIN_SIZE } from '@lobechat/desktop-bridge';
import type { MainBroadcastEventKey, MainBroadcastParams } from '@lobechat/electron-client-ipc';
import type { BrowserWindowConstructorOptions } from 'electron';
import { app, BrowserWindow, ipcMain, screen, session as electronSession, shell } from 'electron';
import { BrowserWindow, ipcMain, screen, session as electronSession, shell } from 'electron';
import { preloadDir, resourcesDir } from '@/const/dir';
import { isMac } from '@/const/env';
@@ -139,7 +139,7 @@ export default class Browser {
webPreferences: {
backgroundThrottling: false,
contextIsolation: true,
preload: path.join(preloadDir, 'index.js'),
preload: join(preloadDir, 'index.js'),
sandbox: false,
webviewTag: true,
},
@@ -238,7 +238,7 @@ export default class Browser {
logger.debug(`[${this.identifier}] Window 'ready-to-show' event fired.`);
if (this.options.showOnInit) {
logger.debug(`Showing window ${this.identifier} because showOnInit is true.`);
this.show();
browserWindow.show();
} else {
logger.debug(`Window ${this.identifier} not shown because showOnInit is false.`);
}
@@ -259,13 +259,6 @@ export default class Browser {
browserWindow.on('focus', () => {
logger.debug(`[${this.identifier}] Window 'focus' event fired.`);
this.broadcast('windowFocused');
// Clear any completion badge once the user returns to the app.
try {
app.setBadgeCount(0);
if (process.platform === 'darwin' && app.dock) app.dock.setBadge('');
} catch {
/* noop — some platforms may not support badge counts */
}
});
}
@@ -296,7 +289,6 @@ export default class Browser {
show(): void {
logger.debug(`Showing window: ${this.identifier}`);
this.ensureForegroundAppOnMac();
if (!this._browserWindow?.isDestroyed()) {
this.determineWindowPosition();
}
@@ -329,7 +321,7 @@ export default class Browser {
if (this._browserWindow?.isVisible() && this._browserWindow.isFocused()) {
this.hide();
} else {
this.show();
this._browserWindow?.show();
this._browserWindow?.focus();
}
}
@@ -388,22 +380,11 @@ export default class Browser {
this._browserWindow!.setPosition(newX, newY, false);
}
private ensureForegroundAppOnMac(): void {
if (!isMac || this.identifier !== 'app') return;
try {
app.setActivationPolicy('regular');
app.dock?.show();
} catch (error) {
logger.warn(`[${this.identifier}] Failed to restore regular activation policy:`, error);
}
}
// ==================== Content Loading ====================
loadPlaceholder = async (): Promise<void> => {
logger.debug(`[${this.identifier}] Loading splash screen placeholder`);
await this._browserWindow!.loadFile(path.join(resourcesDir, 'splash.html'));
await this._browserWindow!.loadFile(join(resourcesDir, 'splash.html'));
logger.debug(`[${this.identifier}] Splash screen placeholder loaded.`);
};
@@ -434,7 +415,7 @@ export default class Browser {
private async handleLoadError(urlWithLocale: string): Promise<void> {
try {
logger.info(`[${this.identifier}] Attempting to load error page...`);
await this._browserWindow!.loadFile(path.join(resourcesDir, 'error.html'));
await this._browserWindow!.loadFile(join(resourcesDir, 'error.html'));
logger.info(`[${this.identifier}] Error page loaded successfully.`);
this.setupRetryHandler(urlWithLocale);
@@ -457,7 +438,7 @@ export default class Browser {
} catch (err: any) {
logger.error(`[${this.identifier}] Retry connection failed:`, err);
try {
await this._browserWindow?.loadFile(path.join(resourcesDir, 'error.html'));
await this._browserWindow?.loadFile(join(resourcesDir, 'error.html'));
} catch (loadErr) {
logger.error(`[${this.identifier}] Failed to reload error page:`, loadErr);
}
@@ -1,8 +1,4 @@
import type {
MainBroadcastEventKey,
MainBroadcastParams,
TopicPopupInfo,
} from '@lobechat/electron-client-ipc';
import type { MainBroadcastEventKey, MainBroadcastParams } from '@lobechat/electron-client-ipc';
import type { WebContents } from 'electron';
import { isLinux } from '@/const/env';
@@ -15,9 +11,6 @@ import type { App } from '../App';
import type { BrowserWindowOpts } from './Browser';
import Browser from './Browser';
const TOPIC_POPUP_TEMPLATE_ID: WindowTemplateIdentifiers = 'topicPopup';
const TOPIC_POPUP_PATH_RE = /^\/popup\/(agent|group)\/([^/?#]+)\/([^/?#]+)/;
// Create logger
const logger = createLogger('core:BrowserManager');
@@ -39,15 +32,8 @@ export class BrowserManager {
showMainWindow() {
logger.debug('Showing main window');
const browser = this.getMainWindow();
const window = browser.browserWindow;
if (window.isMinimized()) {
window.restore();
}
browser.show();
window.focus();
const window = this.getMainWindow();
window.show();
}
broadcastToAllWindows = <T extends MainBroadcastEventKey>(
@@ -159,79 +145,12 @@ export class BrowserManager {
const browser = this.retrieveOrInitialize(browserOpts);
if (templateId === TOPIC_POPUP_TEMPLATE_ID) {
// Notify main-window SPAs so they can redirect to the popup instead of
// rendering the same conversation in two places. Re-emit on close to
// release the "topic is in popup" guard.
this.emitTopicPopupsChanged();
browser.browserWindow.once('closed', () => {
this.emitTopicPopupsChanged();
});
}
return {
browser,
identifier: windowId,
};
}
/**
* List currently-open topic popup windows (alive only). Used by the main
* SPA to decide whether to render the conversation or a redirect-to-popup
* guard.
*/
listTopicPopups(): TopicPopupInfo[] {
const popups: TopicPopupInfo[] = [];
this.browsers.forEach((browser, identifier) => {
if (!identifier.startsWith(`${TOPIC_POPUP_TEMPLATE_ID}_`)) return;
const webContents = browser.webContents;
if (!webContents || webContents.isDestroyed()) return;
const match = browser.options.path.match(TOPIC_POPUP_PATH_RE);
if (!match) return;
const scope = match[1] as 'agent' | 'group';
const id = match[2];
const topicId = match[3];
popups.push({
identifier,
scope,
topicId,
...(scope === 'agent' ? { agentId: id } : { groupId: id }),
});
});
return popups;
}
focusTopicPopup(identifier: string): boolean {
const browser = this.browsers.get(identifier);
if (!browser) return false;
const win = browser.browserWindow;
if (win.isMinimized()) win.restore();
win.show();
win.focus();
return true;
}
/**
* Open (or focus) the single-instance Quick Chat popup.
*
* The window is backed by the `topicPopup` template and the route
* `/popup/agent/inbox`, so it mounts a fresh Inbox conversation with no
* active topic. The first message creates a topic via the normal agent
* flow. The `uniqueId` is fixed — repeated invocations focus the existing
* window rather than spawning additional ones.
*/
openQuickChatPopup() {
const uniqueId = 'topicPopup_quick_inbox';
const result = this.createMultiInstanceWindow('topicPopup', '/popup/agent/inbox', uniqueId);
result.browser.show();
result.browser.browserWindow.focus();
return result;
}
private emitTopicPopupsChanged(): void {
this.broadcastToAllWindows('topicPopupsChanged', { popups: this.listTopicPopups() });
}
/**
* Get all windows based on template
* @param templateId Template identifier
@@ -359,16 +278,6 @@ export class BrowserManager {
browser?.setWindowMinimumSize(size);
}
setWindowAlwaysOnTop(identifier: string, flag: boolean) {
const browser = this.browsers.get(identifier);
browser?.browserWindow.setAlwaysOnTop(flag);
}
isWindowAlwaysOnTop(identifier: string) {
const browser = this.browsers.get(identifier);
return browser?.browserWindow.isAlwaysOnTop() ?? false;
}
getIdentifierByWebContents(webContents: WebContents): string | null {
return this.webContentsMap.get(webContents) || null;
}
@@ -1,4 +1,4 @@
import path from 'node:path';
import { join } from 'node:path';
import { TITLE_BAR_HEIGHT } from '@lobechat/desktop-bridge';
import { type BrowserWindow, type BrowserWindowConstructorOptions, nativeTheme } from 'electron';
@@ -118,7 +118,7 @@ export class WindowThemeManager {
private getWindowsConfig(isDarkMode: boolean): WindowsThemeConfig {
return {
backgroundColor: isDarkMode ? BACKGROUND_DARK : BACKGROUND_LIGHT,
icon: isDev ? path.join(buildDir, 'icon-dev.ico') : undefined,
icon: isDev ? join(buildDir, 'icon-dev.ico') : undefined,
titleBarOverlay: this.getWindowsTitleBarOverlay(isDarkMode),
titleBarStyle: 'hidden',
};
@@ -4,99 +4,76 @@ import { type App as AppCore } from '../../App';
import Browser, { type BrowserWindowOpts } from '../Browser';
// Use vi.hoisted to define mocks before hoisting
const {
mockAppModule,
mockBrowserWindow,
mockNativeTheme,
mockIpcMain,
mockScreen,
MockBrowserWindow,
mockEnv,
} = vi.hoisted(() => {
const mockBrowserWindow = {
center: vi.fn(),
close: vi.fn(),
focus: vi.fn(),
getBounds: vi.fn().mockReturnValue({ height: 600, width: 800, x: 0, y: 0 }),
getContentBounds: vi.fn().mockReturnValue({ height: 600, width: 800 }),
hide: vi.fn(),
isDestroyed: vi.fn().mockReturnValue(false),
isFocused: vi.fn().mockReturnValue(true),
isFullScreen: vi.fn().mockReturnValue(false),
isMaximized: vi.fn().mockReturnValue(false),
isVisible: vi.fn().mockReturnValue(true),
loadFile: vi.fn().mockResolvedValue(undefined),
loadURL: vi.fn().mockResolvedValue(undefined),
maximize: vi.fn(),
minimize: vi.fn(),
on: vi.fn(),
once: vi.fn(),
setBackgroundColor: vi.fn(),
setBounds: vi.fn(),
setFullScreen: vi.fn(),
setPosition: vi.fn(),
setTitleBarOverlay: vi.fn(),
show: vi.fn(),
unmaximize: vi.fn(),
webContents: {
openDevTools: vi.fn(),
send: vi.fn(),
session: {
webRequest: {
onBeforeSendHeaders: vi.fn(),
onHeadersReceived: vi.fn(),
const { mockBrowserWindow, mockNativeTheme, mockIpcMain, mockScreen, MockBrowserWindow } =
vi.hoisted(() => {
const mockBrowserWindow = {
center: vi.fn(),
close: vi.fn(),
focus: vi.fn(),
getBounds: vi.fn().mockReturnValue({ height: 600, width: 800, x: 0, y: 0 }),
getContentBounds: vi.fn().mockReturnValue({ height: 600, width: 800 }),
hide: vi.fn(),
isDestroyed: vi.fn().mockReturnValue(false),
isFocused: vi.fn().mockReturnValue(true),
isFullScreen: vi.fn().mockReturnValue(false),
isMaximized: vi.fn().mockReturnValue(false),
isVisible: vi.fn().mockReturnValue(true),
loadFile: vi.fn().mockResolvedValue(undefined),
loadURL: vi.fn().mockResolvedValue(undefined),
maximize: vi.fn(),
minimize: vi.fn(),
on: vi.fn(),
once: vi.fn(),
setBackgroundColor: vi.fn(),
setBounds: vi.fn(),
setFullScreen: vi.fn(),
setPosition: vi.fn(),
setTitleBarOverlay: vi.fn(),
show: vi.fn(),
unmaximize: vi.fn(),
webContents: {
openDevTools: vi.fn(),
send: vi.fn(),
session: {
webRequest: {
onBeforeSendHeaders: vi.fn(),
onHeadersReceived: vi.fn(),
},
},
on: vi.fn(),
setWindowOpenHandler: vi.fn(),
},
on: vi.fn(),
setWindowOpenHandler: vi.fn(),
},
};
};
return {
mockAppModule: {
dock: {
setBadge: vi.fn(),
show: vi.fn(),
return {
MockBrowserWindow: vi.fn().mockImplementation(() => mockBrowserWindow),
mockBrowserWindow,
mockIpcMain: {
handle: vi.fn(),
removeHandler: vi.fn(),
},
setActivationPolicy: vi.fn(),
setBadgeCount: vi.fn(),
},
MockBrowserWindow: vi.fn().mockImplementation(() => mockBrowserWindow),
mockBrowserWindow,
mockEnv: {
isDev: false,
isLinux: false,
isMac: false,
isMacTahoe: false,
isWindows: true,
},
mockIpcMain: {
handle: vi.fn(),
removeHandler: vi.fn(),
},
mockNativeTheme: {
off: vi.fn(),
on: vi.fn(),
shouldUseDarkColors: false,
themeSource: 'system',
},
mockScreen: {
getDisplayMatching: vi.fn().mockReturnValue({
workArea: { height: 1080, width: 1920, x: 0, y: 0 },
}),
getDisplayNearestPoint: vi.fn().mockReturnValue({
workArea: { height: 1080, width: 1920, x: 0, y: 0 },
}),
getPrimaryDisplay: vi.fn().mockReturnValue({
workArea: { height: 1080, width: 1920, x: 0, y: 0 },
}),
},
};
});
mockNativeTheme: {
off: vi.fn(),
on: vi.fn(),
shouldUseDarkColors: false,
themeSource: 'system',
},
mockScreen: {
getDisplayMatching: vi.fn().mockReturnValue({
workArea: { height: 1080, width: 1920, x: 0, y: 0 },
}),
getDisplayNearestPoint: vi.fn().mockReturnValue({
workArea: { height: 1080, width: 1920, x: 0, y: 0 },
}),
getPrimaryDisplay: vi.fn().mockReturnValue({
workArea: { height: 1080, width: 1920, x: 0, y: 0 },
}),
},
};
});
// Mock electron
vi.mock('electron', () => ({
app: mockAppModule,
BrowserWindow: MockBrowserWindow,
ipcMain: mockIpcMain,
nativeTheme: mockNativeTheme,
@@ -121,21 +98,11 @@ vi.mock('@/const/dir', () => ({
}));
vi.mock('@/const/env', () => ({
get isDev() {
return mockEnv.isDev;
},
get isLinux() {
return mockEnv.isLinux;
},
get isMac() {
return mockEnv.isMac;
},
get isMacTahoe() {
return mockEnv.isMacTahoe;
},
get isWindows() {
return mockEnv.isWindows;
},
isDev: false,
isLinux: false,
isMac: false,
isMacTahoe: false,
isWindows: true,
}));
vi.mock('../../../const/theme', () => ({
@@ -178,10 +145,6 @@ describe('Browser', () => {
mockBrowserWindow.loadURL.mockResolvedValue(undefined);
mockBrowserWindow.loadFile.mockResolvedValue(undefined);
mockNativeTheme.shouldUseDarkColors = false;
mockEnv.isLinux = false;
mockEnv.isMac = false;
mockEnv.isMacTahoe = false;
mockEnv.isWindows = true;
// Create mock App
mockStoreManagerGet = vi.fn().mockReturnValue(undefined);
@@ -506,19 +469,6 @@ describe('Browser', () => {
expect(mockBrowserWindow.show).toHaveBeenCalled();
});
it('should restore regular activation policy when showing the main window on macOS', () => {
mockEnv.isMac = true;
mockEnv.isWindows = false;
const mainBrowser = new Browser({ ...defaultOptions, identifier: 'app' }, mockApp);
vi.spyOn(mainBrowser, 'loadUrl').mockResolvedValue(undefined as any);
mainBrowser.show();
expect(mockAppModule.setActivationPolicy).toHaveBeenCalledWith('regular');
expect(mockAppModule.dock.show).toHaveBeenCalled();
});
});
describe('hide', () => {
@@ -6,13 +6,10 @@ import { BrowserManager } from '../BrowserManager';
// Use vi.hoisted to define mocks before hoisting
const { MockBrowser, mockAppBrowsers, mockWindowTemplates } = vi.hoisted(() => {
const createMockBrowserWindow = () => ({
focus: vi.fn(),
isMaximized: vi.fn().mockReturnValue(false),
isMinimized: vi.fn().mockReturnValue(false),
maximize: vi.fn(),
minimize: vi.fn(),
on: vi.fn(),
restore: vi.fn(),
unmaximize: vi.fn(),
webContents: { id: Math.random() },
});
@@ -139,16 +136,6 @@ describe('BrowserManager', () => {
const appBrowser = manager.browsers.get('app');
expect(appBrowser?.show).toHaveBeenCalled();
expect(appBrowser?.browserWindow.focus).toHaveBeenCalled();
});
it('should restore a minimized main window before showing it', () => {
const appBrowser = manager.getMainWindow();
vi.mocked(appBrowser.browserWindow.isMinimized).mockReturnValue(true);
manager.showMainWindow();
expect(appBrowser.browserWindow.restore).toHaveBeenCalled();
});
});
@@ -1,5 +1,5 @@
import { readFile, stat } from 'node:fs/promises';
import path from 'node:path';
import { basename, extname } from 'node:path';
import { app, protocol } from 'electron';
import { pathExistsSync } from 'fs-extra';
@@ -234,7 +234,7 @@ export class RendererProtocolManager {
private isAssetRequest(pathname: string) {
const normalizedPathname = pathname.endsWith('/') ? pathname.slice(0, -1) : pathname;
const ext = path.extname(normalizedPathname);
const ext = extname(normalizedPathname);
return (
pathname.startsWith('/assets/') ||
@@ -246,6 +246,6 @@ export class RendererProtocolManager {
}
private is404Html(filePath: string) {
return path.basename(filePath) === '404.html';
return basename(filePath) === '404.html';
}
}
@@ -1,4 +1,4 @@
import path from 'node:path';
import { extname, join } from 'node:path';
import { pathExistsSync } from 'fs-extra';
@@ -12,10 +12,8 @@ import { RendererProtocolManager } from './RendererProtocolManager';
const logger = createLogger('core:RendererUrlManager');
// Vite build with root=monorepo preserves input path structure,
// so index.html / overlay.html / popup.html end up under apps/desktop/ in outDir.
const SPA_ENTRY_HTML = path.join(rendererDir, 'apps', 'desktop', 'index.html');
const OVERLAY_ENTRY_HTML = path.join(rendererDir, 'apps', 'desktop', 'overlay.html');
const POPUP_ENTRY_HTML = path.join(rendererDir, 'apps', 'desktop', 'popup.html');
// so index.html ends up at apps/desktop/index.html in outDir.
const SPA_ENTRY_HTML = join(rendererDir, 'apps', 'desktop', 'index.html');
export class RendererUrlManager {
private readonly rendererProtocolManager: RendererProtocolManager;
@@ -63,36 +61,23 @@ export class RendererUrlManager {
*/
buildRendererUrl(path: string): string {
const cleanPath = path.startsWith('/') ? path : `/${path}`;
const normalizedBase = this.rendererLoadedUrl.replace(/\/+$/, '');
return `${normalizedBase}${cleanPath}`;
return `${this.rendererLoadedUrl}${cleanPath}`;
}
/**
* Resolve renderer file path in production.
* Static assets map directly; /overlay routes fall back to overlay.html;
* popup routes go to popup.html; all other routes fall back to index.html (SPA).
* Static assets map directly; all routes fall back to index.html (SPA).
*/
resolveRendererFilePath = async (url: URL): Promise<string | null> => {
const pathname = url.pathname;
// Static assets: direct file mapping
if (pathname.startsWith('/assets/') || path.extname(pathname)) {
const filePath = path.join(rendererDir, pathname);
if (pathname.startsWith('/assets/') || extname(pathname)) {
const filePath = join(rendererDir, pathname);
return pathExistsSync(filePath) ? filePath : null;
}
// Overlay entry (separate MPA page)
if (pathname === '/overlay' || pathname === '/overlay.html') {
return OVERLAY_ENTRY_HTML;
}
// Topic popup window has its own SPA bundle.
if (pathname === '/popup' || pathname.startsWith('/popup/')) {
return POPUP_ENTRY_HTML;
}
// All other routes fallback to index.html (SPA)
// All routes fallback to index.html (SPA)
return SPA_ENTRY_HTML;
};
@@ -41,7 +41,6 @@ export type ToolCategory =
| 'file-search'
| 'browser-automation'
| 'runtime-environment'
| 'cli-agents'
| 'system'
| 'custom';
@@ -92,18 +92,6 @@ describe('RendererUrlManager', () => {
expect(manager.buildRendererUrl('/settings')).toBe('http://localhost:5173/settings');
});
it('should normalize trailing slashes from ELECTRON_RENDERER_URL', async () => {
mockIsDev = true;
process.env['ELECTRON_RENDERER_URL'] = 'http://localhost:5173/';
const { RendererUrlManager } = await import('../RendererUrlManager');
const manager = new RendererUrlManager();
manager.configureRendererLoader();
expect(manager.buildRendererUrl('/')).toBe('http://localhost:5173/');
expect(manager.buildRendererUrl('/overlay')).toBe('http://localhost:5173/overlay');
});
it('should fall back to protocol handler when ELECTRON_RENDERER_URL is not set', async () => {
mockIsDev = true;
@@ -1,6 +1,6 @@
import { DEFAULT_ELECTRON_DESKTOP_SHORTCUTS } from '@lobechat/const/desktopGlobalShortcuts';
import { globalShortcut } from 'electron';
import { DEFAULT_SHORTCUTS_CONFIG } from '@/shortcuts';
import { createLogger } from '@/utils/logger';
import type { App } from '../App';
@@ -77,8 +77,8 @@ export class ShortcutManager {
try {
logger.debug(`Updating shortcut ${id} to ${accelerator}`);
// 1. Check if ID is valid (value may be empty string when disabled by default)
if (!(id in DEFAULT_ELECTRON_DESKTOP_SHORTCUTS)) {
// 1. Check if ID is valid
if (!DEFAULT_SHORTCUTS_CONFIG[id]) {
logger.error(`Invalid shortcut ID: ${id}`);
return { errorType: 'INVALID_ID', success: false };
}
@@ -231,15 +231,15 @@ export class ShortcutManager {
// If no configuration, use default configuration
if (!config || Object.keys(config).length === 0) {
logger.debug('No shortcuts config found, using defaults');
this.shortcutsConfig = { ...DEFAULT_ELECTRON_DESKTOP_SHORTCUTS };
this.shortcutsConfig = { ...DEFAULT_SHORTCUTS_CONFIG };
this.saveShortcutsConfig();
} else {
// Filter out invalid shortcuts that are not in DEFAULT_ELECTRON_DESKTOP_SHORTCUTS
// Filter out invalid shortcuts that are not in DEFAULT_SHORTCUTS_CONFIG
const filteredConfig: Record<string, string> = {};
let hasInvalidKeys = false;
Object.entries(config).forEach(([id, accelerator]) => {
if (id in DEFAULT_ELECTRON_DESKTOP_SHORTCUTS) {
if (DEFAULT_SHORTCUTS_CONFIG[id]) {
filteredConfig[id] = accelerator;
} else {
hasInvalidKeys = true;
@@ -248,7 +248,7 @@ export class ShortcutManager {
});
// Ensure all default shortcuts are present
Object.entries(DEFAULT_ELECTRON_DESKTOP_SHORTCUTS).forEach(([id, defaultAccelerator]) => {
Object.entries(DEFAULT_SHORTCUTS_CONFIG).forEach(([id, defaultAccelerator]) => {
if (!(id in filteredConfig)) {
filteredConfig[id] = defaultAccelerator;
logger.debug(`Adding missing default shortcut: ${id} = ${defaultAccelerator}`);
@@ -267,7 +267,7 @@ export class ShortcutManager {
logger.debug('Loaded shortcuts config:', this.shortcutsConfig);
} catch (error) {
logger.error('Error loading shortcuts config:', error);
this.shortcutsConfig = { ...DEFAULT_ELECTRON_DESKTOP_SHORTCUTS };
this.shortcutsConfig = { ...DEFAULT_SHORTCUTS_CONFIG };
this.saveShortcutsConfig();
}
}
@@ -295,9 +295,9 @@ export class ShortcutManager {
Object.entries(this.shortcutsConfig).forEach(([id, accelerator]) => {
logger.debug(`Registering shortcut '${id}' with ${accelerator}`);
// Only register shortcuts that exist in DEFAULT_ELECTRON_DESKTOP_SHORTCUTS
if (!(id in DEFAULT_ELECTRON_DESKTOP_SHORTCUTS)) {
logger.debug(`Skipping shortcut '${id}' - not found in DEFAULT_ELECTRON_DESKTOP_SHORTCUTS`);
// Only register shortcuts that exist in DEFAULT_SHORTCUTS_CONFIG
if (!DEFAULT_SHORTCUTS_CONFIG[id]) {
logger.debug(`Skipping shortcut '${id}' - not found in DEFAULT_SHORTCUTS_CONFIG`);
return;
}
+26 -58
View File
@@ -1,12 +1,15 @@
import path from 'node:path';
import { join } from 'node:path';
import type { MainBroadcastEventKey, MainBroadcastParams } from '@lobechat/electron-client-ipc';
import type {
DisplayBalloonOptions,
Menu as ElectronMenu,
MenuItemConstructorOptions,
MenuItemConstructorOptions} from 'electron';
import {
app,
Menu,
nativeImage,
Tray as ElectronTray,
} from 'electron';
import { app, Menu, nativeImage, Tray as ElectronTray } from 'electron';
import { resourcesDir } from '@/const/dir';
import { createLogger } from '@/utils/logger';
@@ -27,12 +30,6 @@ export interface TrayOptions {
*/
identifier: string;
/**
* Mark the icon as a macOS template image (black + alpha). macOS will
* then tint it to match the menu bar appearance automatically.
*/
isTemplateImage?: boolean;
/**
* Tray tooltip text
*/
@@ -47,13 +44,6 @@ export class Tray {
*/
private _tray?: ElectronTray;
/**
* Current context menu. We keep this in-house and pop it up manually on
* right-click so that macOS does not swallow the left-click (which would
* happen automatically if we called `_tray.setContextMenu(menu)`).
*/
private _contextMenu?: ElectronMenu;
/**
* Identifier
*/
@@ -97,16 +87,15 @@ export class Tray {
return this._tray;
}
const { iconPath, isTemplateImage, tooltip } = this.options;
const { iconPath, tooltip } = this.options;
// Load tray icon
logger.info(`Creating new tray instance: ${this.identifier}`);
const iconFile = path.join(resourcesDir, iconPath);
const iconFile = join(resourcesDir, iconPath);
logger.debug(`[${this.identifier}] Loading icon: ${iconFile}`);
try {
const icon = nativeImage.createFromPath(iconFile);
if (isTemplateImage) icon.setTemplateImage(true);
this._tray = new ElectronTray(icon);
// Set tooltip
@@ -118,22 +107,12 @@ export class Tray {
// Set default context menu
this.setContextMenu();
// Left-click: open Quick Composer.
// Set click event
this._tray.on('click', () => {
logger.debug(`[${this.identifier}] Tray clicked`);
this.onClick();
});
// Right-click: pop the stored context menu manually so left-click stays
// free (macOS would auto-open the menu on either button if we called
// `_tray.setContextMenu`).
this._tray.on('right-click', () => {
logger.debug(`[${this.identifier}] Tray right-clicked`);
if (this._contextMenu && this._tray) {
this._tray.popUpContextMenu(this._contextMenu);
}
});
logger.debug(`[${this.identifier}] Tray instance created successfully`);
return this._tray;
} catch (error) {
@@ -169,51 +148,40 @@ export class Tray {
];
const contextMenu = Menu.buildFromTemplate(defaultTemplate);
// Store the menu instead of calling `_tray.setContextMenu`. The latter
// makes macOS intercept left-clicks to show the menu, which conflicts
// with our Quick Composer trigger on click.
this._contextMenu = contextMenu;
this._tray?.setContextMenu(contextMenu);
logger.debug(`[${this.identifier}] Tray context menu has been set`);
}
/**
* Handle tray click event opens the Quick Composer overlay.
* Right-click opens the context menu (handled by Electron automatically).
* Handle tray click event
*/
onClick() {
logger.debug(`[${this.identifier}] Tray click → startSession`);
try {
void this.app.screenCaptureManager.startSession();
} catch (error) {
logger.error(`[${this.identifier}] Failed to start capture session:`, error);
}
}
logger.debug(`[${this.identifier}] Handling tray click event`);
const mainWindow = this.app.browserManager.getMainWindow();
/**
* Replace the tray context menu with a pre-built Electron Menu instance.
* Stored in-house and popped up manually on right-click to preserve
* left-click for the Quick Composer trigger.
*/
setMenu(menu: ElectronMenu) {
logger.debug(`[${this.identifier}] Attaching prebuilt context menu`);
this._contextMenu = menu;
if (mainWindow) {
if (mainWindow.browserWindow.isVisible() && mainWindow.browserWindow.isFocused()) {
logger.debug(`[${this.identifier}] Main window is visible and focused, hiding it now`);
mainWindow.hide();
} else {
logger.debug(`[${this.identifier}] Showing and focusing main window`);
mainWindow.show();
mainWindow.browserWindow.focus();
}
}
}
/**
* Update tray icon
* @param iconPath New icon path (relative to resource directory)
* @param isTemplateImage Whether to mark the new icon as a macOS template image
*/
updateIcon(iconPath: string, isTemplateImage?: boolean) {
updateIcon(iconPath: string) {
logger.debug(`[${this.identifier}] Updating icon: ${iconPath}`);
try {
const iconFile = path.join(resourcesDir, iconPath);
const iconFile = join(resourcesDir, iconPath);
const icon = nativeImage.createFromPath(iconFile);
const nextIsTemplate = isTemplateImage ?? this.options.isTemplateImage;
if (nextIsTemplate) icon.setTemplateImage(true);
this._tray?.setImage(icon);
this.options.iconPath = iconPath;
if (isTemplateImage !== undefined) this.options.isTemplateImage = isTemplateImage;
logger.debug(`[${this.identifier}] Icon updated successfully`);
} catch (error) {
logger.error(`[${this.identifier}] Failed to update icon:`, error);
+10 -15
View File
@@ -1,4 +1,5 @@
import type { MainBroadcastEventKey, MainBroadcastParams } from '@lobechat/electron-client-ipc';
import { nativeTheme } from 'electron';
import { name } from '@/../../package.json';
import { isMac } from '@/const/env';
@@ -40,15 +41,7 @@ export class TrayManager {
logger.debug('Initialize application tray');
// Initialize main tray
const mainTray = this.initializeMainTray();
// Attach the platform-specific context menu built by MenuManager so the
// tray right-click entries stay in sync with the app menu i18n.
try {
mainTray.setMenu(this.app.menuManager.buildTrayMenu());
} catch (error) {
logger.error('Failed to attach tray context menu:', error);
}
this.initializeMainTray();
}
/**
@@ -59,16 +52,18 @@ export class TrayManager {
}
/**
* Initialize main tray. On macOS we ship a template image (black + alpha)
* so the system recolors it automatically for light / dark menu bars.
* Initialize main tray
*/
initializeMainTray() {
logger.debug('Initialize main tray');
return this.retrieveOrInitialize({
iconPath: isMac ? 'trayTemplate.png' : 'tray.png',
identifier: 'main',
isTemplateImage: isMac,
tooltip: name,
iconPath: isMac
? nativeTheme.shouldUseDarkColorsForSystemIntegratedUI
? 'tray-dark.png'
: 'tray-light.png'
: 'tray.png',
identifier: 'main', // Use app icon, ensure this file exists in resources directory
tooltip: name, // Can use app.getName() or localized string
});
}
@@ -1,7 +1,8 @@
import { DEFAULT_ELECTRON_DESKTOP_SHORTCUTS } from '@lobechat/const/desktopGlobalShortcuts';
import { globalShortcut } from 'electron';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import { DEFAULT_SHORTCUTS_CONFIG } from '@/shortcuts';
import type { App } from '../../App';
import { ShortcutManager } from '../ShortcutManager';
@@ -25,11 +26,10 @@ vi.mock('@/utils/logger', () => ({
}),
}));
// Mock desktop global shortcut defaults
vi.mock('@lobechat/const/desktopGlobalShortcuts', () => ({
DEFAULT_ELECTRON_DESKTOP_SHORTCUTS: {
quickComposer: 'Alt+Shift+Space',
showApp: '',
// Mock DEFAULT_SHORTCUTS_CONFIG
vi.mock('@/shortcuts', () => ({
DEFAULT_SHORTCUTS_CONFIG: {
showApp: 'Control+E',
openSettings: 'CommandOrControl+,',
},
}));
@@ -57,10 +57,8 @@ describe('ShortcutManager', () => {
// Mock shortcut method map
mockShortcutMethodMap = new Map();
const quickComposerMethod = vi.fn();
const showAppMethod = vi.fn();
const openSettingsMethod = vi.fn();
mockShortcutMethodMap.set('quickComposer', quickComposerMethod);
mockShortcutMethodMap.set('showApp', showAppMethod);
mockShortcutMethodMap.set('openSettings', openSettingsMethod);
@@ -80,8 +78,7 @@ describe('ShortcutManager', () => {
});
it('should populate shortcuts map from app shortcut method map', () => {
expect(shortcutManager['shortcuts'].size).toBe(3);
expect(shortcutManager['shortcuts'].has('quickComposer')).toBe(true);
expect(shortcutManager['shortcuts'].size).toBe(2);
expect(shortcutManager['shortcuts'].has('showApp')).toBe(true);
expect(shortcutManager['shortcuts'].has('openSettings')).toBe(true);
});
@@ -118,17 +115,15 @@ describe('ShortcutManager', () => {
expect(mockStoreManager.get).toHaveBeenCalledWith('shortcuts');
expect(globalShortcut.unregisterAll).toHaveBeenCalled();
expect(globalShortcut.register).toHaveBeenCalledWith('Alt+Shift+Space', expect.any(Function));
expect(globalShortcut.register).toHaveBeenCalledWith('Control+E', expect.any(Function));
expect(globalShortcut.register).toHaveBeenCalledWith(
'CommandOrControl+,',
expect.any(Function),
);
expect(globalShortcut.register).not.toHaveBeenCalledWith('', expect.any(Function));
});
it('should handle stored config with filtering', () => {
const storedConfig = {
quickComposer: 'Alt+Shift+Q',
showApp: 'Alt+E',
openSettings: 'Ctrl+Shift+P',
invalidKey: 'Ctrl+I', // Should be filtered out
@@ -138,7 +133,6 @@ describe('ShortcutManager', () => {
shortcutManager.initialize();
const config = shortcutManager.getShortcutsConfig();
expect(config.quickComposer).toBe('Alt+Shift+Q');
expect(config.showApp).toBe('Alt+E');
expect(config.openSettings).toBe('Ctrl+Shift+P');
expect(config.invalidKey).toBeUndefined();
@@ -151,7 +145,7 @@ describe('ShortcutManager', () => {
shortcutManager.initialize();
const config = shortcutManager.getShortcutsConfig();
expect(config).toEqual(DEFAULT_ELECTRON_DESKTOP_SHORTCUTS);
expect(config).toEqual(DEFAULT_SHORTCUTS_CONFIG);
});
});
@@ -340,13 +334,6 @@ describe('ShortcutManager', () => {
describe('unregisterAll', () => {
it('should unregister all shortcuts', () => {
shortcutManager['shortcutsConfig'] = {
quickComposer: 'Alt+Shift+Space',
showApp: 'Alt+E',
openSettings: 'Ctrl+P',
};
shortcutManager['registerConfiguredShortcuts']();
shortcutManager.unregisterAll();
expect(globalShortcut.unregisterAll).toHaveBeenCalled();
@@ -359,11 +346,8 @@ describe('ShortcutManager', () => {
shortcutManager['loadShortcutsConfig']();
expect(shortcutManager['shortcutsConfig']).toEqual(DEFAULT_ELECTRON_DESKTOP_SHORTCUTS);
expect(mockStoreManager.set).toHaveBeenCalledWith(
'shortcuts',
DEFAULT_ELECTRON_DESKTOP_SHORTCUTS,
);
expect(shortcutManager['shortcutsConfig']).toEqual(DEFAULT_SHORTCUTS_CONFIG);
expect(mockStoreManager.set).toHaveBeenCalledWith('shortcuts', DEFAULT_SHORTCUTS_CONFIG);
});
it('should use defaults when config is empty', () => {
@@ -371,12 +355,11 @@ describe('ShortcutManager', () => {
shortcutManager['loadShortcutsConfig']();
expect(shortcutManager['shortcutsConfig']).toEqual(DEFAULT_ELECTRON_DESKTOP_SHORTCUTS);
expect(shortcutManager['shortcutsConfig']).toEqual(DEFAULT_SHORTCUTS_CONFIG);
});
it('should filter invalid keys from stored config', () => {
const storedConfig = {
quickComposer: 'Alt+Shift+Q',
showApp: 'Alt+E',
openSettings: 'Ctrl+P',
invalidKey1: 'Ctrl+I',
@@ -387,7 +370,6 @@ describe('ShortcutManager', () => {
shortcutManager['loadShortcutsConfig']();
const config = shortcutManager['shortcutsConfig'];
expect(config.quickComposer).toBe('Alt+Shift+Q');
expect(config.showApp).toBe('Alt+E');
expect(config.openSettings).toBe('Ctrl+P');
expect(config.invalidKey1).toBeUndefined();
@@ -400,21 +382,19 @@ describe('ShortcutManager', () => {
it('should add missing default shortcuts', () => {
const incompleteConfig = {
showApp: 'Alt+E',
// Missing quickComposer and openSettings
// Missing openSettings
};
mockStoreManager.get.mockReturnValue(incompleteConfig);
shortcutManager['loadShortcutsConfig']();
const config = shortcutManager['shortcutsConfig'];
expect(config.quickComposer).toBe('Alt+Shift+Space');
expect(config.showApp).toBe('Alt+E');
expect(config.openSettings).toBe('CommandOrControl+,'); // Default value
});
it('should not save config if no invalid keys were found', () => {
const validConfig = {
quickComposer: 'Alt+Shift+Q',
showApp: 'Alt+E',
openSettings: 'Ctrl+P',
};
@@ -433,26 +413,18 @@ describe('ShortcutManager', () => {
shortcutManager['loadShortcutsConfig']();
expect(shortcutManager['shortcutsConfig']).toEqual(DEFAULT_ELECTRON_DESKTOP_SHORTCUTS);
expect(mockStoreManager.set).toHaveBeenCalledWith(
'shortcuts',
DEFAULT_ELECTRON_DESKTOP_SHORTCUTS,
);
expect(shortcutManager['shortcutsConfig']).toEqual(DEFAULT_SHORTCUTS_CONFIG);
expect(mockStoreManager.set).toHaveBeenCalledWith('shortcuts', DEFAULT_SHORTCUTS_CONFIG);
});
});
describe('saveShortcutsConfig', () => {
it('should save shortcuts config to store', () => {
shortcutManager['shortcutsConfig'] = {
quickComposer: 'Alt+Shift+Q',
showApp: 'Alt+E',
openSettings: 'Ctrl+P',
};
shortcutManager['shortcutsConfig'] = { showApp: 'Alt+E', openSettings: 'Ctrl+P' };
shortcutManager['saveShortcutsConfig']();
expect(mockStoreManager.set).toHaveBeenCalledWith('shortcuts', {
quickComposer: 'Alt+Shift+Q',
showApp: 'Alt+E',
openSettings: 'Ctrl+P',
});
@@ -471,7 +443,6 @@ describe('ShortcutManager', () => {
describe('registerConfiguredShortcuts', () => {
beforeEach(() => {
shortcutManager['shortcutsConfig'] = {
quickComposer: 'Alt+Shift+Q',
showApp: 'Alt+E',
openSettings: 'Ctrl+P',
};
@@ -483,28 +454,24 @@ describe('ShortcutManager', () => {
shortcutManager['registerConfiguredShortcuts']();
expect(globalShortcut.unregisterAll).toHaveBeenCalled();
expect(globalShortcut.register).toHaveBeenCalledWith('Alt+Shift+Q', expect.any(Function));
expect(globalShortcut.register).toHaveBeenCalledWith('Alt+E', expect.any(Function));
expect(globalShortcut.register).toHaveBeenCalledWith('Ctrl+P', expect.any(Function));
});
it('should skip shortcuts not defined in default electron desktop shortcuts', () => {
it('should skip shortcuts not in DEFAULT_SHORTCUTS_CONFIG', () => {
shortcutManager['shortcutsConfig'] = {
quickComposer: 'Alt+Shift+Q',
showApp: 'Alt+E',
invalidKey: 'Ctrl+I',
};
shortcutManager['registerConfiguredShortcuts']();
expect(globalShortcut.register).toHaveBeenCalledWith('Alt+Shift+Q', expect.any(Function));
expect(globalShortcut.register).toHaveBeenCalledWith('Alt+E', expect.any(Function));
expect(globalShortcut.register).not.toHaveBeenCalledWith('Ctrl+I', expect.any(Function));
});
it('should skip shortcuts with empty accelerator', () => {
shortcutManager['shortcutsConfig'] = {
quickComposer: '',
showApp: '',
openSettings: 'Ctrl+P',
};
@@ -520,14 +487,12 @@ describe('ShortcutManager', () => {
mockShortcutMethodMap.delete('openSettings');
shortcutManager = new ShortcutManager(mockApp);
shortcutManager['shortcutsConfig'] = {
quickComposer: 'Alt+Shift+Q',
showApp: 'Alt+E',
openSettings: 'Ctrl+P',
};
shortcutManager['registerConfiguredShortcuts']();
expect(globalShortcut.register).toHaveBeenCalledWith('Alt+Shift+Q', expect.any(Function));
expect(globalShortcut.register).toHaveBeenCalledWith('Alt+E', expect.any(Function));
expect(globalShortcut.register).not.toHaveBeenCalledWith('Ctrl+P', expect.any(Function));
});
@@ -536,7 +501,6 @@ describe('ShortcutManager', () => {
describe('integration tests', () => {
it('should complete full initialization flow', () => {
const storedConfig = {
quickComposer: 'Alt+Shift+Q',
showApp: 'Alt+E',
openSettings: 'Ctrl+Shift+P',
invalidKey: 'Ctrl+I',
@@ -548,12 +512,11 @@ describe('ShortcutManager', () => {
// Should filter config and register valid shortcuts
const config = shortcutManager.getShortcutsConfig();
expect(config.quickComposer).toBe('Alt+Shift+Q');
expect(config.showApp).toBe('Alt+E');
expect(config.openSettings).toBe('Ctrl+Shift+P');
expect(config.invalidKey).toBeUndefined();
expect(globalShortcut.register).toHaveBeenCalledTimes(3);
expect(globalShortcut.register).toHaveBeenCalledTimes(2);
expect(mockStoreManager.set).toHaveBeenCalledWith('shortcuts', config);
});
@@ -1,4 +1,4 @@
import { app, Menu, nativeImage, Tray as ElectronTray } from 'electron';
import { app, Menu, nativeImage,Tray as ElectronTray } from 'electron';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { App } from '../../App';
@@ -47,7 +47,6 @@ describe('Tray', () => {
mockElectronTray = {
setToolTip: vi.fn(),
setContextMenu: vi.fn(),
popUpContextMenu: vi.fn(),
setImage: vi.fn(),
on: vi.fn(),
destroy: vi.fn(),
@@ -75,16 +74,11 @@ describe('Tray', () => {
showMainWindow: vi.fn(),
getMainWindow: vi.fn(() => mockMainWindow),
},
screenCaptureManager: {
startSession: vi.fn(),
},
} as unknown as App;
// Mock electron constructors
vi.mocked(ElectronTray).mockImplementation(() => mockElectronTray);
vi.mocked(nativeImage.createFromPath).mockReturnValue({
setTemplateImage: vi.fn(),
} as any);
vi.mocked(nativeImage.createFromPath).mockReturnValue({} as any);
vi.mocked(Menu.buildFromTemplate).mockReturnValue({} as any);
});
@@ -174,7 +168,7 @@ describe('Tray', () => {
expect(mockElectronTray.on).toHaveBeenCalledWith('click', expect.any(Function));
});
it('should build the default context menu and store it in-house', () => {
it('should set default context menu', () => {
tray = new Tray(
{
iconPath: 'tray.png',
@@ -184,23 +178,7 @@ describe('Tray', () => {
);
expect(Menu.buildFromTemplate).toHaveBeenCalled();
// We no longer hand the menu to Electron directly; macOS would hijack
// left-click if we did. The menu is popped up manually on right-click.
expect(mockElectronTray.setContextMenu).not.toHaveBeenCalled();
});
it('should register both click and right-click listeners', () => {
tray = new Tray(
{
iconPath: 'tray.png',
identifier: 'test-tray',
},
mockApp,
);
const events = mockElectronTray.on.mock.calls.map((c: any[]) => c[0]);
expect(events).toContain('click');
expect(events).toContain('right-click');
expect(mockElectronTray.setContextMenu).toHaveBeenCalled();
});
it('should handle errors when creating tray', () => {
@@ -243,9 +221,7 @@ describe('Tray', () => {
expect.objectContaining({ label: 'Quit' }),
]),
);
// Menu is stored for manual popup on right-click — never handed to
// `_tray.setContextMenu`, which would steal left-click on macOS.
expect(mockElectronTray.setContextMenu).not.toHaveBeenCalled();
expect(mockElectronTray.setContextMenu).toHaveBeenCalled();
});
it('should set custom context menu when template provided', () => {
@@ -257,37 +233,7 @@ describe('Tray', () => {
tray.setContextMenu(customTemplate);
expect(Menu.buildFromTemplate).toHaveBeenCalledWith(customTemplate);
expect(mockElectronTray.setContextMenu).not.toHaveBeenCalled();
});
it('should pop up the stored menu on right-click', () => {
// beforeEach cleared mocks after constructing the tray, so capture the
// right-click handler from a fresh instance.
const mockTrayForRightClick = {
setToolTip: vi.fn(),
setContextMenu: vi.fn(),
popUpContextMenu: vi.fn(),
setImage: vi.fn(),
on: vi.fn(),
destroy: vi.fn(),
displayBalloon: vi.fn(),
};
vi.mocked(ElectronTray).mockImplementationOnce(() => mockTrayForRightClick as any);
const builtMenu = { _mockMenu: true } as any;
vi.mocked(Menu.buildFromTemplate).mockReturnValue(builtMenu);
const freshTray = new Tray({ iconPath: 'tray.png', identifier: 'rc-tray' }, mockApp);
freshTray.setContextMenu();
const rightClickHandler = mockTrayForRightClick.on.mock.calls.find(
(c: any[]) => c[0] === 'right-click',
)?.[1];
expect(rightClickHandler).toBeDefined();
rightClickHandler?.();
expect(mockTrayForRightClick.popUpContextMenu).toHaveBeenCalledWith(builtMenu);
expect(mockElectronTray.setContextMenu).toHaveBeenCalled();
});
it('should call showMainWindow when Show Main Window is clicked', () => {
@@ -324,23 +270,40 @@ describe('Tray', () => {
);
});
it('should start the Quick Composer capture session', () => {
it('should hide window when it is visible and focused', () => {
mockBrowserWindow.isVisible.mockReturnValue(true);
mockBrowserWindow.isFocused.mockReturnValue(true);
tray.onClick();
expect(mockApp.screenCaptureManager.startSession).toHaveBeenCalled();
});
it('should not touch main window visibility', () => {
tray.onClick();
expect(mockMainWindow.hide).not.toHaveBeenCalled();
expect(mockMainWindow.hide).toHaveBeenCalled();
expect(mockMainWindow.show).not.toHaveBeenCalled();
});
it('should not throw when startSession rejects', () => {
vi.mocked(mockApp.screenCaptureManager.startSession).mockImplementationOnce(() => {
throw new Error('capture failed');
});
it('should show and focus window when it is not visible', () => {
mockBrowserWindow.isVisible.mockReturnValue(false);
mockBrowserWindow.isFocused.mockReturnValue(false);
tray.onClick();
expect(mockMainWindow.show).toHaveBeenCalled();
expect(mockBrowserWindow.focus).toHaveBeenCalled();
expect(mockMainWindow.hide).not.toHaveBeenCalled();
});
it('should show and focus window when it is visible but not focused', () => {
mockBrowserWindow.isVisible.mockReturnValue(true);
mockBrowserWindow.isFocused.mockReturnValue(false);
tray.onClick();
expect(mockMainWindow.show).toHaveBeenCalled();
expect(mockBrowserWindow.focus).toHaveBeenCalled();
expect(mockMainWindow.hide).not.toHaveBeenCalled();
});
it('should handle case when main window is null', () => {
vi.mocked(mockApp.browserManager.getMainWindow).mockReturnValue(null);
expect(() => tray.onClick()).not.toThrow();
});
@@ -541,9 +504,11 @@ describe('Tray', () => {
tray.updateTooltip('New Tooltip');
expect(mockElectronTray.setToolTip).toHaveBeenCalledWith('New Tooltip');
// Test click behavior — now opens the Quick Composer session
// Test click behavior
mockBrowserWindow.isVisible.mockReturnValue(true);
mockBrowserWindow.isFocused.mockReturnValue(true);
tray.onClick();
expect(mockApp.screenCaptureManager.startSession).toHaveBeenCalled();
expect(mockMainWindow.hide).toHaveBeenCalled();
// Destroy
tray.destroy();
@@ -1,11 +1,16 @@
import { nativeTheme } from 'electron';
import { beforeEach, describe, expect, it, vi } from 'vitest';
import type { App } from '../../App';
import { Tray } from '../Tray';
import { TrayManager } from '../TrayManager';
// Mock electron modules (empty shim — TrayManager no longer reads nativeTheme)
vi.mock('electron', () => ({}));
// Mock electron modules
vi.mock('electron', () => ({
nativeTheme: {
shouldUseDarkColorsForSystemIntegratedUI: false,
},
}));
// Mock logger
vi.mock('@/utils/logger', () => ({
@@ -45,17 +50,12 @@ describe('TrayManager', () => {
identifier: 'main',
broadcast: vi.fn(),
destroy: vi.fn(),
setMenu: vi.fn(),
updateIcon: vi.fn(),
updateTooltip: vi.fn(),
};
// Mock App — initializeTrays now pulls a prebuilt menu from MenuManager.
mockApp = {
menuManager: {
buildTrayMenu: vi.fn(() => ({ _mockMenu: true }) as any),
},
} as unknown as App;
// Mock App
mockApp = {} as unknown as App;
// Mock Tray constructor
vi.mocked(Tray).mockImplementation(() => mockTray);
@@ -86,24 +86,22 @@ describe('TrayManager', () => {
expect(spy).toHaveBeenCalled();
});
it('should attach the platform tray menu to the main tray', () => {
trayManager.initializeTrays();
expect(mockApp.menuManager.buildTrayMenu).toHaveBeenCalled();
expect(mockTray.setMenu).toHaveBeenCalledWith({ _mockMenu: true });
});
});
describe('initializeMainTray', () => {
it('should create main tray with a template image on macOS', () => {
it('should create main tray with dark icon on macOS when dark mode is enabled', () => {
Object.defineProperty(nativeTheme, 'shouldUseDarkColorsForSystemIntegratedUI', {
value: true,
writable: true,
configurable: true,
});
const result = trayManager.initializeMainTray();
expect(Tray).toHaveBeenCalledWith(
expect.objectContaining({
iconPath: 'trayTemplate.png',
iconPath: 'tray-dark.png',
identifier: 'main',
isTemplateImage: true,
tooltip: 'test-app',
}),
mockApp,
@@ -111,6 +109,25 @@ describe('TrayManager', () => {
expect(result).toBe(mockTray);
});
it('should create main tray with light icon on macOS when light mode is enabled', () => {
Object.defineProperty(nativeTheme, 'shouldUseDarkColorsForSystemIntegratedUI', {
value: false,
writable: true,
configurable: true,
});
trayManager.initializeMainTray();
expect(Tray).toHaveBeenCalledWith(
expect.objectContaining({
iconPath: 'tray-light.png',
identifier: 'main',
tooltip: 'test-app',
}),
mockApp,
);
});
it('should add created tray to trays map', () => {
trayManager.initializeMainTray();
+3 -1
View File
@@ -1,4 +1,4 @@
/// <reference types="vite/client" />
import 'vite/client';
/**
* `node-mac-permissions` is a macOS-only native module.
@@ -30,3 +30,5 @@ declare module 'node-mac-permissions' {
export function askForScreenCaptureAccess(openPreferences?: boolean): void;
export function askForFullDiskAccess(): void;
}
export {};
-435
View File
@@ -1,435 +0,0 @@
import type { ChildProcess } from 'node:child_process';
import { spawn } from 'node:child_process';
import type { Readable } from 'node:stream';
import { createLogger } from '@/utils/logger';
import type {
ACPInitializeParams,
ACPPermissionRequest,
ACPPermissionResponse,
ACPServerCapabilities,
ACPSessionCancelParams,
ACPSessionInfo,
ACPSessionNewParams,
ACPSessionPromptParams,
ACPSessionUpdate,
FSReadTextFileParams,
FSReadTextFileResult,
FSWriteTextFileParams,
JsonRpcError,
JsonRpcNotification,
JsonRpcRequest,
JsonRpcResponse,
TerminalCreateParams,
TerminalCreateResult,
TerminalKillParams,
TerminalOutputParams,
TerminalOutputResult,
TerminalReleaseParams,
TerminalWaitForExitParams,
TerminalWaitForExitResult,
} from './types';
const logger = createLogger('libs:acp:client');
type PendingRequest = {
reject: (error: Error) => void;
resolve: (result: unknown) => void;
};
export interface ACPClientParams {
args?: string[];
command: string;
cwd?: string;
env?: Record<string, string>;
}
export interface ACPClientCallbacks {
onPermissionRequest?: (request: ACPPermissionRequest) => Promise<ACPPermissionResponse>;
onSessionComplete?: (sessionId: string) => void;
onSessionUpdate?: (update: ACPSessionUpdate) => void;
}
/**
* ACP Client that communicates with an ACP agent (e.g. Claude Code) over stdio JSON-RPC 2.0.
*
* Bidirectional: sends requests to agent AND handles incoming requests from agent
* (fs/read_text_file, fs/write_text_file, terminal/*, session/request_permission).
*/
export class ACPClient {
private buffer = '';
private callbacks: ACPClientCallbacks = {};
private nextId = 1;
private pendingRequests = new Map<number | string, PendingRequest>();
private process: ChildProcess | null = null;
private stderrLogs: string[] = [];
// Client-side method handlers (agent calls these)
private clientMethodHandlers = new Map<string, (params: any) => Promise<unknown>>();
constructor(private readonly params: ACPClientParams) {}
/**
* Register handlers for client-side methods that the agent can call back.
*/
registerClientMethods(handlers: {
'fs/read_text_file'?: (params: FSReadTextFileParams) => Promise<FSReadTextFileResult>;
'fs/write_text_file'?: (params: FSWriteTextFileParams) => Promise<void>;
'terminal/create'?: (params: TerminalCreateParams) => Promise<TerminalCreateResult>;
'terminal/kill'?: (params: TerminalKillParams) => Promise<void>;
'terminal/output'?: (params: TerminalOutputParams) => Promise<TerminalOutputResult>;
'terminal/release'?: (params: TerminalReleaseParams) => Promise<void>;
'terminal/wait_for_exit'?: (
params: TerminalWaitForExitParams,
) => Promise<TerminalWaitForExitResult>;
}) {
for (const [method, handler] of Object.entries(handlers)) {
if (handler) {
this.clientMethodHandlers.set(method, handler);
}
}
}
setCallbacks(callbacks: ACPClientCallbacks) {
this.callbacks = callbacks;
}
/**
* Spawn the agent process and initialize the ACP connection.
*/
async connect(): Promise<ACPServerCapabilities> {
const { command, args = [], env, cwd } = this.params;
this.process = spawn(command, args, {
cwd,
env: { ...process.env, ...env },
stdio: ['pipe', 'pipe', 'pipe'],
});
// Capture stderr
const stderr = this.process.stderr as Readable | null;
if (stderr) {
stderr.on('data', (chunk: Buffer) => {
const lines = chunk
.toString('utf8')
.split('\n')
.filter((l) => l.trim());
this.stderrLogs.push(...lines);
});
}
// Listen for stdout (JSON-RPC messages)
const stdout = this.process.stdout as Readable | null;
if (stdout) {
stdout.on('data', (chunk: Buffer) => {
this.handleData(chunk.toString('utf8'));
});
}
this.process.on('error', (err) => {
logger.error('ACP process error:', err);
});
this.process.on('exit', (code, signal) => {
logger.info('ACP process exited:', { code, signal });
// Reject all pending requests
for (const [id, pending] of this.pendingRequests) {
pending.reject(new Error(`ACP process exited (code=${code}, signal=${signal})`));
this.pendingRequests.delete(id);
}
});
// Initialize
const capabilities = await this.initialize();
return capabilities;
}
/**
* Send initialize request to the agent.
*/
private async initialize(): Promise<ACPServerCapabilities> {
const params: ACPInitializeParams = {
capabilities: {
fs: { readTextFile: true, writeTextFile: true },
terminal: true,
},
clientInfo: { name: 'lobehub-desktop', version: '1.0.0' },
protocolVersion: '0.1',
};
return this.sendRequest<ACPServerCapabilities>('initialize', params);
}
/**
* Create a new session.
*/
async createSession(params?: ACPSessionNewParams): Promise<ACPSessionInfo> {
return this.sendRequest<ACPSessionInfo>('session/new', params);
}
/**
* Send a prompt to an existing session.
*/
async sendPrompt(params: ACPSessionPromptParams): Promise<void> {
return this.sendRequest<void>('session/prompt', params);
}
/**
* Cancel an ongoing session operation.
*/
async cancelSession(params: ACPSessionCancelParams): Promise<void> {
return this.sendRequest<void>('session/cancel', params);
}
/**
* Respond to a permission request from the agent.
*/
respondToPermission(requestId: string, response: ACPPermissionResponse): void {
this.sendResponse(requestId, response);
}
/**
* Disconnect from the agent and kill the process.
*/
async disconnect(): Promise<void> {
if (this.process) {
this.process.stdin?.end();
this.process.kill('SIGTERM');
// Force kill after timeout
await new Promise<void>((resolve) => {
const timeout = setTimeout(() => {
if (this.process && !this.process.killed) {
this.process.kill('SIGKILL');
}
resolve();
}, 5000);
this.process?.on('exit', () => {
clearTimeout(timeout);
resolve();
});
});
this.process = null;
}
}
getStderrLogs(): string[] {
return this.stderrLogs;
}
// ============================================================
// JSON-RPC transport layer
// ============================================================
private sendRequest<T>(method: string, params?: object): Promise<T> {
return new Promise((resolve, reject) => {
const id = this.nextId++;
const request: JsonRpcRequest = {
id,
jsonrpc: '2.0',
method,
params,
};
this.pendingRequests.set(id, {
reject,
resolve: resolve as (result: unknown) => void,
});
this.writeMessage(request);
});
}
private sendResponse(id: number | string, result: unknown): void {
const response: JsonRpcResponse = {
id,
jsonrpc: '2.0',
result,
};
this.writeMessage(response);
}
private sendErrorResponse(id: number | string, error: JsonRpcError): void {
const response: JsonRpcResponse = {
error,
id,
jsonrpc: '2.0',
};
this.writeMessage(response);
}
private writeMessage(message: JsonRpcRequest | JsonRpcResponse | JsonRpcNotification): void {
if (!this.process?.stdin?.writable) {
logger.error('Cannot write to ACP process: stdin not writable');
return;
}
const json = JSON.stringify(message);
const content = `Content-Length: ${Buffer.byteLength(json)}\r\n\r\n${json}`;
this.process.stdin.write(content);
}
/**
* Handle incoming data from stdout, parsing JSON-RPC messages.
* Uses Content-Length header framing (LSP-style).
*/
private handleData(data: string): void {
this.buffer += data;
while (true) {
// Try to parse a complete message from the buffer
const headerEnd = this.buffer.indexOf('\r\n\r\n');
if (headerEnd === -1) break;
const header = this.buffer.slice(0, headerEnd);
const contentLengthMatch = header.match(/Content-Length:\s*(\d+)/i);
if (!contentLengthMatch) {
// Try parsing as raw JSON (some agents don't use Content-Length headers)
const newlineIdx = this.buffer.indexOf('\n');
if (newlineIdx === -1) break;
const line = this.buffer.slice(0, newlineIdx).trim();
this.buffer = this.buffer.slice(newlineIdx + 1);
if (line) {
try {
const message = JSON.parse(line);
this.handleMessage(message);
} catch {
// Not valid JSON, skip
}
}
continue;
}
const contentLength = Number.parseInt(contentLengthMatch[1], 10);
const messageStart = headerEnd + 4; // after \r\n\r\n
const messageEnd = messageStart + contentLength;
if (Buffer.byteLength(this.buffer.slice(messageStart)) < contentLength) {
// Not enough data yet
break;
}
const messageStr = this.buffer.slice(messageStart, messageEnd);
this.buffer = this.buffer.slice(messageEnd);
try {
const message = JSON.parse(messageStr);
this.handleMessage(message);
} catch (err) {
logger.error('Failed to parse ACP JSON-RPC message:', err);
}
}
}
/**
* Route incoming JSON-RPC messages.
*/
private handleMessage(message: JsonRpcRequest | JsonRpcResponse | JsonRpcNotification): void {
// Response to our request
if ('id' in message && message.id !== null && !('method' in message)) {
const response = message as JsonRpcResponse;
const pending = this.pendingRequests.get(response.id!);
if (pending) {
this.pendingRequests.delete(response.id!);
if (response.error) {
pending.reject(
new Error(`ACP error [${response.error.code}]: ${response.error.message}`),
);
} else {
pending.resolve(response.result);
}
}
return;
}
// Incoming request or notification from agent
if ('method' in message) {
const method = message.method;
const params = message.params || {};
// Notification (no id) — e.g., session/update
if (!('id' in message) || message.id === undefined || message.id === null) {
this.handleNotification(method, params);
return;
}
// Request (has id) — agent calling client methods
this.handleIncomingRequest(message as JsonRpcRequest);
}
}
/**
* Handle notifications from the agent (no response expected).
*/
private handleNotification(method: string, params: Record<string, unknown> | object): void {
switch (method) {
case 'session/update': {
if (this.callbacks.onSessionUpdate) {
this.callbacks.onSessionUpdate(params as unknown as ACPSessionUpdate);
}
break;
}
default: {
logger.warn('Unhandled ACP notification:', method);
}
}
}
/**
* Handle incoming requests from the agent (response required).
*/
private async handleIncomingRequest(request: JsonRpcRequest): Promise<void> {
const { id, method, params } = request;
// Special handling for permission requests
if (method === 'session/request_permission') {
if (this.callbacks.onPermissionRequest) {
try {
const response = await this.callbacks.onPermissionRequest(
params as unknown as ACPPermissionRequest,
);
this.sendResponse(id, response);
} catch (err) {
this.sendErrorResponse(id, {
code: -32000,
message: err instanceof Error ? err.message : 'Permission request failed',
});
}
} else {
// Auto-allow if no handler
const permReq = params as unknown as ACPPermissionRequest;
const allowOption = permReq.options?.find((o) => o.kind === 'allow_once');
this.sendResponse(id, {
kind: 'selected',
optionId: allowOption?.optionId || permReq.options?.[0]?.optionId,
});
}
return;
}
// Delegate to registered client method handlers
const handler = this.clientMethodHandlers.get(method);
if (handler) {
try {
const result = await handler(params);
this.sendResponse(id, result ?? null);
} catch (err) {
this.sendErrorResponse(id, {
code: -32000,
message: err instanceof Error ? err.message : 'Client method failed',
});
}
} else {
this.sendErrorResponse(id, {
code: -32601,
message: `Method not found: ${method}`,
});
}
}
}
-3
View File
@@ -1,3 +0,0 @@
export type { ACPClientCallbacks, ACPClientParams } from './client';
export { ACPClient } from './client';
export type * from './types';
-326
View File
@@ -1,326 +0,0 @@
/**
* ACP (Agent Client Protocol) type definitions
* Based on: https://agentclientprotocol.com/protocol/schema
*/
// ============================================================
// JSON-RPC 2.0 base types
// ============================================================
export interface JsonRpcRequest {
id: number | string;
jsonrpc: '2.0';
method: string;
params?: Record<string, unknown> | object;
}
export interface JsonRpcResponse {
error?: JsonRpcError;
id: number | string | null;
jsonrpc: '2.0';
result?: unknown;
}
export interface JsonRpcNotification {
jsonrpc: '2.0';
method: string;
params?: Record<string, unknown>;
}
export interface JsonRpcError {
code: number;
data?: unknown;
message: string;
}
// ============================================================
// ACP Capabilities
// ============================================================
export interface ACPCapabilities {
audio?: boolean;
embeddedContext?: boolean;
fs?: {
readTextFile?: boolean;
writeTextFile?: boolean;
};
image?: boolean;
terminal?: boolean;
}
export interface ACPServerCapabilities {
modes?: ACPMode[];
name: string;
protocolVersion: string;
version?: string;
}
export interface ACPMode {
description?: string;
id: string;
name: string;
}
// ============================================================
// Session types
// ============================================================
export interface ACPSessionInfo {
createdAt?: string;
id: string;
title?: string;
}
// ============================================================
// Content block types (used in session/update)
// ============================================================
export type ACPContentBlock =
| ACPTextContent
| ACPImageContent
| ACPAudioContent
| ACPResourceContent
| ACPResourceLinkContent;
export interface ACPTextContent {
annotations?: Record<string, unknown>;
text: string;
type: 'text';
}
export interface ACPImageContent {
annotations?: Record<string, unknown>;
data: string;
mimeType: string;
type: 'image';
uri?: string;
}
export interface ACPAudioContent {
annotations?: Record<string, unknown>;
data: string;
mimeType: string;
type: 'audio';
}
export interface ACPResourceContent {
annotations?: Record<string, unknown>;
resource: {
blob?: string;
mimeType?: string;
text?: string;
uri: string;
};
type: 'resource';
}
export interface ACPResourceLinkContent {
annotations?: Record<string, unknown>;
description?: string;
mimeType?: string;
name: string;
size?: number;
title?: string;
type: 'resource_link';
uri: string;
}
// ============================================================
// Tool call types
// ============================================================
export type ACPToolCallKind =
| 'read'
| 'edit'
| 'delete'
| 'move'
| 'search'
| 'execute'
| 'think'
| 'fetch'
| 'other';
export type ACPToolCallStatus = 'pending' | 'in_progress' | 'completed' | 'failed';
export interface ACPToolCallDiffContent {
newText: string;
oldText: string;
path: string;
type: 'diff';
}
export interface ACPToolCallTerminalContent {
command?: string;
exitCode?: number;
output: string;
type: 'terminal';
}
export type ACPToolCallContent =
| ACPTextContent
| ACPImageContent
| ACPToolCallDiffContent
| ACPToolCallTerminalContent;
export interface ACPToolCallLocation {
endLine?: number;
path: string;
startLine?: number;
}
export interface ACPToolCallUpdate {
content?: ACPToolCallContent[];
kind?: ACPToolCallKind;
locations?: ACPToolCallLocation[];
rawInput?: string;
rawOutput?: string;
status?: ACPToolCallStatus;
title: string;
toolCallId: string;
}
// ============================================================
// Session update notification
// ============================================================
export type ACPMessageRole = 'assistant' | 'user' | 'thought';
export interface ACPMessageChunk {
content: ACPContentBlock[];
role: ACPMessageRole;
}
export interface ACPSessionUpdate {
messageChunks?: ACPMessageChunk[];
sessionId: string;
toolCalls?: ACPToolCallUpdate[];
}
// ============================================================
// Permission request types
// ============================================================
export interface ACPPermissionOption {
kind: 'allow_once' | 'allow_always' | 'reject_once' | 'reject_always';
name: string;
optionId: string;
}
export interface ACPPermissionRequest {
message?: string;
options: ACPPermissionOption[];
sessionId: string;
toolCall?: ACPToolCallUpdate;
}
export interface ACPPermissionResponse {
kind: 'selected' | 'cancelled';
optionId?: string;
}
// ============================================================
// Client method params (agent → client)
// ============================================================
export interface FSReadTextFileParams {
path: string;
}
export interface FSReadTextFileResult {
text: string;
}
export interface FSWriteTextFileParams {
path: string;
text: string;
}
export interface TerminalCreateParams {
command: string;
cwd?: string;
env?: Record<string, string>;
}
export interface TerminalCreateResult {
terminalId: string;
}
export interface TerminalOutputParams {
terminalId: string;
}
export interface TerminalOutputResult {
exitCode?: number;
isRunning: boolean;
output: string;
}
export interface TerminalWaitForExitParams {
terminalId: string;
timeout?: number;
}
export interface TerminalWaitForExitResult {
exitCode: number;
output: string;
}
export interface TerminalKillParams {
terminalId: string;
}
export interface TerminalReleaseParams {
terminalId: string;
}
// ============================================================
// Agent method params (client → agent)
// ============================================================
export interface ACPInitializeParams {
capabilities?: ACPCapabilities;
clientInfo?: {
name: string;
version: string;
};
protocolVersion: string;
}
export interface ACPSessionNewParams {
title?: string;
}
export interface ACPSessionPromptParams {
content: ACPContentBlock[];
sessionId: string;
}
export interface ACPSessionCancelParams {
sessionId: string;
}
// ============================================================
// Broadcast event types (main → renderer)
// ============================================================
export interface ACPSessionUpdateEvent {
sessionId: string;
update: ACPSessionUpdate;
}
export interface ACPPermissionRequestEvent {
message?: string;
options: ACPPermissionOption[];
requestId: string;
sessionId: string;
toolCall?: ACPToolCallUpdate;
}
export interface ACPSessionErrorEvent {
error: string;
sessionId: string;
}
export interface ACPSessionCompleteEvent {
sessionId: string;
}
@@ -16,13 +16,6 @@ const dialog = {
'fullDiskAccess.openSettings': 'Open Settings',
'fullDiskAccess.skip': 'Later',
'fullDiskAccess.title': 'Full Disk Access Required',
'screenCaptureAccess.cancel': 'Later',
'screenCaptureAccess.detail':
'Open System Settings, enable Screen Recording for LobeHub, then try Quick Composer again.',
'screenCaptureAccess.message':
'Quick Composer needs Screen Recording permission before it can capture screenshots.',
'screenCaptureAccess.openSettings': 'Open Settings',
'screenCaptureAccess.title': 'Screen Recording Permission Required',
'update.downloadAndInstall': 'Download and Install',
'update.downloadComplete': 'Download Complete',
'update.downloadCompleteMessage': 'Update downloaded. Install now?',
@@ -48,7 +48,6 @@ const menu = {
'file.newAgent': 'New Agent',
'file.newAgentGroup': 'New Agent Group',
'file.newPage': 'New Page',
'file.newTab': 'New Tab',
'file.newTopic': 'New Topic',
'file.preferences': 'Preferences',
'file.quit': 'Quit',
@@ -71,9 +70,7 @@ const menu = {
'macOS.preferences': 'Preferences...',
'macOS.services': 'Services',
'macOS.unhide': 'Show All',
'tray.openMiniToolbar': 'Quick Composer',
'tray.open': 'Open {{appName}}',
'tray.quickChat': 'Quick Chat',
'tray.quit': 'Quit',
'tray.show': 'Show {{appName}}',
'view.forceReload': 'Force Reload',
@@ -61,7 +61,6 @@ const createMockApp = () => {
'dev.forceReload': 'Force Reload',
'dev.devTools': 'Developer Tools',
'dev.devPanel': 'Dev Panel',
'tray.openMiniToolbar': 'Quick Composer',
'tray.open': `Open ${params?.appName || 'App'}`,
'tray.quit': 'Quit',
};
@@ -310,16 +309,14 @@ describe('LinuxMenu', () => {
expect(copyItem.role).toBe('copy');
});
it('should bind CmdOrCtrl+W to a smart close handler (tab first, then window)', () => {
it('should use role for close (accelerator handled by Electron)', () => {
linuxMenu.buildAndSetAppMenu();
const template = (Menu.buildFromTemplate as any).mock.calls[0][0];
const fileMenu = template.find((item: any) => item.label === 'File');
const closeItem = fileMenu.submenu.find((item: any) => item.label === 'Close');
expect(closeItem.accelerator).toBe('CmdOrCtrl+W');
expect(typeof closeItem.click).toBe('function');
expect(closeItem.role).toBeUndefined();
expect(closeItem.role).toBe('close');
});
it('should use role for minimize (accelerator handled by Electron)', () => {

Some files were not shown because too many files have changed in this diff Show More