@getpaseo/server 0.1.88 → 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;

package/dist/server/server/session.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,
@@ -374,6 +375,7 @@ export class Session {
         });
         this.createAgentLifecycleDispatch = new CreateAgentLifecycleDispatch({
             paseoHome: this.paseoHome,
+            worktreesRoot: this.worktreesRoot,
             agentManager: this.agentManager,
             agentStorage: this.agentStorage,
             github: this.github,
@@ -398,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();
@@ -2094,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(),
@@ -2428,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, {
@@ -3873,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")] : []),
@@ -4293,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,
@@ -4730,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,
                 })
@@ -5399,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,
         });
@@ -5443,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);
@@ -5459,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,
@@ -5554,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,
@@ -5563,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),
@@ -5574,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);
             },

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;

package/dist/server/server/workspace-git-service.js

@@ -71,6 +71,7 @@ export class WorkspaceGitServiceImpl {
         this.checkoutDiffCache = new LRUCache({ max: WORKSPACE_GIT_CHECKOUT_DIFF_CACHE_MAX });
         this.logger = options.logger.child({ module: "workspace-git-service" });
         this.paseoHome = options.paseoHome;
+        this.worktreesRoot = options.worktreesRoot;
         this.deps = resolveWorkspaceGitServiceDeps(options.deps);
     }
     registerWorkspace(params, listener) {
@@ -112,6 +113,7 @@ export class WorkspaceGitServiceImpl {
         try {
             const status = await this.deps.getCheckoutStatus(normalizedCwd, {
                 paseoHome: this.paseoHome,
+                worktreesRoot: this.worktreesRoot,
                 logger: this.logger,
             });
             if (!status.isGit) {
@@ -152,7 +154,10 @@ export class WorkspaceGitServiceImpl {
         const normalizedCwd = normalizeWorkspaceId(cwd);
         const normalizedOptions = this.normalizeCheckoutDiffOptions(options);
         const key = this.buildCheckoutDiffCacheKey(normalizedCwd, normalizedOptions);
-        return this.readAuxiliaryCache(this.checkoutDiffCache, key, readOptions, () => this.deps.getCheckoutDiff(normalizedCwd, normalizedOptions, { paseoHome: this.paseoHome }));
+        return this.readAuxiliaryCache(this.checkoutDiffCache, key, readOptions, () => this.deps.getCheckoutDiff(normalizedCwd, normalizedOptions, {
+            paseoHome: this.paseoHome,
+            worktreesRoot: this.worktreesRoot,
+        }));
     }
     normalizeCheckoutDiffOptions(options) {
         return {
@@ -221,6 +226,7 @@ export class WorkspaceGitServiceImpl {
         return this.readAuxiliaryCache(this.worktreeListCache, key, options, () => this.deps.listPaseoWorktrees({
             cwd: repoRoot,
             paseoHome: this.paseoHome,
+            worktreesRoot: this.worktreesRoot,
         }));
     }
     async resolveRepoRoot(cwd, options) {
@@ -380,7 +386,7 @@ export class WorkspaceGitServiceImpl {
             debounceTimer: null,
             selfHealTimer: null,
             githubPollSubscription: null,
-            githubPollHeadRef: null,
+            githubPollKey: null,
             refreshState: { status: "idle" },
             latestGit: null,
             latestGitLoadedAtMs: null,
@@ -676,21 +682,26 @@ export class WorkspaceGitServiceImpl {
             this.stopGitHubPollForTarget(target);
             return;
         }
-        const headRef = git.currentBranch;
-        const hasGitHubRemote = target.cachedGitHubRemote?.remoteUrl === git.remoteUrl &&
+        const pollTarget = this.resolveGitHubPollTarget(target);
+        const remoteUrl = git.remoteUrl;
+        const hasGitHubRemote = target.cachedGitHubRemote?.remoteUrl === remoteUrl &&
             target.cachedGitHubRemote.identity !== null;
-        if (!headRef || !hasGitHubRemote) {
+        if (!pollTarget || remoteUrl === null || !hasGitHubRemote) {
             this.stopGitHubPollForTarget(target);
             return;
         }
-        if (target.githubPollHeadRef === headRef && target.githubPollSubscription) {
+        const pollKey = buildWorkspaceGitHubPollKey(remoteUrl, pollTarget);
+        if (target.githubPollKey === pollKey && target.githubPollSubscription) {
             return;
         }
         this.stopGitHubPollForTarget(target);
-        target.githubPollHeadRef = headRef;
+        target.githubPollKey = pollKey;
         target.githubPollSubscription = this.deps.github.retainCurrentPullRequestStatusPoll({
             cwd: target.cwd,
-            headRef,
+            headRef: pollTarget.headRef,
+            ...(pollTarget.headRepositoryOwner
+                ? { headRepositoryOwner: pollTarget.headRepositoryOwner }
+                : {}),
             onStatus: (status) => {
                 if (!this.isActiveObservedWorkspaceTarget(target)) {
                     return;
@@ -700,14 +711,33 @@ export class WorkspaceGitServiceImpl {
                 });
             },
             onError: (error) => {
-                this.logger.warn({ err: error, cwd: target.cwd, headRef, reason: "self-heal-github" }, "Failed to run GitHub self-heal refresh");
+                this.logger.warn({
+                    err: error,
+                    cwd: target.cwd,
+                    headRef: pollTarget.headRef,
+                    headRepositoryOwner: pollTarget.headRepositoryOwner,
+                    reason: "self-heal-github",
+                }, "Failed to run GitHub self-heal refresh");
             },
         });
     }
+    resolveGitHubPollTarget(target) {
+        const git = target.latestGit;
+        if (!git?.currentBranch) {
+            return null;
+        }
+        const lookupTarget = target.latestFacts?.isGit && target.latestFacts.currentBranch === git.currentBranch
+            ? target.latestFacts.pullRequestLookupTarget
+            : null;
+        if (lookupTarget) {
+            return lookupTarget;
+        }
+        return { headRef: git.currentBranch };
+    }
     stopGitHubPollForTarget(target) {
         target.githubPollSubscription?.unsubscribe();
         target.githubPollSubscription = null;
-        target.githubPollHeadRef = null;
+        target.githubPollKey = null;
     }
     addWorkingTreeWatcher(target, watchPath, shouldTryRecursive) {
         if (target.watchedPaths.has(watchPath)) {
@@ -998,7 +1028,11 @@ export class WorkspaceGitServiceImpl {
         target.lastShellOutAtMs = now.getTime();
         const cwd = target.cwd;
         const previousGitHubPollKey = this.getGitHubPollKey(target);
-        const baseContext = { paseoHome: this.paseoHome, logger: this.logger };
+        const baseContext = {
+            paseoHome: this.paseoHome,
+            worktreesRoot: this.worktreesRoot,
+            logger: this.logger,
+        };
         const facts = await this.loadCheckoutFacts(target, {
             ...baseContext,
             allowRecent: !request.force,
@@ -1075,7 +1109,11 @@ export class WorkspaceGitServiceImpl {
         if (!githubRemote || githubRemote.remoteUrl !== git.remoteUrl || !githubRemote.identity) {
             return null;
         }
-        return JSON.stringify([git.remoteUrl, git.currentBranch]);
+        const pollTarget = this.resolveGitHubPollTarget(target);
+        if (!pollTarget) {
+            return null;
+        }
+        return buildWorkspaceGitHubPollKey(git.remoteUrl, pollTarget);
     }
     rememberGitHubSnapshot(target, github, options) {
         if (target.closed || this.workspaceTargets.get(target.cwd) !== target) {
@@ -1317,6 +1355,9 @@ function buildGitHubSnapshotFromStatus(status) {
         error: null,
     };
 }
+function buildWorkspaceGitHubPollKey(remoteUrl, target) {
+    return JSON.stringify([remoteUrl, target.headRef, target.headRepositoryOwner ?? null]);
+}
 async function runGitFetch(cwd) {
     await runGitCommand(["fetch", "origin", "--prune"], {
         cwd,

package/dist/server/server/workspace-registry.d.ts

@@ -39,6 +39,7 @@ declare const PersistedWorkspaceRecordSchema: z.ZodObject<{
     updatedAt: z.ZodString;
     archivedAt: z.ZodNullable<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
+    workspaceId: string;
     cwd: string;
     createdAt: string;
     updatedAt: string;
@@ -46,8 +47,8 @@ declare const PersistedWorkspaceRecordSchema: z.ZodObject<{
     kind: "worktree" | "local_checkout" | "directory";
     projectId: string;
     displayName: string;
-    workspaceId: string;
 }, {
+    workspaceId: string;
     cwd: string;
     createdAt: string;
     updatedAt: string;
@@ -55,7 +56,6 @@ declare const PersistedWorkspaceRecordSchema: z.ZodObject<{
     kind: "worktree" | "local_checkout" | "directory";
     projectId: string;
     displayName: string;
-    workspaceId: string;
 }>;
 export type PersistedProjectRecord = z.infer<typeof PersistedProjectRecordSchema>;
 export type PersistedWorkspaceRecord = z.infer<typeof PersistedWorkspaceRecordSchema>;

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

@@ -8,6 +8,7 @@ export interface BuildWorkspaceServiceEnvOptions {
     branchName: string | null;
     daemonPort: number | null | undefined;
     daemonListenHost: string | null | undefined;
+    serviceProxyPublicBaseUrl?: string | null;
     peers: readonly WorkspaceServicePeer[];
 }
 export declare function normalizeServiceEnvName(scriptName: string): string;

package/dist/server/server/workspace-service-env.js

@@ -1,4 +1,4 @@
-import { buildScriptHostname } from "../utils/script-hostname.js";
+import { projectServiceProxyUrls } from "./service-proxy.js";
 export function normalizeServiceEnvName(scriptName) {
     return scriptName
         .toUpperCase()
@@ -16,24 +16,28 @@ export function buildWorkspaceServiceEnv(options) {
         HOST: resolveServiceBindHost(options.daemonListenHost),
         PASEO_PORT: String(selfPeer.port),
     };
-    if (options.daemonPort !== null && options.daemonPort !== undefined) {
-        env.PASEO_URL = buildServiceProxyUrl({
-            projectSlug: options.projectSlug,
-            branchName: options.branchName,
-            scriptName: options.scriptName,
-            daemonPort: options.daemonPort,
-        });
+    const selfProxyUrl = buildServiceProxyUrl({
+        projectSlug: options.projectSlug,
+        branchName: options.branchName,
+        scriptName: options.scriptName,
+        daemonPort: options.daemonPort,
+        serviceProxyPublicBaseUrl: options.serviceProxyPublicBaseUrl,
+    });
+    if (selfProxyUrl) {
+        env.PASEO_URL = selfProxyUrl;
     }
     for (const peer of options.peers) {
         const envName = normalizeServiceEnvName(peer.scriptName);
         env[`PASEO_SERVICE_${envName}_PORT`] = String(peer.port);
-        if (options.daemonPort !== null && options.daemonPort !== undefined) {
-            env[`PASEO_SERVICE_${envName}_URL`] = buildServiceProxyUrl({
-                projectSlug: options.projectSlug,
-                branchName: options.branchName,
-                scriptName: peer.scriptName,
-                daemonPort: options.daemonPort,
-            });
+        const peerProxyUrl = buildServiceProxyUrl({
+            projectSlug: options.projectSlug,
+            branchName: options.branchName,
+            scriptName: peer.scriptName,
+            daemonPort: options.daemonPort,
+            serviceProxyPublicBaseUrl: options.serviceProxyPublicBaseUrl,
+        });
+        if (peerProxyUrl) {
+            env[`PASEO_SERVICE_${envName}_URL`] = peerProxyUrl;
         }
     }
     return env;
@@ -42,12 +46,13 @@ export function resolveServiceBindHost(daemonListenHost) {
     return isLoopbackListenHost(daemonListenHost) ? "127.0.0.1" : "0.0.0.0";
 }
 function buildServiceProxyUrl(options) {
-    const hostname = buildScriptHostname({
+    return projectServiceProxyUrls({
         projectSlug: options.projectSlug,
         branchName: options.branchName,
         scriptName: options.scriptName,
-    });
-    return `http://${hostname}:${options.daemonPort}`;
+        daemonPort: options.daemonPort,
+        publicBaseUrl: options.serviceProxyPublicBaseUrl,
+    }).proxyUrl;
 }
 function isLoopbackListenHost(host) {
     if (!host) {

package/dist/server/server/worktree/commands.d.ts

@@ -13,10 +13,12 @@ export declare function listPaseoWorktreesCommand(dependencies: ListPaseoWorktre
 type CreatePaseoWorktreeWorkflow<Result extends CreatePaseoWorktreeResult> = (input: CreatePaseoWorktreeInput) => Promise<Result>;
 export interface CreatePaseoWorktreeCommandDependencies<Result extends CreatePaseoWorktreeResult = CreatePaseoWorktreeResult> {
     paseoHome?: string;
+    worktreesRoot?: string;
     createPaseoWorktreeWorkflow?: CreatePaseoWorktreeWorkflow<Result>;
 }
 export type CreatePaseoWorktreeCommandInput = Omit<CreatePaseoWorktreeInput, "paseoHome" | "runSetup"> & {
     paseoHome?: string;
+    worktreesRoot?: string;
 };
 export type CreatePaseoWorktreeCommandResult<Result extends CreatePaseoWorktreeResult> = {
     ok: true;