@junctionpanel/server 0.1.69 → 0.1.71

package/dist/server/server/session.js

@@ -23,7 +23,7 @@ import { listDirectoryEntries, readExplorerFile, getDownloadableFileInfo, isWork
 import { slugify, validateBranchSlug, listJunctionWorktrees, deleteJunctionWorktree, isJunctionOwnedWorktreeCwd, resolveJunctionWorktreeRootForCwd, createInRepoWorktree, attachInRepoWorktree, restoreInRepoWorktree, } from '../utils/worktree.js';
 import { readJunctionWorktreeMetadata } from '../utils/worktree-metadata.js';
 import { runAsyncWorktreeBootstrap } from './worktree-bootstrap.js';
-import { getCheckoutDiff, getCheckoutStatus, getCheckoutStatusLite, listBranchSuggestions, NotGitRepoError, MergeConflictError, MergeFromBaseConflictError, commitChanges, mergeToBase, mergeFromBase, pushCurrentBranch, createPullRequest, getPullRequestFailureLogs, getPullRequestStatus, searchPullRequests, listGitRemotes, mergePullRequest, resolveMergeToBaseOperationCwd, resolveBaseRefWithSource, } from '../utils/checkout-git.js';
+import { getCheckoutDiff, getCheckoutStatus, getCheckoutStatusLite, listBranchSuggestions, NotGitRepoError, MergeConflictError, MergeFromBaseConflictError, commitChanges, mergeToBase, mergeFromBase, pushCurrentBranch, createPullRequest, getPullRequestFailureLogs, getPullRequestSnapshot, getPullRequestStatus, invalidatePullRequestCache, searchPullRequests, listGitRemotes, mergePullRequest, resolveMergeToBaseOperationCwd, resolveBaseRefWithSource, } from '../utils/checkout-git.js';
 import { getProjectIcon } from '../utils/project-icon.js';
 import { expandTilde } from '../utils/path.js';
 import { searchHomeDirectories, searchWorkspaceEntries, searchWorkspaceEntriesAtGitRef, searchGitRepositories, checkIsGitRepo, } from '../utils/directory-suggestions.js';
@@ -58,6 +58,8 @@ const WORKSPACE_STATUS_WATCH_DEBOUNCE_MS = 250;
 const WORKSPACE_STATUS_GIT_REFRESH_MS = 3000;
 const WORKSPACE_STATUS_PR_ACTIVE_REFRESH_MS = 15000;
 const WORKSPACE_STATUS_PR_PASSIVE_REFRESH_MS = 60000;
+const WORKSPACE_STATUS_PR_ACTIVE_CACHE_MAX_AGE_MS = WORKSPACE_STATUS_PR_ACTIVE_REFRESH_MS;
+const WORKSPACE_STATUS_PR_PASSIVE_CACHE_MAX_AGE_MS = 3 * 60000;
 const PROVIDER_CHILD_THREADS_REFRESH_DEBOUNCE_MS = 250;
 const PROVIDER_CHILD_THREADS_PERSISTED_LIST_INITIAL_LIMIT = 500;
 const PROVIDER_CHILD_THREADS_PERSISTED_LIST_MAX_LIMIT = 50000;
@@ -3274,11 +3276,21 @@ export class Session {
             };
         }
     }
-    async resolveWorkspacePullRequestSnapshot(cwd, remoteName) {
+    async resolveWorkspacePullRequestSnapshot(cwd, remoteName, options) {
         try {
-            const prStatus = await getPullRequestStatus(expandTilde(cwd), {
-                ...(remoteName ? { remoteName } : {}),
-            });
+            const detailLevel = options?.detailLevel ?? 'detail';
+            const prStatus = detailLevel === 'detail'
+                ? await getPullRequestStatus(expandTilde(cwd), {
+                    remoteName,
+                    maxAgeMs: options?.maxAgeMs,
+                    forceRefresh: options?.forceRefresh,
+                })
+                : await getPullRequestSnapshot(expandTilde(cwd), {
+                    remoteName,
+                    detailLevel,
+                    maxAgeMs: options?.maxAgeMs,
+                    forceRefresh: options?.forceRefresh,
+                });
             return {
                 pullRequest: prStatus.status,
                 pullRequestError: null,
@@ -3743,6 +3755,9 @@ export class Session {
     scheduleWorkspaceStatusTargetRefresh(target, options) {
         const includePr = options?.includePr ?? false;
         const shouldDebounce = options?.debounce ?? true;
+        if (includePr && options?.bumpPrGeneration) {
+            target.prRefreshGeneration += 1;
+        }
         if (!shouldDebounce) {
             void this.refreshWorkspaceStatusTarget(target, { includePr });
             return;
@@ -3795,7 +3810,13 @@ export class Session {
             githubFeaturesEnabled = false;
         }
         else if (includePr) {
-            const prSnapshot = await this.resolveWorkspacePullRequestSnapshot(target.cwd, target.remoteName);
+            const prSnapshot = await this.resolveWorkspacePullRequestSnapshot(target.cwd, target.remoteName, {
+                detailLevel: fullGit ? 'detail' : 'summary',
+                maxAgeMs: fullGit
+                    ? WORKSPACE_STATUS_PR_ACTIVE_CACHE_MAX_AGE_MS
+                    : WORKSPACE_STATUS_PR_PASSIVE_CACHE_MAX_AGE_MS,
+                forceRefresh: gitIdentityChanged,
+            });
             pullRequest = prSnapshot.pullRequest;
             pullRequestError = prSnapshot.pullRequestError;
             githubFeaturesEnabled = prSnapshot.githubFeaturesEnabled;
@@ -3829,6 +3850,7 @@ export class Session {
                 const previousHasLoadedPullRequest = target.hasLoadedPullRequest;
                 const includePr = target.refreshIncludesPr
                     || (hasExplicitIncludePr ? Boolean(options?.includePr) : !target.latestPayload);
+                const prRefreshGeneration = includePr ? target.prRefreshGeneration : null;
                 target.refreshQueued = false;
                 target.refreshIncludesPr = false;
                 const snapshot = await this.computeWorkspaceStatusSnapshot(target, {
@@ -3838,6 +3860,15 @@ export class Session {
                 if (!this.hasWorkspaceStatusTarget(target)) {
                     return;
                 }
+                const newerPrRefreshQueued = includePr
+                    && (prRefreshGeneration !== target.prRefreshGeneration
+                        || target.refreshQueued
+                        || target.refreshIncludesPr);
+                if (newerPrRefreshQueued) {
+                    target.refreshQueued = true;
+                    target.refreshIncludesPr = true;
+                    continue;
+                }
                 const activeSubscribersPresent = this.workspaceStatusHasActiveSubscribers(target);
                 const gitIdentityChanged = this.workspaceStatusGitIdentityChanged(target.latestPayload, snapshot.git);
                 const needsPrReplay = (!includePr && target.refreshIncludesPr)
@@ -3890,6 +3921,7 @@ export class Session {
             refreshPromise: null,
             refreshQueued: false,
             refreshIncludesPr: false,
+            prRefreshGeneration: 0,
             latestPayload: null,
             latestFingerprint: null,
             hasLoadedPullRequest: false,
@@ -3946,7 +3978,7 @@ export class Session {
         this.updateWorkspaceStatusGitPolling(target);
         this.updateWorkspaceStatusPrPolling(target);
         const fullGit = this.workspaceStatusHasActiveSubscribers(target);
-        const includePr = fullGit;
+        const includePr = fullGit || !target.latestPayload;
         const previousFingerprint = target.latestFingerprint;
         const hadExistingSubscribers = target.subscriptions.size > 1;
         const snapshot = target.latestPayload
@@ -3990,6 +4022,7 @@ export class Session {
             }
             this.scheduleWorkspaceStatusTargetRefresh(target, {
                 includePr: options?.includePr,
+                bumpPrGeneration: options?.bumpPrGeneration,
                 debounce: false,
             });
         }
@@ -4680,13 +4713,18 @@ export class Session {
         }
     }
     async handleCheckoutPrStatusRequest(msg) {
-        const { cwd, requestId } = msg;
+        const cwd = expandTilde(msg.cwd);
+        const { requestId } = msg;
         try {
-            const prStatus = await getPullRequestStatus(cwd, { remoteName: msg.remoteName });
+            const prStatus = await getPullRequestStatus(cwd, {
+                remoteName: msg.remoteName,
+                maxAgeMs: WORKSPACE_STATUS_PR_ACTIVE_CACHE_MAX_AGE_MS,
+                forceRefresh: true,
+            });
             this.emit({
                 type: 'checkout_pr_status_response',
                 payload: {
-                    cwd,
+                    cwd: msg.cwd,
                     status: prStatus.status,
                     githubFeaturesEnabled: prStatus.githubFeaturesEnabled,
                     error: null,
@@ -4698,7 +4736,7 @@ export class Session {
             this.emit({
                 type: 'checkout_pr_status_response',
                 payload: {
-                    cwd,
+                    cwd: msg.cwd,
                     status: null,
                     githubFeaturesEnabled: true,
                     error: this.toCheckoutError(error),
@@ -4741,13 +4779,18 @@ export class Session {
         }
     }
     async handleCheckoutPrFailureLogsRequest(msg) {
-        const { cwd, requestId } = msg;
+        const cwd = expandTilde(msg.cwd);
+        const { requestId } = msg;
         try {
-            const result = await this.runWorkspaceGitRead(cwd, () => getPullRequestFailureLogs(cwd, { remoteName: msg.remoteName }));
+            const result = await this.runWorkspaceGitRead(cwd, () => getPullRequestFailureLogs(cwd, {
+                remoteName: msg.remoteName,
+                maxAgeMs: WORKSPACE_STATUS_PR_ACTIVE_CACHE_MAX_AGE_MS,
+                forceRefresh: true,
+            }));
             this.emit({
                 type: 'checkout_pr_failure_logs_response',
                 payload: {
-                    cwd,
+                    cwd: msg.cwd,
                     logs: result.logs,
                     githubFeaturesEnabled: result.githubFeaturesEnabled,
                     error: null,
@@ -4759,7 +4802,7 @@ export class Session {
             this.emit({
                 type: 'checkout_pr_failure_logs_response',
                 payload: {
-                    cwd,
+                    cwd: msg.cwd,
                     logs: null,
                     githubFeaturesEnabled: true,
                     error: this.toCheckoutError(error),
@@ -4769,17 +4812,24 @@ export class Session {
         }
     }
     async handleCheckoutPrMergeRequest(msg) {
-        const { cwd, requestId } = msg;
+        const cwd = expandTilde(msg.cwd);
+        const { requestId } = msg;
         try {
             await mergePullRequest(cwd, {
                 method: msg.method ?? 'squash',
                 remoteName: msg.remoteName,
+                maxAgeMs: WORKSPACE_STATUS_PR_ACTIVE_CACHE_MAX_AGE_MS,
+                forceRefresh: true,
+            });
+            invalidatePullRequestCache(cwd, { remoteName: msg.remoteName });
+            this.scheduleWorkspaceStatusRefreshForCwd(cwd, {
+                includePr: true,
+                bumpPrGeneration: true,
             });
-            this.scheduleWorkspaceStatusRefreshForCwd(cwd, { includePr: true });
             this.emit({
                 type: 'checkout_pr_merge_response',
                 payload: {
-                    cwd,
+                    cwd: msg.cwd,
                     success: true,
                     error: null,
                     requestId,
@@ -4790,7 +4840,7 @@ export class Session {
             this.emit({
                 type: 'checkout_pr_merge_response',
                 payload: {
-                    cwd,
+                    cwd: msg.cwd,
                     success: false,
                     error: this.toCheckoutError(error),
                     requestId,