imcodes 2026.4.1304-dev.1266 → 2026.4.1308-dev.1276

package/dist/src/daemon/command-handler.js

@@ -35,9 +35,8 @@ import { CODEX_MODEL_IDS, normalizeClaudeCodeModelId } from '../shared/models/op
 import { getClaudeSdkRuntimeConfig, normalizeClaudeSdkModelForProvider } from '../agent/sdk-runtime-config.js';
 import { getCodexRuntimeConfig } from '../agent/codex-runtime-config.js';
 import { P2P_TERMINAL_RUN_STATUSES } from '../../shared/p2p-status.js';
+import { DAEMON_MSG } from '../../shared/daemon-events.js';
 import { CLAUDE_SDK_EFFORT_LEVELS, CODEX_SDK_EFFORT_LEVELS, DEFAULT_TRANSPORT_EFFORT, OPENCLAW_THINKING_LEVELS, QWEN_EFFORT_LEVELS, isTransportEffortLevel, } from '../../shared/effort-levels.js';
-import { SESSION_STATE } from '../../shared/session-states.js';
-import { canSessionUseTerminal } from '../../shared/session-capabilities.js';
 /**
  * Build a unified subsession.sync payload from the session store record.
  * Ensures all fields (including Qwen metadata) are always sent — no more
@@ -81,7 +80,6 @@ async function buildSubSessionSync(id, overrides) {
         providerId: r?.providerId ?? null,
         providerSessionId: r?.providerSessionId ?? null,
         requestedModel: r?.requestedModel ?? null,
-        state: r?.state ?? SESSION_STATE.UNKNOWN,
         activeModel: r?.activeModel ?? r?.modelDisplay ?? null,
         transportConfig: r?.transportConfig ?? null,
         // Qwen metadata — freshly computed display fields + stored config fields
@@ -588,7 +586,7 @@ export function handleWebCommand(msg, serverLink) {
             void handleServerDelete();
             break;
         case 'daemon.upgrade':
-            void handleDaemonUpgrade(cmd.targetVersion);
+            void handleDaemonUpgrade(cmd.targetVersion, serverLink);
             break;
         case 'file.search':
             void handleFileSearch(cmd, serverLink);
@@ -1482,16 +1480,6 @@ function handleSubscribe(cmd, serverLink) {
     const session = cmd.session;
     if (!session)
         return;
-    const record = getSession(session);
-    if (!canSessionUseTerminal(record)) {
-        const existing = activeSubscriptions.get(session);
-        if (existing) {
-            existing.unsubscribe();
-            activeSubscriptions.delete(session);
-        }
-        logger.debug({ session, runtimeType: record?.runtimeType, agentType: record?.agentType }, 'Ignored terminal subscribe for non-terminal session');
-        return;
-    }
     // The bridge may include a `raw` flag on terminal.subscribe for its own forwarding-mode
     // bookkeeping, but daemon-side terminal streaming remains transport-stable in this phase:
     // once subscribed for a session, we continue emitting both text diffs and raw PTY bytes.
@@ -2175,7 +2163,24 @@ async function handleDiscussionStop(cmd) {
  *  3. A short sleep before the restart gives the current daemon time to finish
  *     sending any in-flight messages.
  */
-async function handleDaemonUpgrade(targetVersion) {
+async function handleDaemonUpgrade(targetVersion, serverLink) {
+    const activeRuns = getActiveP2pRunsBlockingDaemonUpgrade();
+    if (activeRuns.length > 0) {
+        logger.warn({
+            targetVersion,
+            activeRunIds: activeRuns.map((run) => run.id),
+            activeRunStatuses: activeRuns.map((run) => run.status),
+        }, 'daemon.upgrade: blocked because P2P runs are active');
+        try {
+            serverLink?.send({
+                type: DAEMON_MSG.UPGRADE_BLOCKED,
+                reason: 'p2p_active',
+                activeRunIds: activeRuns.map((run) => run.id),
+            });
+        }
+        catch { /* ignore */ }
+        return;
+    }
     const { spawn } = await import('child_process');
     const { writeFileSync, mkdtempSync, existsSync } = await import('fs');
     const { join, dirname } = await import('path');
@@ -2370,6 +2375,9 @@ const FILE_SEARCH_EXCLUDES = new Set([
     'dist', 'build', '.next', '.nuxt', 'vendor', 'target',
 ]);
 const FILE_SEARCH_MAX = 20;
+export function getActiveP2pRunsBlockingDaemonUpgrade(runs = listP2pRuns()) {
+    return runs.filter((run) => !P2P_TERMINAL_RUN_STATUSES.has(run.status));
+}
 async function handleFileSearch(cmd, serverLink) {
     const query = (cmd.query ?? '').trim();
     const projectDir = cmd.projectDir;