@buildautomaton/cli 0.1.83 → 0.1.84

package/dist/cli.js

@@ -30462,7 +30462,7 @@ var {
 } = import_index.default;
 
 // src/cli-version.ts
-var CLI_VERSION = "0.1.83".length > 0 ? "0.1.83" : "0.0.0-dev";
+var CLI_VERSION = "0.1.84".length > 0 ? "0.1.84" : "0.0.0-dev";
 
 // src/cli/defaults.ts
 var DEFAULT_API_URL = process.env.BUILDAUTOMATON_API_URL ?? "https://api.buildautomaton.com";
@@ -38438,7 +38438,7 @@ var FLY_LEGACY_HOST_SKU = defineHostSku({
   storage: { storageGb: 1 },
   monthlyPriceCents: 750
 });
-var FLY_DEFAULT_HOST_SKU = defineHostSku({
+var FLY_LEGACY_1G_HOST_SKU = defineHostSku({
   id: "fly-shared-1x1024-1gb",
   provider: "fly",
   compute: { cpus: 1, cpuKind: "shared" },
@@ -38446,8 +38446,17 @@ var FLY_DEFAULT_HOST_SKU = defineHostSku({
   storage: { storageGb: 1 },
   monthlyPriceCents: 1e3
 });
+var FLY_DEFAULT_HOST_SKU = defineHostSku({
+  id: "fly-shared-2x2048-1gb",
+  provider: "fly",
+  compute: { cpus: 2, cpuKind: "shared" },
+  memory: { memoryMb: 2048 },
+  storage: { storageGb: 1 },
+  monthlyPriceCents: 2e3
+});
 var HOST_SKUS_BY_ID = {
   [FLY_LEGACY_HOST_SKU.id]: FLY_LEGACY_HOST_SKU,
+  [FLY_LEGACY_1G_HOST_SKU.id]: FLY_LEGACY_1G_HOST_SKU,
   [FLY_DEFAULT_HOST_SKU.id]: FLY_DEFAULT_HOST_SKU
 };
 
@@ -50828,12 +50837,6 @@ async function pushAheadOfUpstreamForPaths(paths) {
 }
 
 // src/worktrees/manager/resolve-commit-targets.ts
-function bridgeRootBinding(bridgeRoot) {
-  return {
-    sessionParentPath: bridgeRoot,
-    repoCheckoutPaths: [bridgeRoot]
-  };
-}
 async function resolveCommitTargetsAsync(sessionId, cache2, discover) {
   const sid = sessionId.trim();
   const paths = cache2.getRepoCheckoutPathsRef(sid);
@@ -50843,9 +50846,7 @@ async function resolveCommitTargetsAsync(sessionId, cache2, discover) {
     cache2.remember(sid, disc);
     return disc.repoCheckoutPaths;
   }
-  const bridgeRoot = getBridgeRoot();
-  cache2.remember(sid, bridgeRootBinding(bridgeRoot));
-  return [bridgeRoot];
+  return [getBridgeRoot()];
 }
 
 // src/worktrees/manager/git/get-session-working-tree-status.ts
@@ -52052,33 +52053,42 @@ async function removeSessionWorktreeCheckouts(cache2, sessionId, worktreesRootPa
   await removeSessionWorktrees(paths, worktreesRootPath, log2);
 }
 
+// src/worktrees/manager/git/rename-session-worktree-branch.ts
+init_normalize_resolved_path();
+
 // src/git/branches/rename-branch.ts
 async function gitRenameCurrentBranch(repoDir, newName) {
   const g = cliSimpleGit(repoDir);
   await g.raw(["branch", "-m", newName]);
 }
 
+// src/worktrees/sanitize-git-branch-name.ts
+function sanitizeGitBranchName(newBranch) {
+  return newBranch.replace(/[^a-zA-Z0-9/_-]+/g, "-").slice(0, 80) || "session-branch";
+}
+
 // src/worktrees/rename-session-worktree-branches.ts
 async function renameSessionWorktreeBranches(paths, newBranch, log2) {
-  const safe = newBranch.replace(/[^a-zA-Z0-9/_-]+/g, "-").slice(0, 80) || "session-branch";
+  const safe = sanitizeGitBranchName(newBranch);
   await forEachWithGitYield(paths, async (wt) => {
     if (!await isGitRepoDirectory(wt)) return;
-    try {
-      await gitRenameCurrentBranch(wt, safe);
-      log2(`[worktrees] Renamed branch in ${wt} \u2192 ${safe}`);
-    } catch (e) {
-      log2(
-        `[worktrees] Branch rename failed in ${wt}: ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
+    await gitRenameCurrentBranch(wt, safe);
+    log2(`[worktrees] Renamed branch in ${wt} \u2192 ${safe}`);
   });
+  return safe;
 }
 
 // src/worktrees/manager/git/rename-session-worktree-branch.ts
 async function renameSessionWorktreeBranch(cache2, sessionId, newBranch, log2) {
   const paths = cache2.getRepoCheckoutPathsRef(sessionId);
-  if (!paths?.length) return;
-  await renameSessionWorktreeBranches(paths, newBranch, log2);
+  if (!paths?.length) return null;
+  const bridgeRoot = normalizeResolvedPath(getBridgeRoot());
+  const worktreePaths = paths.filter((p) => normalizeResolvedPath(p) !== bridgeRoot);
+  if (!worktreePaths.length) {
+    log2(`[worktrees] Skipping branch rename for ${sessionId}: no session worktree paths`);
+    return null;
+  }
+  return renameSessionWorktreeBranches(worktreePaths, newBranch, log2);
 }
 
 // src/worktrees/discovery/discover-session-worktree-on-disk.ts
@@ -52878,7 +52888,20 @@ function createSessionWorktreeGitApi(ctx) {
       await removeSessionWorktreeCheckouts(ctx.cache, sessionId, ctx.worktreesRootPath, ctx.log);
     },
     async commitSession(params) {
-      return commitSessionWorktree(ctx.cache, params);
+      let branch = params.branch;
+      if (params.renameBranch) {
+        const renamed = await renameSessionWorktreeBranch(
+          ctx.cache,
+          params.sessionId,
+          params.branch,
+          ctx.log
+        );
+        if (renamed == null) {
+          return { ok: false, error: "Branch rename is only supported for session worktrees" };
+        }
+        branch = renamed;
+      }
+      return commitSessionWorktree(ctx.cache, { ...params, branch });
     },
     async getSessionWorkingTreeStatus(sessionId) {
       return getSessionWorkingTreeStatus(ctx.cache, sessionId, (sid) => paths.discoverAsync(sid));
@@ -56186,6 +56209,7 @@ async function handleSessionGitCommitAction(deps, sessionId, msg, reply) {
   const branch = typeof msg.branch === "string" ? msg.branch : "";
   const message = typeof msg.message === "string" ? msg.message : "";
   const pushAfterCommit = msg.pushAfterCommit === true;
+  const renameBranch = msg.renameBranch === true;
   if (!branch.trim() || !message.trim()) {
     reply({ ok: false, error: "branch and message are required for commit" });
     return;
@@ -56194,7 +56218,8 @@ async function handleSessionGitCommitAction(deps, sessionId, msg, reply) {
     sessionId,
     branch: branch.trim(),
     message: message.trim(),
-    push: pushAfterCommit
+    push: pushAfterCommit,
+    renameBranch
   });
   if (!commitRes.ok) {
     reply({ ok: false, error: commitRes.error ?? "Commit failed" });