cc-viewer 1.9.3 → 1.9.5

package/README.md

@@ -61,14 +61,14 @@ Once started in programming mode, the web page opens automatically.
 
 cc-viewer also ships as a native desktop app: [download page](https://github.com/weiesky/cc-viewer/releases)
 
-### SDK mode (headless, `ccv -SDK`)
+### SDK mode (headless, `ccv --sdk`)
 
-`ccv -SDK` runs the session through the Agent SDK instead of an interactive terminal — no terminal panel, messages are sent from the web UI, and everything else (session logs, streaming typewriter, usage stats) works the same as in terminal mode.
+`ccv --sdk` runs the session through the Agent SDK instead of an interactive terminal — no main PTY, messages are sent from the web UI, and everything else (session logs, streaming typewriter, usage stats) works the same as in terminal mode. The header still exposes a **Terminal** button, but it opens the standalone scratch multi-tab shell (unrelated to the SDK session), not a project PTY.
 
 ```bash
-ccv -SDK                # headless session; chat from the browser
-ccv -SDK -c             # continue the most recent session
-ccv -SDK --model sonnet # pick a model
+ccv --sdk                # headless session; chat from the browser
+ccv --sdk -c             # continue the most recent session
+ccv --sdk --model sonnet # pick a model
 ```
 
 Approvals (Bash/Edit/Write/WebFetch/…) pop up in the browser with allow / deny / allow-for-session, and `AskUserQuestion` / plan prompts appear as modals. `npm publish` always requires an explicit approval — even with `--d`. Requires the `@anthropic-ai/claude-agent-sdk` package (bundled with cc-viewer); falls back to terminal mode if unavailable.

package/cli.js

@@ -788,6 +788,13 @@ async function runSdkMode(extraClaudeArgs = [], cwd, noOpen = false) {
   const childEnv = {
     ...process.env,
     ANTHROPIC_BASE_URL: proxyBaseUrl,
+    // Opt the CLI child into emitting `session_state_changed` messages (idle /
+    // running / requires_action) — the authoritative turn-level busy signal the
+    // conversation spinner needs. Gated emission point in the CLI binary; harmless
+    // on older CLIs (unknown env is ignored, sdk-manager falls back to
+    // push-running/result-idle broadcasts). Top-level childEnv, not settings.env:
+    // the settings merge path could be overridden by user settings.
+    CLAUDE_CODE_EMIT_SESSION_STATE_EVENTS: '1',
     // 与 PTY 子进程同款(pty-manager.js:247):SDK 子进程的 cli.js 若已被 -logger/PTY 注入
     // interceptor,CCV_PROXY_MODE=1 让它只装 fetch hook 而不再自起 server;wire 捕获本来
     // 就发生在主进程 proxy 的出站 fetch(ANTHROPIC_BASE_URL 指过来),此键保证子进程不双起。
@@ -850,12 +857,15 @@ async function runSdkMode(extraClaudeArgs = [], cwd, noOpen = false) {
     // 若 SDK 内部异常吞掉了 result 消息这条信号就丢了 —— 至少打个 warn 让排查时有线索。
     // 显式 typeof 检查：以前用可选链 `?.()` 在 export 缺失时返回 undefined → catch 永远不触发
     // → 「至少 warn」承诺落空，turn-end 静默丢，bug 极难追。
-    onTurnEnd: ({ sessionId, ts }) => {
+    onTurnEnd: ({ sessionId, ts, cwd }) => {
       if (typeof serverMod.broadcastTurnEnd !== 'function') {
         console.warn('[sdk] serverMod.broadcastTurnEnd is not a function (export missing?); turn-end signal dropped');
         return;
       }
-      try { serverMod.broadcastTurnEnd(sessionId, ts); }
+      // Per-workspace (2026-10): forward the session cwd so the server routes the
+      // turn_end to THIS workspace's scope (SDK has no Stop-hook POST; without a
+      // scope hint every SDK turn-end resolved to the bound project).
+      try { serverMod.broadcastTurnEnd(sessionId, ts, null, cwd); }
       catch (err) { console.warn('[sdk] broadcastTurnEnd threw:', err?.message); }
     },
     // query 级失败(spawn/protocol/iterator)推到 Web UI toast —— 此前只有 console.error,
@@ -863,6 +873,20 @@ async function runSdkMode(extraClaudeArgs = [], cwd, noOpen = false) {
     onQueryError: (message) => serverMod.broadcastWsMessage({ type: 'sdk-error', message }),
   });
 
+  // Per-cwd multi-session (2026-10-12): hand the boot launch config (proxy env, model,
+  // permission, executable, user args) to the manager as a process-level template. The
+  // workspace-launch route uses it to register a session for a NEW cwd — without it the new
+  // session would get no env (bypassing the proxy → no transcript, no per-cwd routing).
+  // launchResume is boot-only and deliberately NOT templated.
+  sdkManager.setSdkLaunchConfig({
+    permissionMode,
+    env: childEnv,
+    settings: JSON.parse(settingsMerge.settingsJson),
+    model: sdkArgs.model,
+    userArgs: sdkArgs.rest,
+    claudeExecutable: sdkClaudePath,
+  });
+
   // 注册 SDK 回调到 server.js（WS 消息路由用）
   serverMod.setSdkResolveApproval(sdkManager.resolveApproval);
   serverMod.setSdkCancelApproval(sdkManager.cancelApproval);
@@ -870,6 +894,9 @@ async function runSdkMode(extraClaudeArgs = [], cwd, noOpen = false) {
   serverMod.setSdkInterruptTurn(sdkManager.interruptTurn);
   serverMod.setSdkGetPendingApprovals(sdkManager.getPendingApprovals);
   serverMod.setSdkGetInitSnapshot(sdkManager.getSdkInitSnapshot);
+  serverMod.setSdkGetContextUsageSnapshot(sdkManager.getContextUsageSnapshot);
+  serverMod.setSdkGetMcpStatusSnapshot(sdkManager.getMcpStatusSnapshot);
+  serverMod.setSdkGetSessionStateSnapshot(sdkManager.getSessionStateSnapshot);
   // Busy-queue bubble actions (queue-send-now / queue-remove / queue-clear / replay).
   serverMod.setSdkSendQueuedNow(sdkManager.sendQueuedNow);
   serverMod.setSdkRemoveQueued(sdkManager.removeQueued);