@mduan/paseo-cli 0.11.0-fork.5 → 0.11.0-fork.6

package/node_modules/@getpaseo/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/client",
-  "version": "0.11.0-fork.5",
+  "version": "0.11.0-fork.6",
   "description": "Paseo client SDK package",
   "files": [
     "dist",
@@ -44,7 +44,7 @@
     "vitest": "^4.1.6"
   },
   "dependencies": {
-    "@getpaseo/protocol": "0.11.0-fork.5",
-    "@getpaseo/relay": "0.11.0-fork.5"
+    "@getpaseo/protocol": "0.11.0-fork.6",
+    "@getpaseo/relay": "0.11.0-fork.6"
   }
 }

package/node_modules/@getpaseo/highlight/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/highlight",
-  "version": "0.11.0-fork.5",
+  "version": "0.11.0-fork.6",
   "files": [
     "dist",
     "!dist/**/*.map",

package/node_modules/@getpaseo/plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/plugin",
-  "version": "0.11.0-fork.5",
+  "version": "0.11.0-fork.6",
   "description": "Paseo plugin SDK package",
   "files": [
     "dist",
@@ -66,8 +66,8 @@
     "test": "vitest run"
   },
   "devDependencies": {
-    "@getpaseo/client": "0.11.0-fork.5",
-    "@getpaseo/protocol": "0.11.0-fork.5",
+    "@getpaseo/client": "0.11.0-fork.6",
+    "@getpaseo/protocol": "0.11.0-fork.6",
     "@types/node": "^20.9.0",
     "@types/react": "~19.2.0",
     "react": "19.1.0",

package/node_modules/@getpaseo/protocol/dist/generated/validation/ws-outbound.aot.js

@@ -80530,6 +80530,11 @@ export const WSOutboundMessageSchema = /* @__PURE__ */ (() => {
                                                             else if (!Number.isFinite(__o_5518["committerDate"])) {
                                                                 _e.push({ code: "invalid_type", expected: "number", received: "Infinity", input: __o_5518["committerDate"], path: ["message"].concat("payload").concat("branchDetails").concat(__i_5517).concat("committerDate") });
                                                             }
+                                                            if (__o_5518["isDefault"] !== undefined) {
+                                                                if (typeof __o_5518["isDefault"] !== "boolean") {
+                                                                    _e.push({ code: "invalid_type", expected: "boolean", input: __o_5518["isDefault"], path: ["message"].concat("payload").concat("branchDetails").concat(__i_5517).concat("isDefault") });
+                                                                }
+                                                            }
                                                             if (__o_5518["hasLocal"] !== undefined) {
                                                                 if (typeof __o_5518["hasLocal"] !== "boolean") {
                                                                     _e.push({ code: "invalid_type", expected: "boolean", input: __o_5518["hasLocal"], path: ["message"].concat("payload").concat("branchDetails").concat(__i_5517).concat("hasLocal") });

package/node_modules/@getpaseo/protocol/dist/messages.d.ts

@@ -18895,6 +18895,7 @@ export declare const BranchSuggestionsResponseSchema: z.ZodObject<{
         branchDetails: z.ZodOptional<z.ZodArray<z.ZodObject<{
             name: z.ZodString;
             committerDate: z.ZodNumber;
+            isDefault: z.ZodOptional<z.ZodBoolean>;
             hasLocal: z.ZodOptional<z.ZodBoolean>;
             hasRemote: z.ZodOptional<z.ZodBoolean>;
             localAhead: z.ZodOptional<z.ZodNumber>;
@@ -31848,6 +31849,7 @@ export declare const SessionOutboundMessageSchema: z.ZodDiscriminatedUnion<[z.Zo
         branchDetails: z.ZodOptional<z.ZodArray<z.ZodObject<{
             name: z.ZodString;
             committerDate: z.ZodNumber;
+            isDefault: z.ZodOptional<z.ZodBoolean>;
             hasLocal: z.ZodOptional<z.ZodBoolean>;
             hasRemote: z.ZodOptional<z.ZodBoolean>;
             localAhead: z.ZodOptional<z.ZodNumber>;
@@ -47213,6 +47215,7 @@ export declare const WSSessionOutboundSchema: z.ZodObject<{
             branchDetails: z.ZodOptional<z.ZodArray<z.ZodObject<{
                 name: z.ZodString;
                 committerDate: z.ZodNumber;
+                isDefault: z.ZodOptional<z.ZodBoolean>;
                 hasLocal: z.ZodOptional<z.ZodBoolean>;
                 hasRemote: z.ZodOptional<z.ZodBoolean>;
                 localAhead: z.ZodOptional<z.ZodNumber>;
@@ -62223,6 +62226,7 @@ export declare const WSOutboundMessageSchema: z.ZodDiscriminatedUnion<[z.ZodObje
             branchDetails: z.ZodOptional<z.ZodArray<z.ZodObject<{
                 name: z.ZodString;
                 committerDate: z.ZodNumber;
+                isDefault: z.ZodOptional<z.ZodBoolean>;
                 hasLocal: z.ZodOptional<z.ZodBoolean>;
                 hasRemote: z.ZodOptional<z.ZodBoolean>;
                 localAhead: z.ZodOptional<z.ZodNumber>;

package/node_modules/@getpaseo/protocol/dist/messages.js

@@ -5282,6 +5282,7 @@ export const BranchSuggestionsResponseSchema = z.object({
             .array(z.object({
             name: z.string(),
             committerDate: z.number(),
+            isDefault: z.boolean().optional(),
             hasLocal: z.boolean().optional(),
             hasRemote: z.boolean().optional(),
             localAhead: z.number().int().nonnegative().optional(),

package/node_modules/@getpaseo/protocol/dist/validation/ws-outbound-schema-metadata.d.ts

@@ -9787,6 +9787,7 @@ export declare const WSOutboundMessageSchema: {
                 branchDetails: import("zod").ZodOptional<import("zod").ZodArray<import("zod").ZodObject<{
                     name: import("zod").ZodString;
                     committerDate: import("zod").ZodNumber;
+                    isDefault: import("zod").ZodOptional<import("zod").ZodBoolean>;
                     hasLocal: import("zod").ZodOptional<import("zod").ZodBoolean>;
                     hasRemote: import("zod").ZodOptional<import("zod").ZodBoolean>;
                     localAhead: import("zod").ZodOptional<import("zod").ZodNumber>;

package/node_modules/@getpaseo/protocol/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/protocol",
-  "version": "0.11.0-fork.5",
+  "version": "0.11.0-fork.6",
   "description": "Paseo shared protocol schemas and wire types",
   "files": [
     "dist",

package/node_modules/@getpaseo/relay/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/relay",
-  "version": "0.11.0-fork.5",
+  "version": "0.11.0-fork.6",
   "description": "Paseo relay for bridging daemon and client connections",
   "files": [
     "dist",

package/node_modules/@getpaseo/server/dist/server/builtin-plugins/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpaseo/builtin-plugins",
-  "version": "0.11.0-fork.5",
+  "version": "0.11.0-fork.6",
   "private": true,
   "type": "module",
   "scripts": {

package/node_modules/@getpaseo/server/dist/server/server/session/checkout/checkout-session.js

@@ -5,7 +5,7 @@ import { validateBranchSlug } from "@getpaseo/protocol/branch-slug";
 import { toCheckoutError } from "../../checkout-git-utils.js";
 import { buildCheckoutPrStatusPayloadFromSnapshot, buildCheckoutStatusPayloadFromSnapshot, } from "../../checkout/status-projection.js";
 import { assertSafeGitRef } from "../../worktree-session.js";
-import { commitChanges, createPullRequest, discardChanges, forgeAuthStateFromError, isForgeAuthError, mergeFromBase, mergeToBase, pullCurrentBranch, pushCurrentBranch, listCheckoutCommits, getCommitFileDiff, readDiffContextLines, setCurrentBranchBaseRef, } from "../../../utils/checkout-git.js";
+import { BranchCheckoutKind, commitChanges, createPullRequest, discardChanges, forgeAuthStateFromError, isForgeAuthError, mergeFromBase, mergeToBase, pullCurrentBranch, pushCurrentBranch, listCheckoutCommits, getCommitFileDiff, readDiffContextLines, setCurrentBranchBaseRef, } from "../../../utils/checkout-git.js";
 import { runGitCommand } from "../../../utils/run-git-command.js";
 import { expandTilde } from "../../../utils/path.js";
 function assertSafeRelativePath(path) {
@@ -223,6 +223,7 @@ export class CheckoutSession {
                     });
                     return;
                 case "remote-only":
+                case BranchCheckoutKind.Remote:
                     this.host.emit({
                         type: "validate_branch_response",
                         payload: {

package/node_modules/@getpaseo/server/dist/server/utils/checkout-git.d.ts

@@ -24,6 +24,7 @@ export declare function __setPullRequestStatusCacheTtlForTests(ttlMs: number): v
 export declare function __resetCheckoutShortstatCacheForTests(): void;
 export declare function __setCheckoutShortstatCacheTtlForTests(ttlMs: number): void;
 export interface BranchSuggestion {
+    isDefault?: boolean;
     name: string;
     committerDate: number;
     hasLocal: boolean;
@@ -47,7 +48,13 @@ export interface RemoteOnlyBranchCheckoutResolution {
 export interface NotFoundBranchCheckoutResolution {
     kind: "not-found";
 }
-export type BranchCheckoutResolution = LocalBranchCheckoutResolution | RemoteOnlyBranchCheckoutResolution | NotFoundBranchCheckoutResolution;
+export declare enum BranchCheckoutKind {
+    Remote = "remote"
+}
+export type BranchCheckoutResolution = LocalBranchCheckoutResolution | RemoteOnlyBranchCheckoutResolution | {
+    kind: BranchCheckoutKind.Remote;
+    remoteRef: string;
+} | NotFoundBranchCheckoutResolution;
 export declare function resolveBranchCheckout(cwd: string, name: string): Promise<BranchCheckoutResolution>;
 export type BranchCheckoutSource = "local" | "remote";
 export interface CheckoutExistingBranchResult {

package/node_modules/@getpaseo/server/dist/server/utils/checkout-git.js

@@ -169,9 +169,10 @@ export async function listBranchSuggestions(cwd, options) {
     const limit = Math.max(1, Math.min(200, requestedLimit));
     const rawQuery = options?.query?.trim().toLowerCase() ?? "";
     const query = normalizeBranchSuggestionName(rawQuery) ?? rawQuery;
-    const [localRefs, remoteRefs] = await Promise.all([
+    const [localRefs, remoteRefs, defaultBranch] = await Promise.all([
         listGitRefs(cwd, "refs/heads"),
         listGitRefs(cwd, "refs/remotes/origin"),
+        resolveRepositoryDefaultBranch(cwd),
     ]);
     const branchMeta = new Map();
     for (const ref of localRefs) {
@@ -218,6 +219,7 @@ export async function listBranchSuggestions(cwd, options) {
         const meta = branchMeta.get(name);
         const suggestion = {
             name,
+            isDefault: name === normalizeBranchSuggestionName(defaultBranch ?? ""),
             committerDate: meta?.committerDate ?? 0,
             hasLocal: meta?.hasLocal ?? false,
             hasRemote: meta?.hasRemote ?? false,
@@ -250,31 +252,38 @@ export async function listBranchSuggestions(cwd, options) {
         return suggestion;
     }));
 }
+export var BranchCheckoutKind;
+(function (BranchCheckoutKind) {
+    BranchCheckoutKind["Remote"] = "remote";
+})(BranchCheckoutKind || (BranchCheckoutKind = {}));
 export async function resolveBranchCheckout(cwd, name) {
     await requireGitRepo(cwd);
-    const normalized = normalizeBranchSuggestionName(name);
+    const requestedRef = name.trim();
+    const isExplicitRemote = requestedRef.startsWith("refs/remotes/") || requestedRef.startsWith("origin/");
+    if (isExplicitRemote) {
+        const remoteRef = requestedRef.startsWith("refs/remotes/")
+            ? requestedRef
+            : `refs/remotes/${requestedRef}`;
+        if (await doesGitRefExist(cwd, remoteRef)) {
+            return { kind: BranchCheckoutKind.Remote, remoteRef };
+        }
+        return { kind: "not-found" };
+    }
+    const isExplicitLocal = requestedRef.startsWith("refs/heads/");
+    const normalized = isExplicitLocal
+        ? requestedRef.slice("refs/heads/".length)
+        : normalizeBranchSuggestionName(requestedRef);
     if (!normalized) {
         return { kind: "not-found" };
     }
-    const localRef = `refs/heads/${normalized}`;
-    const localResult = await runGitCommand(["rev-parse", "--verify", "--quiet", localRef], {
-        cwd,
-        envOverlay: READ_ONLY_GIT_ENV,
-        acceptExitCodes: [0, 1],
-    });
-    const hasLocal = localResult.exitCode === 0;
-    if (hasLocal) {
+    if (await doesGitRefExist(cwd, `refs/heads/${normalized}`)) {
         return { kind: "local", name: normalized };
     }
+    if (isExplicitLocal) {
+        return { kind: "not-found" };
+    }
     const remoteRef = `origin/${normalized}`;
-    const remoteRefPath = `refs/remotes/${remoteRef}`;
-    const remoteResult = await runGitCommand(["rev-parse", "--verify", "--quiet", remoteRefPath], {
-        cwd,
-        envOverlay: READ_ONLY_GIT_ENV,
-        acceptExitCodes: [0, 1],
-    });
-    const hasRemote = remoteResult.exitCode === 0;
-    if (hasRemote) {
+    if (await doesGitRefExist(cwd, `refs/remotes/${remoteRef}`)) {
         return { kind: "remote-only", name: normalized, remoteRef };
     }
     return { kind: "not-found" };
@@ -282,6 +291,9 @@ export async function resolveBranchCheckout(cwd, name) {
 export async function checkoutResolvedBranch(input) {
     const { cwd, resolution } = input;
     switch (resolution.kind) {
+        case BranchCheckoutKind.Remote:
+            await runGitCommand(["checkout", "--detach", resolution.remoteRef], { cwd });
+            return { source: "remote" };
         case "local": {
             const { stdout } = await runGitCommand(["rev-parse", "--abbrev-ref", "HEAD"], { cwd });
             const current = stdout.trim();