cc-viewer 1.7.22 → 1.8.0

package/server/routes/ask-perm.js

@@ -1,5 +1,5 @@
 // Ask / permission hook bridge routes (moved verbatim from server.js handleRequest).
-import { loadAskStore, consumeIfFinal as askStoreConsumeIfFinal, markCancelled as askStoreMarkCancelled } from '../lib/ask-store.js';
+import { loadAskStore, consumeIfFinal as askStoreConsumeIfFinal, markCancelled as askStoreMarkCancelled } from '../lib/ask/ask-store.js';
 import { runWaterfallHook, runParallelHook } from '../lib/plugin-loader.js';
 import { sendEventToClients } from '../lib/log-watcher.js';
 

package/server/routes/dingtalk.js

@@ -1,11 +1,11 @@
-// DingTalk bridge config API. See server/lib/dingtalk-config.js (storage) and
-// server/lib/dingtalk-bridge.js (the Stream client) for the underlying logic.
+// DingTalk bridge config API. See server/lib/im/dingtalk-config.js (storage) and
+// server/lib/im/dingtalk-bridge.js (the Stream client) for the underlying logic.
 //
 //   GET  /api/dingtalk/status — public; remote callers get only hasSecret, the local (admin)
 //                               caller additionally gets the plaintext appSecret to view/copy.
 //   POST /api/dingtalk/config — loopback-only (!isLocal → 403); save creds, reload bridge.
 //   POST /api/dingtalk/test   — loopback-only; validate creds (fetch an access token).
-import { loadDingTalkState, saveDingTalkConfig, loadDingTalkConfig } from '../lib/dingtalk-config.js';
+import { loadDingTalkState, saveDingTalkConfig, loadDingTalkConfig } from '../lib/im/dingtalk-config.js';
 
 const JSON_HEADERS = { 'Content-Type': 'application/json' };
 

package/server/routes/events.js

@@ -5,7 +5,7 @@ import { _projectName, getLiveLogSource, isContinuedLaunch } from '../intercepto
 import { LOG_DIR } from '../../findcc.js';
 import { streamRawEntriesAsync } from '../lib/log-stream.js';
 import { migrationStatus } from '../lib/v2/migrate-prompt.js';
-import { reportSwallowed } from '../lib/error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 import { sseHead, sseWrite, needsDrain, wireEnd, awaitWireDrain } from '../lib/wire-compress.js';
 import { readV2ColdBundle } from '../lib/v2/meta-rows.js';
 import { readV2SingleEntry } from '../lib/v2/adapter.js';
@@ -13,7 +13,7 @@ import { enrichRawIfNeeded } from '../lib/enrich-plan-input.js';
 import { validateLogPath } from '../lib/log-management.js';
 import { isMainAgentEntry, extractCachedContent } from '../lib/kv-cache-analyzer.js';
 import { CONTEXT_WINDOW_FILE, readModelContextSize, buildContextWindowEvent, getContextSizeForModel } from '../lib/context-watcher.js';
-import { adaptContextWindow } from '../lib/context-rules.js';
+import { adaptContextWindow } from '@ccv/core/context-rules';
 
 function turnEndNotify(req, res, parsedUrl, isLocal, deps) {
   if (!isLocal) {

package/server/routes/im.js

@@ -19,13 +19,13 @@
 // detached ccv worker (im-process-manager). In the MAIN process, status/process routes go through the
 // manager (lock + loopback probe of the worker). In a WORKER process (CCV_IM_PLATFORM set), status
 // reports its own in-process adapter (deps.im.getBridgeStatus) — that's what the manager probes.
-import { getDescriptor, loadConfig, loadState, saveConfig } from '../lib/im-config.js';
+import { getDescriptor, loadConfig, loadState, saveConfig } from '../lib/im/im-config.js';
 import { findRecentLog } from '../lib/interceptor-core.js';
 import { listV2Sessions } from '../lib/v2/adapter.js';
-import { readSenders } from '../lib/im-senders.js';
-import { readImAppendSystem, writeImAppendSystem, buildImAppendSystemPreset, MAX_IM_APPEND_SYSTEM_CHARS } from '../lib/im-append-system.js';
-import { imDir } from '../lib/im-lock.js';
-import { resolvePrefLang } from '../lib/im-lang.js';
+import { readSenders } from '../lib/im/im-senders.js';
+import { readImAppendSystem, writeImAppendSystem, buildImAppendSystemPreset, MAX_IM_APPEND_SYSTEM_CHARS } from '../lib/im/im-append-system.js';
+import { imDir } from '../lib/im/im-lock.js';
+import { resolvePrefLang } from '../lib/im/im-lang.js';
 import { listSkills, moveSkill, deleteSkill } from '../lib/skills-api.js';
 import { importSkillTo } from './skills.js';
 import { LOG_DIR } from '../../findcc.js';

package/server/routes/preferences.js

@@ -5,14 +5,14 @@ import { homedir } from 'node:os';
 import { LOG_DIR, setLogDir, getClaudeConfigDir, discoverClaudeExecutables, resolveExplicitClaudePath, CLAUDE_EXECUTABLE_PREF_KEY } from '../../findcc.js';
 import { PROFILE_PATH, _defaultConfig, getActiveProfileId, getStoredRoles, isOfficialDefaultEndpoint, setActiveProfileForWorkspace, _loadProxyProfile, RETRY_CONFIG_PATH, _retryConfigState, _loadRetryConfigState } from '../interceptor.js';
 import { migrateProxyProfileList, isValidRoleValue, PROXY_ROLE_KEYS } from '../lib/interceptor-core.js';
-import { DEFAULT_RETRY_CONFIG, validateRetryConfig, resolveRetryConfig } from '../lib/proxy-retry.js';
+import { DEFAULT_RETRY_CONFIG, validateRetryConfig, resolveRetryConfig } from '../lib/proxy/proxy-retry.js';
 import { discoverCcSwitchProviders, mergeImportedProfiles } from '../lib/ccswitch-import.js';
-import { reportSwallowed } from '../lib/error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 import { setLang } from '../i18n.js';
 import { reconcileVoicePackPrefs as vpReconcile } from '../lib/voice-pack-manager.js';
 import { readClaudeProjectModel } from '../lib/context-watcher.js';
 import { sendEventToClients } from '../lib/log-watcher.js';
-import { listPlatforms } from '../lib/im-config.js';
+import { listPlatforms } from '../lib/im/im-config.js';
 import { mutatePrefs, applyPrefsPatch, readPrefsRaw } from '../lib/prefs-store.js';
 import {
   getCurrentProjectKey, getCurrentProjectName, hasFork, listForks, resolveScoped,

package/server/routes/workspaces.js

@@ -4,7 +4,7 @@ import { basename } from 'node:path';
 import { initForWorkspace, resetWorkspace, getLiveLogSource, markContinuedLaunch, markForkSession, markResumeSession, isContinuedLaunch } from '../interceptor.js';
 import { LOG_DIR } from '../../findcc.js';
 import { migrationStatus } from '../lib/v2/migrate-prompt.js';
-import { reportSwallowed } from '../lib/error-report.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 
 // P2: claude continuation flags — the workspace launcher injects `-c` itself
 // (WorkspaceList's logCount heuristic), so argv scanning in cli.js never sees

package/server/server.js

@@ -10,9 +10,9 @@ import { promisify } from 'node:util';
 import { Worker } from 'node:worker_threads';
 import { isPathContained } from './lib/file-api.js';
 import { sseWrite, isWireV3Enabled } from './lib/wire-compress.js';
-import { setEntry as askStoreSetEntry, deleteEntry as askStoreDeleteEntry, pruneStale as askStorePruneStale, markAnswered as askStoreMarkAnswered, markCancelled as askStoreMarkCancelled, loadAskStore as askStoreLoad } from './lib/ask-store.js';
-import { ASK_TIMEOUT_MS, ASK_WAITER_REAP_INTERVAL_MS, ASK_WAITER_LIVENESS_MS } from './lib/ask-constants.js';
-import { reapDeadAskWaiters, sweepOrphanedDiskAsks } from './lib/ask-reaper.js';
+import { setEntry as askStoreSetEntry, deleteEntry as askStoreDeleteEntry, pruneStale as askStorePruneStale, markAnswered as askStoreMarkAnswered, markCancelled as askStoreMarkCancelled, loadAskStore as askStoreLoad } from './lib/ask/ask-store.js';
+import { ASK_TIMEOUT_MS, ASK_WAITER_REAP_INTERVAL_MS, ASK_WAITER_LIVENESS_MS } from './lib/ask/ask-constants.js';
+import { reapDeadAskWaiters, sweepOrphanedDiskAsks } from './lib/ask/ask-reaper.js';
 import { sdkApprovalCloseType } from './lib/sdk-adapter.js';
 import { DIST_DIR, NODE_MODULES } from './_paths.js';
 import { createDispatcher } from './routes/_dispatch.js';
@@ -41,14 +41,16 @@ import { authRoutes } from './routes/auth.js';
 import { dingtalkRoutes } from './routes/dingtalk.js';
 import { imRoutes } from './routes/im.js';
 import { proxyStatsRoutes } from './routes/proxy-stats.js';
-import { setProxyStatsListener } from './lib/proxy-stats.js';
-import * as imCore from './lib/im-bridge-core.js';
-import * as imProcMgr from './lib/im-process-manager.js';
+import { setProxyStatsListener } from './lib/proxy/proxy-stats.js';
+import * as imCore from './lib/im/im-bridge-core.js';
+import * as imProcMgr from './lib/im/im-process-manager.js';
+import * as chatQueue from './lib/chat-queue.js';
+import { reportSwallowed } from '@ccv/core/error-report';
 import './lib/adapters/dingtalk-adapter.js'; // side-effect: registers the DingTalk adapter
 import './lib/adapters/feishu-adapter.js';   // side-effect: registers the Feishu adapter
 import './lib/adapters/wecom-adapter.js';    // side-effect: registers the WeCom adapter
 import './lib/adapters/discord-adapter.js';  // side-effect: registers the Discord adapter
-import { loadConfig } from './lib/im-config.js';
+import { loadConfig } from './lib/im/im-config.js';
 
 // Windows：git.exe / cmd.exe 等 console-subsystem 子进程从无控制台的 worker node.exe 启动时
 // 会各弹一个可见控制台窗口（diff/status 轮询路径高频闪现）。在 promisify 包装层统一默认
@@ -83,7 +85,7 @@ import { V2LiveFeed } from './lib/v2/live-feed.js';
 import { sanitizePathComponent } from './lib/v2/layout.js';
 import { maybeResumeConvert } from './lib/v2/convert-manager.js';
 import { LOG_DIR, setLogDir, getClaudeConfigDir, isBrowserOpenSuppressed } from '../findcc.js';
-import { loadRetryConfig } from './lib/proxy-retry.js';
+import { loadRetryConfig } from './lib/proxy/proxy-retry.js';
 
 // 代理重试配置：由 interceptor._retryConfigState 提供（live binding，watchFile 热刷新）。
 // mode 默认 off（向后兼容，不重试）。env 是启动默认/兜底，retry-config.json 覆盖 env。
@@ -97,8 +99,8 @@ import { loadAuthConfig, loadAuthState, saveAuthConfig, clearProjectOverride, ge
 import { checkAndUpdate } from './lib/updater.js';
 import { loadPlugins, runWaterfallHook, runParallelHook } from './lib/plugin-loader.js';
 import { CONTEXT_WINDOW_FILE, readModelContextSize } from './lib/context-watcher.js';
-import { sendEventToClients, sendToClients } from './lib/log-watcher.js';
-import { createImLogWatcher } from './lib/im-log-watcher.js';
+import { sendEventToClients } from './lib/log-watcher.js';
+import { createImLogWatcher } from './lib/im/im-log-watcher.js';
 import { unwatchAllWorkflows } from './lib/workflow-watcher.js';
 import { backupConfigs } from './lib/config-backup.js';
 import { normalizeBasePath, validateBasePath, stripBasePath } from './lib/base-path.js';
@@ -184,7 +186,7 @@ const pendingAskHooks = new Map(); // Map<id, { questions, res, timer, createdAt
 const ASK_HOOK_MAP_MAX = 1000;
 // 单一来源的"无超时"实质上限——延伸至 24h 兼顾防 entry 泄漏；
 // 任何引用此值的地方（HOOK_TIMEOUT / REPLAY_HOOK_TIMEOUT / 广播 timeoutMs）都从这里取。
-// 实际常量定义在 server/lib/ask-constants.js（hook 路径 + SDK 路径同源）。
+// 实际常量定义在 server/lib/ask/ask-constants.js（hook 路径 + SDK 路径同源）。
 const ASK_HOOK_TIMEOUT_MS = ASK_TIMEOUT_MS;
 
 // 内存 Map 是权威源；ask-store 是镜像（best-effort）。崩溃时只丢"未落盘窗口"内的最新一次变更。
@@ -205,7 +207,7 @@ function _persistAskDelete(id) {
 // until either an answer/cancel arrives or wait ms elapses (then 204).
 const shortPollListeners = new Map(); // id -> Set<{ res, tid, finished }>
 
-// Waiter-liveness tracking for short-poll asks (see server/lib/ask-reaper.js).
+// Waiter-liveness tracking for short-poll asks (see server/lib/ask/ask-reaper.js).
 // Memory-only BY DESIGN: persisting it would bump the ask-store SCHEMA_VERSION;
 // the reaper's boot-time orphan sweep covers restarts instead.
 const askWaiterLastPoll = new Map(); // id -> ms of last POST create / GET result poll
@@ -395,7 +397,7 @@ delete process.env.CCV_USE_PASSWORD;
 delete process.env.CCV_PASSWORD;
 
 let clients = [];
-// 内存级缓存：30s 启动检查若发现「有新版」(major_available / deferred_busy / brew_managed)，
+// 内存级缓存：30s 启动检查若发现「有新版」(major_available / deferred_busy / brew_managed / pnpm_managed)，
 // 在此存下 {version, source}，供 events 路由向新连接(刷新/新标签页)补推 update_major_available，
 // 让版本徽标在本进程存续期内跨刷新持续显示。进程重启即归零(不落盘)。
 let pendingMajorUpdate = null;
@@ -956,7 +958,7 @@ export async function startViewer() {
   // Waiter-liveness reaper: resolves short-poll asks whose hook process (ask-bridge)
   // died without notifying us (e.g. AskUserQuestion declined at the CLI → SIGTERM).
   // Keys on waiter liveness, never on wall-clock ask age — the "GUI effectively
-  // no-timeout" contract is untouched. See server/lib/ask-reaper.js.
+  // no-timeout" contract is untouched. See server/lib/ask/ask-reaper.js.
   const _reaperDeps = {
     pendingAskHooks,
     shortPollListeners,
@@ -1229,7 +1231,7 @@ export async function startViewer() {
 async function setupTerminalWebSocket(httpServer) {
   try {
     const { WebSocketServer } = await import('ws');
-    const { writeToPty, writeToPtySequential, resizePty, onPtyData, onPtyExit, getPtyState, getOutputBuffer, getCurrentWorkspace, spawnShell, findSafeSliceStart } = await import('./pty-manager.js');
+    const { writeToPty, writeToPtySequential, resizePty, onPtyData, onPtyExit, getPtyState, getPtyKind, getOutputBuffer, getCurrentWorkspace, spawnShell, findSafeSliceStart } = await import('./pty-manager.js');
     const {
       spawnScratch,
       writeScratch,
@@ -1247,6 +1249,20 @@ async function setupTerminalWebSocket(httpServer) {
     const MAX_SCRATCH_PTYS = 16;
     _writeToPty = writeToPty;
     _onPtyData = onPtyData;
+    // Chat-composer busy queue (terminal-hidden PTY mode): holds Enter-while-busy messages
+    // and injects them via the same write path the IM bridge uses. SDK mode has no PTY —
+    // sdk-manager owns its own queue there, so init is skipped entirely.
+    if (!isSdkMode) {
+      chatQueue.initChatQueue({
+        writeToPty,
+        writeToPtySequential,
+        getPtyKind,
+        isStreaming: () => streamingState.active,
+        hasPendingApproval: () => pendingAskHooks.size > 0 || pendingPermHooks.size > 0,
+        hasExternalInjection: () => imCore.anyActiveInjection(),
+        broadcastWs: broadcastWsMessage,
+      });
+    }
     const wss = new WebSocketServer({ noServer: true });
     terminalWss = wss;
     const wssScratch = new WebSocketServer({ noServer: true });
@@ -1531,6 +1547,48 @@ async function setupTerminalWebSocket(httpServer) {
         } catch {}
       }
 
+      // Replay pending perm-hook 请求(PTY 与 SDK 模式同理):perm 广播原本是一次性的,
+      // ws 断连期间打开的审批弹窗在重连后会孤儿化(server 端 long-poll/wait 仍在等,
+      // 直到超时 silent deny)。连接时重发,前端 perm 分支按 id 去重,天然幂等。
+      for (const [id, entry] of pendingPermHooks) {
+        try {
+          ws.send(JSON.stringify({ type: 'perm-hook-pending', id, toolName: entry.toolName, input: entry.input }));
+        } catch {}
+      }
+
+      // Replay SDK 模式 pendings(sdk-manager canUseTool 的 ask/plan/perm):
+      // 与上面 perm-hook 同理,但快照来自 sdk-manager(_pendingApprovals)。
+      // ask 类带 startedAt/timeoutMs —— 与 ask-hook replay 同款剩余时间重算。
+      if (isSdkMode && _sdkGetPendingApprovals) {
+        for (const p of _sdkGetPendingApprovals() || []) {
+          if (!p || !p.replay || !p.id) continue;
+          const payload = { ...p.replay };
+          if (p.kind === 'ask') {
+            payload.startedAt = now;           // 让前端按"还剩 remaining"起算
+            payload.timeoutMs = p.remainingMs; // 剩余可用时间
+          }
+          try { ws.send(JSON.stringify(payload)); } catch {}
+        }
+      }
+
+      // Replay sdk-init snapshot so a refreshed/reconnected page restores slash-command
+      // surface and model info without waiting for the next session.
+      if (isSdkMode && _sdkGetInitSnapshot) {
+        const initSnap = _sdkGetInitSnapshot();
+        if (initSnap) {
+          try { ws.send(JSON.stringify(initSnap)); } catch {}
+        }
+      }
+
+      // Replay the chat-composer busy queue so a refreshed/reconnected page restores the
+      // floating queued-message bubbles (server is the source of truth in both modes).
+      {
+        const qItems = (isSdkMode && _sdkGetQueueSnapshot) ? _sdkGetQueueSnapshot() : chatQueue.getSnapshot();
+        if (Array.isArray(qItems) && qItems.length) {
+          try { ws.send(JSON.stringify({ type: 'queue-state', items: qItems })); } catch {}
+        }
+      }
+
       // 兜底重绘标记：claude TUI 在 alternate-screen 下只在收到 SIGWINCH 时重绘整屏。
       // 若前端首次 resize 与 PTY 当前尺寸恰好相等，pty.resize noop 不发 SIGWINCH → 前端空白。
       // 该 ws 收到第一条 resize 时（见 ws.on('message')），抖动 (rows+1) → (rows) 触发 SIGWINCH。
@@ -1656,6 +1714,13 @@ async function setupTerminalWebSocket(httpServer) {
       ws.on('message', async (raw) => {
         try {
           const msg = JSON.parse(raw.toString());
+          // SDK 模式没有 PTY：PTY 专属消息(input/sequential input/resync/resize)一律 no-op,
+          // 否则 'input' 会在无会话时触发 spawnShell() 拉出一个用户看不见的裸 shell。
+          // sdk-*/ask-*/perm-*/image-* 等控制消息不受影响。scratch WS 是独立 handler,不受此闸门影响。
+          if (isSdkMode && (msg.type === 'input' || msg.type === 'input-sequential'
+              || msg.type === 'resync-request' || msg.type === 'resize')) {
+            return;
+          }
           if (msg.type === 'input') {
             // PTY 已退出时，自动 spawn 交互式 shell
             const state = getPtyState();
@@ -1965,27 +2030,70 @@ async function setupTerminalWebSocket(httpServer) {
             }
           } else if (msg.type === 'sdk-interrupt') {
             // Stop button in SDK mode — interrupt current turn, keep session alive.
-            // _executeQuery's finally emits streaming_status{active:false} to reconcile UI.
+            // Streaming-state reconciliation comes from the wire path (proxy →
+            // fetch hook → streamingState → SSE), same as PTY mode; sdk-manager
+            // no longer emits its own streaming_status.
             if (isSdkMode && _sdkInterruptTurn) {
               const cancelled = _sdkInterruptTurn() || [];
-              // Close any open approval modal on every client (the canUseTool promise was just
-              // drained server-side; reuse each kind's existing resolve/cancel broadcast type).
-              if (cancelled.length && terminalWss) {
-                for (const { id, kind } of cancelled) {
-                  if (!id) continue;
-                  const type = sdkApprovalCloseType(kind);
-                  const m = JSON.stringify({ type, id, reason: 'Turn interrupted' });
-                  terminalWss.clients.forEach((c) => {
-                    if (c.readyState === 1) { try { c.send(m); } catch {} }
-                  });
-                }
-              }
+              _broadcastApprovalCloses(cancelled, 'Turn interrupted');
             } else {
               // sdk-interrupt 收到却没生效：客户端按 props.sdkMode 发了中断，但本端不是 SDK 模式或
               // _sdkInterruptTurn 未由 cli.js 接线（client/server sdkMode 配置漂移）。此时客户端会乐观
               // 切非运行态并等 4s 兜底才翻回，输出仍在流 —— 打日志让这类错配可观测。
               console.warn('[SDK] sdk-interrupt ignored: isSdkMode=%s, handler=%s', isSdkMode, !!_sdkInterruptTurn);
             }
+          } else if (msg.type === 'queue-message') {
+            // Chat-composer busy-queue enqueue (terminal-hidden PTY mode). These queue-* types
+            // are deliberately NOT in the SDK no-op gate above: each branch routes by mode.
+            // SDK fallback: the frontend normally still sends sdk-user-message, which
+            // self-queues server-side when busy — relay keeps the contract mode-agnostic.
+            if (typeof msg.text === 'string' && msg.text) {
+              if (isSdkMode) {
+                if (_sdkSendUserMessage) {
+                  _sdkSendUserMessage(msg.text).catch(err => {
+                    console.error('[SDK] queue-message relay error:', err.message);
+                  });
+                }
+              } else {
+                try { chatQueue.enqueue(msg.text); } catch (err) { reportSwallowed('server.queue-message', err); }
+              }
+            }
+          } else if (msg.type === 'queue-send-now') {
+            // Bubble "send now": interrupt the running turn and inject this message first.
+            const qid = (typeof msg.id === 'string' && /^[a-zA-Z0-9_-]{1,128}$/.test(msg.id)) ? msg.id : null;
+            if (qid) {
+              if (isSdkMode) {
+                if (_sdkSendQueuedNow) {
+                  try { _broadcastApprovalCloses(_sdkSendQueuedNow(qid) || [], 'Queued message sent now'); }
+                  catch (err) { reportSwallowed('server.queue-send-now', err); }
+                }
+              } else {
+                try { chatQueue.sendNow(qid); } catch (err) { reportSwallowed('server.queue-send-now', err); }
+              }
+            }
+          } else if (msg.type === 'queue-remove') {
+            const qid = (typeof msg.id === 'string' && /^[a-zA-Z0-9_-]{1,128}$/.test(msg.id)) ? msg.id : null;
+            if (qid) {
+              if (isSdkMode) {
+                if (_sdkRemoveQueued) { try { _sdkRemoveQueued(qid); } catch (err) { reportSwallowed('server.queue-remove', err); } }
+              } else {
+                try { chatQueue.remove(qid); } catch (err) { reportSwallowed('server.queue-remove', err); }
+              }
+            }
+          } else if (msg.type === 'queue-clear') {
+            // Session/workspace switch: drop the parked queue WITHOUT interrupting a running
+            // turn. (Stop semantics live elsewhere: PTY queue-suppress, SDK sdk-interrupt.)
+            if (isSdkMode) {
+              if (_sdkClearQueued) { try { _sdkClearQueued(); } catch (err) { reportSwallowed('server.queue-clear', err); } }
+            } else {
+              try { chatQueue.clear(); } catch (err) { reportSwallowed('server.queue-clear', err); }
+            }
+          } else if (msg.type === 'queue-suppress') {
+            // PTY Stop pressed: park the queue — the coming turn-end must not auto-drain it.
+            // (SDK mode handles this inside sdk-manager.interruptTurn; no PTY queue exists.)
+            if (!isSdkMode) {
+              try { chatQueue.suppressNextDrain(); } catch (err) { reportSwallowed('server.queue-suppress', err); }
+            }
           } else if (msg.type === 'image-remove-notify' || msg.type === 'image-upload-notify') {
             // Security: only allow paths within upload directories, reject traversal
             const p = msg.path;
@@ -2153,6 +2261,10 @@ function _emitTurnEnd(sessionId, ts, transcriptPath = null) {
     // Forward the (clean) assistant reply for this turn to whichever IM bridge owns the in-flight
     // turn, if any. Fire-and-forget: a bridge failure must never affect SSE broadcast.
     try { imCore.notifyTurnEnd(sid, t, transcriptPath); } catch { /* best-effort */ }
+    // chat-queue drain trigger #2: post-debounce idempotent retry of the trigger at
+    // _scheduleTurnEndBroadcast entry. chatQueue no-ops internally when uninitialized
+    // (SDK mode / tests that never ran startViewer).
+    try { chatQueue.onTurnEnd(sid, t); } catch { /* best-effort */ }
     if (typeof _onTurnEndBroadcastForTests === 'function') {
       try { _onTurnEndBroadcastForTests({ sessionId: sid, ts: t }); }
       catch (e) { if (process.env.NODE_ENV === 'test') throw e; /* prod 不让测试桩污染 */ }
@@ -2166,6 +2278,11 @@ function _scheduleTurnEndBroadcast(sessionId, ts, transcriptPath = null) {
   if (_isStopping) return;
   const sid = _normalizeKey(sessionId);
   const t = ts || Date.now();
+  // chat-queue drain trigger #1: the Stop-hook POST arrival IS the authoritative
+  // "query() ended" signal — don't wait out the SSE debounce window (default 10s),
+  // or freshly-parked bubbles would sit visibly inert after every turn. The queue's
+  // internal idle poll absorbs the housekeeping/telemetry streaming tail.
+  try { chatQueue.onTurnEnd(sid, t); } catch { /* best-effort */ }
   // 注意：这里不再对 streamingState.active 做同步 race-guard。理由见上方 HISTORY 段。
   // POST 一律入桶排 timer；真正「新一轮 query()」走 _observeStreamingTick 的 rising-edge
   // cancel 兜底，不会让无效尾音播出来。
@@ -2192,6 +2309,9 @@ function _onStreamingActivated() {
   // 不播放」，直接 cancel 所有 pending（**不** flush）。这正是用户键入「请等待 10 秒钟」
   // 的本意：被打断就当没完成。
   _cancelAllPendingTurnEndBroadcasts();
+  // A new turn also lifts the chat-queue Stop-park: parked bubbles resume auto-draining
+  // at the next turn end.
+  try { chatQueue.onStreamingActivated(); } catch { /* best-effort */ }
 }
 
 // 统一的 streaming-state 观察入口。production polling 和 SDK push 都调它，测试也走它，
@@ -2259,11 +2379,12 @@ let _askOrphanSweepTimer = null;
 //  - .unref() 防止它把事件循环 keep-alive 30s(测试进程靠 --test-force-exit 兜底是时序侥幸);
 //  - _doStop 里 clearTimeout 防止 stop/start 循环(Electron tab / 测试)泄漏多个 pending 检查。
 let _updateCheckTimer = null;
-function startStreamingStatusTimer() {
+// Exported for tests: workspace-mode startViewer defers this timer to initPostLaunch, but
+// lifecycle tests need to drive the streaming_status poll directly (setSdkStreamingState
+// was retired in the wire architecture; the timer reads interceptor's streamingState).
+export function startStreamingStatusTimer() {
   if (_streamingStatusTimer) return;
   _streamingStatusTimer = setInterval(() => {
-    // SDK mode uses its own streaming state (pushed directly via setSdkStreamingState)
-    if (isSdkMode) return;
     const isActive = streamingState.active;
     const wasActive = _lastCliActive;
     // 统一走 _observeStreamingTick：内部负责 rising-edge cancel（丢弃 pending turn_end，不 flush）+ 更新 _lastCliActive。
@@ -2291,6 +2412,9 @@ async function _doStop() {
   // → 后续 await 期间 turn-end 状态机彻底冻结，无并发改 Map 的可能。
   _isStopping = true;
   _cancelAllPendingTurnEndBroadcasts();
+  // Drop chat-queue timers (rescue / idle poll) so a stop/start cycle never injects a stale
+  // queued message into a fresh PTY session.
+  try { chatQueue.stop(); } catch { /* best-effort */ }
   // 对称 startViewer：下一次启动后第一次 active 才算 rising edge
   _lastSdkActive = false;
   _lastCliActive = false;
@@ -2322,6 +2446,11 @@ async function _doStop() {
     server.closeAllConnections();
     server.close();
   }
+  // Tear down terminal WSS so stop/start cycles never leak a second listener on the same HTTP server.
+  if (terminalWss) {
+    terminalWss.close();
+    terminalWss = null;
+  }
   if (statsWorker) {
     statsWorker.terminate();
     statsWorker = null;
@@ -2351,30 +2480,9 @@ async function _doStop() {
 }
 
 // ─── SDK Mode Exports ──────────────────────────────────────────
-
-/** Push a JSONL entry to all SSE clients (for SDK mode). */
-export function pushSdkEntry(entry) {
-  if (sendToClients) sendToClients(clients, entry);
-}
-
-/**
- * Update streaming status (SDK mode). 调用约定：SDK 每个 chunk 都调一次 `{active:true,...}`，
- * turn 结束才调 `{active:false}`。rising-edge 检测统一走 `_observeStreamingTick`。
- * **SSE 推送只在 transition（edge）或仍 active 时发**，避免每 chunk 都放大 streaming_status 流量
- * （对齐 CLI polling 的 `changed || isActive` 闸门）。
- * `undefined`/`{}`/`null` 都会被当作 active=false。
- */
-export function setSdkStreamingState(data) {
-  const isActive = !!(data && data.active);
-  const wasActive = _lastSdkActive;
-  _observeStreamingTick(isActive, 'sdk');
-  const changed = wasActive !== isActive;
-  if (changed || isActive) {
-    if (clients.length > 0 && sendEventToClients) {
-      sendEventToClients(clients, 'streaming_status', data);
-    }
-  }
-}
+// NOTE: SDK-mode display/streaming data flows through the same wire path as PTY
+// mode (loopback proxy → fetch hook → V2Writer → SSE / streamingState) — there
+// are intentionally no pushSdkEntry/setSdkStreamingState shortcuts anymore.
 
 /** Broadcast a message to all terminal WS clients (for SDK canUseTool). */
 export function broadcastWsMessage(msg) {
@@ -2394,6 +2502,23 @@ export function broadcastWsMessage(msg) {
   }
 }
 
+/**
+ * Close open approval modals on every client after a server-side drain of canUseTool
+ * approvals (sdk-interrupt Stop, or queue-send-now interrupting a turn mid-approval).
+ * Reuses each kind's existing resolve/cancel broadcast type.
+ */
+function _broadcastApprovalCloses(cancelled, reason) {
+  if (!Array.isArray(cancelled) || cancelled.length === 0 || !terminalWss) return;
+  for (const { id, kind } of cancelled) {
+    if (!id) continue;
+    const type = sdkApprovalCloseType(kind);
+    const m = JSON.stringify({ type, id, reason });
+    terminalWss.clients.forEach((c) => {
+      if (c.readyState === 1) { try { c.send(m); } catch {} }
+    });
+  }
+}
+
 /** Reference to sdk-manager's resolveApproval (set by cli.js after import). */
 let _sdkResolveApproval = null;
 export function setSdkResolveApproval(fn) { _sdkResolveApproval = fn; }
@@ -2412,6 +2537,30 @@ export function setSdkSendUserMessage(fn) { _sdkSendUserMessage = fn; }
 let _sdkInterruptTurn = null;
 export function setSdkInterruptTurn(fn) { _sdkInterruptTurn = fn; }
 
+/** Reference to sdk-manager's getPendingApprovals (set by cli.js after import). */
+let _sdkGetPendingApprovals = null;
+export function setSdkGetPendingApprovals(fn) { _sdkGetPendingApprovals = fn; }
+
+/** Reference to sdk-manager's getSdkInitSnapshot (set by cli.js after import). */
+let _sdkGetInitSnapshot = null;
+export function setSdkGetInitSnapshot(fn) { _sdkGetInitSnapshot = fn; }
+
+/** Reference to sdk-manager's sendQueuedNow (set by cli.js after import). */
+let _sdkSendQueuedNow = null;
+export function setSdkSendQueuedNow(fn) { _sdkSendQueuedNow = fn; }
+
+/** Reference to sdk-manager's removeQueued (set by cli.js after import). */
+let _sdkRemoveQueued = null;
+export function setSdkRemoveQueued(fn) { _sdkRemoveQueued = fn; }
+
+/** Reference to sdk-manager's clearQueued (set by cli.js after import). */
+let _sdkClearQueued = null;
+export function setSdkClearQueued(fn) { _sdkClearQueued = fn; }
+
+/** Reference to sdk-manager's getQueueSnapshot (set by cli.js after import). */
+let _sdkGetQueueSnapshot = null;
+export function setSdkGetQueueSnapshot(fn) { _sdkGetQueueSnapshot = fn; }
+
 // Auto-start the viewer after log file init completes
 // 工作区模式下由 cli.js 直接 import server.js 触发启动，跳过 _initPromise 自动启动
 if (!isWorkspaceMode) {
@@ -2433,11 +2582,11 @@ if (!isWorkspaceMode) {
         const busy = clients.length > 0 || ptyRunning || _sdkResolveApproval !== null;
         try {
           const result = await checkAndUpdate({ busy, portRange: [START_PORT, MAX_PORT] });
-          // major_available / deferred_busy / brew_managed 都是"有新版但这次不升级"——
+          // major_available / deferred_busy / brew_managed / pnpm_managed 都是"有新版但这次不升级"——
           // 共用 update_major_available 事件渲染 banner（前端不区分子类，命令在 i18n 文案里给）。
-          // brew_managed 走这里至关重要：否则 Electron / GUI 用户看不到升级提示，
+          // brew_managed / pnpm_managed 走这里至关重要：否则 Electron / GUI 用户看不到升级提示，
           // 仅 stderr 一行 console.error 在桌面模式下不可见。
-          if (result.status === 'major_available' || result.status === 'deferred_busy' || result.status === 'brew_managed') {
+          if (result.status === 'major_available' || result.status === 'deferred_busy' || result.status === 'brew_managed' || result.status === 'pnpm_managed') {
             // 先缓存：之后新连接的 SSE 客户端会在 events 路由里补推此事件
             pendingMajorUpdate = { version: result.remoteVersion, source: result.status };
             const payload = JSON.stringify(pendingMajorUpdate);

package/server/system-prompt-templates/systemPromptModel.md

@@ -72,8 +72,6 @@ ${environment.workspaceRoots}
  - Hostname: ${os.hostname}
  - Available parallelism: ${os.availableParallelism}
  - Total memory bytes: ${os.totalMemory}
- - Free memory bytes: ${os.freeMemory}
- - Uptime seconds: ${os.uptime}
 
 # Runtime
  - Node.js version: ${runtime.nodeVersion}
@@ -82,8 +80,6 @@ ${environment.workspaceRoots}
  - Parent process ID: ${runtime.ppid}
 
 # Time
- - Current time: ${time.current}
- - ISO time: ${time.iso}
  - Current date: ${time.date}
  - Timezone: ${time.timezone}
 
@@ -98,8 +94,6 @@ ${sandbox.writableRoots}
 # Terminal
  - TERM: ${terminal.term}
  - COLORTERM: ${terminal.colorTerm}
- - Columns: ${terminal.columns}
- - Rows: ${terminal.rows}
 
 # Filesystem
  - Temporary directory: ${filesystem.tmpdir}
@@ -116,8 +110,6 @@ ${sandbox.writableRoots}
  - Current branch: ${git.branch}
  - Main branch: ${git.mainBranch}
  - Git user: ${git.userName}
- - Working tree status:
-${git.status}
  - Recent commits:
 ${git.recentCommits}
 

package/server/system-prompt-templates/systemPromptVariables.ar.md

@@ -27,8 +27,6 @@
 | `${os.hostname}` | اسم المضيف الحالي. | `MacBook-Pro.local` |
 | `${os.availableParallelism}` | التوازي المتاح. | `10` |
 | `${os.totalMemory}` | إجمالي ذاكرة النظام بالبايتات. | `34359738368` |
-| `${os.freeMemory}` | الذاكرة المجانية بالبايتات. | `8589934592` |
-| `${os.uptime}` | وقت تشغيل النظام بالثواني. | `123456` |
 
 ## بيئة تشغيل Node.js
 
@@ -43,8 +41,6 @@
 
 | Variable | Description | Example |
 |---|---|---|
-| `${time.current}` | سلسلة الوقت المحلي الحالي. | `Thu Jul 09 2026 18:22:09 GMT+0800 (China Standard Time)` |
-| `${time.iso}` | الوقت الحالي بصيغة ISO. | `2026-07-09T10:22:09.000Z` |
 | `${time.date}` | التاريخ المحلي الحالي. | `2026-07-09` |
 | `${time.timezone}` | المنطقة الزمنية للنظام الحالية. | `Asia/Shanghai` |
 
@@ -64,8 +60,6 @@
 |---|---|---|
 | `${terminal.term}` | TERM الحالي. | `xterm-256color` |
 | `${terminal.colorTerm}` | COLORTERM الحالي. | `truecolor` |
-| `${terminal.columns}` | عدد أعمدة المحطة الطرفية الحالي. | `120` |
-| `${terminal.rows}` | عدد صفوف المحطة الطرفية الحالي. | `40` |
 
 ## نظام الملفات
 
@@ -91,7 +85,6 @@
 | `${git.branch}` | فرع git الحالي أو تجزئة HEAD المختصرة. | `main` |
 | `${git.mainBranch}` | الفرع الرئيسي الافتراضي، عادةً ما يُستخدم كهدف PR أو الدمج. | `main` |
 | `${git.userName}` | اسم git `user.name` الحالي. | `Sky` |
-| `${git.status}` | مخرجات `git status --short`. | `M src/index.ts` |
 | `${git.recentCommits}` | ملخص الالتزامات الأخيرة. | `abc1234 Fix prompt builder` |
 
 ## الذاكرة

package/server/system-prompt-templates/systemPromptVariables.da.md

@@ -27,8 +27,6 @@ Denne fil dokumenterer kun variablerne i `systemPromptModel.md`, der skal løses
 | `${os.hostname}` | Aktuelt værtsnavn. | `MacBook-Pro.local` |
 | `${os.availableParallelism}` | Tilgængelig parallelisme. | `10` |
 | `${os.totalMemory}` | Samlet systemhukommelse i bytes. | `34359738368` |
-| `${os.freeMemory}` | Fri hukommelse i bytes. | `8589934592` |
-| `${os.uptime}` | System oppetid i sekunder. | `123456` |
 
 ## Node.js-køretid
 
@@ -43,8 +41,6 @@ Denne fil dokumenterer kun variablerne i `systemPromptModel.md`, der skal løses
 
 | Variable | Description | Example |
 |---|---|---|
-| `${time.current}` | Aktuel lokal tidsstreng. | `Thu Jul 09 2026 18:22:09 GMT+0800 (China Standard Time)` |
-| `${time.iso}` | Aktuel ISO tid. | `2026-07-09T10:22:09.000Z` |
 | `${time.date}` | Aktuel lokaldato. | `2026-07-09` |
 | `${time.timezone}` | Aktuelt systemtidzone. | `Asia/Shanghai` |
 
@@ -64,8 +60,6 @@ Denne fil dokumenterer kun variablerne i `systemPromptModel.md`, der skal løses
 |---|---|---|
 | `${terminal.term}` | Aktuel TERM. | `xterm-256color` |
 | `${terminal.colorTerm}` | Aktuel COLORTERM. | `truecolor` |
-| `${terminal.columns}` | Aktuelt terminal kolonne antal. | `120` |
-| `${terminal.rows}` | Aktuelt terminal rækkeantal. | `40` |
 
 ## Filsystem
 
@@ -91,7 +85,6 @@ Denne fil dokumenterer kun variablerne i `systemPromptModel.md`, der skal løses
 | `${git.branch}` | Aktuel git gren eller kort HEAD hash. | `main` |
 | `${git.mainBranch}` | Standard hoved gren, typisk brugt som PR eller sammensmeltnings mål. | `main` |
 | `${git.userName}` | Aktuel git `user.name`. | `Sky` |
-| `${git.status}` | Output af `git status --short`. | `M src/index.ts` |
 | `${git.recentCommits}` | Oversigt over seneste commits. | `abc1234 Fix prompt builder` |
 
 ## Hukommelse