@cvr/stacked 0.4.1 → 0.4.3

package/README.md

@@ -13,11 +13,12 @@ bun run build   # compiles binary to bin/stacked + symlinks to ~/.bun/bin/
 ## Setup
 
 ```sh
-# Trunk is auto-detected (main > master > develop). Override if needed:
-stacked trunk develop
-
 # Install the Claude skill (optional):
 stacked init
+
+# Trunk is auto-detected on first use from origin/HEAD when available
+# (fallback: main > master > develop). Override only if needed:
+stacked trunk <name>
 ```
 
 ## Usage
@@ -131,7 +132,7 @@ stacked --yes clean      # skip confirmation prompts
 
 Stack metadata lives in `.git/stacked.json`. Each branch's parent is implied by array position — `branches[0]`'s parent is trunk, `branches[n]`'s parent is `branches[n-1]`.
 
-Trunk is auto-detected on first use by checking for `main`, `master`, or `develop` branches. Override with `stacked trunk <name>`.
+Trunk is auto-detected on first use from `origin/HEAD` when available, then falls back to local `main`, `master`, or `develop`. Override with `stacked trunk <name>`.
 
 ## Output Conventions
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cvr/stacked",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/cevr/stacked"

package/skills/stacked/SKILL.md

@@ -71,11 +71,12 @@ What do you need?
 ## Setup
 
 ```sh
-# Trunk is auto-detected (main > master > develop). Override if needed:
-stacked trunk develop
-
 # Install the Claude skill (optional, compiled binary only):
 stacked init
+
+# Trunk is auto-detected on first use from origin/HEAD when available
+# (fallback: main > master > develop). Override only if needed:
+stacked trunk <name>
 ```
 
 Requires `gh` CLI installed and authenticated for `submit` and `clean`.
@@ -315,7 +316,7 @@ Stack metadata lives in `.git/stacked.json`. Each branch's parent is implied by
 - `branches[0]` → parent is trunk
 - `branches[n]` → parent is `branches[n-1]`
 
-Trunk is auto-detected on first use by checking for `main`, `master`, or `develop` branches. Override with `stacked trunk <name>`.
+Trunk is auto-detected on first use from `origin/HEAD` when available, then falls back to local `main`, `master`, or `develop`. Override with `stacked trunk <name>`.
 
 A repo can have multiple independent stacks. The current stack is determined by which branch you're on.
 
@@ -361,7 +362,7 @@ stacked down  # go to previous branch
 - `stacked submit` and `stacked clean` require `gh` CLI authenticated (`gh auth login`)
 - PRs target parent branches, not trunk — this is intentional for stacked review
 - PRs include auto-generated stack metadata (position, navigation links)
-- Trunk is auto-detected (`main` > `master` > `develop`) — use `stacked trunk <name>` to override
+- Trunk is auto-detected (`origin/HEAD` first, then `main` > `master` > `develop`) — use `stacked trunk <name>` only when detection is wrong
 - Forked branches (one parent, multiple children) are not supported — `detect` reports them but skips
 - `stacked delete --force` on a mid-stack branch requires `stacked sync` afterward
 - `stacked checkout` falls through to `git checkout` for branches not in a stack

package/src/commands/doctor.ts

@@ -1,5 +1,5 @@
 import { Command, Flag } from "effect/unstable/cli";
-import { Console, Effect } from "effect";
+import { Console, Effect, Option } from "effect";
 import { GitService } from "../services/Git.js";
 import { StackService } from "../services/Stack.js";
 import { success, warn } from "../ui.js";
@@ -33,20 +33,20 @@ export const doctor = Command.make("doctor", { fix: fixFlag, json: jsonFlag }).p
         .pipe(Effect.catchTag("GitError", () => Effect.succeed(false)));
       if (!trunkExists) {
         if (fix) {
-          // Auto-detect a trunk
-          for (const candidate of ["main", "master", "develop"]) {
-            const exists = yield* git
-              .branchExists(candidate)
-              .pipe(Effect.catchTag("GitError", () => Effect.succeed(false)));
-            if (exists) {
-              yield* stacks.setTrunk(candidate);
-              findings.push({
-                type: "missing_trunk",
-                message: `Trunk "${data.trunk}" not found, set to "${candidate}"`,
-                fixed: true,
-              });
-              break;
-            }
+          const candidate = yield* stacks.detectTrunkCandidate();
+          if (Option.isSome(candidate)) {
+            yield* stacks.setTrunk(candidate.value);
+            findings.push({
+              type: "missing_trunk",
+              message: `Trunk "${data.trunk}" not found, set to "${candidate.value}"`,
+              fixed: true,
+            });
+          } else {
+            findings.push({
+              type: "missing_trunk",
+              message: `Trunk branch "${data.trunk}" does not exist and no replacement could be auto-detected`,
+              fixed: false,
+            });
           }
         } else {
           findings.push({

package/src/commands/index.ts

@@ -30,7 +30,7 @@ const root = Command.make("stacked").pipe(
   Command.withExamples([
     { command: "stacked create feat-auth", description: "Create a new branch in the stack" },
     { command: "stacked list", description: "Show branches in the current stack" },
-    { command: "stacked sync", description: "Rebase all branches in order" },
+    { command: "stacked sync", description: "Update trunk, then rebase stack branches in order" },
     { command: "stacked submit", description: "Push and create/update PRs" },
   ]),
 );

package/src/commands/init.ts

@@ -35,8 +35,10 @@ export const init = Command.make("init").pipe(
 
       yield* Console.error(`Installed stacked skill to ${targetPath}`);
       yield* Console.error("\nNext steps:");
-      yield* Console.error("  stacked trunk          # verify/set your trunk branch");
       yield* Console.error("  stacked create <name>  # start your first stack");
+      yield* Console.error(
+        "  stacked trunk <name>   # only if auto-detection picks the wrong trunk",
+      );
     }),
   ),
 );

package/src/commands/sync.ts

@@ -36,7 +36,7 @@ export const sync = Command.make("sync", {
     "Fetch, rebase, and force-push stack branches. Use --from to start from a branch.",
   ),
   Command.withExamples([
-    { command: "stacked sync", description: "Rebase entire stack on trunk" },
+    { command: "stacked sync", description: "Sync local trunk, then rebase entire stack on trunk" },
     { command: "stacked sync --from feat-auth", description: "Resume from a specific branch" },
     { command: "stacked sync --dry-run", description: "Preview rebase plan" },
   ]),
@@ -46,6 +46,7 @@ export const sync = Command.make("sync", {
       const stacks = yield* StackService;
 
       const trunk = Option.isSome(trunkOpt) ? trunkOpt.value : yield* stacks.getTrunk();
+      const originTrunk = `origin/${trunk}`;
       const currentBranch = yield* git.currentBranch();
 
       if (!dryRun) {
@@ -89,10 +90,15 @@ export const sync = Command.make("sync", {
       const results: SyncResult[] = [];
 
       if (dryRun) {
+        results.push({ name: trunk, action: "skipped", base: originTrunk });
+        if (!json) {
+          yield* Console.error(`Would fetch and rebase ${trunk} onto ${originTrunk}`);
+        }
+
         for (let i = startIdx; i < branches.length; i++) {
           const branch = branches[i];
           if (branch === undefined) continue;
-          const base = i === 0 ? `origin/${trunk}` : (branches[i - 1] ?? `origin/${trunk}`);
+          const base = i === 0 ? originTrunk : (branches[i - 1] ?? originTrunk);
           results.push({ name: branch, action: "skipped", base });
           if (!json) {
             yield* Console.error(`Would rebase and force-push ${branch} onto ${base}`);
@@ -110,13 +116,25 @@ export const sync = Command.make("sync", {
         return;
       }
 
-      yield* withSpinner(`Fetching ${trunk}`, git.fetch());
-
       yield* Effect.gen(function* () {
+        yield* withSpinner(`Fetching ${trunk}`, git.fetch());
+        yield* git.checkout(trunk);
+        yield* withSpinner(`Rebasing ${trunk} onto ${originTrunk}`, git.rebase(originTrunk)).pipe(
+          Effect.catchTag("GitError", (e) =>
+            Effect.fail(
+              new StackError({
+                code: ErrorCode.REBASE_CONFLICT,
+                message: `Rebase conflict on ${trunk}: ${e.message}\n\nResolve conflicts, then run:\n  git rebase --continue`,
+              }),
+            ),
+          ),
+        );
+        results.push({ name: trunk, action: "rebased", base: originTrunk });
+
         for (let i = startIdx; i < branches.length; i++) {
           const branch = branches[i];
           if (branch === undefined) continue;
-          const newBase = i === 0 ? `origin/${trunk}` : (branches[i - 1] ?? `origin/${trunk}`);
+          const newBase = i === 0 ? originTrunk : (branches[i - 1] ?? originTrunk);
 
           // Compute old base (merge-base of this branch and its parent) before rebasing
           const oldBase = yield* git
@@ -158,7 +176,7 @@ export const sync = Command.make("sync", {
         // @effect-diagnostics-next-line effect/preferSchemaOverJson:off
         yield* Console.log(JSON.stringify({ branches: results }, null, 2));
       } else {
-        yield* success("Stack synced");
+        yield* success(`Stack synced (including trunk ${trunk})`);
       }
     }),
   ),

package/src/services/Git.ts

@@ -1,5 +1,5 @@
 import { existsSync } from "node:fs";
-import { Effect, Layer, ServiceMap } from "effect";
+import { Effect, Layer, Option, ServiceMap } from "effect";
 import { GitError } from "../errors/index.js";
 
 export class GitService extends ServiceMap.Service<
@@ -8,6 +8,7 @@ export class GitService extends ServiceMap.Service<
     readonly currentBranch: () => Effect.Effect<string, GitError>;
     readonly listBranches: () => Effect.Effect<string[], GitError>;
     readonly branchExists: (name: string) => Effect.Effect<boolean, GitError>;
+    readonly remoteDefaultBranch: (remote?: string) => Effect.Effect<Option.Option<string>, never>;
     readonly createBranch: (name: string, from?: string) => Effect.Effect<void, GitError>;
     readonly deleteBranch: (name: string, force?: boolean) => Effect.Effect<void, GitError>;
     readonly checkout: (name: string) => Effect.Effect<void, GitError>;
@@ -113,6 +114,12 @@ export class GitService extends ServiceMap.Service<
           Effect.catchTag("GitError", () => Effect.succeed(false)),
         ),
 
+      remoteDefaultBranch: (remote = "origin") =>
+        run(["symbolic-ref", "--quiet", "--short", `refs/remotes/${remote}/HEAD`]).pipe(
+          Effect.map((ref) => Option.some(ref.replace(new RegExp(`^${remote}/`), ""))),
+          Effect.catchTag("GitError", () => Effect.succeed(Option.none())),
+        ),
+
       createBranch: (name, from) => {
         const args = from !== undefined ? ["checkout", "-b", name, from] : ["checkout", "-b", name];
         return run(args).pipe(Effect.asVoid);
@@ -183,6 +190,7 @@ export class GitService extends ServiceMap.Service<
       currentBranch: () => Effect.succeed("main"),
       listBranches: () => Effect.succeed([]),
       branchExists: () => Effect.succeed(false),
+      remoteDefaultBranch: () => Effect.succeed(Option.none()),
       createBranch: () => Effect.void,
       deleteBranch: () => Effect.void,
       checkout: () => Effect.void,

package/src/services/Stack.ts

@@ -1,4 +1,4 @@
-import { Effect, Layer, Ref, Schema, ServiceMap } from "effect";
+import { Effect, Layer, Option, Ref, Schema, ServiceMap } from "effect";
 import { rename } from "node:fs/promises";
 import type { GitError } from "../errors/index.js";
 import { StackError } from "../errors/index.js";
@@ -38,6 +38,7 @@ export class StackService extends ServiceMap.Service<
     readonly findBranchStack: (
       branch: string,
     ) => Effect.Effect<{ name: string; stack: Stack } | null, StackError>;
+    readonly detectTrunkCandidate: () => Effect.Effect<Option.Option<string>, never>;
     readonly getTrunk: () => Effect.Effect<string, StackError>;
     readonly setTrunk: (name: string) => Effect.Effect<void, StackError>;
   }
@@ -62,15 +63,27 @@ export class StackService extends ServiceMap.Service<
       const decodeStackFile = Schema.decodeUnknownEffect(StackFileJson);
       const encodeStackFile = Schema.encodeEffect(StackFileJson);
 
-      const detectTrunk = Effect.fn("StackService.detectTrunk")(function* () {
-        // Check common default branch names
+      const detectTrunkCandidate = Effect.fn("StackService.detectTrunkCandidate")(function* () {
+        const remoteDefault = yield* git.remoteDefaultBranch("origin");
+        if (Option.isSome(remoteDefault)) {
+          const exists = yield* git
+            .branchExists(remoteDefault.value)
+            .pipe(Effect.catchTag("GitError", () => Effect.succeed(false)));
+          if (exists) return remoteDefault;
+        }
+
         for (const candidate of ["main", "master", "develop"]) {
           const exists = yield* git
             .branchExists(candidate)
             .pipe(Effect.catchTag("GitError", () => Effect.succeed(false)));
-          if (exists) return candidate;
+          if (exists) return Option.some(candidate);
         }
-        return "main";
+        return Option.none();
+      });
+
+      const detectTrunk = Effect.fn("StackService.detectTrunk")(function* () {
+        const candidate = yield* detectTrunkCandidate();
+        return Option.getOrElse(candidate, () => "main");
       });
 
       const load = Effect.fn("StackService.load")(function* () {
@@ -137,6 +150,7 @@ export class StackService extends ServiceMap.Service<
 
         findBranchStack: (branch: string) =>
           load().pipe(Effect.map((data) => findBranchStack(data, branch))),
+        detectTrunkCandidate: () => detectTrunkCandidate(),
 
         currentStack: Effect.fn("StackService.currentStack")(function* () {
           const branch = yield* git.currentBranch();
@@ -226,7 +240,10 @@ export class StackService extends ServiceMap.Service<
     }),
   );
 
-  static layerTest = (data?: StackFile, options?: { currentBranch?: string }) => {
+  static layerTest = (
+    data?: StackFile,
+    options?: { currentBranch?: string; detectTrunkCandidate?: Option.Option<string> },
+  ) => {
     const initial = data ?? emptyStackFile;
     return Layer.effect(
       StackService,
@@ -297,6 +314,12 @@ export class StackService extends ServiceMap.Service<
             }));
           }),
 
+          detectTrunkCandidate: () =>
+            Effect.succeed(
+              options?.detectTrunkCandidate !== undefined
+                ? options.detectTrunkCandidate
+                : Option.some(initial.trunk),
+            ),
           getTrunk: () => Ref.get(ref).pipe(Effect.map((d) => d.trunk)),
           setTrunk: (name: string) => Ref.update(ref, (d) => ({ ...d, trunk: name })),
         };