@skaile/workspaces 0.29.0 → 0.29.1

package/dist/{chunk-FENG6OO6.js → chunk-OTFG5Q7H.js}

@@ -103,6 +103,14 @@ function hasChanges(cwd) {
   const status = git("status --porcelain", cwd);
   return status.length > 0;
 }
+function localBranchExists(branch, cwd) {
+  try {
+    git(`rev-parse --verify --quiet refs/heads/${branch}`, cwd);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function isDirEmpty(dir) {
   try {
     return readdirSync(dir).length === 0;
@@ -203,37 +211,42 @@ var GitConnector = class extends AbstractConnector {
       if (!isValidGitRefOrSha(sessionBranch)) {
         throw new Error(`Git connector: invalid session branch name "${sessionBranch}"`);
       }
-      try {
-        git(`rev-parse --verify origin/${sessionBranch}`, targetDir);
-        git(`checkout -B ${sessionBranch} origin/${sessionBranch}`, targetDir);
-      } catch {
-        let anchored = false;
-        if (session.fromRef) {
-          if (!isValidGitRefOrSha(session.fromRef)) {
-            this.log.warn("fromRef rejected by refname validation, falling back to base branch", {
-              sessionBranch,
-              fromRef: session.fromRef
-            });
-          } else {
-            try {
-              git(`fetch origin ${session.fromRef}`, targetDir);
-              git(`checkout -b ${sessionBranch} FETCH_HEAD`, targetDir);
-              anchored = true;
-              this.log.info("session branch created from fromRef", {
+      if (localBranchExists(sessionBranch, targetDir)) {
+        git(`checkout ${sessionBranch}`, targetDir);
+        this.log.info("reusing existing local session branch", { sessionBranch });
+      } else {
+        try {
+          git(`rev-parse --verify origin/${sessionBranch}`, targetDir);
+          git(`checkout -B ${sessionBranch} origin/${sessionBranch}`, targetDir);
+        } catch {
+          let anchored = false;
+          if (session.fromRef) {
+            if (!isValidGitRefOrSha(session.fromRef)) {
+              this.log.warn("fromRef rejected by refname validation, falling back to base branch", {
                 sessionBranch,
                 fromRef: session.fromRef
               });
-            } catch (err) {
-              this.log.warn("fromRef fetch failed, falling back to base branch", {
-                sessionBranch,
-                fromRef: session.fromRef,
-                error: err instanceof Error ? err.message : String(err)
-              });
+            } else {
+              try {
+                git(`fetch origin ${session.fromRef}`, targetDir);
+                git(`checkout -b ${sessionBranch} FETCH_HEAD`, targetDir);
+                anchored = true;
+                this.log.info("session branch created from fromRef", {
+                  sessionBranch,
+                  fromRef: session.fromRef
+                });
+              } catch (err) {
+                this.log.warn("fromRef fetch failed, falling back to base branch", {
+                  sessionBranch,
+                  fromRef: session.fromRef,
+                  error: err instanceof Error ? err.message : String(err)
+                });
+              }
             }
           }
-        }
-        if (!anchored) {
-          git(`checkout -b ${sessionBranch}`, targetDir);
+          if (!anchored) {
+            git(`checkout -b ${sessionBranch}`, targetDir);
+          }
         }
       }
       syncSubmodules(targetDir);
@@ -7822,5 +7835,5 @@ function createConnector() {
 }
 
 export { AbstractConnector, BUILTIN_CONNECTOR_CATALOG, ConnectorFieldMissingError, ConnectorManager, ConnectorStartupError, DeployConnector, DevServerConnector, FlowAdapter, GitConnector, GmailConnector, GoogleDriveConnector, LocalConnector, LogBuffer, ManagedGitconfigCollisionError, MattermostConnector, MemoryConnector, MinIOConnector, NOT_READY_SENTINEL, PostgresConnector, RoMountPlaceholderBarrier, S3Connector, SQLiteConnector, SharePointConnector, StaticServerConnector, TunnelConnector, WebDAVConnector, XStateConnector, XStateStoreConnector, atomicReplaceCredential, buildConnectorPromptSection, buildSdkConnectorTools, createConnector, createConnector10, createConnector11, createConnector12, createConnector13, createConnector14, createConnector15, createConnector16, createConnector17, createConnector18, createConnector19, createConnector2, createConnector3, createConnector4, createConnector5, createConnector6, createConnector7, createConnector8, createConnector9, createWorktree, defaultMountPlaceholderBarrier, defaultSpawn, ensureFleetMounted, findGitRoot, findMissingPackages, getConnector, installNpmPackages, isFleetManaged, isPackageResolvable, listConnectors, listWorktrees, registerBuiltinConnectors, removeMountBlock, renderCredentialHelperScript, tryGetConnector, worktreeRegistry, writeHelperScript, writeMountBlock };
-//# sourceMappingURL=chunk-FENG6OO6.js.map
-//# sourceMappingURL=chunk-FENG6OO6.js.map
+//# sourceMappingURL=chunk-OTFG5Q7H.js.map
+//# sourceMappingURL=chunk-OTFG5Q7H.js.map