test: update integration tests for merged-branch reset behavior

Update existing tests that expected fully-merged repos to be skipped.
They now expect the reset-to-base behavior instead.

https://claude.ai/code/session_01JwYwdYdscozHuZVPdrM9pq

Author: claude

src/lib/render/integrate-cells.ts

@@ -25,9 +25,7 @@ export function integrateActionCell(desc: IntegrateActionDesc): Cell {
     const merged = desc.skipCount ?? 0;
     if (n === 0) {
       const text =
-        merged > 0
-          ? `reset to ${desc.baseRef} (all ${merged} commits merged)`
-          : `reset to ${desc.baseRef} (merged)`;
+        merged > 0 ? `reset to ${desc.baseRef} (all ${merged} commits merged)` : `reset to ${desc.baseRef} (merged)`;
       result = cell(text);
     } else {
       const commitWord = n === 1 ? "commit" : "commits";

src/lib/sync/classify-integrate.ts

@@ -201,9 +201,7 @@ export async function assessIntegrateRepo(
       };
     }
     const needsStash =
-      flags.isDirty && options.autostash && (status.local.staged > 0 || status.local.modified > 0)
-        ? true
-        : undefined;
+      flags.isDirty && options.autostash && (status.local.staged > 0 || status.local.modified > 0) ? true : undefined;
 
     if (options.mode === "rebase") {
       return {

test/integration/integrate.test.ts

@@ -572,7 +572,7 @@ describe("--verbose", () => {
 // ── diverged commit matching in plan ─────────────────────────────
 
 describe("diverged commit matching in plan", () => {
-  test("arb rebase --verbose --dry-run skips cherry-picked commit (detected as squash-merged)", () =>
+  test("arb rebase --verbose --dry-run plans reset for cherry-picked commit (detected as squash-merged)", () =>
     withEnv(async (env) => {
       await arb(env, ["create", "my-feature", "repo-a"]);
       await write(join(env.projectDir, "my-feature/repo-a/feature.txt"), "feature");
@@ -594,10 +594,11 @@ describe("diverged commit matching in plan", () => {
         cwd: join(env.projectDir, "my-feature"),
       });
       expect(result.exitCode).toBe(0);
-      expect(result.output).toContain("already squash-merged into main");
+      expect(result.output).toContain("reset to origin/main");
+      expect(result.output).toContain("merged");
     }));
 
-  test("arb rebase skips repo that was squash-merged onto base", () =>
+  test("arb rebase plans reset for repo that was squash-merged onto base", () =>
     withEnv(async (env) => {
       await arb(env, ["create", "my-feature", "repo-a"]);
       await write(join(env.projectDir, "my-feature/repo-a/first.txt"), "first");
@@ -619,10 +620,11 @@ describe("diverged commit matching in plan", () => {
         cwd: join(env.projectDir, "my-feature"),
       });
       expect(result.exitCode).toBe(0);
-      expect(result.output).toContain("already squash-merged into main");
+      expect(result.output).toContain("reset to origin/main");
+      expect(result.output).toContain("commits merged");
     }));
 
-  test("arb rebase skips squash-merged repo and rebases others", () =>
+  test("arb rebase resets squash-merged repo and rebases others", () =>
     withEnv(async (env) => {
       await arb(env, ["create", "my-feature", "repo-a", "repo-b"]);
 
@@ -650,12 +652,16 @@ describe("diverged commit matching in plan", () => {
         cwd: join(env.projectDir, "my-feature"),
       });
       expect(result.exitCode).toBe(0);
-      expect(result.output).toContain("already squash-merged into main");
+      expect(result.output).toContain("reset to origin/main (merged)");
       expect(result.output).toContain("rebased my-feature onto origin/main");
 
       // Verify repo-b actually has the upstream commit after rebase
       const logB = await git(join(env.projectDir, "my-feature/repo-b"), ["log", "--oneline"]);
       expect(logB).toContain("upstream change");
+
+      // Verify repo-a was reset to origin/main (squash commit is in history)
+      const logA = await git(join(env.projectDir, "my-feature/repo-a"), ["log", "--oneline"]);
+      expect(logA).toContain("squash: feature");
     }));
 
   test("arb rebase --verbose --dry-run shows no match annotations for genuinely different commits", () =>

test/integration/sync.test.ts

@@ -1611,7 +1611,7 @@ describe("--where filtering", () => {
       expect(result.output).not.toContain("already merged");
     }));
 
-  test("rebase skips when all local commits are already squash-equivalent on base", () =>
+  test("rebase resets when all local commits are already squash-equivalent on base", () =>
     withEnv(async (env) => {
       await arb(env, ["create", "rebase-squash-equivalent-test", "repo-a"]);
       const wt = join(env.projectDir, "rebase-squash-equivalent-test/repo-a");
@@ -1638,8 +1638,12 @@ describe("--where filtering", () => {
         cwd: join(env.projectDir, "rebase-squash-equivalent-test"),
       });
       expect(rebaseResult.exitCode).toBe(0);
-      expect(rebaseResult.output).toContain("already squash-merged");
+      expect(rebaseResult.output).toContain("reset to origin/main (merged)");
       expect(rebaseResult.output).not.toContain("conflict");
+
+      // Verify the branch was reset — squash-equivalent commit is in history
+      const log = await git(wt, ["log", "--oneline"]);
+      expect(log).toContain("squash-equivalent on main");
     }));
 });