npm - @junctionpanel/server - Versions diffs - 0.1.21 → 0.1.23 - Mend

@junctionpanel/server 0.1.21 → 0.1.23

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/dist/server/client/daemon-client.d.ts +7 -1
package/dist/server/client/daemon-client.d.ts.map +1 -1
package/dist/server/client/daemon-client.js +23 -0
package/dist/server/client/daemon-client.js.map +1 -1
package/dist/server/server/agent/agent-manager.d.ts.map +1 -1
package/dist/server/server/agent/agent-manager.js +77 -0
package/dist/server/server/agent/agent-manager.js.map +1 -1
package/dist/server/server/session.d.ts +2 -0
package/dist/server/server/session.d.ts.map +1 -1
package/dist/server/server/session.js +71 -1
package/dist/server/server/session.js.map +1 -1
package/dist/server/shared/messages.d.ts +1008 -0
package/dist/server/shared/messages.d.ts.map +1 -1
package/dist/server/shared/messages.js +45 -0
package/dist/server/shared/messages.js.map +1 -1
package/dist/server/utils/checkout-git.d.ts +18 -0
package/dist/server/utils/checkout-git.d.ts.map +1 -1
package/dist/server/utils/checkout-git.js +533 -36
package/dist/server/utils/checkout-git.js.map +1 -1
package/package.json +2 -2

package/dist/server/shared/messages.d.ts CHANGED Viewed

@@ -1487,6 +1487,35 @@ export declare const CheckoutPrStatusRequestSchema: z.ZodObject<{
     type: "checkout_pr_status_request";
     requestId: string;
 }>;
+export declare const CheckoutPrFailureLogsRequestSchema: z.ZodObject<{
+    type: z.ZodLiteral<"checkout_pr_failure_logs_request">;
+    cwd: z.ZodString;
+    requestId: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    cwd: string;
+    type: "checkout_pr_failure_logs_request";
+    requestId: string;
+}, {
+    cwd: string;
+    type: "checkout_pr_failure_logs_request";
+    requestId: string;
+}>;
+export declare const CheckoutPrMergeRequestSchema: z.ZodObject<{
+    type: z.ZodLiteral<"checkout_pr_merge_request">;
+    cwd: z.ZodString;
+    method: z.ZodOptional<z.ZodEnum<["squash"]>>;
+    requestId: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    cwd: string;
+    type: "checkout_pr_merge_request";
+    requestId: string;
+    method?: "squash" | undefined;
+}, {
+    cwd: string;
+    type: "checkout_pr_merge_request";
+    requestId: string;
+    method?: "squash" | undefined;
+}>;
 export declare const ValidateBranchRequestSchema: z.ZodObject<{
     type: z.ZodLiteral<"validate_branch_request">;
     cwd: z.ZodString;
@@ -2976,6 +3005,33 @@ export declare const SessionInboundMessageSchema: z.ZodDiscriminatedUnion<"type"
     cwd: string;
     type: "checkout_pr_status_request";
     requestId: string;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<"checkout_pr_failure_logs_request">;
+    cwd: z.ZodString;
+    requestId: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    cwd: string;
+    type: "checkout_pr_failure_logs_request";
+    requestId: string;
+}, {
+    cwd: string;
+    type: "checkout_pr_failure_logs_request";
+    requestId: string;
+}>, z.ZodObject<{
+    type: z.ZodLiteral<"checkout_pr_merge_request">;
+    cwd: z.ZodString;
+    method: z.ZodOptional<z.ZodEnum<["squash"]>>;
+    requestId: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    cwd: string;
+    type: "checkout_pr_merge_request";
+    requestId: string;
+    method?: "squash" | undefined;
+}, {
+    cwd: string;
+    type: "checkout_pr_merge_request";
+    requestId: string;
+    method?: "squash" | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"validate_branch_request">;
     cwd: z.ZodString;
@@ -7560,6 +7616,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         aheadBehind: z.ZodNull;
         aheadOfOrigin: z.ZodNull;
         behindOfOrigin: z.ZodNull;
+        hasUpstream: z.ZodLiteral<false>;
+        upstreamBranch: z.ZodNull;
         hasRemote: z.ZodBoolean;
         remoteUrl: z.ZodNull;
     }, "strip", z.ZodTypeAny, {
@@ -7579,6 +7637,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         aheadBehind: null;
         aheadOfOrigin: null;
         behindOfOrigin: null;
+        hasUpstream: false;
+        upstreamBranch: null;
         hasRemote: boolean;
     }, {
         error: {
@@ -7597,6 +7657,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         aheadBehind: null;
         aheadOfOrigin: null;
         behindOfOrigin: null;
+        hasUpstream: false;
+        upstreamBranch: null;
         hasRemote: boolean;
     }>, z.ZodObject<{
         cwd: z.ZodString;
@@ -7630,6 +7692,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         }>>;
         aheadOfOrigin: z.ZodNullable<z.ZodNumber>;
         behindOfOrigin: z.ZodNullable<z.ZodNumber>;
+        hasUpstream: z.ZodBoolean;
+        upstreamBranch: z.ZodNullable<z.ZodString>;
         hasRemote: z.ZodBoolean;
         remoteUrl: z.ZodNullable<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
@@ -7652,6 +7716,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     }, {
         error: {
@@ -7673,6 +7739,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     }>, z.ZodObject<{
         cwd: z.ZodString;
@@ -7707,6 +7775,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         }>>;
         aheadOfOrigin: z.ZodNullable<z.ZodNumber>;
         behindOfOrigin: z.ZodNullable<z.ZodNumber>;
+        hasUpstream: z.ZodBoolean;
+        upstreamBranch: z.ZodNullable<z.ZodString>;
         hasRemote: z.ZodBoolean;
         remoteUrl: z.ZodNullable<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
@@ -7730,6 +7800,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     }, {
         error: {
@@ -7752,6 +7824,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     }>]>;
 }, "strip", z.ZodTypeAny, {
@@ -7773,6 +7847,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         aheadBehind: null;
         aheadOfOrigin: null;
         behindOfOrigin: null;
+        hasUpstream: false;
+        upstreamBranch: null;
         hasRemote: boolean;
     } | {
         error: {
@@ -7794,6 +7870,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     } | {
         error: {
@@ -7816,6 +7894,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     };
 }, {
@@ -7837,6 +7917,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         aheadBehind: null;
         aheadOfOrigin: null;
         behindOfOrigin: null;
+        hasUpstream: false;
+        upstreamBranch: null;
         hasRemote: boolean;
     } | {
         error: {
@@ -7858,6 +7940,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     } | {
         error: {
@@ -7880,6 +7964,8 @@ export declare const CheckoutStatusResponseSchema: z.ZodObject<{
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     };
 }>;
@@ -8677,26 +8763,41 @@ export declare const CheckoutPrStatusResponseSchema: z.ZodObject<{
     payload: z.ZodObject<{
         cwd: z.ZodString;
         status: z.ZodNullable<z.ZodObject<{
+            number: z.ZodNumber;
             url: z.ZodString;
             title: z.ZodString;
             state: z.ZodString;
             baseRefName: z.ZodString;
             headRefName: z.ZodString;
             isMerged: z.ZodBoolean;
+            checksState: z.ZodEnum<["pending", "failing", "passing"]>;
+            requiredChecksPassed: z.ZodBoolean;
+            canMerge: z.ZodBoolean;
+            hasConflicts: z.ZodBoolean;
         }, "strip", z.ZodTypeAny, {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
         }, {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
         }>>;
         githubFeaturesEnabled: z.ZodBoolean;
         error: z.ZodNullable<z.ZodObject<{
@@ -8717,12 +8818,17 @@ export declare const CheckoutPrStatusResponseSchema: z.ZodObject<{
         } | null;
         cwd: string;
         status: {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
         } | null;
         requestId: string;
         githubFeaturesEnabled: boolean;
@@ -8733,12 +8839,17 @@ export declare const CheckoutPrStatusResponseSchema: z.ZodObject<{
         } | null;
         cwd: string;
         status: {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
         } | null;
         requestId: string;
         githubFeaturesEnabled: boolean;
@@ -8752,12 +8863,17 @@ export declare const CheckoutPrStatusResponseSchema: z.ZodObject<{
         } | null;
         cwd: string;
         status: {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
         } | null;
         requestId: string;
         githubFeaturesEnabled: boolean;
@@ -8771,17 +8887,139 @@ export declare const CheckoutPrStatusResponseSchema: z.ZodObject<{
         } | null;
         cwd: string;
         status: {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
         } | null;
         requestId: string;
         githubFeaturesEnabled: boolean;
     };
 }>;
+export declare const CheckoutPrFailureLogsResponseSchema: z.ZodObject<{
+    type: z.ZodLiteral<"checkout_pr_failure_logs_response">;
+    payload: z.ZodObject<{
+        cwd: z.ZodString;
+        logs: z.ZodNullable<z.ZodString>;
+        githubFeaturesEnabled: z.ZodBoolean;
+        error: z.ZodNullable<z.ZodObject<{
+            code: z.ZodEnum<["NOT_GIT_REPO", "NOT_ALLOWED", "MERGE_CONFLICT", "UNKNOWN"]>;
+            message: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        }, {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        }>>;
+        requestId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        githubFeaturesEnabled: boolean;
+        logs: string | null;
+    }, {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        githubFeaturesEnabled: boolean;
+        logs: string | null;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    type: "checkout_pr_failure_logs_response";
+    payload: {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        githubFeaturesEnabled: boolean;
+        logs: string | null;
+    };
+}, {
+    type: "checkout_pr_failure_logs_response";
+    payload: {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        githubFeaturesEnabled: boolean;
+        logs: string | null;
+    };
+}>;
+export declare const CheckoutPrMergeResponseSchema: z.ZodObject<{
+    type: z.ZodLiteral<"checkout_pr_merge_response">;
+    payload: z.ZodObject<{
+        cwd: z.ZodString;
+        success: z.ZodBoolean;
+        error: z.ZodNullable<z.ZodObject<{
+            code: z.ZodEnum<["NOT_GIT_REPO", "NOT_ALLOWED", "MERGE_CONFLICT", "UNKNOWN"]>;
+            message: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        }, {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        }>>;
+        requestId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        success: boolean;
+    }, {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        success: boolean;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    type: "checkout_pr_merge_response";
+    payload: {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        success: boolean;
+    };
+}, {
+    type: "checkout_pr_merge_response";
+    payload: {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        success: boolean;
+    };
+}>;
 export declare const ValidateBranchResponseSchema: z.ZodObject<{
     type: z.ZodLiteral<"validate_branch_response">;
     payload: z.ZodObject<{
@@ -13580,6 +13818,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         aheadBehind: z.ZodNull;
         aheadOfOrigin: z.ZodNull;
         behindOfOrigin: z.ZodNull;
+        hasUpstream: z.ZodLiteral<false>;
+        upstreamBranch: z.ZodNull;
         hasRemote: z.ZodBoolean;
         remoteUrl: z.ZodNull;
     }, "strip", z.ZodTypeAny, {
@@ -13599,6 +13839,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         aheadBehind: null;
         aheadOfOrigin: null;
         behindOfOrigin: null;
+        hasUpstream: false;
+        upstreamBranch: null;
         hasRemote: boolean;
     }, {
         error: {
@@ -13617,6 +13859,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         aheadBehind: null;
         aheadOfOrigin: null;
         behindOfOrigin: null;
+        hasUpstream: false;
+        upstreamBranch: null;
         hasRemote: boolean;
     }>, z.ZodObject<{
         cwd: z.ZodString;
@@ -13650,6 +13894,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         }>>;
         aheadOfOrigin: z.ZodNullable<z.ZodNumber>;
         behindOfOrigin: z.ZodNullable<z.ZodNumber>;
+        hasUpstream: z.ZodBoolean;
+        upstreamBranch: z.ZodNullable<z.ZodString>;
         hasRemote: z.ZodBoolean;
         remoteUrl: z.ZodNullable<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
@@ -13672,6 +13918,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     }, {
         error: {
@@ -13693,6 +13941,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     }>, z.ZodObject<{
         cwd: z.ZodString;
@@ -13727,6 +13977,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         }>>;
         aheadOfOrigin: z.ZodNullable<z.ZodNumber>;
         behindOfOrigin: z.ZodNullable<z.ZodNumber>;
+        hasUpstream: z.ZodBoolean;
+        upstreamBranch: z.ZodNullable<z.ZodString>;
         hasRemote: z.ZodBoolean;
         remoteUrl: z.ZodNullable<z.ZodString>;
     }, "strip", z.ZodTypeAny, {
@@ -13750,6 +14002,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     }, {
         error: {
@@ -13772,6 +14026,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     }>]>;
 }, "strip", z.ZodTypeAny, {
@@ -13793,6 +14049,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         aheadBehind: null;
         aheadOfOrigin: null;
         behindOfOrigin: null;
+        hasUpstream: false;
+        upstreamBranch: null;
         hasRemote: boolean;
     } | {
         error: {
@@ -13814,6 +14072,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     } | {
         error: {
@@ -13836,6 +14096,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     };
 }, {
@@ -13857,6 +14119,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         aheadBehind: null;
         aheadOfOrigin: null;
         behindOfOrigin: null;
+        hasUpstream: false;
+        upstreamBranch: null;
         hasRemote: boolean;
     } | {
         error: {
@@ -13878,6 +14142,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     } | {
         error: {
@@ -13900,6 +14166,8 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         aheadOfOrigin: number | null;
         behindOfOrigin: number | null;
+        hasUpstream: boolean;
+        upstreamBranch: string | null;
         hasRemote: boolean;
     };
 }>, z.ZodObject<{
@@ -14689,26 +14957,41 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
     payload: z.ZodObject<{
         cwd: z.ZodString;
         status: z.ZodNullable<z.ZodObject<{
+            number: z.ZodNumber;
             url: z.ZodString;
             title: z.ZodString;
             state: z.ZodString;
             baseRefName: z.ZodString;
             headRefName: z.ZodString;
             isMerged: z.ZodBoolean;
+            checksState: z.ZodEnum<["pending", "failing", "passing"]>;
+            requiredChecksPassed: z.ZodBoolean;
+            canMerge: z.ZodBoolean;
+            hasConflicts: z.ZodBoolean;
         }, "strip", z.ZodTypeAny, {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
         }, {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
         }>>;
         githubFeaturesEnabled: z.ZodBoolean;
         error: z.ZodNullable<z.ZodObject<{
@@ -14729,12 +15012,17 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         cwd: string;
         status: {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
         } | null;
         requestId: string;
         githubFeaturesEnabled: boolean;
@@ -14745,12 +15033,17 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         cwd: string;
         status: {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
         } | null;
         requestId: string;
         githubFeaturesEnabled: boolean;
@@ -14764,12 +15057,17 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         cwd: string;
         status: {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
         } | null;
         requestId: string;
         githubFeaturesEnabled: boolean;
@@ -14783,15 +15081,135 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<"type
         } | null;
         cwd: string;
         status: {
+            number: number;
             title: string;
             url: string;
             state: string;
             baseRefName: string;
             headRefName: string;
             isMerged: boolean;
+            checksState: "pending" | "failing" | "passing";
+            requiredChecksPassed: boolean;
+            canMerge: boolean;
+            hasConflicts: boolean;
+        } | null;
+        requestId: string;
+        githubFeaturesEnabled: boolean;
+    };
+}>, z.ZodObject<{
+    type: z.ZodLiteral<"checkout_pr_failure_logs_response">;
+    payload: z.ZodObject<{
+        cwd: z.ZodString;
+        logs: z.ZodNullable<z.ZodString>;
+        githubFeaturesEnabled: z.ZodBoolean;
+        error: z.ZodNullable<z.ZodObject<{
+            code: z.ZodEnum<["NOT_GIT_REPO", "NOT_ALLOWED", "MERGE_CONFLICT", "UNKNOWN"]>;
+            message: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        }, {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        }>>;
+        requestId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        githubFeaturesEnabled: boolean;
+        logs: string | null;
+    }, {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
         } | null;
+        cwd: string;
         requestId: string;
         githubFeaturesEnabled: boolean;
+        logs: string | null;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    type: "checkout_pr_failure_logs_response";
+    payload: {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        githubFeaturesEnabled: boolean;
+        logs: string | null;
+    };
+}, {
+    type: "checkout_pr_failure_logs_response";
+    payload: {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        githubFeaturesEnabled: boolean;
+        logs: string | null;
+    };
+}>, z.ZodObject<{
+    type: z.ZodLiteral<"checkout_pr_merge_response">;
+    payload: z.ZodObject<{
+        cwd: z.ZodString;
+        success: z.ZodBoolean;
+        error: z.ZodNullable<z.ZodObject<{
+            code: z.ZodEnum<["NOT_GIT_REPO", "NOT_ALLOWED", "MERGE_CONFLICT", "UNKNOWN"]>;
+            message: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        }, {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        }>>;
+        requestId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        success: boolean;
+    }, {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        success: boolean;
+    }>;
+}, "strip", z.ZodTypeAny, {
+    type: "checkout_pr_merge_response";
+    payload: {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        success: boolean;
+    };
+}, {
+    type: "checkout_pr_merge_response";
+    payload: {
+        error: {
+            code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+            message: string;
+        } | null;
+        cwd: string;
+        requestId: string;
+        success: boolean;
     };
 }>, z.ZodObject<{
     type: z.ZodLiteral<"validate_branch_response">;
@@ -16620,6 +17038,10 @@ export type CheckoutPrCreateRequest = z.infer<typeof CheckoutPrCreateRequestSche
 export type CheckoutPrCreateResponse = z.infer<typeof CheckoutPrCreateResponseSchema>;
 export type CheckoutPrStatusRequest = z.infer<typeof CheckoutPrStatusRequestSchema>;
 export type CheckoutPrStatusResponse = z.infer<typeof CheckoutPrStatusResponseSchema>;
+export type CheckoutPrFailureLogsRequest = z.infer<typeof CheckoutPrFailureLogsRequestSchema>;
+export type CheckoutPrFailureLogsResponse = z.infer<typeof CheckoutPrFailureLogsResponseSchema>;
+export type CheckoutPrMergeRequest = z.infer<typeof CheckoutPrMergeRequestSchema>;
+export type CheckoutPrMergeResponse = z.infer<typeof CheckoutPrMergeResponseSchema>;
 export type ValidateBranchRequest = z.infer<typeof ValidateBranchRequestSchema>;
 export type ValidateBranchResponse = z.infer<typeof ValidateBranchResponseSchema>;
 export type BranchSuggestionsRequest = z.infer<typeof BranchSuggestionsRequestSchema>;
@@ -17731,6 +18153,33 @@ export declare const WSSessionInboundSchema: z.ZodObject<{
         cwd: string;
         type: "checkout_pr_status_request";
         requestId: string;
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"checkout_pr_failure_logs_request">;
+        cwd: z.ZodString;
+        requestId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        cwd: string;
+        type: "checkout_pr_failure_logs_request";
+        requestId: string;
+    }, {
+        cwd: string;
+        type: "checkout_pr_failure_logs_request";
+        requestId: string;
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"checkout_pr_merge_request">;
+        cwd: z.ZodString;
+        method: z.ZodOptional<z.ZodEnum<["squash"]>>;
+        requestId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        cwd: string;
+        type: "checkout_pr_merge_request";
+        requestId: string;
+        method?: "squash" | undefined;
+    }, {
+        cwd: string;
+        type: "checkout_pr_merge_request";
+        requestId: string;
+        method?: "squash" | undefined;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"validate_branch_request">;
         cwd: z.ZodString;
@@ -18444,6 +18893,15 @@ export declare const WSSessionInboundSchema: z.ZodObject<{
         cwd: string;
         type: "checkout_pr_status_request";
         requestId: string;
+    } | {
+        cwd: string;
+        type: "checkout_pr_failure_logs_request";
+        requestId: string;
+    } | {
+        cwd: string;
+        type: "checkout_pr_merge_request";
+        requestId: string;
+        method?: "squash" | undefined;
     } | {
         cwd: string;
         type: "validate_branch_request";
@@ -18838,6 +19296,15 @@ export declare const WSSessionInboundSchema: z.ZodObject<{
         cwd: string;
         type: "checkout_pr_status_request";
         requestId: string;
+    } | {
+        cwd: string;
+        type: "checkout_pr_failure_logs_request";
+        requestId: string;
+    } | {
+        cwd: string;
+        type: "checkout_pr_merge_request";
+        requestId: string;
+        method?: "squash" | undefined;
     } | {
         cwd: string;
         type: "validate_branch_request";
@@ -21986,6 +22453,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             aheadBehind: z.ZodNull;
             aheadOfOrigin: z.ZodNull;
             behindOfOrigin: z.ZodNull;
+            hasUpstream: z.ZodLiteral<false>;
+            upstreamBranch: z.ZodNull;
             hasRemote: z.ZodBoolean;
             remoteUrl: z.ZodNull;
         }, "strip", z.ZodTypeAny, {
@@ -22005,6 +22474,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         }, {
             error: {
@@ -22023,6 +22494,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         }>, z.ZodObject<{
             cwd: z.ZodString;
@@ -22056,6 +22529,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             }>>;
             aheadOfOrigin: z.ZodNullable<z.ZodNumber>;
             behindOfOrigin: z.ZodNullable<z.ZodNumber>;
+            hasUpstream: z.ZodBoolean;
+            upstreamBranch: z.ZodNullable<z.ZodString>;
             hasRemote: z.ZodBoolean;
             remoteUrl: z.ZodNullable<z.ZodString>;
         }, "strip", z.ZodTypeAny, {
@@ -22078,6 +22553,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         }, {
             error: {
@@ -22099,6 +22576,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         }>, z.ZodObject<{
             cwd: z.ZodString;
@@ -22133,6 +22612,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             }>>;
             aheadOfOrigin: z.ZodNullable<z.ZodNumber>;
             behindOfOrigin: z.ZodNullable<z.ZodNumber>;
+            hasUpstream: z.ZodBoolean;
+            upstreamBranch: z.ZodNullable<z.ZodString>;
             hasRemote: z.ZodBoolean;
             remoteUrl: z.ZodNullable<z.ZodString>;
         }, "strip", z.ZodTypeAny, {
@@ -22156,6 +22637,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         }, {
             error: {
@@ -22178,6 +22661,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         }>]>;
     }, "strip", z.ZodTypeAny, {
@@ -22199,6 +22684,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         } | {
             error: {
@@ -22220,6 +22707,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         } | {
             error: {
@@ -22242,6 +22731,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         };
     }, {
@@ -22263,6 +22754,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         } | {
             error: {
@@ -22284,6 +22777,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         } | {
             error: {
@@ -22306,6 +22801,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         };
     }>, z.ZodObject<{
@@ -23095,26 +23592,41 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
         payload: z.ZodObject<{
             cwd: z.ZodString;
             status: z.ZodNullable<z.ZodObject<{
+                number: z.ZodNumber;
                 url: z.ZodString;
                 title: z.ZodString;
                 state: z.ZodString;
                 baseRefName: z.ZodString;
                 headRefName: z.ZodString;
                 isMerged: z.ZodBoolean;
+                checksState: z.ZodEnum<["pending", "failing", "passing"]>;
+                requiredChecksPassed: z.ZodBoolean;
+                canMerge: z.ZodBoolean;
+                hasConflicts: z.ZodBoolean;
             }, "strip", z.ZodTypeAny, {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             }, {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             }>>;
             githubFeaturesEnabled: z.ZodBoolean;
             error: z.ZodNullable<z.ZodObject<{
@@ -23135,12 +23647,17 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             } | null;
             requestId: string;
             githubFeaturesEnabled: boolean;
@@ -23151,12 +23668,17 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             } | null;
             requestId: string;
             githubFeaturesEnabled: boolean;
@@ -23170,12 +23692,17 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             } | null;
             requestId: string;
             githubFeaturesEnabled: boolean;
@@ -23189,16 +23716,136 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             } | null;
             requestId: string;
             githubFeaturesEnabled: boolean;
         };
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"checkout_pr_failure_logs_response">;
+        payload: z.ZodObject<{
+            cwd: z.ZodString;
+            logs: z.ZodNullable<z.ZodString>;
+            githubFeaturesEnabled: z.ZodBoolean;
+            error: z.ZodNullable<z.ZodObject<{
+                code: z.ZodEnum<["NOT_GIT_REPO", "NOT_ALLOWED", "MERGE_CONFLICT", "UNKNOWN"]>;
+                message: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            }, {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            }>>;
+            requestId: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+            logs: string | null;
+        }, {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+            logs: string | null;
+        }>;
+    }, "strip", z.ZodTypeAny, {
+        type: "checkout_pr_failure_logs_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+            logs: string | null;
+        };
+    }, {
+        type: "checkout_pr_failure_logs_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+            logs: string | null;
+        };
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"checkout_pr_merge_response">;
+        payload: z.ZodObject<{
+            cwd: z.ZodString;
+            success: z.ZodBoolean;
+            error: z.ZodNullable<z.ZodObject<{
+                code: z.ZodEnum<["NOT_GIT_REPO", "NOT_ALLOWED", "MERGE_CONFLICT", "UNKNOWN"]>;
+                message: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            }, {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            }>>;
+            requestId: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
+        }, {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
+        }>;
+    }, "strip", z.ZodTypeAny, {
+        type: "checkout_pr_merge_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
+        };
+    }, {
+        type: "checkout_pr_merge_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
+        };
     }>, z.ZodObject<{
         type: z.ZodLiteral<"validate_branch_response">;
         payload: z.ZodObject<{
@@ -25446,6 +26093,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         } | {
             error: {
@@ -25467,6 +26116,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         } | {
             error: {
@@ -25489,6 +26140,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         };
     } | {
@@ -25621,15 +26274,43 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
+            } | null;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+        };
+    } | {
+        type: "checkout_pr_failure_logs_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
             } | null;
+            cwd: string;
             requestId: string;
             githubFeaturesEnabled: boolean;
+            logs: string | null;
+        };
+    } | {
+        type: "checkout_pr_merge_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
         };
     } | {
         type: "validate_branch_response";
@@ -26425,6 +27106,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         } | {
             error: {
@@ -26446,6 +27129,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         } | {
             error: {
@@ -26468,6 +27153,8 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         };
     } | {
@@ -26600,16 +27287,44 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             } | null;
             requestId: string;
             githubFeaturesEnabled: boolean;
         };
+    } | {
+        type: "checkout_pr_failure_logs_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+            logs: string | null;
+        };
+    } | {
+        type: "checkout_pr_merge_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
+        };
     } | {
         type: "validate_branch_response";
         payload: {
@@ -27954,6 +28669,33 @@ export declare const WSInboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z.
         cwd: string;
         type: "checkout_pr_status_request";
         requestId: string;
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"checkout_pr_failure_logs_request">;
+        cwd: z.ZodString;
+        requestId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        cwd: string;
+        type: "checkout_pr_failure_logs_request";
+        requestId: string;
+    }, {
+        cwd: string;
+        type: "checkout_pr_failure_logs_request";
+        requestId: string;
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"checkout_pr_merge_request">;
+        cwd: z.ZodString;
+        method: z.ZodOptional<z.ZodEnum<["squash"]>>;
+        requestId: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        cwd: string;
+        type: "checkout_pr_merge_request";
+        requestId: string;
+        method?: "squash" | undefined;
+    }, {
+        cwd: string;
+        type: "checkout_pr_merge_request";
+        requestId: string;
+        method?: "squash" | undefined;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"validate_branch_request">;
         cwd: z.ZodString;
@@ -28667,6 +29409,15 @@ export declare const WSInboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z.
         cwd: string;
         type: "checkout_pr_status_request";
         requestId: string;
+    } | {
+        cwd: string;
+        type: "checkout_pr_failure_logs_request";
+        requestId: string;
+    } | {
+        cwd: string;
+        type: "checkout_pr_merge_request";
+        requestId: string;
+        method?: "squash" | undefined;
     } | {
         cwd: string;
         type: "validate_branch_request";
@@ -29061,6 +29812,15 @@ export declare const WSInboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z.
         cwd: string;
         type: "checkout_pr_status_request";
         requestId: string;
+    } | {
+        cwd: string;
+        type: "checkout_pr_failure_logs_request";
+        requestId: string;
+    } | {
+        cwd: string;
+        type: "checkout_pr_merge_request";
+        requestId: string;
+        method?: "squash" | undefined;
     } | {
         cwd: string;
         type: "validate_branch_request";
@@ -32236,6 +32996,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             aheadBehind: z.ZodNull;
             aheadOfOrigin: z.ZodNull;
             behindOfOrigin: z.ZodNull;
+            hasUpstream: z.ZodLiteral<false>;
+            upstreamBranch: z.ZodNull;
             hasRemote: z.ZodBoolean;
             remoteUrl: z.ZodNull;
         }, "strip", z.ZodTypeAny, {
@@ -32255,6 +33017,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         }, {
             error: {
@@ -32273,6 +33037,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         }>, z.ZodObject<{
             cwd: z.ZodString;
@@ -32306,6 +33072,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             }>>;
             aheadOfOrigin: z.ZodNullable<z.ZodNumber>;
             behindOfOrigin: z.ZodNullable<z.ZodNumber>;
+            hasUpstream: z.ZodBoolean;
+            upstreamBranch: z.ZodNullable<z.ZodString>;
             hasRemote: z.ZodBoolean;
             remoteUrl: z.ZodNullable<z.ZodString>;
         }, "strip", z.ZodTypeAny, {
@@ -32328,6 +33096,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         }, {
             error: {
@@ -32349,6 +33119,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         }>, z.ZodObject<{
             cwd: z.ZodString;
@@ -32383,6 +33155,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             }>>;
             aheadOfOrigin: z.ZodNullable<z.ZodNumber>;
             behindOfOrigin: z.ZodNullable<z.ZodNumber>;
+            hasUpstream: z.ZodBoolean;
+            upstreamBranch: z.ZodNullable<z.ZodString>;
             hasRemote: z.ZodBoolean;
             remoteUrl: z.ZodNullable<z.ZodString>;
         }, "strip", z.ZodTypeAny, {
@@ -32406,6 +33180,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         }, {
             error: {
@@ -32428,6 +33204,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         }>]>;
     }, "strip", z.ZodTypeAny, {
@@ -32449,6 +33227,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         } | {
             error: {
@@ -32470,6 +33250,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         } | {
             error: {
@@ -32492,6 +33274,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         };
     }, {
@@ -32513,6 +33297,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         } | {
             error: {
@@ -32534,6 +33320,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         } | {
             error: {
@@ -32556,6 +33344,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         };
     }>, z.ZodObject<{
@@ -33345,26 +34135,41 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
         payload: z.ZodObject<{
             cwd: z.ZodString;
             status: z.ZodNullable<z.ZodObject<{
+                number: z.ZodNumber;
                 url: z.ZodString;
                 title: z.ZodString;
                 state: z.ZodString;
                 baseRefName: z.ZodString;
                 headRefName: z.ZodString;
                 isMerged: z.ZodBoolean;
+                checksState: z.ZodEnum<["pending", "failing", "passing"]>;
+                requiredChecksPassed: z.ZodBoolean;
+                canMerge: z.ZodBoolean;
+                hasConflicts: z.ZodBoolean;
             }, "strip", z.ZodTypeAny, {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             }, {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             }>>;
             githubFeaturesEnabled: z.ZodBoolean;
             error: z.ZodNullable<z.ZodObject<{
@@ -33385,12 +34190,17 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             } | null;
             requestId: string;
             githubFeaturesEnabled: boolean;
@@ -33401,12 +34211,17 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             } | null;
             requestId: string;
             githubFeaturesEnabled: boolean;
@@ -33420,12 +34235,17 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             } | null;
             requestId: string;
             githubFeaturesEnabled: boolean;
@@ -33439,16 +34259,136 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             } | null;
             requestId: string;
             githubFeaturesEnabled: boolean;
         };
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"checkout_pr_failure_logs_response">;
+        payload: z.ZodObject<{
+            cwd: z.ZodString;
+            logs: z.ZodNullable<z.ZodString>;
+            githubFeaturesEnabled: z.ZodBoolean;
+            error: z.ZodNullable<z.ZodObject<{
+                code: z.ZodEnum<["NOT_GIT_REPO", "NOT_ALLOWED", "MERGE_CONFLICT", "UNKNOWN"]>;
+                message: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            }, {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            }>>;
+            requestId: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+            logs: string | null;
+        }, {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+            logs: string | null;
+        }>;
+    }, "strip", z.ZodTypeAny, {
+        type: "checkout_pr_failure_logs_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+            logs: string | null;
+        };
+    }, {
+        type: "checkout_pr_failure_logs_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+            logs: string | null;
+        };
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"checkout_pr_merge_response">;
+        payload: z.ZodObject<{
+            cwd: z.ZodString;
+            success: z.ZodBoolean;
+            error: z.ZodNullable<z.ZodObject<{
+                code: z.ZodEnum<["NOT_GIT_REPO", "NOT_ALLOWED", "MERGE_CONFLICT", "UNKNOWN"]>;
+                message: z.ZodString;
+            }, "strip", z.ZodTypeAny, {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            }, {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            }>>;
+            requestId: z.ZodString;
+        }, "strip", z.ZodTypeAny, {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
+        }, {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
+        }>;
+    }, "strip", z.ZodTypeAny, {
+        type: "checkout_pr_merge_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
+        };
+    }, {
+        type: "checkout_pr_merge_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
+        };
     }>, z.ZodObject<{
         type: z.ZodLiteral<"validate_branch_response">;
         payload: z.ZodObject<{
@@ -35696,6 +36636,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         } | {
             error: {
@@ -35717,6 +36659,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         } | {
             error: {
@@ -35739,6 +36683,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         };
     } | {
@@ -35871,16 +36817,44 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             } | null;
             requestId: string;
             githubFeaturesEnabled: boolean;
         };
+    } | {
+        type: "checkout_pr_failure_logs_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+            logs: string | null;
+        };
+    } | {
+        type: "checkout_pr_merge_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
+        };
     } | {
         type: "validate_branch_response";
         payload: {
@@ -36675,6 +37649,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             aheadBehind: null;
             aheadOfOrigin: null;
             behindOfOrigin: null;
+            hasUpstream: false;
+            upstreamBranch: null;
             hasRemote: boolean;
         } | {
             error: {
@@ -36696,6 +37672,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         } | {
             error: {
@@ -36718,6 +37696,8 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             aheadOfOrigin: number | null;
             behindOfOrigin: number | null;
+            hasUpstream: boolean;
+            upstreamBranch: string | null;
             hasRemote: boolean;
         };
     } | {
@@ -36850,16 +37830,44 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<"type", [z
             } | null;
             cwd: string;
             status: {
+                number: number;
                 title: string;
                 url: string;
                 state: string;
                 baseRefName: string;
                 headRefName: string;
                 isMerged: boolean;
+                checksState: "pending" | "failing" | "passing";
+                requiredChecksPassed: boolean;
+                canMerge: boolean;
+                hasConflicts: boolean;
             } | null;
             requestId: string;
             githubFeaturesEnabled: boolean;
         };
+    } | {
+        type: "checkout_pr_failure_logs_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            githubFeaturesEnabled: boolean;
+            logs: string | null;
+        };
+    } | {
+        type: "checkout_pr_merge_response";
+        payload: {
+            error: {
+                code: "NOT_GIT_REPO" | "NOT_ALLOWED" | "MERGE_CONFLICT" | "UNKNOWN";
+                message: string;
+            } | null;
+            cwd: string;
+            requestId: string;
+            success: boolean;
+        };
     } | {
         type: "validate_branch_response";
         payload: {