fix(init): require explicit choice when stored and detected values conflict

When .cf/project.json and the workspace (e.g. git remote) disagree, the
prompt now shows both and Enter accepts the detected value (ground truth).
Type `k`/`keep` to keep the stored value instead. Previously Enter would
silently keep the stale stored value, which let wrong github_repo_url
values persist through repeated `cf init` runs.

Made-with: Cursor

Author: jeffdi

README.md

@@ -249,7 +249,9 @@ cf init [--project-root DIRECTORY] [--shuttle NAME_OR_ID] [--description TEXT]
 **What it does:**
 - **Idempotent refresh**: Running `cf init` again on an already-linked project pulls in the current platform values, pre-fills prompts, and only PUTs the differences you confirm. The `platform_project_id` link is preserved.
 - **Smart defaults**: Auto-detects project name from directory, project type from GDS files, and GitHub repo URL from your `origin` remote (HTTPS or SSH).
-- **Interactive prompts**: Blank input keeps the current/detected value; type `clear` to explicitly remove a field.
+- **Interactive prompts**:
+  - When a stored value and a detected value match (or only one exists), press Enter to accept it.
+  - When they **differ** (e.g. a stale `github_repo_url` in `.cf/project.json` vs. your current `git remote`), the prompt shows both and Enter accepts the detected value (ground truth). Type `k` or `keep` to keep the current value instead, type a new value to override, or type `clear` to remove the field entirely.
 - **Shuttle selection**: On first init, prompts to select an available shuttle (sorted by nearest deadline).
 - **Platform registration**: Creates the project on the platform and links it automatically.
 - Setting the GitHub repo URL enables `cf precheck --remote` and `cf push --remote`.

chipfoundry_cli/main.py

@@ -309,26 +309,54 @@ def keyview():
     _print_manual_key_instructions()
 
 def _prompt_with_default(label: str, current: Optional[str], detected: Optional[str] = None) -> Optional[str]:
-    """Interactive prompt that preserves `current` on blank input.
-
-    - Enter = keep current (or accept detected when no current).
-    - Type a value = new value.
-    - Type 'clear' = explicitly remove the value (returns None).
-    Returned value is stripped. `clear` is case-insensitive.
+    """Interactive prompt with sensible defaults for current/detected values.
+
+    Behavior:
+    - No current, no detected: Enter leaves the value unset (None).
+    - Only current:            Enter keeps current.
+    - Only detected:           Enter accepts detected.
+    - Current == detected:     Enter accepts the (single) value.
+    - Current != detected:     Enter accepts `detected` (ground truth, e.g. git
+                               remote). Type `k` or `keep` to keep current.
+    Any typed value becomes the new value. `clear` (case-insensitive) explicitly
+    removes the value (returns None).
     """
-    effective_default = current if current else detected
-    hint_parts = []
-    if current:
-        hint_parts.append(f"current: [cyan]{current}[/cyan]")
-    if detected and detected != current:
-        hint_parts.append(f"detected: [cyan]{detected}[/cyan]")
-    hint_parts.append("blank=keep, 'clear'=remove")
-    hint = ", ".join(hint_parts)
-    raw = console.input(f"{label} ({hint}): ").strip()
+    normalized_current = current.strip() if isinstance(current, str) and current.strip() else None
+    normalized_detected = detected.strip() if isinstance(detected, str) and detected.strip() else None
+    conflict = (
+        normalized_current is not None
+        and normalized_detected is not None
+        and normalized_current != normalized_detected
+    )
+
+    if conflict:
+        effective_default = normalized_detected
+    elif normalized_detected is not None:
+        effective_default = normalized_detected
+    else:
+        effective_default = normalized_current
+
+    console.print(f"[bold]{label}[/bold]")
+    if normalized_current:
+        console.print(f"  current:  [cyan]{normalized_current}[/cyan]")
+    if normalized_detected and normalized_detected != normalized_current:
+        console.print(f"  detected: [cyan]{normalized_detected}[/cyan]")
+
+    if conflict:
+        hint = "enter=use detected, k=keep current, clear=remove, or type new value"
+    elif effective_default:
+        hint = "enter=accept, clear=remove, or type new value"
+    else:
+        hint = "enter=skip, or type value"
+
+    raw = console.input(f"  [dim]{hint}[/dim]: ").strip()
     if raw == "":
         return effective_default
-    if raw.lower() == "clear":
+    lowered = raw.lower()
+    if lowered == "clear":
         return None
+    if conflict and lowered in ("k", "keep"):
+        return normalized_current
     return raw
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "chipfoundry-cli"
-version = "2.3.14"
+version = "2.3.15"
 description = "CLI tool to automate ChipFoundry project submission to SFTP server"
 authors = ["ChipFoundry <marwan.abbas@chipfoundry.io>"]
 readme = "README.md"