Add interactive mode to auto-continue — restarts in same terminal

Default is now interactive (claude --init-prompt) so the session
reopens in the users terminal. Headless mode (claude -p) available
via --headless flag or claude-auto wrapper.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: jvalin17

README.md

@@ -36,7 +36,14 @@ cd /path/to/your-project && claude        # hooks inject context; look for "AGEN
 
 Natural language works: *"fix the login bug"* routes to `/debug`. Chain hands-off: `/requirements auto my-app`.
 
-**Auto-continuation** is on by default (`"continue": true` in `gates.json`). When context is exhausted, the hook writes `HANDOFF.md` and automatically relaunches a fresh session. No wrapper needed. Set `"continue": false` to disable (session will warn but keep running).
+**Auto-continuation** — when context is exhausted, the session hands off via `HANDOFF.md` and restarts. Two ways to use it:
+
+```bash
+agent-toolkit-continue "Build auth system"   # interactive — restarts in same terminal
+claude-auto "Build auth system"              # headless — for CI/background tasks
+```
+
+Or set `"continue": true` in `gates.json` for in-hook restart (headless only). Set `"continue": false` to disable (session will warn but keep running).
 
 Install details & updates: [docs/install-and-updates.md](docs/install-and-updates.md)
 
@@ -277,7 +284,7 @@ agent-toolkit-setup --tdd off     # toggle one setting
 
 | Feature | Doc |
 |---------|-----|
-| Auto-continuation (long tasks) | [architecture/auto-continuation.md](architecture/auto-continuation.md) |
+| Auto-continuation (long tasks) | `agent-toolkit-continue` (interactive) / `claude-auto` (headless) · [architecture/auto-continuation.md](architecture/auto-continuation.md) |
 | TDD strict mode | `"tdd_mode": "strict"` in `gates.json` — blocks source edits until tests exist |
 | Strict mode (anti-fake) | [shared/strict-mode.md](shared/strict-mode.md) |
 | Signed gates (teams / CI) | [shared/gate-unlock.md](shared/gate-unlock.md) |

scripts/agent-toolkit-continue

@@ -1,10 +1,14 @@
 #!/bin/bash
 # agent-toolkit-continue — Session continuation wrapper for Claude Code
 # Launches auto_continue.py which manages session lifecycle:
-# detect context exhaustion, write HANDOFF.md, relaunch.
+# detect context exhaustion, write HANDOFF.md, relaunch in the same terminal.
+#
+# Runs INTERACTIVE by default (you get a normal claude terminal).
+# Add --headless for non-interactive (claude -p) mode.
 #
 # Usage:
-#   agent-toolkit-continue "Build auth system"
+#   agent-toolkit-continue "Build auth system"           # interactive
+#   agent-toolkit-continue --headless "Build auth system" # headless
 #   agent-toolkit-continue --max-budget-usd 5.00 "Build auth system"
 #   agent-toolkit-continue --dry-run "Build auth system"
 #   agent-toolkit-continue  # resume from existing HANDOFF.md

scripts/auto_continue.py

@@ -39,11 +39,13 @@ def __init__(
         project_dir: Path,
         dry_run: bool = False,
         model: Optional[str] = None,
+        headless: bool = False,
     ):
         self.goal = goal
         self.max_budget = max_budget
         self.project_dir = project_dir
         self.dry_run = dry_run
+        self.headless = headless
         self.handoff_file = project_dir / "HANDOFF.md"
         self.history_log = project_dir / "handoff-history.log"
         self.session_count = 0
@@ -127,17 +129,22 @@ def _build_prompt(self) -> str:
         )
 
     def _launch_session(self, prompt: str) -> int:
-        """Launch a Claude Code session in headless mode. Returns process exit code.
+        """Launch a Claude Code session. Returns process exit code.
 
-        Uses `claude -p` (print mode) which runs non-interactively.
-        --dangerously-skip-permissions allows autonomous file operations.
-        --max-budget-usd caps spend per session.
+        Headless mode: `claude -p` (non-interactive, JSON output).
+        Interactive mode: `claude --resume` or `claude` with initial prompt,
+        runs in the same terminal with full user interaction.
         """
-        cmd = [
-            "claude", "-p", prompt,
-            "--output-format", "json",
-            "--dangerously-skip-permissions",
-        ]
+        if self.headless:
+            cmd = [
+                "claude", "-p", prompt,
+                "--output-format", "json",
+                "--dangerously-skip-permissions",
+            ]
+        else:
+            # Interactive: launch claude normally, let user interact
+            # First session uses --init-prompt, continuations use --resume
+            cmd = ["claude", "--init-prompt", prompt]
 
         if self.model and self.model != "auto":
             cmd.extend(["--model", self.model])
@@ -258,6 +265,12 @@ def parse_args(argv: Optional[list] = None) -> argparse.Namespace:
         default=None,
         help="Model to use (overrides gates.json). 'auto' = no override.",
     )
+    parser.add_argument(
+        "--headless",
+        action="store_true",
+        default=False,
+        help="Run in headless mode (claude -p). Default is interactive.",
+    )
     return parser.parse_args(argv)
 
 
@@ -270,6 +283,7 @@ def main() -> int:
         project_dir=Path(args.project_dir).resolve(),
         dry_run=args.dry_run,
         model=args.model,
+        headless=args.headless,
     )
     return runner.run()
 

scripts/claude-auto

@@ -1,14 +1,14 @@
 #!/bin/bash
-# claude-auto — Auto-continuation wrapper for Claude Code
-# Launches auto_continue.py which manages session lifecycle:
-# detect context exhaustion, write HANDOFF.md, relaunch.
+# claude-auto — Auto-continuation wrapper for Claude Code (headless)
+# Launches auto_continue.py in headless mode (claude -p).
+# For interactive mode, use agent-toolkit-continue instead.
 #
 # Usage:
-#   claude-auto --headless "Build auth system"
-#   claude-auto --headless --max-budget-usd 5.00 "Build auth"
-#   claude-auto --headless  # resume from existing HANDOFF.md
+#   claude-auto "Build auth system"
+#   claude-auto --max-budget-usd 5.00 "Build auth"
+#   claude-auto  # resume from existing HANDOFF.md
 
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 # Headless sessions start with strict gate enforcement
 export AGENT_TOOLKIT_ENFORCEMENT=block
-exec python3 "$SCRIPT_DIR/auto_continue.py" "$@"
+exec python3 "$SCRIPT_DIR/auto_continue.py" --headless "$@"

tests/test_auto_continue.py

@@ -196,14 +196,33 @@ def test_includes_timestamp(self, runner):
 
 
 class TestLaunchSession:
-    def test_uses_claude_p(self, runner):
+    def test_interactive_uses_init_prompt(self, runner):
+        """Default (interactive) mode uses --init-prompt, not -p."""
+        with patch("subprocess.run") as mock_run:
+            mock_run.return_value = MagicMock(returncode=0)
+            runner._launch_session("test prompt")
+
+        cmd = mock_run.call_args[0][0]
+        assert "claude" in cmd
+        assert "--init-prompt" in cmd
+        assert "test prompt" in cmd
+
+    def test_headless_uses_claude_p(self, project_dir):
+        """Headless mode uses claude -p with JSON output."""
+        runner = AutoContinue(
+            goal="Build it",
+            max_budget=None,
+            project_dir=project_dir,
+            headless=True,
+        )
         with patch("subprocess.run") as mock_run:
             mock_run.return_value = MagicMock(returncode=0)
             runner._launch_session("test prompt")
 
         cmd = mock_run.call_args[0][0]
         assert "claude" in cmd
         assert "-p" in cmd
+        assert "--output-format" in cmd
         assert "test prompt" in cmd
 
     def test_budget_passthrough(self, project_dir):