π« Toolkit to help you get started with SDD or any other process!
fix(init): don't block on confirmation for 'init --here' without a TTY (#3236)
Ali jawwad993083405ee8
diff --git a/src/specify_cli/commands/init.py b/src/specify_cli/commands/init.pyindex dd815b8c5..9eb830288 100644--- a/src/specify_cli/commands/init.py+++ b/src/specify_cli/commands/init.py@@ -220,16 +220,45 @@ def register(app: typer.Typer) -> None:console.print(f"[yellow]Warning:[/yellow] Current directory is not empty ({len(existing_items)} items)")- console.print(- "[yellow]Template files will be merged with existing content and may overwrite existing files[/yellow]"- )if force:+ # Proceeding: the merge/overwrite warning is accurate here.+ console.print(+ "[yellow]Template files will be merged with existing content and may overwrite existing files[/yellow]"+ )console.print("[cyan]--force supplied: skipping confirmation and proceeding with merge[/cyan]")else:- response = typer.confirm("Do you want to continue?")- if not response:+ # Fold the merge risk into the confirmation prompt rather than+ # printing it unconditionally first: on the EOF/no-input path+ # below the command exits without changing anything, so a+ # standalone "will be merged" line would mislead. Interactive+ # users still see the risk as part of the question.+ #+ # Call typer.confirm normally so piped y/n is honored β e.g.+ # `echo y | specify init --here` keeps reaching the+ # non-destructive preserve-merge path.+ try:+ proceed = typer.confirm(+ "Template files will be merged with existing content "+ "and may overwrite existing files. Do you want to continue?"+ )+ except (typer.Abort, EOFError):+ # typer.confirm raises Abort for BOTH an interactive Ctrl+C+ # and an EOF on closed/empty stdin. Distinguish them: a real+ # TTY cancellation is a normal exit (0, "cancelled"), while a+ # missing-input EOF (non-interactive) becomes an actionable+ # error pointing at --force.+ if _stdin_is_interactive():+ console.print("[yellow]Operation cancelled[/yellow]")+ raise typer.Exit(0) from None+ console.print(+ "[red]Error:[/red] Current directory is not empty and no "+ "confirmation input is available. Re-run with "+ "[bold]--force[/bold] to merge into it."+ )+ raise typer.Exit(1) from None+ if not proceed:console.print("[yellow]Operation cancelled[/yellow]")raise typer.Exit(0)else:diff --git a/tests/integrations/test_cli.py b/tests/integrations/test_cli.pyindex cb2d136e6..7b6461b4d 100644--- a/tests/integrations/test_cli.py+++ b/tests/integrations/test_cli.py@@ -115,6 +115,63 @@ class TestInitIntegrationFlag:data = json.loads((project / ".specify" / "integration.json").read_text(encoding="utf-8"))assert data["integration"] == specify_cli.DEFAULT_INIT_INTEGRATION+ def test_init_here_nonempty_noninteractive_errors_with_force_guidance(self, tmp_path):+ """`init --here` on a non-empty directory with no confirmation input (empty+ stdin) must fail fast with guidance to use --force, instead of the bare+ 'Aborted.' from an EOF on typer.confirm. CliRunner with no `input=` provides+ empty stdin, so typer.confirm raises Abort, which the command converts to the+ actionable error."""+ from typer.testing import CliRunner+ from specify_cli import app++ project = tmp_path / "nonempty-here"+ project.mkdir()+ (project / "existing.txt").write_text("keep me", encoding="utf-8")+ old_cwd = os.getcwd()+ try:+ os.chdir(project)+ result = CliRunner().invoke(app, [+ "init", "--here", "--integration", "copilot", "--script", "sh", "--ignore-agent-tools",+ ], catch_exceptions=False)+ finally:+ os.chdir(old_cwd)++ assert result.exit_code == 1, result.output+ assert "--force" in result.output+ # Aborted before scaffolding: the pre-existing file is untouched.+ assert (project / "existing.txt").read_text(encoding="utf-8") == "keep me"++ def test_init_here_interactive_cancel_exits_zero(self, tmp_path, monkeypatch):+ """An interactive Ctrl+C at the merge confirmation (typer.Abort on a TTY)+ is a normal cancellation β exit 0, "cancelled" β NOT the missing-input+ --force error, which is reserved for non-interactive EOF. Guards the+ regression where Abort was caught unconditionally and every cancel became+ an exit-1 --force error."""+ from typer.testing import CliRunner+ from specify_cli import app+ import specify_cli.commands.init as init_mod++ # Simulate an interactive terminal so the Abort is treated as a cancel.+ monkeypatch.setattr(init_mod, "_stdin_is_interactive", lambda: True)++ project = tmp_path / "cancel-here"+ project.mkdir()+ (project / "existing.txt").write_text("keep me", encoding="utf-8")+ old_cwd = os.getcwd()+ try:+ os.chdir(project)+ # No input β typer.confirm raises Abort (stands in for Ctrl+C).+ result = CliRunner().invoke(app, [+ "init", "--here", "--integration", "copilot", "--script", "sh", "--ignore-agent-tools",+ ], catch_exceptions=False)+ finally:+ os.chdir(old_cwd)++ assert result.exit_code == 0, result.output+ assert "cancelled" in result.output.lower()+ assert "--force" not in result.output # not the missing-input error+ assert (project / "existing.txt").read_text(encoding="utf-8") == "keep me"+def test_integration_copilot_auto_promotes(self, tmp_path):from typer.testing import CliRunnerfrom specify_cli import app@@ -835,7 +892,8 @@ class TestInitIntegrationFlag:assert (scripts_dir / "common.sh").read_text(encoding="utf-8") != custom_contentdef test_init_here_without_force_preserves_shared_infra(self, tmp_path):- """E2E: specify init --here (no --force) preserves existing shared infra files."""+ """E2E: confirming the merge with piped "y" (no --force) preserves+ existing shared infra files (unlike --force, which overwrites them)."""from typer.testing import CliRunnerfrom specify_cli import app