add --force flag to merge and squash commands

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@because/sandlot",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Sandboxed, branch-based development with Claude",
   "type": "module",
   "bin": {

src/cli.ts

@@ -128,14 +128,16 @@ program
 program
   .command("merge")
   .argument("<branch>", "branch name")
+  .option("-f, --force", "allow merging into a non-main branch")
   .description("Merge a branch into main and close the session")
-  .action(mergeAction)
+  .action((branch: string, opts: { force?: boolean }) => mergeAction(branch, opts))
 
 program
   .command("squash")
   .argument("<branch>", "branch name")
+  .option("-f, --force", "allow merging into a non-main branch")
   .description("Squash-merge a branch into main and close the session")
-  .action(squashAction)
+  .action((branch: string, opts: { force?: boolean }) => squashAction(branch, opts))
 
 program
   .command("rebase")

src/commands/helpers.ts

@@ -91,8 +91,13 @@ export async function resolveConflicts(
 }
 
 /** Merge (or squash-merge) a branch into main, resolve conflicts if needed, and close the session. */
-export async function mergeAndClose(branch: string, opts?: { squash?: boolean }): Promise<void> {
+export async function mergeAndClose(branch: string, opts?: { squash?: boolean; force?: boolean }): Promise<void> {
   const root = await git.repoRoot()
+  const main = await git.mainBranch(root)
+  const current = await git.currentBranch(root)
+  if (current !== main && !opts?.force) {
+    die(`You must be on "${main}" to merge. Currently on "${current}". Use --force to merge into "${current}" anyway.`)
+  }
   const session = await state.getSession(root, branch)
 
   if (session && await git.isDirty(session.worktree)) {

src/commands/merge.ts

@@ -1,5 +1,5 @@
 import { mergeAndClose } from "./helpers.ts"
 
-export async function action(branch: string) {
+export async function action(branch: string, opts?: { force?: boolean }) {
-  await mergeAndClose(branch)
+  await mergeAndClose(branch, { force: opts?.force })
 }

src/commands/squash.ts

@@ -1,5 +1,5 @@
 import { mergeAndClose } from "./helpers.ts"
 
-export async function action(branch: string) {
+export async function action(branch: string, opts?: { force?: boolean }) {
-  await mergeAndClose(branch, { squash: true })
+  await mergeAndClose(branch, { squash: true, force: opts?.force })
 }