@getpaseo/server 0.1.69 → 0.1.71

package/dist/server/server/session.js

@@ -21,13 +21,14 @@ import { DictationStreamManager, } from "./dictation/dictation-stream-manager.js
 import { createVoiceTurnController, } from "./voice/voice-turn-controller.js";
 import { buildConfigOverrides, extractTimestamps, isStoredAgentProviderAvailable, toAgentPersistenceHandle, } from "./persistence-hooks.js";
 import { ensureAgentLoaded } from "./agent/agent-loading.js";
-import { sendPromptToAgent, unarchiveAgentState } from "./agent/mcp-shared.js";
+import { formatSystemNotificationPrompt, sendPromptToAgent, unarchiveAgentState, } from "./agent/agent-prompt.js";
 import { experimental_createMCPClient } from "ai";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { buildWorkspaceScriptPayloads, readPaseoConfigForProjection, } from "./script-status-projection.js";
 import { deriveProjectSlug } from "./workspace-git-metadata.js";
 import { spawnWorkspaceScript } from "./worktree-bootstrap.js";
 import { applyMutableProviderConfigToOverrides } from "./daemon-config-store.js";
+import { getErrorMessage, getErrorMessageOr } from "../shared/error-utils.js";
 import { buildProviderRegistry } from "./agent/provider-registry.js";
 import { resolveSnapshotCwd } from "./agent/provider-snapshot-manager.js";
 import { scheduleAgentMetadataGeneration } from "./agent/agent-metadata-generator.js";
@@ -36,12 +37,14 @@ import { MAX_EXPLICIT_AGENT_TITLE_CHARS } from "./agent/agent-title-limits.js";
 import { appendTimelineItemIfAgentKnown, emitLiveTimelineItemIfAgentKnown, } from "./agent/timeline-append.js";
 import { projectTimelineRows, selectTimelineWindowByProjectedLimit, } from "./agent/timeline-projection.js";
 import { DEFAULT_STRUCTURED_GENERATION_PROVIDERS, StructuredAgentFallbackError, StructuredAgentResponseError, generateStructuredAgentResponseWithFallback, } from "./agent/agent-response-loop.js";
+import { ImportSessionsRequestError, listImportableProviderSessions, normalizeImportAgentRequest, } from "./agent/import-sessions.js";
 import { checkoutLiteFromGitSnapshot, normalizeWorkspaceId as normalizePersistedWorkspaceId, deriveProjectGroupingName, classifyDirectoryForProjectMembership, deriveWorkspaceDisplayName, } from "./workspace-registry-model.js";
 import { createPersistedProjectRecord, createPersistedWorkspaceRecord, } from "./workspace-registry.js";
 import { buildVoiceModeSystemPrompt, stripVoiceModeSystemPrompt, wrapSpokenInput, } from "./voice-config.js";
 import { isVoicePermissionAllowed } from "./voice-permission-policy.js";
 import { listDirectoryEntries, readExplorerFile, readExplorerFileBytes, getDownloadableFileInfo, } from "./file-explorer/service.js";
 import { readPaseoConfigForEdit, writePaseoConfigForEdit, } from "../utils/paseo-config-file.js";
+import { buildMetadataPrompt } from "../utils/build-metadata-prompt.js";
 import { archivePersistedWorkspaceRecord } from "./workspace-archive-service.js";
 import { WorkspaceReconciliationService } from "./workspace-reconciliation-service.js";
 import { checkoutResolvedBranch, commitChanges, mergeToBase, mergeFromBase, pullCurrentBranch, pushCurrentBranch, createPullRequest, } from "../utils/checkout-git.js";
@@ -51,8 +54,8 @@ import { searchHomeDirectories, searchWorkspaceEntries } from "../utils/director
 import { toCheckoutError } from "./checkout-git-utils.js";
 import { toResolver } from "./speech/provider-resolver.js";
 import { resolveClientMessageId } from "./client-message-id.js";
-import { ChatServiceError } from "./chat/chat-service.js";
-import { notifyChatMentions } from "./chat/chat-mentions.js";
+import { ChatServiceError, parseMentionAgentIds, } from "./chat/chat-service.js";
+import { notifyChatMentions, prepareChatMentionFanout } from "./chat/chat-mentions.js";
 import { execCommand } from "../utils/spawn.js";
 import { createGitHubService, } from "../services/github-service.js";
 import { summarizeFetchWorkspacesEntries, WorkspaceDirectory, } from "./workspace-directory.js";
@@ -241,7 +244,6 @@ const PCM_BYTES_PER_MS = (PCM_SAMPLE_RATE * PCM_CHANNELS * (PCM_BITS_PER_SAMPLE
 const MIN_STREAMING_SEGMENT_DURATION_MS = 1000;
 const MIN_STREAMING_SEGMENT_BYTES = Math.round(PCM_BYTES_PER_MS * MIN_STREAMING_SEGMENT_DURATION_MS);
 const AgentIdSchema = z.string().uuid();
-const VOICE_INTERRUPT_CONFIRMATION_MS = 500;
 const AVAILABLE_EDITOR_TARGETS_CACHE_TTL_MS = 60000;
 const AVAILABLE_EDITOR_TARGETS_CACHE_KEY = "available";
 class VoiceFeatureUnavailableError extends Error {
@@ -257,8 +259,8 @@ function buildImportPersistenceHandle(input) {
     const cwd = input.cwd ?? process.cwd();
     return {
         provider: input.provider,
-        sessionId: input.sessionId,
-        nativeHandle: input.sessionId,
+        sessionId: input.providerHandleId,
+        nativeHandle: input.providerHandleId,
         metadata: {
             provider: input.provider,
             cwd,
@@ -304,7 +306,13 @@ function parseClientCapabilities(capabilities) {
         return new Set();
     }
     const known = new Set(Object.values(CLIENT_CAPS));
-    return new Set(Object.entries(capabilities).flatMap(([key, value]) => value === true && known.has(key) ? [key] : []));
+    const result = [];
+    for (const [key, value] of Object.entries(capabilities)) {
+        if (value === true && known.has(key)) {
+            result.push(key);
+        }
+    }
+    return new Set(result);
 }
 /**
  * Session represents a single connected client session.
@@ -317,8 +325,6 @@ export class Session {
         // Voice mode state
         this.isVoiceMode = false;
         this.speechInProgress = false;
-        this.pendingVoiceSpeechStartAt = null;
-        this.pendingVoiceSpeechTimer = null;
         this.voiceTurnController = null;
         this.voiceInputChunkCount = 0;
         this.voiceInputBytes = 0;
@@ -991,7 +997,7 @@ export class Session {
             catch (error) {
                 const err = error instanceof Error ? error : new Error(String(error));
                 this.sessionLogger.error({ err }, "Error handling message");
-                const requestId = msg.requestId;
+                const requestId = "requestId" in msg && typeof msg.requestId === "string" ? msg.requestId : undefined;
                 if (typeof requestId === "string") {
                     try {
                         this.emit({
@@ -1108,6 +1114,8 @@ export class Session {
                 return this.handleFetchAgents(msg);
             case "fetch_agent_history_request":
                 return this.handleFetchAgentHistory(msg);
+            case "fetch_recent_provider_sessions_request":
+                return this.handleFetchRecentProviderSessions(msg);
             case "fetch_agent_request":
                 return this.handleFetchAgent(msg.agentId, msg.requestId);
             case "delete_agent_request":
@@ -1258,6 +1266,7 @@ export class Session {
             },
         });
     }
+    // eslint-disable-next-line complexity
     dispatchCheckoutMessage(msg) {
         switch (msg.type) {
             case "checkout_status_request":
@@ -1293,6 +1302,8 @@ export class Session {
                 return this.handleCheckoutPushRequest(msg);
             case "checkout_pr_create_request":
                 return this.handleCheckoutPrCreateRequest(msg);
+            case "checkout_pr_merge_request":
+                return this.handleCheckoutPrMergeRequest(msg);
             case "checkout_pr_status_request":
                 return this.handleCheckoutPrStatusRequest(msg);
             case "pull_request_timeline_request":
@@ -1375,6 +1386,22 @@ export class Session {
                 return this.handleChatReadRequest(msg);
             case "chat/wait":
                 return this.handleChatWaitRequest(msg);
+            case "loop/run":
+                return this.handleLoopRunRequest(msg);
+            case "loop/list":
+                return this.handleLoopListRequest(msg);
+            case "loop/inspect":
+                return this.handleLoopInspectRequest(msg);
+            case "loop/logs":
+                return this.handleLoopLogsRequest(msg);
+            case "loop/stop":
+                return this.handleLoopStopRequest(msg);
+            default:
+                return this.dispatchScheduleMessage(msg);
+        }
+    }
+    dispatchScheduleMessage(msg) {
+        switch (msg.type) {
             case "schedule/create":
                 return this.handleScheduleCreateRequest(msg);
             case "schedule/list":
@@ -1389,16 +1416,10 @@ export class Session {
                 return this.handleScheduleResumeRequest(msg);
             case "schedule/delete":
                 return this.handleScheduleDeleteRequest(msg);
-            case "loop/run":
-                return this.handleLoopRunRequest(msg);
-            case "loop/list":
-                return this.handleLoopListRequest(msg);
-            case "loop/inspect":
-                return this.handleLoopInspectRequest(msg);
-            case "loop/logs":
-                return this.handleLoopLogsRequest(msg);
-            case "loop/stop":
-                return this.handleLoopStopRequest(msg);
+            case "schedule/run-once":
+                return this.handleScheduleRunOnceRequest(msg);
+            case "schedule/update":
+                return this.handleScheduleUpdateRequest(msg);
             default:
                 return undefined;
         }
@@ -1663,7 +1684,7 @@ export class Session {
                     id: uuidv4(),
                     timestamp: new Date(),
                     type: "error",
-                    content: `Failed to update agent: ${error.message}`,
+                    content: `Failed to update agent: ${getErrorMessage(error)}`,
                 },
             });
             this.emit({
@@ -1672,9 +1693,7 @@ export class Session {
                     requestId,
                     agentId,
                     accepted: false,
-                    error: error?.message
-                        ? String(error.message)
-                        : "Failed to update agent",
+                    error: getErrorMessageOr(error, "Failed to update agent"),
                 },
             });
         }
@@ -1886,28 +1905,62 @@ export class Session {
         if (!turnDetection) {
             throw new Error("Voice turn detection is not configured");
         }
+        const stt = this.sttManager.getProvider();
+        if (!stt) {
+            throw new Error("Voice speech-to-text is not configured");
+        }
         this.sessionLogger.info({ providerId: turnDetection.id }, "startVoiceTurnController creating controller");
         const controller = createVoiceTurnController({
             logger: this.sessionLogger.child({ component: "voice-turn-controller" }),
             turnDetection,
-            utteranceSink: {
-                submitUtterance: async ({ pcm16, format, sampleRate, startedAt, endedAt }) => {
-                    this.sessionLogger.debug({
-                        audioBytes: pcm16.length,
-                        sampleRate,
-                        startedAt,
-                        endedAt,
-                        durationMs: Math.max(0, endedAt - startedAt),
-                    }, "Submitting detected voice utterance");
-                    await this.processCompletedAudio(pcm16, format);
-                },
-            },
+            stt,
             callbacks: {
                 onSpeechStarted: async () => {
-                    this.handleProvisionalVoiceSpeechStarted();
+                    this.sessionLogger.debug("Voice VAD speech_started");
+                },
+                onPartialTranscript: async ({ segmentId, transcript }) => {
+                    this.sessionLogger.info({ segmentId, transcriptLength: transcript.trim().length }, "voice_input_state emitting isSpeaking=true");
+                    this.emit({
+                        type: "voice_input_state",
+                        payload: {
+                            isSpeaking: true,
+                        },
+                    });
+                    await this.handleVoiceSpeechStart();
                 },
                 onSpeechStopped: async () => {
                     this.handleVoiceSpeechStopped();
+                    this.setPhase("transcribing");
+                    this.emit({
+                        type: "activity_log",
+                        payload: {
+                            id: uuidv4(),
+                            timestamp: new Date(),
+                            type: "system",
+                            content: "Transcribing audio...",
+                        },
+                    });
+                },
+                onFinalTranscript: async ({ transcript, language, durationMs, avgLogprob, isLowConfidence, }) => {
+                    const requestId = uuidv4();
+                    const transcriptText = isLowConfidence ? "" : transcript.trim();
+                    if (isLowConfidence) {
+                        this.sessionLogger.debug({ text: transcript, avgLogprob }, "Filtered low-confidence transcription (likely non-speech)");
+                    }
+                    this.sessionLogger.info({
+                        requestId,
+                        isVoiceMode: this.isVoiceMode,
+                        transcriptLength: transcriptText.length,
+                        transcript: transcriptText,
+                    }, "Transcription result");
+                    await this.handleTranscriptionResultPayload({
+                        text: transcriptText,
+                        requestId,
+                        ...(language ? { language } : {}),
+                        duration: durationMs,
+                        ...(avgLogprob !== undefined ? { avgLogprob } : {}),
+                        ...(isLowConfidence !== undefined ? { isLowConfidence } : {}),
+                    });
                 },
                 onError: (error) => {
                     this.sessionLogger.error({ err: error }, "Voice turn controller failed");
@@ -1923,51 +1976,11 @@ export class Session {
         if (!this.voiceTurnController) {
             return;
         }
-        this.clearPendingVoiceSpeechStart("turn-controller-stop");
         const controller = this.voiceTurnController;
         this.voiceTurnController = null;
         await controller.stop();
     }
-    clearPendingVoiceSpeechStart(reason) {
-        if (this.pendingVoiceSpeechTimer) {
-            clearTimeout(this.pendingVoiceSpeechTimer);
-            this.pendingVoiceSpeechTimer = null;
-        }
-        if (this.pendingVoiceSpeechStartAt !== null) {
-            this.sessionLogger.debug({ reason }, "Clearing provisional voice speech start");
-            this.pendingVoiceSpeechStartAt = null;
-        }
-    }
-    handleProvisionalVoiceSpeechStarted() {
-        if (this.speechInProgress || this.pendingVoiceSpeechTimer) {
-            return;
-        }
-        const startedAt = Date.now();
-        this.pendingVoiceSpeechStartAt = startedAt;
-        this.sessionLogger.info({ confirmationMs: VOICE_INTERRUPT_CONFIRMATION_MS }, "Silero VAD provisional speech_started");
-        this.pendingVoiceSpeechTimer = setTimeout(() => {
-            this.pendingVoiceSpeechTimer = null;
-            if (this.pendingVoiceSpeechStartAt !== startedAt || this.speechInProgress) {
-                return;
-            }
-            this.pendingVoiceSpeechStartAt = null;
-            this.sessionLogger.info("voice_input_state emitting isSpeaking=true");
-            this.emit({
-                type: "voice_input_state",
-                payload: {
-                    isSpeaking: true,
-                },
-            });
-            void this.handleVoiceSpeechStart();
-        }, VOICE_INTERRUPT_CONFIRMATION_MS);
-    }
     handleVoiceSpeechStopped() {
-        if (this.pendingVoiceSpeechStartAt !== null) {
-            const durationMs = Date.now() - this.pendingVoiceSpeechStartAt;
-            this.clearPendingVoiceSpeechStart("speech-stopped-before-confirmation");
-            this.sessionLogger.info({ durationMs, confirmationMs: VOICE_INTERRUPT_CONFIRMATION_MS }, "Ignoring provisional voice speech start that ended before confirmation");
-            return;
-        }
         this.sessionLogger.info("voice_input_state emitting isSpeaking=false");
         this.emit({
             type: "voice_input_state",
@@ -2039,14 +2052,7 @@ export class Session {
             if (!resolvedWorkspace) {
                 throw new Error(`Workspace not found: ${msg.workspaceId}`);
             }
-            this.scheduleAutoNameWorkspaceBranchForFirstAgent({
-                workspace: resolvedWorkspace,
-                firstAgentContext,
-            });
-            const snapshot = await this.agentManager.createAgent({
-                ...sessionConfig,
-                cwd: resolvedWorkspace.cwd,
-            }, undefined, {
+            const snapshot = await this.agentManager.createAgent(sessionConfig, undefined, {
                 labels,
                 workspaceId: resolvedWorkspace.workspaceId,
                 initialPrompt: trimmedPrompt,
@@ -2115,6 +2121,7 @@ export class Session {
             agentManager: this.agentManager,
             agentId: snapshot.id,
             cwd: snapshot.cwd,
+            workspaceGitService: this.workspaceGitService,
             initialPrompt: trimmedPrompt,
             explicitTitle: params.explicitTitle,
             paseoHome: this.paseoHome,
@@ -2170,22 +2177,34 @@ export class Session {
                     id: uuidv4(),
                     timestamp: new Date(),
                     type: "error",
-                    content: `Failed to resume agent: ${error.message}`,
+                    content: `Failed to resume agent: ${getErrorMessage(error)}`,
                 },
             });
         }
     }
     async handleImportAgentRequest(msg) {
-        const { provider, sessionId, cwd, labels, requestId } = msg;
-        this.sessionLogger.info({ sessionId, provider }, `Importing agent ${sessionId} (${provider})`);
+        const normalized = normalizeImportAgentRequest(msg);
+        if ("error" in normalized) {
+            this.emit({
+                type: "status",
+                payload: {
+                    status: "agent_create_failed",
+                    requestId: msg.requestId,
+                    error: normalized.error,
+                },
+            });
+            return;
+        }
+        const { provider, providerHandleId, cwd, labels, requestId } = normalized;
+        this.sessionLogger.info({ providerHandleId, provider }, `Importing agent ${providerHandleId} (${provider})`);
         try {
-            const descriptor = await this.agentManager.findPersistedAgent(provider, sessionId);
+            const descriptor = await this.agentManager.findPersistedAgent(provider, providerHandleId);
             if (!descriptor && provider === "opencode" && !cwd) {
                 throw new Error("OpenCode sessions require --cwd when the session cannot be found in persisted agents");
             }
             const handle = descriptor
                 ? applyImportCwdOverride(descriptor.persistence, cwd)
-                : buildImportPersistenceHandle({ provider, sessionId, cwd });
+                : buildImportPersistenceHandle({ provider, providerHandleId, cwd });
             const overrides = cwd ? { cwd } : undefined;
             await this.unarchiveAgentByHandle(handle);
             const snapshot = await this.agentManager.resumeAgentFromPersistence(handle, overrides, undefined, {
@@ -2246,6 +2265,7 @@ export class Session {
             agentManager: this.agentManager,
             agentId: snapshot.id,
             cwd: snapshot.cwd,
+            workspaceGitService: this.workspaceGitService,
             initialPrompt,
             explicitTitle,
             paseoHome: this.paseoHome,
@@ -2261,7 +2281,9 @@ export class Session {
             const existing = this.agentManager.getAgent(agentId);
             if (existing) {
                 await this.interruptAgentIfRunning(agentId);
-                snapshot = await this.agentManager.reloadAgentSession(agentId);
+                snapshot = await this.agentManager.reloadAgentSession(agentId, undefined, {
+                    rehydrateFromDisk: true,
+                });
             }
             else {
                 const record = await this.agentStorage.get(agentId);
@@ -2301,7 +2323,7 @@ export class Session {
                     id: uuidv4(),
                     timestamp: new Date(),
                     type: "error",
-                    content: `Failed to refresh agent: ${error.message}`,
+                    content: `Failed to refresh agent: ${getErrorMessage(error)}`,
                 },
             });
         }
@@ -2370,6 +2392,7 @@ export class Session {
                 return generateBranchNameFromFirstAgentContext({
                     agentManager: this.agentManager,
                     cwd,
+                    workspaceGitService: this.workspaceGitService,
                     firstAgentContext,
                     logger: this.sessionLogger,
                 });
@@ -2434,7 +2457,7 @@ export class Session {
                     type: "list_provider_models_response",
                     payload: {
                         provider: msg.provider,
-                        error: error?.message ?? String(error),
+                        error: getErrorMessage(error),
                         fetchedAt,
                         requestId: msg.requestId,
                     },
@@ -2561,7 +2584,7 @@ export class Session {
                 type: "list_provider_modes_response",
                 payload: {
                     provider: msg.provider,
-                    error: error?.message ?? String(error),
+                    error: getErrorMessage(error),
                     fetchedAt,
                     requestId: msg.requestId,
                 },
@@ -2618,7 +2641,7 @@ export class Session {
                 type: "list_provider_features_response",
                 payload: {
                     provider: msg.draftConfig.provider,
-                    error: error?.message ?? String(error),
+                    error: getErrorMessage(error),
                     fetchedAt,
                     requestId: msg.requestId,
                 },
@@ -2645,7 +2668,7 @@ export class Session {
                 type: "list_available_providers_response",
                 payload: {
                     providers: [],
-                    error: error?.message ?? String(error),
+                    error: getErrorMessage(error),
                     fetchedAt,
                     requestId: msg.requestId,
                 },
@@ -2757,14 +2780,19 @@ export class Session {
         const patch = diff.diff.length > maxPatchChars
             ? `${diff.diff.slice(0, maxPatchChars)}\n\n... (diff truncated to ${maxPatchChars} chars)\n`
             : diff.diff;
-        const prompt = [
-            "Write a concise git commit message for the changes below.",
-            "Return JSON only with a single field 'message'.",
-            "",
-            fileList,
-            "",
-            patch.length > 0 ? patch : "(No diff available)",
-        ].join("\n");
+        const prompt = await buildMetadataPrompt({
+            cwd,
+            workspaceGitService: this.workspaceGitService,
+            configKey: "commitMessage",
+            before: "Write a concise git commit message for the changes below.",
+            after: [
+                "Return JSON only with a single field 'message'.",
+                "",
+                fileList,
+                "",
+                patch.length > 0 ? patch : "(No diff available)",
+            ].join("\n"),
+        });
         try {
             const result = await generateStructuredAgentResponseWithFallback({
                 manager: this.agentManager,
@@ -2814,14 +2842,19 @@ export class Session {
         const patch = diff.diff.length > maxPatchChars
             ? `${diff.diff.slice(0, maxPatchChars)}\n\n... (diff truncated to ${maxPatchChars} chars)\n`
             : diff.diff;
-        const prompt = [
-            "Write a pull request title and body for the changes below.",
-            "Return JSON only with fields 'title' and 'body'.",
-            "",
-            fileList,
-            "",
-            patch.length > 0 ? patch : "(No diff available)",
-        ].join("\n");
+        const prompt = await buildMetadataPrompt({
+            cwd,
+            workspaceGitService: this.workspaceGitService,
+            configKey: "pullRequest",
+            before: "Write a pull request title and body for the changes below.",
+            after: [
+                "Return JSON only with fields 'title' and 'body'.",
+                "",
+                fileList,
+                "",
+                patch.length > 0 ? patch : "(No diff available)",
+            ].join("\n"),
+        });
         try {
             return await generateStructuredAgentResponseWithFallback({
                 manager: this.agentManager,
@@ -2861,7 +2894,7 @@ export class Session {
             return snapshot.git.isDirty === true;
         }
         catch (error) {
-            throw new Error(`Unable to inspect git status for ${cwd}: ${error.message}`, {
+            throw new Error(`Unable to inspect git status for ${cwd}: ${getErrorMessage(error)}`, {
                 cause: error,
             });
         }
@@ -2934,7 +2967,7 @@ export class Session {
                     id: uuidv4(),
                     timestamp: new Date(),
                     type: "error",
-                    content: `Failed to set agent mode: ${error.message}`,
+                    content: `Failed to set agent mode: ${getErrorMessage(error)}`,
                 },
             });
             this.emit({
@@ -2943,9 +2976,7 @@ export class Session {
                     requestId,
                     agentId,
                     accepted: false,
-                    error: error?.message
-                        ? String(error.message)
-                        : "Failed to set agent mode",
+                    error: getErrorMessageOr(error, "Failed to set agent mode"),
                 },
             });
         }
@@ -2968,7 +2999,7 @@ export class Session {
                     id: uuidv4(),
                     timestamp: new Date(),
                     type: "error",
-                    content: `Failed to set agent model: ${error.message}`,
+                    content: `Failed to set agent model: ${getErrorMessage(error)}`,
                 },
             });
             this.emit({
@@ -2977,9 +3008,7 @@ export class Session {
                     requestId,
                     agentId,
                     accepted: false,
-                    error: error?.message
-                        ? String(error.message)
-                        : "Failed to set agent model",
+                    error: getErrorMessageOr(error, "Failed to set agent model"),
                 },
             });
         }
@@ -3002,7 +3031,7 @@ export class Session {
                     id: uuidv4(),
                     timestamp: new Date(),
                     type: "error",
-                    content: `Failed to set agent feature: ${error.message}`,
+                    content: `Failed to set agent feature: ${getErrorMessage(error)}`,
                 },
             });
             this.emit({
@@ -3011,9 +3040,7 @@ export class Session {
                     requestId,
                     agentId,
                     accepted: false,
-                    error: error?.message
-                        ? String(error.message)
-                        : "Failed to set agent feature",
+                    error: getErrorMessageOr(error, "Failed to set agent feature"),
                 },
             });
         }
@@ -3036,7 +3063,7 @@ export class Session {
                     id: uuidv4(),
                     timestamp: new Date(),
                     type: "error",
-                    content: `Failed to set agent thinking option: ${error.message}`,
+                    content: `Failed to set agent thinking option: ${getErrorMessage(error)}`,
                 },
             });
             this.emit({
@@ -3045,9 +3072,7 @@ export class Session {
                     requestId,
                     agentId,
                     accepted: false,
-                    error: error?.message
-                        ? String(error.message)
-                        : "Failed to set agent thinking option",
+                    error: getErrorMessageOr(error, "Failed to set agent thinking option"),
                 },
             });
         }
@@ -3162,7 +3187,7 @@ export class Session {
                 payload: {
                     agentId,
                     commands: [],
-                    error: error.message,
+                    error: getErrorMessage(error),
                     requestId,
                 },
             });
@@ -3189,7 +3214,7 @@ export class Session {
                     id: uuidv4(),
                     timestamp: new Date(),
                     type: "error",
-                    content: `Failed to respond to permission: ${error.message}`,
+                    content: `Failed to respond to permission: ${getErrorMessage(error)}`,
                 },
             });
             throw error;
@@ -3276,7 +3301,7 @@ export class Session {
                     return;
                 default: {
                     const exhaustiveCheck = resolution;
-                    throw new Error(`Unhandled branch resolution: ${exhaustiveCheck}`);
+                    throw new Error(`Unhandled branch resolution: ${getErrorMessage(exhaustiveCheck)}`);
                 }
             }
         }
@@ -3927,6 +3952,42 @@ export class Session {
             });
         }
     }
+    async handleCheckoutPrMergeRequest(msg) {
+        const { cwd, requestId } = msg;
+        try {
+            const snapshot = await this.workspaceGitService.getSnapshot(cwd);
+            const prNumber = snapshot.github.pullRequest?.number;
+            if (typeof prNumber !== "number") {
+                throw new Error("Unable to determine GitHub pull request number for merge");
+            }
+            await this.github.mergePullRequest({
+                cwd,
+                prNumber,
+                mergeMethod: msg.mergeMethod,
+            });
+            await this.notifyGitMutation(cwd, "merge-pr", { invalidateGithub: true });
+            this.emit({
+                type: "checkout_pr_merge_response",
+                payload: {
+                    cwd,
+                    success: true,
+                    error: null,
+                    requestId,
+                },
+            });
+        }
+        catch (error) {
+            this.emit({
+                type: "checkout_pr_merge_response",
+                payload: {
+                    cwd,
+                    success: false,
+                    error: toCheckoutError(error),
+                    requestId,
+                },
+            });
+        }
+    }
     async handleCheckoutPrStatusRequest(msg) {
         const { cwd, requestId } = msg;
         try {
@@ -4157,7 +4218,7 @@ export class Session {
                     mode,
                     directory: null,
                     file: null,
-                    error: error.message,
+                    error: getErrorMessage(error),
                     requestId,
                 },
             });
@@ -4186,7 +4247,7 @@ export class Session {
                 payload: {
                     cwd,
                     icon: null,
-                    error: error.message,
+                    error: getErrorMessage(error),
                     requestId,
                 },
             });
@@ -4252,7 +4313,7 @@ export class Session {
                     fileName: null,
                     mimeType: null,
                     size: null,
-                    error: error.message,
+                    error: getErrorMessage(error),
                     requestId,
                 },
             });
@@ -4488,7 +4549,7 @@ export class Session {
         return {
             id: workspace.workspaceId,
             projectId: workspace.projectId,
-            projectDisplayName: resolvedProjectRecord?.displayName ?? String(workspace.projectId),
+            projectDisplayName: resolvedProjectRecord?.displayName ?? workspace.projectId,
             projectRootPath: resolvedProjectRecord?.rootPath ?? workspace.cwd,
             workspaceDirectory: workspace.cwd,
             projectKind: (resolvedProjectRecord?.kind ?? "directory") === "git" ? "git" : "non_git",
@@ -4559,7 +4620,7 @@ export class Session {
         return {
             id: result.workspace.workspaceId,
             projectId: result.workspace.projectId,
-            projectDisplayName: projectRecord?.displayName ?? String(result.workspace.projectId),
+            projectDisplayName: projectRecord?.displayName ?? result.workspace.projectId,
             projectRootPath: projectRecord?.rootPath ?? result.repoRoot,
             workspaceDirectory: result.workspace.cwd,
             projectKind: "git",
@@ -5011,6 +5072,42 @@ export class Session {
             });
         }
     }
+    async handleFetchRecentProviderSessions(request) {
+        try {
+            const result = await listImportableProviderSessions({
+                request,
+                agentManager: this.agentManager,
+                agentStorage: this.agentStorage,
+                providerRegistry: this.getProviderRegistry(),
+            });
+            this.emit({
+                type: "fetch_recent_provider_sessions_response",
+                payload: {
+                    requestId: request.requestId,
+                    entries: result.entries,
+                    ...(result.filteredAlreadyImportedCount > 0
+                        ? { filteredAlreadyImportedCount: result.filteredAlreadyImportedCount }
+                        : {}),
+                },
+            });
+        }
+        catch (error) {
+            const code = error instanceof ImportSessionsRequestError
+                ? error.code
+                : "fetch_recent_provider_sessions_failed";
+            const message = error instanceof Error ? error.message : "Failed to fetch recent provider sessions";
+            this.sessionLogger.error({ err: error }, "Failed to handle fetch_recent_provider_sessions_request");
+            this.emit({
+                type: "rpc_error",
+                payload: {
+                    requestId: request.requestId,
+                    requestType: request.type,
+                    error: message,
+                    code,
+                },
+            });
+        }
+    }
     async handleFetchWorkspacesRequest(request) {
         const requestedSubscriptionId = request.subscribe?.subscriptionId?.trim();
         const subscriptionId = resolveSubscriptionId(request.subscribe, requestedSubscriptionId);
@@ -5551,8 +5648,9 @@ export class Session {
             const agentId = resolved.agentId;
             const prompt = this.buildAgentPrompt(msg.text, msg.images, msg.attachments);
             this.sessionLogger.trace({ agentId, messageId: msg.messageId, textPrefix: msg.text.slice(0, 80) }, "send_agent_message_request: dispatching shared sendPromptToAgent");
+            let dispatchResult;
             try {
-                await sendPromptToAgent({
+                dispatchResult = await sendPromptToAgent({
                     agentManager: this.agentManager,
                     agentStorage: this.agentStorage,
                     agentId,
@@ -5576,6 +5674,18 @@ export class Session {
                 });
                 return;
             }
+            if (dispatchResult.outOfBand) {
+                this.emit({
+                    type: "send_agent_message_response",
+                    payload: {
+                        requestId: msg.requestId,
+                        agentId,
+                        accepted: true,
+                        error: null,
+                    },
+                });
+                return;
+            }
             const startAbort = new AbortController();
             const startTimeoutMs = 15000;
             const startTimeout = setTimeout(() => startAbort.abort("timeout"), startTimeoutMs);
@@ -5777,12 +5887,6 @@ export class Session {
         const chunkBytes = Buffer.byteLength(msg.audio, "base64");
         this.voiceInputChunkCount += 1;
         this.voiceInputBytes += chunkBytes;
-        if (this.voiceInputChunkCount === 1) {
-            this.sessionLogger.info({
-                format: chunkFormat,
-                audioBytes: chunkBytes,
-            }, "Received first voice_audio_chunk for active voice mode");
-        }
         const now = Date.now();
         if (this.voiceInputChunkCount % 50 === 0 || now - this.voiceInputWindowStartedAt >= 1000) {
             this.sessionLogger.info({
@@ -5943,7 +6047,7 @@ export class Session {
                     id: uuidv4(),
                     timestamp: new Date(),
                     type: "error",
-                    content: `Transcription error: ${error.message}`,
+                    content: `Transcription error: ${getErrorMessage(error)}`,
                 },
             });
             throw error;
@@ -6110,7 +6214,6 @@ export class Session {
      * Clear speech-in-progress flag once the user turn has completed
      */
     clearSpeechInProgress(reason) {
-        this.clearPendingVoiceSpeechStart(`clear-speech-in-progress:${reason}`);
         if (!this.speechInProgress) {
             return;
         }
@@ -6354,6 +6457,19 @@ export class Session {
     async handleChatPostRequest(request) {
         try {
             const authorAgentId = request.authorAgentId?.trim() || this.clientId;
+            const mentionAgentIds = parseMentionAgentIds(request.body);
+            const storedAgents = await this.agentStorage.list();
+            const liveAgents = this.agentManager.listAgents();
+            const fanout = await prepareChatMentionFanout({
+                authorAgentId,
+                mentionAgentIds,
+                storedAgents,
+                liveAgents,
+                listRoomPosterAgentIds: () => this.chatService.listRoomPosterAgentIds({ room: request.room }),
+            });
+            if (!fanout.ok) {
+                throw new ChatServiceError("chat_mention_fanout_limit_exceeded", fanout.error);
+            }
             const message = await this.chatService.dispatchMessage({
                 room: request.room,
                 authorAgentId,
@@ -6374,11 +6490,20 @@ export class Session {
                 body: request.body,
                 mentionAgentIds: message.mentionAgentIds,
                 logger: this.sessionLogger,
-                listStoredAgents: () => this.agentStorage.list(),
-                listLiveAgents: () => this.agentManager.listAgents(),
+                storedAgents,
+                liveAgents,
+                prepared: fanout.prepared,
                 resolveAgentIdentifier: (identifier) => this.resolveAgentIdentifier(identifier),
                 sendAgentMessage: async (agentId, text) => {
-                    await this.handleSendAgentMessage(agentId, text);
+                    await sendPromptToAgent({
+                        agentManager: this.agentManager,
+                        agentStorage: this.agentStorage,
+                        agentId,
+                        prompt: formatSystemNotificationPrompt(text),
+                        unarchive: false,
+                        recordUserMessage: false,
+                        logger: this.sessionLogger,
+                    });
                 },
             });
         }
@@ -6457,6 +6582,7 @@ export class Session {
                 target,
                 maxRuns: request.maxRuns,
                 expiresAt: request.expiresAt,
+                runOnCreate: request.runOnCreate,
             });
             this.emit({
                 type: "schedule/create/response",
@@ -6567,6 +6693,46 @@ export class Session {
             this.emitScheduleRpcError(request, error);
         }
     }
+    async handleScheduleRunOnceRequest(request) {
+        try {
+            const schedule = await this.scheduleService.runOnce(request.scheduleId);
+            this.emit({
+                type: "schedule/run-once/response",
+                payload: {
+                    requestId: request.requestId,
+                    schedule,
+                    error: null,
+                },
+            });
+        }
+        catch (error) {
+            this.emitScheduleRpcError(request, error);
+        }
+    }
+    async handleScheduleUpdateRequest(request) {
+        try {
+            const schedule = await this.scheduleService.update({
+                id: request.scheduleId,
+                ...(request.name !== undefined ? { name: request.name } : {}),
+                ...(request.prompt !== undefined ? { prompt: request.prompt } : {}),
+                ...(request.cadence !== undefined ? { cadence: request.cadence } : {}),
+                ...(request.newAgentConfig !== undefined ? { newAgentConfig: request.newAgentConfig } : {}),
+                ...(request.maxRuns !== undefined ? { maxRuns: request.maxRuns } : {}),
+                ...(request.expiresAt !== undefined ? { expiresAt: request.expiresAt } : {}),
+            });
+            this.emit({
+                type: "schedule/update/response",
+                payload: {
+                    requestId: request.requestId,
+                    schedule,
+                    error: null,
+                },
+            });
+        }
+        catch (error) {
+            this.emitScheduleRpcError(request, error);
+        }
+    }
     emitLoopRpcError(request, error) {
         const message = error instanceof Error ? error.message : String(error);
         this.sessionLogger.error({ err: error, requestType: request.type }, "Loop request failed");
@@ -6587,10 +6753,12 @@ export class Session {
                 cwd: request.cwd,
                 provider: request.provider,
                 model: request.model,
+                modeId: request.modeId,
                 workerProvider: request.workerProvider,
                 workerModel: request.workerModel,
                 verifierProvider: request.verifierProvider,
                 verifierModel: request.verifierModel,
+                verifierModeId: request.verifierModeId,
                 verifyPrompt: request.verifyPrompt,
                 verifyChecks: request.verifyChecks,
                 archive: request.archive,
@@ -6698,6 +6866,7 @@ export function normalizeCheckoutPrStatusPayload(status) {
         headRefName: status.headRefName,
         isMerged: status.isMerged,
         isDraft: status.isDraft ?? false,
+        mergeable: status.mergeable ?? "UNKNOWN",
         checks: status.checks ?? [],
         checksStatus: status.checksStatus,
         reviewDecision: status.reviewDecision,