@getpaseo/server 0.1.87 → 0.1.89

package/dist/server/server/session.d.ts

@@ -15,7 +15,7 @@ import type { AgentStorage } from "./agent/agent-storage.js";
 import { type PersistedWorkspaceRecord, type ProjectRegistry, type WorkspaceRegistry } from "./workspace-registry.js";
 import { DownloadTokenStore } from "./file-download/token-store.js";
 import { PushTokenStore } from "./push/token-store.js";
-import type { ScriptRouteStore } from "./script-proxy.js";
+import type { ServiceProxySubsystem } from "./service-proxy.js";
 import { CheckoutDiffManager } from "./checkout-diff-manager.js";
 import { type Resolvable } from "./speech/provider-resolver.js";
 import type { SpeechReadinessSnapshot } from "./speech/speech-runtime.js";
@@ -46,6 +46,7 @@ export interface SessionOptions {
     downloadTokenStore: DownloadTokenStore;
     pushTokenStore: PushTokenStore;
     paseoHome: string;
+    worktreesRoot?: string;
     agentManager: AgentManager;
     agentStorage: AgentStorage;
     projectRegistry: ProjectRegistry;
@@ -64,12 +65,13 @@ export interface SessionOptions {
     tts: Resolvable<TextToSpeechProvider | null>;
     terminalManager: TerminalManager | null;
     providerSnapshotManager: ProviderSnapshotManager;
-    scriptRouteStore?: ScriptRouteStore;
+    serviceProxy?: ServiceProxySubsystem;
     scriptRuntimeStore?: WorkspaceScriptRuntimeStore;
     workspaceSetupSnapshots?: Map<string, WorkspaceSetupSnapshot>;
     onBranchChanged?: (workspaceId: string, oldBranch: string | null, newBranch: string | null) => void;
     getDaemonTcpPort?: () => number | null;
     getDaemonTcpHost?: () => string | null;
+    serviceProxyPublicBaseUrl?: string | null;
     resolveScriptHealth?: (hostname: string) => ScriptHealthState | null;
     voice?: {
         turnDetection?: Resolvable<TurnDetectionProvider | null>;
@@ -124,6 +126,7 @@ export declare class Session {
     private readonly onLifecycleIntent;
     private readonly sessionLogger;
     private readonly paseoHome;
+    private readonly worktreesRoot;
     private abortController;
     private processingPhase;
     private isVoiceMode;
@@ -163,11 +166,12 @@ export declare class Session {
     private readonly terminalManager;
     private readonly providerSnapshotManager;
     private unsubscribeProviderSnapshotEvents;
-    private readonly scriptRouteStore;
+    private readonly serviceProxy;
     private readonly scriptRuntimeStore;
     private readonly onBranchChanged?;
     private readonly getDaemonTcpPort;
     private readonly getDaemonTcpHost;
+    private readonly serviceProxyPublicBaseUrl;
     private readonly resolveScriptHealth;
     private readonly terminalController;
     private inflightRequests;
@@ -489,7 +493,10 @@ export declare class Session {
     private handleWorkspaceSetupStatusRequest;
     private handleArchiveWorkspaceRequest;
     private handleFetchAgent;
-    private loadProjectedTimelineWindow;
+    private shouldUseFullTimelineForProjectedPage;
+    private selectCanonicalTimelineProjection;
+    private selectProjectedTimelineProjection;
+    private selectTimelineProjection;
     private handleFetchAgentTimelineRequest;
     private handleSendAgentMessageRequest;
     private handleWaitForFinish;

package/dist/server/server/session.js

@@ -38,7 +38,7 @@ import { createAgentCommand } from "./agent/create-agent/create.js";
 import { archiveAgentCommand, cancelAgentRunCommand, closeAgentCommand, setAgentModeCommand, updateAgentCommand, } from "./agent/lifecycle-command.js";
 import { buildStoredAgentPayload, resolveEffectiveThinkingOptionId, resolveStoredAgentPayloadUpdatedAt, toAgentPayload, } from "./agent/agent-projections.js";
 import { appendTimelineItemIfAgentKnown, emitLiveTimelineItemIfAgentKnown, } from "./agent/timeline-append.js";
-import { projectTimelineRows, selectTimelineWindowByProjectedLimit, } from "./agent/timeline-projection.js";
+import { projectTimelineRows, selectProjectedTimelinePage, } from "./agent/timeline-projection.js";
 import { StructuredAgentFallbackError, StructuredAgentResponseError, generateStructuredAgentResponseWithFallback, } from "./agent/agent-response-loop.js";
 import { resolveStructuredGenerationProviders, } from "./agent/structured-generation-providers.js";
 import { getAgentStreamEventTurnId, } from "./agent/agent-sdk-types.js";
@@ -334,7 +334,7 @@ export class Session {
                 }
             },
         });
-        const { clientId, appVersion, clientCapabilities, onMessage, onBinaryMessage, onLifecycleIntent, logger, downloadTokenStore, pushTokenStore, paseoHome, agentManager, agentStorage, projectRegistry, workspaceRegistry, chatService, scheduleService, loopService, checkoutDiffManager, github, workspaceGitService, daemonConfigStore, mcpBaseUrl, stt, sttLanguage, tts, terminalManager, providerSnapshotManager, scriptRouteStore, scriptRuntimeStore, workspaceSetupSnapshots, onBranchChanged, getDaemonTcpPort, getDaemonTcpHost, resolveScriptHealth, voice, voiceBridge, dictation, serverId, daemonVersion, daemonRuntimeConfig, } = options;
+        const { clientId, appVersion, clientCapabilities, onMessage, onBinaryMessage, onLifecycleIntent, logger, downloadTokenStore, pushTokenStore, paseoHome, worktreesRoot, agentManager, agentStorage, projectRegistry, workspaceRegistry, chatService, scheduleService, loopService, checkoutDiffManager, github, workspaceGitService, daemonConfigStore, mcpBaseUrl, stt, sttLanguage, tts, terminalManager, providerSnapshotManager, serviceProxy, scriptRuntimeStore, workspaceSetupSnapshots, onBranchChanged, getDaemonTcpPort, getDaemonTcpHost, serviceProxyPublicBaseUrl, resolveScriptHealth, voice, voiceBridge, dictation, serverId, daemonVersion, daemonRuntimeConfig, } = options;
         this.clientId = clientId;
         this.appVersion = appVersion ?? null;
         this.clientCapabilities = parseClientCapabilities(clientCapabilities);
@@ -345,6 +345,7 @@ export class Session {
         this.downloadTokenStore = downloadTokenStore;
         this.pushTokenStore = pushTokenStore;
         this.paseoHome = paseoHome;
+        this.worktreesRoot = worktreesRoot;
         this.sessionLogger = logger.child({
             module: "session",
             clientId: this.clientId,
@@ -370,9 +371,11 @@ export class Session {
             hasBinaryChannel: () => this.onBinaryMessage !== null,
             isPathWithinRoot: (rootPath, candidatePath) => this.isPathWithinRoot(rootPath, candidatePath),
             sessionLogger: this.sessionLogger,
+            clientSupportsWrapReflow: () => this.clientCapabilities.has(CLIENT_CAPS.terminalReflowableSnapshot),
         });
         this.createAgentLifecycleDispatch = new CreateAgentLifecycleDispatch({
             paseoHome: this.paseoHome,
+            worktreesRoot: this.worktreesRoot,
             agentManager: this.agentManager,
             agentStorage: this.agentStorage,
             github: this.github,
@@ -397,12 +400,13 @@ export class Session {
             logger: this.sessionLogger,
         });
         this.providerSnapshotManager = providerSnapshotManager;
-        this.scriptRouteStore = scriptRouteStore ?? null;
+        this.serviceProxy = serviceProxy ?? null;
         this.scriptRuntimeStore = scriptRuntimeStore ?? null;
         this.workspaceSetupSnapshots = workspaceSetupSnapshots ?? new Map();
         this.onBranchChanged = onBranchChanged;
         this.getDaemonTcpPort = getDaemonTcpPort ?? null;
         this.getDaemonTcpHost = getDaemonTcpHost ?? null;
+        this.serviceProxyPublicBaseUrl = serviceProxyPublicBaseUrl ?? null;
         this.resolveScriptHealth = resolveScriptHealth ?? null;
         this.sttLanguage = sttLanguage ?? "en";
         this.subscribeToOptionalManagers();
@@ -2093,6 +2097,7 @@ export class Session {
                 agentStorage: this.agentStorage,
                 logger: this.sessionLogger,
                 paseoHome: this.paseoHome,
+                worktreesRoot: this.worktreesRoot,
                 workspaceGitService: this.workspaceGitService,
                 providerSnapshotManager: this.providerSnapshotManager,
                 daemonConfig: this.readStructuredGenerationDaemonConfig(),
@@ -2427,6 +2432,7 @@ export class Session {
     async buildAgentSessionConfig(config, gitOptions, legacyWorktreeName, firstAgentContext) {
         return buildWorktreeAgentSessionConfig({
             paseoHome: this.paseoHome,
+            worktreesRoot: this.worktreesRoot,
             sessionLogger: this.sessionLogger,
             workspaceGitService: this.workspaceGitService,
             createPaseoWorktree: (input, serviceOptions) => this.createPaseoWorktreeWorkflow(input, {
@@ -3872,7 +3878,7 @@ export class Session {
             const mutatedCwd = await mergeToBase(cwd, {
                 baseRef,
                 mode: msg.strategy === "squash" ? "squash" : "merge",
-            }, { paseoHome: this.paseoHome });
+            }, { paseoHome: this.paseoHome, worktreesRoot: this.worktreesRoot });
             await Promise.all([
                 this.notifyGitMutation(mutatedCwd, "merge-to-base", { invalidateGithub: true }),
                 ...(mutatedCwd !== cwd ? [this.notifyGitMutation(cwd, "merge-to-base")] : []),
@@ -4292,6 +4298,7 @@ export class Session {
     async handlePaseoWorktreeArchiveRequest(msg) {
         return handleWorktreeArchiveRequest({
             paseoHome: this.paseoHome,
+            worktreesRoot: this.worktreesRoot,
             github: this.github,
             workspaceGitService: this.workspaceGitService,
             agentManager: this.agentManager,
@@ -4729,14 +4736,15 @@ export class Session {
             status: "done",
             activityAt: null,
             diffStat,
-            scripts: this.scriptRouteStore && this.scriptRuntimeStore
+            scripts: this.serviceProxy && this.scriptRuntimeStore
                 ? buildWorkspaceScriptPayloads({
                     workspaceId: workspace.workspaceId,
                     workspaceDirectory: workspace.cwd,
                     paseoConfig: readPaseoConfigForProjection(workspace.cwd, this.sessionLogger),
-                    routeStore: this.scriptRouteStore,
+                    serviceProxy: this.serviceProxy,
                     runtimeStore: this.scriptRuntimeStore,
                     daemonPort: this.getDaemonTcpPort?.() ?? null,
+                    serviceProxyPublicBaseUrl: this.serviceProxyPublicBaseUrl,
                     gitMetadata: this.resolveWorkspaceScriptGitMetadata(workspace.cwd),
                     resolveHealth: this.resolveScriptHealth ?? undefined,
                 })
@@ -5398,16 +5406,17 @@ export class Session {
         }
     }
     buildWorkspaceScriptPayloadSnapshot(workspaceId, workspaceDirectory) {
-        if (!this.scriptRouteStore || !this.scriptRuntimeStore) {
+        if (!this.serviceProxy || !this.scriptRuntimeStore) {
             return [];
         }
         return buildWorkspaceScriptPayloads({
             workspaceId,
             workspaceDirectory,
             paseoConfig: readPaseoConfigForProjection(workspaceDirectory, this.sessionLogger),
-            routeStore: this.scriptRouteStore,
+            serviceProxy: this.serviceProxy,
             runtimeStore: this.scriptRuntimeStore,
             daemonPort: this.getDaemonTcpPort?.() ?? null,
+            serviceProxyPublicBaseUrl: this.serviceProxyPublicBaseUrl,
             gitMetadata: this.resolveWorkspaceScriptGitMetadata(workspaceDirectory),
             resolveHealth: this.resolveScriptHealth ?? undefined,
         });
@@ -5442,7 +5451,7 @@ export class Session {
     }
     async handleStartWorkspaceScriptRequest(request) {
         try {
-            if (!this.terminalManager || !this.scriptRouteStore || !this.scriptRuntimeStore) {
+            if (!this.terminalManager || !this.serviceProxy || !this.scriptRuntimeStore) {
                 throw new Error("Workspace scripts are not available on this daemon");
             }
             const workspace = await this.workspaceRegistry.get(request.workspaceId);
@@ -5458,7 +5467,8 @@ export class Session {
                 scriptName: request.scriptName,
                 daemonPort: this.getDaemonTcpPort?.() ?? null,
                 daemonListenHost: this.getDaemonTcpHost?.() ?? null,
-                routeStore: this.scriptRouteStore,
+                serviceProxyPublicBaseUrl: this.serviceProxyPublicBaseUrl,
+                serviceProxy: this.serviceProxy,
                 runtimeStore: this.scriptRuntimeStore,
                 terminalManager: this.terminalManager,
                 logger: this.sessionLogger,
@@ -5553,6 +5563,7 @@ export class Session {
     async handleCreatePaseoWorktreeRequest(request) {
         return handleCreateWorktreeRequest({
             paseoHome: this.paseoHome,
+            worktreesRoot: this.worktreesRoot,
             describeWorkspaceRecord: (result) => this.describeCreatedWorktreeWorkspace(result),
             emit: (message) => this.emit(message),
             sessionLogger: this.sessionLogger,
@@ -5562,6 +5573,7 @@ export class Session {
     async createPaseoWorktreeWorkflow(input, options) {
         return createWorktreeWorkflow({
             paseoHome: this.paseoHome,
+            worktreesRoot: this.worktreesRoot,
             createPaseoWorktree: (workflowInput, serviceOptions) => this.createPaseoWorktree(workflowInput, serviceOptions),
             warmWorkspaceGitData: (workspace) => this.warmWorkspaceGitDataForWorkspace(workspace),
             autoNameWorkspaceBranchForFirstAgent: (autoNameInput) => this.scheduleAutoNameWorkspaceBranchForFirstAgent(autoNameInput),
@@ -5573,10 +5585,11 @@ export class Session {
             sessionLogger: this.sessionLogger,
             terminalManager: this.terminalManager,
             archiveWorkspaceRecord: (workspaceId) => this.archiveWorkspaceRecord(workspaceId),
-            scriptRouteStore: this.scriptRouteStore,
+            serviceProxy: this.serviceProxy,
             scriptRuntimeStore: this.scriptRuntimeStore,
             getDaemonTcpPort: this.getDaemonTcpPort,
             getDaemonTcpHost: this.getDaemonTcpHost,
+            serviceProxyPublicBaseUrl: this.serviceProxyPublicBaseUrl,
             onScriptsChanged: (workspaceId, workspaceDirectory) => {
                 this.emitWorkspaceScriptStatusUpdate(workspaceId, workspaceDirectory);
             },
@@ -5652,62 +5665,63 @@ export class Session {
             payload: { requestId, agent, project, error: null },
         });
     }
-    loadProjectedTimelineWindow(params) {
-        const { agentId, direction, cursor, requestedLimit } = params;
-        let timeline = params.timeline;
-        const projectedLimit = Math.max(1, Math.floor(requestedLimit));
-        let fetchLimit = projectedLimit;
-        let projectedWindow = selectTimelineWindowByProjectedLimit({
+    shouldUseFullTimelineForProjectedPage(input) {
+        const { timeline } = input;
+        if (timeline.reset || timeline.rows.length === 0 || !timeline.hasOlder) {
+            return false;
+        }
+        const firstRow = timeline.rows[0];
+        if (firstRow?.item.type === "assistant_message" ||
+            firstRow?.item.type === "reasoning" ||
+            firstRow?.item.type === "tool_call") {
+            return true;
+        }
+        return timeline.rows.some((row) => row.item.type === "tool_call");
+    }
+    selectCanonicalTimelineProjection(input) {
+        const entries = projectTimelineRows({ rows: input.timeline.rows, mode: "canonical" });
+        return {
+            timeline: input.timeline,
+            entries,
+            startSeq: entries[0]?.seqStart ?? null,
+            endSeq: entries[entries.length - 1]?.seqEnd ?? null,
+            hasOlder: input.timeline.hasOlder,
+            hasNewer: input.timeline.hasNewer,
+        };
+    }
+    selectProjectedTimelineProjection(input) {
+        const timeline = this.shouldUseFullTimelineForProjectedPage({
+            timeline: input.controlTimeline,
+        })
+            ? this.agentManager.fetchTimeline(input.agentId, { direction: "tail", limit: 0 })
+            : input.controlTimeline;
+        const page = selectProjectedTimelinePage({
             rows: timeline.rows,
-            direction,
-            limit: projectedLimit,
-            collapseToolLifecycle: false,
+            bounds: timeline.window,
+            direction: input.controlTimeline.reset ? "tail" : input.direction,
+            ...(input.cursor ? { cursorSeq: input.cursor.seq } : {}),
+            limit: input.pageLimit,
         });
-        while (timeline.hasOlder) {
-            const needsMoreProjectedEntries = projectedWindow.projectedEntries.length < projectedLimit;
-            const firstLoadedRow = timeline.rows[0];
-            const firstSelectedRow = projectedWindow.selectedRows[0];
-            const startsAtLoadedBoundary = firstLoadedRow != null &&
-                firstSelectedRow != null &&
-                firstSelectedRow.seq === firstLoadedRow.seq;
-            const boundaryIsAssistantChunk = startsAtLoadedBoundary && firstLoadedRow.item.type === "assistant_message";
-            if (!needsMoreProjectedEntries && !boundaryIsAssistantChunk) {
-                break;
-            }
-            const maxRows = Math.max(0, timeline.window.maxSeq - timeline.window.minSeq + 1);
-            const nextFetchLimit = Math.min(maxRows, fetchLimit * 2);
-            if (nextFetchLimit <= fetchLimit) {
-                break;
-            }
-            fetchLimit = nextFetchLimit;
-            timeline = this.agentManager.fetchTimeline(agentId, {
-                direction,
-                cursor,
-                limit: fetchLimit,
-            });
-            projectedWindow = selectTimelineWindowByProjectedLimit({
-                rows: timeline.rows,
-                direction,
-                limit: projectedLimit,
-                collapseToolLifecycle: false,
-            });
-        }
         return {
             timeline,
-            selectedRows: projectedWindow.selectedRows,
-            minSeq: projectedWindow.minSeq,
-            maxSeq: projectedWindow.maxSeq,
+            entries: page.entries,
+            startSeq: page.startSeq,
+            endSeq: page.endSeq,
+            hasOlder: page.hasOlder || (page.startSeq !== null && page.startSeq > timeline.window.minSeq),
+            hasNewer: page.hasNewer,
         };
     }
+    selectTimelineProjection(input) {
+        if (input.projection === "canonical") {
+            return this.selectCanonicalTimelineProjection({ timeline: input.controlTimeline });
+        }
+        return this.selectProjectedTimelineProjection(input);
+    }
     async handleFetchAgentTimelineRequest(msg) {
         const direction = msg.direction ?? (msg.cursor ? "after" : "tail");
         const projection = msg.projection ?? "projected";
         const requestedLimit = msg.limit;
-        const limit = requestedLimit ?? (direction === "after" ? 0 : undefined);
-        const shouldLimitByProjectedWindow = projection === "canonical" &&
-            direction === "tail" &&
-            typeof requestedLimit === "number" &&
-            requestedLimit > 0;
+        const pageLimit = requestedLimit ?? (direction === "after" ? 0 : 200);
         const cursor = msg.cursor
             ? {
                 epoch: msg.cursor.epoch,
@@ -5721,42 +5735,25 @@ export class Session {
                 logger: this.sessionLogger,
             });
             const agentPayload = await this.buildAgentPayload(snapshot);
-            let timeline = this.agentManager.fetchTimeline(msg.agentId, {
+            const controlTimeline = this.agentManager.fetchTimeline(msg.agentId, {
                 direction,
                 cursor,
-                limit: shouldLimitByProjectedWindow && typeof requestedLimit === "number"
-                    ? Math.max(1, Math.floor(requestedLimit))
-                    : limit,
-            });
-            let hasOlder = timeline.hasOlder;
-            let hasNewer = timeline.hasNewer;
-            let startCursor = null;
-            let endCursor = null;
-            let entries;
-            if (shouldLimitByProjectedWindow) {
-                const projectedResult = this.loadProjectedTimelineWindow({
-                    agentId: msg.agentId,
-                    direction,
-                    cursor,
-                    requestedLimit,
-                    timeline,
-                });
-                timeline = projectedResult.timeline;
-                entries = projectTimelineRows({ rows: projectedResult.selectedRows, mode: projection });
-                if (projectedResult.minSeq !== null && projectedResult.maxSeq !== null) {
-                    startCursor = { epoch: timeline.epoch, seq: projectedResult.minSeq };
-                    endCursor = { epoch: timeline.epoch, seq: projectedResult.maxSeq };
-                    hasOlder = projectedResult.minSeq > timeline.window.minSeq;
-                    hasNewer = false;
-                }
-            }
-            else {
-                const firstRow = timeline.rows[0];
-                const lastRow = timeline.rows[timeline.rows.length - 1];
-                startCursor = firstRow ? { epoch: timeline.epoch, seq: firstRow.seq } : null;
-                endCursor = lastRow ? { epoch: timeline.epoch, seq: lastRow.seq } : null;
-                entries = projectTimelineRows({ rows: timeline.rows, mode: projection });
-            }
+                limit: pageLimit,
+            });
+            const selectedTimeline = this.selectTimelineProjection({
+                agentId: msg.agentId,
+                projection,
+                controlTimeline,
+                direction,
+                ...(cursor ? { cursor } : {}),
+                pageLimit,
+            });
+            const startCursor = selectedTimeline.startSeq !== null
+                ? { epoch: selectedTimeline.timeline.epoch, seq: selectedTimeline.startSeq }
+                : null;
+            const endCursor = selectedTimeline.endSeq !== null
+                ? { epoch: selectedTimeline.timeline.epoch, seq: selectedTimeline.endSeq }
+                : null;
             this.emit({
                 type: "fetch_agent_timeline_response",
                 payload: {
@@ -5765,16 +5762,16 @@ export class Session {
                     agent: agentPayload,
                     direction,
                     projection,
-                    epoch: timeline.epoch,
-                    reset: timeline.reset,
-                    staleCursor: timeline.staleCursor,
-                    gap: timeline.gap,
-                    window: timeline.window,
+                    epoch: selectedTimeline.timeline.epoch,
+                    reset: controlTimeline.reset,
+                    staleCursor: controlTimeline.staleCursor,
+                    gap: controlTimeline.gap,
+                    window: selectedTimeline.timeline.window,
                     startCursor,
                     endCursor,
-                    hasOlder,
-                    hasNewer,
-                    entries: entries.map((entry) => ({
+                    hasOlder: selectedTimeline.hasOlder,
+                    hasNewer: selectedTimeline.hasNewer,
+                    entries: selectedTimeline.entries.map((entry) => ({
                         provider: snapshot.provider,
                         item: entry.item,
                         timestamp: entry.timestamp,

package/dist/server/server/websocket-server.d.ts

@@ -17,7 +17,7 @@ import { ProviderSnapshotManager } from "./agent/provider-snapshot-manager.js";
 import type { WorkspaceGitService } from "./workspace-git-service.js";
 import { type PushNotificationSender } from "./push/notifications.js";
 import type { ScriptHealthState } from "./script-health-monitor.js";
-import type { ScriptRouteStore } from "./script-proxy.js";
+import type { ServiceProxySubsystem } from "./service-proxy.js";
 import type { WorkspaceScriptRuntimeStore } from "./workspace-script-runtime-store.js";
 import type { SpeechReadinessSnapshot, SpeechService } from "./speech/speech-runtime.js";
 import type { VoiceCallerContext, VoiceSpeakHandler } from "./voice-types.js";
@@ -66,16 +66,18 @@ export declare class VoiceAssistantWebSocketServer {
     private readonly workspaceGitService;
     private readonly downloadTokenStore;
     private readonly paseoHome;
+    private readonly worktreesRoot;
     private readonly daemonConfigStore;
     private readonly pushTokenStore;
     private readonly pushNotificationSender;
     private readonly mcpBaseUrl;
     private speech;
     private terminalManager;
-    private scriptRouteStore;
+    private serviceProxy;
     private scriptRuntimeStore;
     private getDaemonTcpPort;
     private getDaemonTcpHost;
+    private serviceProxyPublicBaseUrl;
     private resolveScriptHealth;
     private dictation;
     private readonly voiceSpeakHandlers;
@@ -91,8 +93,9 @@ export declare class VoiceAssistantWebSocketServer {
     private unsubscribeDaemonConfigChange;
     constructor(server: HTTPServer, logger: pino.Logger, serverId: string, agentManager: AgentManager, agentStorage: AgentStorage, downloadTokenStore: DownloadTokenStore, paseoHome: string, daemonConfigStore: DaemonConfigStore, mcpBaseUrl: string | null, wsConfig: WebSocketServerConfig, auth?: DaemonAuthConfig, speech?: SpeechService | null, terminalManager?: TerminalManager | null, dictation?: {
         finalTimeoutMs?: number;
-    }, daemonVersion?: string, onLifecycleIntent?: (intent: SessionLifecycleIntent) => void, projectRegistry?: ProjectRegistry, workspaceRegistry?: WorkspaceRegistry, chatService?: FileBackedChatService, loopService?: LoopService, scheduleService?: ScheduleService, checkoutDiffManager?: CheckoutDiffManager, scriptRouteStore?: ScriptRouteStore | null, scriptRuntimeStore?: WorkspaceScriptRuntimeStore | null, onBranchChanged?: (workspaceId: string, oldBranch: string | null, newBranch: string | null) => void, getDaemonTcpPort?: () => number | null, getDaemonTcpHost?: () => string | null, resolveScriptHealth?: (hostname: string) => ScriptHealthState | null, workspaceGitService?: WorkspaceGitService, github?: GitHubService, pushNotificationSender?: PushNotificationSender, providerSnapshotManager?: ProviderSnapshotManager, daemonRuntimeConfig?: {
+    }, daemonVersion?: string, onLifecycleIntent?: (intent: SessionLifecycleIntent) => void, projectRegistry?: ProjectRegistry, workspaceRegistry?: WorkspaceRegistry, chatService?: FileBackedChatService, loopService?: LoopService, scheduleService?: ScheduleService, checkoutDiffManager?: CheckoutDiffManager, serviceProxy?: ServiceProxySubsystem | null, scriptRuntimeStore?: WorkspaceScriptRuntimeStore | null, onBranchChanged?: (workspaceId: string, oldBranch: string | null, newBranch: string | null) => void, getDaemonTcpPort?: () => number | null, getDaemonTcpHost?: () => string | null, resolveScriptHealth?: (hostname: string) => ScriptHealthState | null, workspaceGitService?: WorkspaceGitService, github?: GitHubService, pushNotificationSender?: PushNotificationSender, providerSnapshotManager?: ProviderSnapshotManager, daemonRuntimeConfig?: {
         listen: string | null;
+        worktreesRoot?: string;
         relay: {
             enabled: boolean;
             endpoint: string;
@@ -100,7 +103,7 @@ export declare class VoiceAssistantWebSocketServer {
             useTls: boolean;
             publicUseTls: boolean;
         };
-    });
+    }, serviceProxyPublicBaseUrl?: string | null);
     private assignOptionalServices;
     private createWebSocketServer;
     private startRuntimeMetricsInterval;

package/dist/server/server/websocket-server.js

@@ -202,7 +202,7 @@ function requireWebSocketServices(params) {
  * WebSocket server that only accepts sockets + parses/forwards messages to the session layer.
  */
 export class VoiceAssistantWebSocketServer {
-    constructor(server, logger, serverId, agentManager, agentStorage, downloadTokenStore, paseoHome, daemonConfigStore, mcpBaseUrl, wsConfig, auth, speech, terminalManager, dictation, daemonVersion, onLifecycleIntent, projectRegistry, workspaceRegistry, chatService, loopService, scheduleService, checkoutDiffManager, scriptRouteStore, scriptRuntimeStore, onBranchChanged, getDaemonTcpPort, getDaemonTcpHost, resolveScriptHealth, workspaceGitService, github, pushNotificationSender, providerSnapshotManager, daemonRuntimeConfig) {
+    constructor(server, logger, serverId, agentManager, agentStorage, downloadTokenStore, paseoHome, daemonConfigStore, mcpBaseUrl, wsConfig, auth, speech, terminalManager, dictation, daemonVersion, onLifecycleIntent, projectRegistry, workspaceRegistry, chatService, loopService, scheduleService, checkoutDiffManager, serviceProxy, scriptRuntimeStore, onBranchChanged, getDaemonTcpPort, getDaemonTcpHost, resolveScriptHealth, workspaceGitService, github, pushNotificationSender, providerSnapshotManager, daemonRuntimeConfig, serviceProxyPublicBaseUrl) {
         this.pendingConnections = new Map();
         this.sessions = new Map();
         this.externalSessionsByKey = new Map();
@@ -238,6 +238,7 @@ export class VoiceAssistantWebSocketServer {
         this.workspaceGitService = workspaceGitService ?? createFallbackWorkspaceGitService();
         this.downloadTokenStore = downloadTokenStore;
         this.paseoHome = paseoHome;
+        this.worktreesRoot = daemonRuntimeConfig?.worktreesRoot;
         this.daemonConfigStore = daemonConfigStore;
         this.mcpBaseUrl = mcpBaseUrl;
         this.assignOptionalServices({
@@ -245,11 +246,12 @@ export class VoiceAssistantWebSocketServer {
             terminalManager,
             dictation,
             onLifecycleIntent,
-            scriptRouteStore,
+            serviceProxy,
             scriptRuntimeStore,
             onBranchChanged,
             getDaemonTcpPort,
             getDaemonTcpHost,
+            serviceProxyPublicBaseUrl,
             resolveScriptHealth,
         });
         if (!providerSnapshotManager) {
@@ -286,11 +288,12 @@ export class VoiceAssistantWebSocketServer {
         this.terminalManager = params.terminalManager ?? null;
         this.dictation = params.dictation ?? null;
         this.onLifecycleIntent = params.onLifecycleIntent ?? null;
-        this.scriptRouteStore = params.scriptRouteStore ?? null;
+        this.serviceProxy = params.serviceProxy ?? null;
         this.scriptRuntimeStore = params.scriptRuntimeStore ?? null;
         this.onBranchChanged = params.onBranchChanged ?? null;
         this.getDaemonTcpPort = params.getDaemonTcpPort ?? null;
         this.getDaemonTcpHost = params.getDaemonTcpHost ?? null;
+        this.serviceProxyPublicBaseUrl = params.serviceProxyPublicBaseUrl ?? null;
         this.resolveScriptHealth = params.resolveScriptHealth ?? null;
     }
     createWebSocketServer(server, wsConfig, auth) {
@@ -550,6 +553,7 @@ export class VoiceAssistantWebSocketServer {
             downloadTokenStore: this.downloadTokenStore,
             pushTokenStore: this.pushTokenStore,
             paseoHome: this.paseoHome,
+            worktreesRoot: this.worktreesRoot,
             agentManager: this.agentManager,
             agentStorage: this.agentStorage,
             projectRegistry: this.projectRegistry,
@@ -567,12 +571,13 @@ export class VoiceAssistantWebSocketServer {
             tts: () => this.speech?.resolveTts() ?? null,
             terminalManager: this.terminalManager,
             providerSnapshotManager: this.providerSnapshotManager,
-            scriptRouteStore: this.scriptRouteStore ?? undefined,
+            serviceProxy: this.serviceProxy ?? undefined,
             scriptRuntimeStore: this.scriptRuntimeStore ?? undefined,
             workspaceSetupSnapshots: this.workspaceSetupSnapshots,
             onBranchChanged: this.onBranchChanged ?? undefined,
             getDaemonTcpPort: this.getDaemonTcpPort ?? undefined,
             getDaemonTcpHost: this.getDaemonTcpHost ?? undefined,
+            serviceProxyPublicBaseUrl: this.serviceProxyPublicBaseUrl,
             resolveScriptHealth: this.resolveScriptHealth ?? undefined,
             voice: {
                 turnDetection: () => this.speech?.resolveTurnDetection() ?? null,

package/dist/server/server/workspace-directory.js

@@ -1,6 +1,7 @@
 import { homedir } from "node:os";
 import { sep } from "node:path";
 import { deriveAgentStateBucket, getWorkspaceStateBucketPriority, } from "@getpaseo/protocol/agent-state-bucket";
+import { isDelegatedAgent } from "@getpaseo/protocol/agent-labels";
 import { SortablePager } from "./pagination/sortable-pager.js";
 import { normalizeWorkspaceId } from "./workspace-registry-model.js";
 const FETCH_WORKSPACES_SORT_KEYS = [
@@ -99,6 +100,9 @@ export class WorkspaceDirectory {
             if (!this.deps.isProviderVisibleToClient(agent.provider)) {
                 continue;
             }
+            if (isDelegatedAgent(agent)) {
+                continue;
+            }
             const workspaceId = workspaceIdsByDirectory.get(normalizeWorkspaceId(agent.cwd));
             if (workspaceId === undefined) {
                 continue;

package/dist/server/server/workspace-git-service.d.ts

@@ -150,11 +150,13 @@ interface WorkspaceGitServiceDependencies {
 interface WorkspaceGitServiceOptions {
     logger: pino.Logger;
     paseoHome: string;
+    worktreesRoot?: string;
     deps?: Partial<WorkspaceGitServiceDependencies>;
 }
 export declare class WorkspaceGitServiceImpl implements WorkspaceGitService {
     private readonly logger;
     private readonly paseoHome;
+    private readonly worktreesRoot;
     private readonly deps;
     private readonly snapshotUpdatedListeners;
     private readonly workspaceTargets;
@@ -219,6 +221,7 @@ export declare class WorkspaceGitServiceImpl implements WorkspaceGitService {
     private scheduleWorkspaceRefresh;
     private startWorkspaceSubscriptionTimers;
     private updateGitHubPollForTarget;
+    private resolveGitHubPollTarget;
     private stopGitHubPollForTarget;
     private addWorkingTreeWatcher;
     private ensureLinuxRepoTreeWatchers;