9 Commits

Author SHA1 Message Date
你的姓名
c032e38081 merge: upstream v0.4.2 (NanmiCoder/cc-haha 39 commits)
Major upstream changes integrated:
- providers list drag-and-drop reordering (#753)
- streaming stability fixes for slow providers (#766)
- active-turn prompt queue with edit/dedupe (#755)
- H5 access tokens / ports / background sessions (#767, #764)
- OpenAI prompt cache semantics (#789)
- exit plan approvals preview (#793)
- Windows settings panel stability (#788, #791)
- file path expansion when revealing generated files (#776)
- in-app browser preview menus (#761)
- auto-dream background memory consolidation
- compactCount tracking on sessions
- streamingResponseChars metric
- v0.4.2 release notes

Conflict resolution highlights:
- providerService: kept HEAD's markThinkingIncompatible + upstream's reorderProviders side-by-side
- types/provider: kept FetchModelsSchema + ReorderProvidersSchema both
- Settings.tsx: migrated HEAD's compat/thinking badges into upstream's SortableProviderCard slots
- chatStore: kept both message-queue implementations (messageQueue + queuedUserMessages)
- compact_boundary: merged HEAD's registerCompactionAndShouldSuggest with upstream's compactCount field
- exposed __resetCompactionThrashForTesting to fix cross-test state pollution exposed by upstream's new compactCount=2 test

Verification:
- desktop tsc --noEmit: clean
- desktop test suite: 1789/1792 pass (3 pre-existing electron/terminal Windows-only failures, not regressions)
- server providers test: 95/95 pass
- desktop chatStore tests: 131/131 pass
- desktop settingsStore + WorkspacePanel tests: 65/65 pass
2026-06-16 04:38:24 +08:00
小橙子
355b7294b9
feat(desktop): seed cc-haha-builtin marketplace into Electron package (#50)
* feat(desktop): seed cc-haha-builtin marketplace into Electron package

Wires the missing desktop side of the plugin-seed mechanism. The CLI
side (src/utils/plugins/{pluginDirectories,marketplaceManager}.ts) has
been on main for a while and exposes `getPluginSeedDirs()` +
`registerSeedMarketplaces()` reading `CLAUDE_CODE_PLUGIN_SEED_DIR`. But
the desktop side never set that env var or copied any seed into the
Electron package, so:

- v0.5.11 packaged users see whatever marketplaces they manually
  registered (typically just `reverse-engineering` from a one-off
  `plugin marketplace add ./plugins`).
- The image-gen plugin added in PR #49 was invisible after install
  because no mechanism shipped it inside the Electron bundle.

What this commit adds

- `desktop/scripts/build-plugin-seed.ts` (new)
  - Mirrors the repo's `plugins/` directory into
    `desktop/plugin-seed/marketplaces/cc-haha-builtin/`.
  - Generates `desktop/plugin-seed/known_marketplaces.json` with a
    placeholder `installLocation`. registerSeedMarketplaces() recomputes
    the real path at runtime via findSeedMarketplaceLocation(), so the
    placeholder is intentional — handles cases like multi-stage Docker
    builds where the seed lives at a different path than where it was
    built.

- `desktop/package.json`
  - Adds `build:plugin-seed` script.
  - Prepends it to `electron:dev` and `electron:build` so the seed is
    always fresh before the app starts (or is packaged).
  - Adds `plugin-seed/**` to electron-builder `files` and `asarUnpack`
    so the seed dir ships inside the .app/.exe but stays outside the
    asar archive (CC reads files from disk, not from asar).

- `desktop/electron/services/sidecarManager.ts`
  - Threads `desktopRoot` through `buildSidecarEnv(...)` and adds
    `CLAUDE_CODE_PLUGIN_SEED_DIR=<desktopRoot>/plugin-seed` so the
    spawned server sidecar finds the seed.

- `src/server/index.ts`
  - Calls `registerSeedMarketplaces()` at server boot so the seeded
    marketplace appears in `~/.claude/plugins/known_marketplaces.json`
    and the desktop's Settings → Plugins page picks it up.
  - Fire-and-forget (`void ...`) rather than `await`, since
    `startServer` is sync and the registration takes ~ms; the seeded
    marketplace appears in the UI within 1-2 seconds of server boot.
    (The original drafted version used `await` inside a sync function,
    which doesn't compile — fixed in this commit.)

- `.gitignore` — excludes `desktop/plugin-seed/` from version control
  (regenerated on every electron build, never committed).

End-to-end flow after this lands

  build time:
    bun run electron:build
      → bun run build:plugin-seed
          → desktop/plugin-seed/marketplaces/cc-haha-builtin/{plugin/,...}
          → desktop/plugin-seed/known_marketplaces.json
      → bun run build:sidecars + electron-builder
          → packages plugin-seed/** into .app/.exe (asarUnpack ensures
            the dir is on disk, not inside asar)

  runtime (first launch):
    Electron main → spawn server sidecar with
      CLAUDE_CODE_PLUGIN_SEED_DIR=<resourcesDir>/plugin-seed
    Server sidecar starts → registerSeedMarketplaces()
      → reads seed/known_marketplaces.json
      → calls findSeedMarketplaceLocation() to resolve real path
      → writes resolved entry into ~/.claude/plugins/known_marketplaces.json
    Desktop Settings → Plugins reads ~/.claude/plugins/known_marketplaces.json
      → shows cc-haha-builtin marketplace with both reverse-engineering
        and image-gen plugins available to install.

Verification

- `bun run desktop/scripts/build-plugin-seed.ts` produces the seed
  with both plugins present, valid JSON, in expected dir layout.
- `bun run lint` (desktop): tsc --noEmit clean — no remaining type
  errors from the await→void change or the buildSidecarEnv signature
  change.
- Seed marketplace.json plugins array confirmed includes both
  reverse-engineering (v0.4.6, post-#33) and image-gen (v1.0.0, from
  #49).

Tested: build script runs locally; tsc clean.
Not-tested: live `bun run electron:package` end-to-end pack on this
host (no codesign, slow). The packaging-side wiring (asarUnpack +
files) is configuration-only and matches established patterns
(node_modules/node-pty/**, src-tauri/binaries/**); no behaviour change
to the existing package layout besides adding plugin-seed/.

Risk: low — additive across the board, no existing path changes
behaviour. The fire-and-forget marketplace registration cannot block
boot; if it fails, the worst case is the user sees no seeded
marketplace and can manually re-add it (existing flow).

Confidence: high
Scope-risk: narrow — desktop wiring + 1 server-side hook call.

* test(server): add seed-marketplaces-startup integration tests

Covers the registerSeedMarketplaces() integration that startServer()

now invokes at boot. Four cases:

- env var unset → returns false, no write

- valid seed → returns true, writes primary entry with resolved (non-placeholder) installLocation

- repeat call → primary entry stays intact (returns false on the no-op call but the previously-written entry survives)

- nonexistent seed dir → returns false, no crash

Resolves the change-policy 'Server product files changed without a server test file in the PR' block on PR #50.

* test(desktop): pass desktopRoot to buildSidecarEnv in sidecar test

buildSidecarEnv now requires desktopRoot to derive CLAUDE_CODE_PLUGIN_SEED_DIR. The existing 'passes portable config' test still called the old 2-arg signature, breaking both desktop-checks (vitest) and desktop-native-checks (tsc) on PR #50.

Tested:

  - bunx vitest run electron/services/sidecarManager.test.ts -t 'passes portable config' — 1 passed

  - tsc -p electron/tsconfig.json — clean

Confidence: high

Scope-risk: narrow

---------

Co-authored-by: 你的姓名 <you@example.com>
2026-06-15 23:18:34 +08:00
程序员阿江(Relakkes)
53d8e7ad77 feat(desktop): stabilize H5 access tokens, ports, and background sessions (#767, #764)
H5 远程访问的三处不稳定来源修复,让手机出门在外也能稳定连接、长任务不丢。

#767 令牌与端口固定:
- 令牌明文持久化到 cc-haha/settings.json,重启后二维码/令牌随时可查、可复制;
  enable 复用现有令牌、disable 保留令牌,仅 regenerate 才轮换。手改 token 字段
  即自定义固定令牌。完整令牌只经 local-trusted 面返回,远端 403。
- 新增可选固定端口 fixedPort,并在未配置时复用上次端口(desktop-server-state.json
  sticky,Electron/Tauri 双壳共享),反向代理/手机书签跨重启不失效;占用时回退随机。

#764 断连不杀正在运行的 CLI:
- 客户端断开时若该会话仍在跑一轮任务,不再 30s 后强杀子进程,而是等任务跑完;
  手机锁屏/切后台时长任务在后台跑完,重连即见结果。
- 空闲清理超时改为可配 disconnectGraceSeconds(H5 访问设置页,默认 30s),
  经 disconnectGraceConfig 同步缓存供 close 处理读取。

server / Electron / Tauri / React 四层 + 五语言 i18n + 配套单测全部覆盖。
2026-06-12 16:37:00 +08:00
程序员阿江(Relakkes)
be4984009c fix(desktop): hide Windows subprocess consoles (#802)
Ensure Electron sidecar launch and Windows taskkill calls hide console windows, and pass the same hidden-window spawn option through desktop CLI and scheduled-task subprocess launches.

Tested: cd desktop && bun test ./electron/services/sidecarManager.test.ts
Tested: bun test src/server/__tests__/conversation-service.test.ts src/server/__tests__/cron-scheduler-launcher.test.ts
Tested: bun run check:native
Tested: bun run check:server
Not-tested: Windows GUI quit smoke
Confidence: medium
Scope-risk: narrow
2026-06-12 10:16:58 +08:00
程序员阿江(Relakkes)
ddcfa5faae feat(adapters): add WhatsApp linked-device support (#573)
Add a WhatsApp adapter backed by Baileys linked-device auth, plus desktop QR binding UI, server config endpoints, sidecar startup wiring, tests, and documentation.

Constraint: Uses WhatsApp Web linked-device auth, not Meta WhatsApp Business Cloud API.

Tested:
- cd adapters && bun run check:adapters
- bun test src/server/__tests__/adapters.test.ts
- cd desktop && bun run check:desktop
- bun run check:native
- bun run check:persistence-upgrade
- bun run check:docs

Not-tested:
- Live WhatsApp QR pairing, because no WhatsApp account/device was exercised here.
- bun run check:server, because the existing src/server/__tests__/conversations.test.ts timeout still fails independently.

Confidence: medium
Scope-risk: moderate
2026-06-09 21:31:46 +08:00
程序员阿江(Relakkes)
7a882d1858 fix(desktop): forward Windows PowerShell choice to agent sidecar
- serverRuntime injects CLAUDE_CODE_POWERSHELL_PATH from the user's chosen shell
  (readDesktopTerminalConfig + resolveDesktopTerminalShell) on Windows, so the
  agent PowerShellTool honors the same shell as the UI terminal. Best-effort:
  never blocks startup, never overrides an explicit env var, only forwards
  pwsh/powershell selections (not cmd/custom). Regression from the Tauri build.
- document that notificationPermissionState reflects OS capability, not macOS
  authorization (no Electron API exists; the 'failed' lifecycle is the real
  signal) instead of calling the non-existent systemPreferences.getNotificationSettings

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-03 14:17:13 +08:00
程序员阿江(Relakkes)
f070d16d38 fix(desktop): kill sidecars synchronously on quit to avoid orphans
killSidecar gains a sync flag (spawnSync taskkill on Windows); serverRuntime
stopAll threads it through; before-quit now shuts down synchronously so the
Windows taskkill completes before the process exits.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-03 14:17:13 +08:00
程序员阿江(Relakkes)
16f4137954 fix(desktop): stabilize Electron proxy and fullscreen handling
Electron desktop runs network-sensitive OpenAI OAuth token exchange in the sidecar process, so the sidecar now receives system proxy env derived from Electron's cross-platform proxy resolver and the OAuth token client uses the existing proxy fetch options. General manual proxy settings also document and preserve authenticated proxy URLs.

The macOS fullscreen black-screen path is addressed by avoiding native fullscreen Spaces for app fullscreen toggles and by leaving fullscreen before hiding or closing the window.

Constraint: Electron packaged apps may not inherit shell HTTPS_PROXY env when launched from Finder.
Constraint: Manual authenticated proxies must remain standard HTTP(S) proxy URLs for Bun/undici compatibility.
Rejected: Store proxy username and password as separate fields | would require new secret-storage semantics and migration beyond this bugfix.
Rejected: Use native macOS fullscreen Spaces for the desktop app | reproduced black-screen behavior when hiding/closing from fullscreen.
Confidence: high
Scope-risk: moderate
Directive: Do not remove sidecar proxy env injection without retesting OpenAI OAuth from a packaged app launched outside a shell.
Tested: bun test src/services/openaiAuth/client.test.ts src/server/__tests__/haha-openai-oauth-service.test.ts
Tested: bun test src/server/__tests__/network-settings.test.ts
Tested: cd desktop && bun run test -- src/__tests__/generalSettings.test.tsx --run
Tested: cd desktop && bun run check:electron
Tested: git diff --check
Not-tested: bun run check:server blocked by expired quarantine entries server:cron-scheduler, server:providers-real, server:tasks, server:e2e:business-flow, server:e2e:full-flow
Not-tested: live OpenAI OAuth through a corporate authenticated proxy
2026-06-02 21:37:35 +08:00
程序员阿江(Relakkes)
386a41e606 feat(desktop): enable Electron migration path
Introduce the Electron desktop shell alongside the existing React renderer and local Bun server boundary. The migration keeps the DesktopHost contract explicit across Tauri, Electron, and browser runtimes while adding Electron main/preload services for dialogs, shell, notifications, updates, tray/window lifecycle, terminal, preview WebContentsView, app mode, and release/package validation.

The commit also carries the latest local main desktop command updates, including agent slash entries and hidden-by-default markdown thinking details, so the packaged Electron build matches the current main UX surface.

Constraint: React renderer, local Bun server, REST/WebSocket, and sidecar boundaries must remain reusable during the migration
Constraint: macOS dev packages are ad-hoc signed and cannot prove Developer ID notarization or Gatekeeper release launch
Rejected: Browser-only smoke validation | it cannot exercise native dialogs, keychain prompts, notification behavior, or packaged app startup
Confidence: medium
Scope-risk: broad
Directive: Do not remove Tauri host support until signed Electron release artifacts pass native OS smoke on macOS, Windows, and Linux
Tested: bun run check:desktop
Tested: cd desktop && bun run check:electron
Tested: CSC_IDENTITY_AUTO_DISCOVERY=false bun run electron📦dir
Tested: bun run test:package-smoke --platform macos --package-kind dir --artifacts-dir desktop/build-artifacts/electron
Tested: Computer Use read packaged Electron app window at desktop/build-artifacts/electron/mac-arm64/Claude Code Haha.app
Not-tested: Developer ID signed/notarized Gatekeeper launch
Not-tested: Real OS notification click-to-session action
Not-tested: Windows and Linux packaged app smoke on real hosts
2026-06-01 22:43:16 +08:00