[Experimental] Auto-terminate agent when queue action is written (#14)

Author: blipinsk

.claude/commands/go-reviewer.md

@@ -54,7 +54,18 @@ List each issue with:
 - **What's wrong** and **why it matters** - be specific
 - **Suggested fix** if you have one
 
+Before finalizing your issues list, re-read each `suggestion` and `concern` and ask yourself: "Would a pragmatic senior engineer consider this overengineering for the current stage and scope of the project?" If the answer is yes - if the suggestion adds complexity, abstraction, or defensive code that isn't justified by a concrete present-day problem - drop it. Only keep suggestions where the cost of NOT doing it is real and near-term.
+
 ### Unification opportunities
 If you found duplicated logic or missed reuse opportunities, list them here.
 
+### Merge confidence
+Rate 1-5 with a one-line justification:
+
+- **5 - Ship it** - No issues found, or only trivial suggestions. Merge without hesitation.
+- **4 - Looks good** - Minor suggestions that are nice-to-have but not worth blocking on. Merge, optionally address in a follow-up.
+- **3 - Probably fine** - Has concerns that deserve a second look. Author should review the feedback and make a judgement call - could go either way.
+- **2 - Needs work** - Has issues that should be fixed before merging. Nothing catastrophic, but the code isn't ready as-is.
+- **1 - Do not merge** - Has bugs, regressions, or fundamental design problems that will cause real damage if shipped.
+
 If the code looks good, say so. Don't manufacture issues to seem thorough.

cmd/root.go

@@ -769,7 +769,8 @@ func resolveNextAction(root string, next *mob.QueuedAction) (workdir, agent stri
 		if m == nil {
 			return "", "", false, fmt.Errorf("mob '%s' not found", name)
 		}
-		fmt.Fprintf(os.Stderr, "\n  \033[33m!\033[0m This will permanently delete mob '%s'. Uncommitted/unpushed changes will be lost.\n", m.Name)
+		fmt.Fprintln(os.Stderr)
+		fmt.Fprintf(os.Stderr, "  \033[33m!\033[0m This will permanently delete mob '%s'. Uncommitted/unpushed changes will be lost.\n", m.Name)
 		fmt.Fprint(os.Stderr, "  Continue? [y/N]: ")
 		var input string
 		fmt.Scanln(&input)
@@ -923,7 +924,7 @@ func runAgent(root, agent, workdir string, resume bool) error {
 	}
 
 	if resume {
-		err := spawnAgent(binPath, resumeArgs, workdir)
+		err := spawnAgent(root, binPath, resumeArgs, workdir)
 		if err == nil {
 			return nil
 		}
@@ -936,7 +937,7 @@ func runAgent(root, agent, workdir string, resume bool) error {
 		mobStatus("No previous session found, starting new session")
 	}
 
-	return spawnAgent(binPath, newArgs, workdir)
+	return spawnAgent(root, binPath, newArgs, workdir)
 }
 
 func cmdInjectArgs(args []string) error {
@@ -996,18 +997,23 @@ func agentArgs(agent, repoRoot string) (binPath string, resumeArgs, newArgs []st
 	return
 }
 
-func spawnAgent(binPath string, args []string, workdir string) error {
+func spawnAgent(root, binPath string, args []string, workdir string) error {
 	cmd := exec.Command(binPath, args...)
 	cmd.Dir = workdir
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	cmd.Env = append(os.Environ(), "CODEMOB_MOB="+filepath.Base(workdir))
 
-	// Forward signals to child, clean up goroutine on exit
+	if err := cmd.Start(); err != nil {
+		return err
+	}
+
+	done := make(chan struct{})
+
+	// Forward signals to child
 	sigCh := make(chan os.Signal, 1)
 	signal.Notify(sigCh, os.Interrupt, syscall.SIGTERM)
-	done := make(chan struct{})
 	go func() {
 		select {
 		case sig := <-sigCh:
@@ -1018,7 +1024,30 @@ func spawnAgent(binPath string, args []string, workdir string) error {
 		}
 	}()
 
-	err := cmd.Run()
+	// Watch for queue.json - auto-terminate agent when a queued action appears
+	if root != "" && filepath.IsAbs(root) {
+		queuePath := mob.QueueFilePath(root)
+		go func() {
+			ticker := time.NewTicker(500 * time.Millisecond)
+			defer ticker.Stop()
+			for {
+				select {
+				case <-ticker.C:
+					if _, err := os.Stat(queuePath); err == nil {
+						mobStatus("Stopping agent...")
+						if cmd.Process != nil {
+							cmd.Process.Signal(syscall.SIGTERM)
+						}
+						return
+					}
+				case <-done:
+					return
+				}
+			}
+		}()
+	}
+
+	err := cmd.Wait()
 	signal.Stop(sigCh)
 	close(done)
 	return err

internal/mob/init.go

@@ -21,6 +21,16 @@ const triggerGuard = "IMPORTANT: Only invoke this command when the user explicit
 	"\"mob\" or \"codemob\". Generic requests like \"list\", \"create\", " +
 	"\"remove\", or \"switch\" without mentioning mob/codemob should NOT trigger this.\n\n"
 
+const confirmationGuardLaunch = `IMPORTANT: Before running the codemob queue command, you MUST get explicit confirmation from the user. Tell them: "This will end our current conversation. codemob will automatically close this session and launch the new one. Are you sure?"
+
+Only run the queue command after the user confirms. If they decline, cancel the operation.
+`
+
+const confirmationGuardExit = `IMPORTANT: Before running the codemob queue command, you MUST get explicit confirmation from the user. Tell them: "This will end our current conversation and close this session. Are you sure?"
+
+Only run the queue command after the user confirms. If they decline, cancel the operation.
+`
+
 var slashCommandDefs = map[string]commandDef{
 	"list": {
 		Description: "List all codemob workspaces and their status",
@@ -29,7 +39,7 @@ var slashCommandDefs = map[string]commandDef{
 	},
 	"new": {
 		Description: "Create a new codemob workspace",
-		Body: triggerGuard + `Ask the user if they want to provide a name or have one auto-generated.
+		Body: triggerGuard + confirmationGuardLaunch + `Ask the user if they want to provide a name or have one auto-generated.
 
 If they provide a name, validate it against these rules before running the command:
 - Only letters (a-z, A-Z), numbers, and hyphens allowed (no spaces or special characters)
@@ -44,32 +54,26 @@ If the name is valid, run: ` + "`codemob queue new <name>`" + ` (replace ` + "`<
 If they want auto-generated, run: ` + "`codemob queue new`" + ` (no name argument — codemob generates one).
 
 Do NOT generate a name yourself — codemob handles name generation.
-
-Then tell the user: "New mob queued. Exit this session (Ctrl+C) and codemob will automatically create and launch the new mob."
 `,
 	},
 	"switch": {
 		Description: "Switch to a different codemob workspace",
-		Body: triggerGuard + `Run ` + "`codemob list-others`" + ` using the Bash tool.
+		Body: triggerGuard + confirmationGuardLaunch + `Run ` + "`codemob list-others`" + ` using the Bash tool.
 
 If the output says "No mobs", tell the user there are no other mobs to switch to and suggest using /mob-new or /codemob-new to create one.
 
 Otherwise, display the results and ask the user which mob they want to switch to.
 
 Once they pick one, run ` + "`codemob queue switch <name>`" + ` using the Bash tool (replace ` + "`<name>`" + ` with the chosen mob name).
-
-Then tell the user: "Switch queued. Exit this session (Ctrl+C) and codemob will automatically launch the new mob."
 `,
 	},
 	"change-agent": {
 		Description: "Switch the current mob to a different AI agent",
-		Body: triggerGuard + `codemob supports claude and codex out of the box.
+		Body: triggerGuard + confirmationGuardLaunch + `codemob supports claude and codex out of the box.
 
 Determine the current agent by checking which tool you are (claude or codex). Offer the OTHER agent — do not suggest the one already running.
 
-Once the user confirms, run ` + "`codemob queue change-agent <agent>`" + ` using the Bash tool (replace ` + "`<agent>`" + ` with the chosen agent name).
-
-Then tell the user: "Agent switch queued. Exit this session (Ctrl+C) and codemob will relaunch with the new agent."
+Once the user confirms which agent they want, run ` + "`codemob queue change-agent <agent>`" + ` using the Bash tool (replace ` + "`<agent>`" + ` with the chosen agent name).
 `,
 	},
 	"remove": {
@@ -78,22 +82,23 @@ Then tell the user: "Agent switch queued. Exit this session (Ctrl+C) and codemob
 
 Ask the user which mob they want to remove.
 
-If they choose a DIFFERENT mob (not the one marked with ◀), run ` + "`codemob remove <name>`" + ` directly.
+If they choose a DIFFERENT mob (not the one marked with ◀), run ` + "`codemob remove <name>`" + ` directly. No session confirmation needed since the current session stays alive.
+
+If they choose the CURRENT mob (marked with ◀):
 
-If they choose the CURRENT mob (marked with ◀), run this exact command:
+` + confirmationGuardExit + `
+Run this exact command:
 
 ` + "```" + `
 codemob queue remove "$CODEMOB_MOB"
 ` + "```" + `
 
 $CODEMOB_MOB is already set in your environment. There is no need to echo it - the command above will resolve it automatically.
-
-Then tell the user: "Removal queued. Exit this session (Ctrl+C) and codemob will remove the mob."
 `,
 	},
 	"drop": {
 		Description: "Remove the current codemob workspace and exit",
-		Body: triggerGuard + `Run this exact command using the Bash tool:
+		Body: triggerGuard + confirmationGuardExit + `Run this exact command using the Bash tool:
 
 ` + "```" + `
 codemob queue remove "$CODEMOB_MOB"
@@ -102,8 +107,6 @@ codemob queue remove "$CODEMOB_MOB"
 $CODEMOB_MOB is already set in your environment. There is no need to echo it - the command above will resolve it automatically.
 
 If the command fails, tell the user: "This command can only be used from within a codemob workspace." and stop.
-
-Otherwise, tell the user: "Mob queued for removal. Exit this session (Ctrl+C) and codemob will remove it."
 `,
 	},
 }

internal/mob/next.go

@@ -52,6 +52,11 @@ func ReadQueuedAction(repoRoot string) (*QueuedAction, error) {
 	return &action, nil
 }
 
+// QueueFilePath returns the absolute path to the queue file.
+func QueueFilePath(repoRoot string) string {
+	return filepath.Join(repoRoot, queueFile)
+}
+
 // ClearQueue removes the queued action file.
 func ClearQueue(repoRoot string) {
 	os.Remove(filepath.Join(repoRoot, queueFile))