@junctionpanel/server 0.1.20 → 0.1.22

package/dist/server/server/session.js

@@ -20,7 +20,7 @@ import { listDirectoryEntries, readExplorerFile, getDownloadableFileInfo, } from
 import { slugify, validateBranchSlug, listJunctionWorktrees, deleteJunctionWorktree, isJunctionOwnedWorktreeCwd, resolveJunctionWorktreeRootForCwd, createInRepoWorktree, 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, getPullRequestStatus, resolveBaseRef, } from '../utils/checkout-git.js';
+import { getCheckoutDiff, getCheckoutStatus, getCheckoutStatusLite, listBranchSuggestions, NotGitRepoError, MergeConflictError, MergeFromBaseConflictError, commitChanges, mergeToBase, mergeFromBase, pushCurrentBranch, createPullRequest, getPullRequestFailureLogs, getPullRequestStatus, mergePullRequest, resolveBaseRef, } from '../utils/checkout-git.js';
 import { getProjectIcon } from '../utils/project-icon.js';
 import { expandTilde } from '../utils/path.js';
 import { searchHomeDirectories, searchWorkspaceEntries, searchGitRepositories, checkIsGitRepo } from '../utils/directory-suggestions.js';
@@ -830,6 +830,12 @@ export class Session {
                 case 'checkout_pr_status_request':
                     await this.handleCheckoutPrStatusRequest(msg);
                     break;
+                case 'checkout_pr_failure_logs_request':
+                    await this.handleCheckoutPrFailureLogsRequest(msg);
+                    break;
+                case 'checkout_pr_merge_request':
+                    await this.handleCheckoutPrMergeRequest(msg);
+                    break;
                 case 'junction_worktree_list_request':
                     await this.handleJunctionWorktreeListRequest(msg);
                     break;
@@ -2090,6 +2096,8 @@ export class Session {
                         aheadBehind: null,
                         aheadOfOrigin: null,
                         behindOfOrigin: null,
+                        hasUpstream: false,
+                        upstreamBranch: null,
                         hasRemote: false,
                         remoteUrl: null,
                         isJunctionOwnedWorktree: false,
@@ -2113,6 +2121,8 @@ export class Session {
                         aheadBehind: status.aheadBehind ?? null,
                         aheadOfOrigin: status.aheadOfOrigin ?? null,
                         behindOfOrigin: status.behindOfOrigin ?? null,
+                        hasUpstream: status.hasUpstream,
+                        upstreamBranch: status.upstreamBranch ?? null,
                         hasRemote: status.hasRemote,
                         remoteUrl: status.remoteUrl,
                         isJunctionOwnedWorktree: true,
@@ -2134,6 +2144,8 @@ export class Session {
                     aheadBehind: status.aheadBehind ?? null,
                     aheadOfOrigin: status.aheadOfOrigin ?? null,
                     behindOfOrigin: status.behindOfOrigin ?? null,
+                    hasUpstream: status.hasUpstream,
+                    upstreamBranch: status.upstreamBranch ?? null,
                     hasRemote: status.hasRemote,
                     remoteUrl: status.remoteUrl,
                     isJunctionOwnedWorktree: false,
@@ -2155,6 +2167,8 @@ export class Session {
                     aheadBehind: null,
                     aheadOfOrigin: null,
                     behindOfOrigin: null,
+                    hasUpstream: false,
+                    upstreamBranch: null,
                     hasRemote: false,
                     remoteUrl: null,
                     isJunctionOwnedWorktree: false,
@@ -2879,6 +2893,62 @@ export class Session {
             });
         }
     }
+    async handleCheckoutPrFailureLogsRequest(msg) {
+        const { cwd, requestId } = msg;
+        try {
+            const result = await getPullRequestFailureLogs(cwd);
+            this.emit({
+                type: 'checkout_pr_failure_logs_response',
+                payload: {
+                    cwd,
+                    logs: result.logs,
+                    githubFeaturesEnabled: result.githubFeaturesEnabled,
+                    error: null,
+                    requestId,
+                },
+            });
+        }
+        catch (error) {
+            this.emit({
+                type: 'checkout_pr_failure_logs_response',
+                payload: {
+                    cwd,
+                    logs: null,
+                    githubFeaturesEnabled: true,
+                    error: this.toCheckoutError(error),
+                    requestId,
+                },
+            });
+        }
+    }
+    async handleCheckoutPrMergeRequest(msg) {
+        const { cwd, requestId } = msg;
+        try {
+            await mergePullRequest(cwd, {
+                method: msg.method ?? 'squash',
+            });
+            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: this.toCheckoutError(error),
+                    requestId,
+                },
+            });
+        }
+    }
     async handleJunctionWorktreeListRequest(msg) {
         const { requestId } = msg;
         const cwd = msg.repoRoot ?? msg.cwd;