cli: Remove pre-review dead code

Remove unreachable creation guards and the permanently false correction ambiguity field, align the CLI test Core stub with production, and move reference-only correction helpers out of the installed package.\n\nSecurity: fail-closed correction and wallet behavior are unchanged.\n\nRefs #38.

Author: BenWestgate

src/codex32/_cli_input.py

@@ -452,7 +452,7 @@ def _correction_candidates(
     deadline: float | None = None,
     capture_layers: list[tuple[int, int]] | None = None,
     fingerprint_match: Callable[[CorrectionCandidate], bool | None] | None = None,
-) -> tuple[tuple[CorrectionCandidate, ...], bool, float | None, bool]:
+) -> tuple[tuple[CorrectionCandidate, ...], bool, float | None]:
     count = len(value.replace(" ", ""))
     targets, primary, reduced, _timed = _correction_plan(profile, byte_length, count, target)
     deadline = monotonic() + 10 if deadline is None else deadline
@@ -478,7 +478,7 @@ def _correction_candidates(
         if len(candidates) == 1 and not candidates[0].search_complete
         else ()
     )
-    return results, complete, deadline, False
+    return results, complete, deadline
 
 
 def _fingerprint_matcher(

src/codex32/cli.py

@@ -426,17 +426,13 @@ def _create(
         raise _UsageError("--bytes applies only to a new random seed.")
     if not (sys.stdin.isatty() and sys.stdout.isatty()):
         raise _UsageError("Bitcoin backup creation requires an interactive terminal.")
-    if threshold and not sys.stdin.isatty():
-        raise _UsageError("Shared creation requires an interactive terminal.")
     if threshold and shares is None and indices is None:
         if threshold in (2, 3):
             shares = {2: 3, 3: 5}[threshold]
         else:
             raise _UsageError("For thresholds 4 through 9, choose --shares or --indices.")
     core = _connected_core()
     source = _creation_source(profile, core.fingerprint) if existing else None
-    if not existing and not sys.stdin.isatty() and _text("", optional=True):
-        raise _UsageError("Use --existing when supplying a seed or secret.")
     if isinstance(source, (Share, Secret)) and not isinstance(source, MasterSeed):
         raise _UsageError(f"Enter one {_profile_rules(profile).label}, not a share or another backup type.")
     try:
@@ -450,13 +446,8 @@ def _create(
             else:
                 secret = _generated_secret(source, byte_length, identifier, core.fingerprint_seed)
             _emit(secret, False, fingerprint=core.fingerprint)
-            if sys.stdin.isatty():
-                _confirm_card(secret)
-            return (
-                _initialize_wallet(core, secret, timestamp=0 if existing else "now", fresh=not existing)
-                if core is not None
-                else 0
-            )
+            _confirm_card(secret)
+            return _initialize_wallet(core, secret, timestamp=0 if existing else "now", fresh=not existing)
         if isinstance(source, MasterSeed):
             ceremony = CreationCeremony.from_secret(
                 source,
@@ -494,10 +485,7 @@ def _create(
         _print(f"Recovery card {position + 1} of {output_count} confirmed.", err=True)
     finished = ceremony.finish()
     assert isinstance(finished, MasterSeed)
-    if core is not None:
-        return _initialize_wallet(core, finished, timestamp=0 if existing else "now", fresh=not existing)
-    _print("\nEvery recovery card was confirmed from its re-entered text.", err=True)
-    return 0
+    return _initialize_wallet(core, finished, timestamp=0 if existing else "now", fresh=not existing)
 
 
 def _correct(
@@ -573,17 +561,17 @@ def _correct(
     capture_layers: list[tuple[int, int]] = []
     candidates: tuple[CorrectionCandidate, ...]
     if candidate is not None:
-        candidates, complete, deadline, ambiguous = (candidate,), True, None, False
+        candidates, complete, deadline = (candidate,), True, None
     else:
-        candidates, complete, deadline, ambiguous = _correction_candidates(
+        candidates, complete, deadline = _correction_candidates(
             search_value,
             hrp,
             byte_length,
             immutable,
             capture_layers=capture_layers,
         )
         if complete and not candidates and erased != search_value:
-            candidates, complete, deadline, ambiguous = _correction_candidates(
+            candidates, complete, deadline = _correction_candidates(
                 erased,
                 hrp,
                 byte_length,
@@ -593,8 +581,6 @@ def _correct(
             )
     if not complete and not candidates:
         raise _CommandError("The correction search did not complete within ten seconds.")
-    if ambiguous:
-        raise _CommandError("More than one correction is possible; none was selected.")
     if not candidates:
         raise _CommandError("No valid correction found. Check the original backup.")
     if context.master_seed and len(candidates) > 1:

src/codex32/indel.py

@@ -88,8 +88,6 @@ def _classes(unit: int, depth: int) -> tuple[_StructuralClass, ...]:
 _CHARACTER_CLASSES = _classes(1, 4)
 _GROUP_CLASSES = _classes(4, 2)
 _CLASSES = (_FIXED, *_CHARACTER_CLASSES, *_GROUP_CLASSES)
-# Compatibility for older offline tools; public search uses the full class set.
-_REDUCED_CLASSES = tuple(shape for shape in _CLASSES if shape.unit == 4 or shape.distance <= 3)
 
 
 def _group_boundary(immutable_length: int) -> int:
@@ -161,44 +159,6 @@ def _alignment_counts(
     return counts
 
 
-def _alignment_count(
-    shape: _StructuralClass,
-    observed_length: int,
-    target_length: int,
-    immutable_length: int,
-) -> int:
-    return sum(_alignment_counts(shape, "q" * observed_length, target_length, immutable_length).values())
-
-
-def _reductions(
-    values: tuple[int, ...],
-    characters: str,
-    count: int,
-    offset: int,
-) -> Iterator[tuple[tuple[int, ...], tuple[tuple[int, str], ...]]]:
-    for deleted in combinations(range(len(values)), count):
-        removed = frozenset(deleted)
-        kept = tuple(index for index in range(len(values)) if index not in removed)
-        retained = tuple(values[index] for index in kept)
-        position = 0
-        for kept_index in kept:
-            while values[position] != values[kept_index]:
-                position += 1
-            if position != kept_index:
-                break
-            position += 1
-        else:
-            edits = tuple((offset + index, characters[index]) for index in deleted)
-            yield retained, edits
-
-
-def _variants(
-    text: str, target: int, shape: _StructuralClass, immutable: int, prefix_length: int = 3
-) -> Iterator[_Variant]:
-    for view in _views(text, target, shape, immutable, prefix_length):
-        yield _view_variant(view, text, prefix_length)
-
-
 def _views(text: str, target: int, shape: _StructuralClass, immutable: int, base: int) -> Iterator[_View]:
     source = tuple(CHARSET.find(char.lower()) for char in text[base:])
     initial = _View(source, ((0, len(source)),), len(source))

tests/test_cli.py

@@ -93,7 +93,6 @@ class _FakeBitcoinCore:
     chain: str = "main"
     version: int = 320000
     imported: MasterSeed | None = None
-    private: bool | None = None
     account: int | None = None
     timestamp: int | str | None = None
 
@@ -109,12 +108,11 @@ def initialize(
         _ask: Callable[[str], str],
         _tell: Callable[[str], None],
         *,
-        private: bool = True,
         account: int = 0,
         timestamp: int | str = "now",
     ) -> str:
         self.imported = secret
-        self.private, self.account, self.timestamp = private, account, timestamp
+        self.account, self.timestamp = account, timestamp
         return "test-wallet"
 
 
@@ -1763,7 +1761,7 @@ def test_correction_bytes_rejects_an_unsupported_ms_size() -> None:
 def test_cli_never_accepts_an_incomplete_structural_search() -> None:
     original = VECTOR_1["secret_s"]
     damaged = original[:19] + original[20:]
-    with patch("codex32.cli._correction_candidates", return_value=((), False, 0.0, False)):
+    with patch("codex32.cli._correction_candidates", return_value=((), False, 0.0)):
         result = _invoke(["correct"], damaged)
 
     assert result.exit_code == 3
@@ -1891,7 +1889,6 @@ def test_wallet_commands_initialize_selected_master_seed_destinations() -> None:
     assert xprv.stderr.endswith("Keep it secret.\n\n")
     assert private.stdout == ""
     assert private_core.imported == parse_codex32(VECTOR_1["secret_s"])
-    assert private_core.private is True
     assert "Warning: This imports private descriptors that can spend funds." in private.stderr
     assert "Use only the intended encrypted wallet" not in private.stderr
     assert "\x1b[" not in private.stderr + private.stdout
@@ -2760,7 +2757,7 @@ def test_incomplete_candidate_has_no_search_warning_and_is_never_accepted_automa
     candidate = _correct_fixed(source, suspected_profile=Profile.MS)
     assert candidate is not None
     candidate = replace(candidate, search_complete=False)
-    with patch("codex32.cli._correction_candidates", return_value=((candidate,), False, 0.0, False)):
+    with patch("codex32.cli._correction_candidates", return_value=((candidate,), False, 0.0)):
         result = _invoke(["correct"], source[:-1] + "?")
     assert result.exit_code == 1 and result.stdout == ""
     assert "Search incomplete" not in result.stderr

tests/test_correction_disclosure.py

@@ -100,7 +100,7 @@ def test_noninteractive_gate_emits_only_operational_error(entrypoint, plain):
         patch.object(sys, "stdin", io.StringIO(VECTOR_1["secret_s"][:-1] + "?")),
         contextlib.redirect_stdout(stdout),
         contextlib.redirect_stderr(stderr),
-        patch.object(cli, "_correction_candidates", return_value=((_candidate(),), True, None, False)),
+        patch.object(cli, "_correction_candidates", return_value=((_candidate(),), True, None)),
     ):
         status = entrypoint(["correct", *(["--plain"] if plain else [])])
     prog = "codex32" if entrypoint is cli.main else "ms32"
@@ -127,9 +127,7 @@ def respond(prompt, prefill=""):
     monkeypatch.setattr(_cli_input, "_editable_input", respond)
     monkeypatch.setattr(_cli_input, "_suggestions", lambda *args, **kwargs: (candidate,))
     monkeypatch.setattr(cli, "_suggestions", lambda *args, **kwargs: (candidate,))
-    monkeypatch.setattr(
-        cli, "_correction_candidates", lambda *args, **kwargs: ((candidate,), True, None, False)
-    )
+    monkeypatch.setattr(cli, "_correction_candidates", lambda *args, **kwargs: ((candidate,), True, None))
     core = _FakeBitcoinCore()
     monkeypatch.setattr(cli.BitcoinCore, "connect", lambda *args: core)
     stdout, stderr = _TTYOutput(), _TTYOutput()
@@ -163,9 +161,7 @@ def respond(prompt, prefill=""):
         return next(responses)
 
     monkeypatch.setattr(_cli_input, "_editable_input", respond)
-    monkeypatch.setattr(
-        cli, "_correction_candidates", lambda *args, **kwargs: ((candidate,), True, None, False)
-    )
+    monkeypatch.setattr(cli, "_correction_candidates", lambda *args, **kwargs: ((candidate,), True, None))
     with (
         patch.object(sys, "stdin", _TTYInput()),
         contextlib.redirect_stdout(stdout),
@@ -181,9 +177,7 @@ def test_redirected_stderr_blocks_low_discrimination_disclosure(monkeypatch):
     candidate = _candidate(source)
     responses = iter((source[:-1] + "?",))
     monkeypatch.setattr(_cli_input, "_editable_input", lambda *args, **kwargs: next(responses))
-    monkeypatch.setattr(
-        cli, "_correction_candidates", lambda *args, **kwargs: ((candidate,), True, None, False)
-    )
+    monkeypatch.setattr(cli, "_correction_candidates", lambda *args, **kwargs: ((candidate,), True, None))
     stdout, stderr = io.StringIO(), io.StringIO()
     with (
         patch.object(sys, "stdin", _TTYInput()),
@@ -218,9 +212,7 @@ def confirm(prompt):
         return "YES"
 
     monkeypatch.setattr(_cli_input, "_confirmation_input", confirm)
-    monkeypatch.setattr(
-        cli, "_correction_candidates", lambda *args, **kwargs: ((candidate,), True, None, False)
-    )
+    monkeypatch.setattr(cli, "_correction_candidates", lambda *args, **kwargs: ((candidate,), True, None))
     stdout, stderr = io.StringIO(), _TTYOutput()
     with (
         patch.object(sys, "stdin", io.StringIO(source[:-1] + "?")),

tests/test_correction_indel.py

@@ -19,21 +19,19 @@
     _CLASSES,
     _FIXED,
     _GROUP_CLASSES,
-    _REDUCED_CLASSES,
-    _alignment_count,
     _alignment_counts,
     _capacities,
     _frontier,
     _keep,
     _prepare,
-    _reductions,
     _required_header_substitutions,
     _search_many,
     _search_target,
 )
 from codex32.profiles.ms32 import TEXT_LENGTHS
 from tools._wallet_reference import fingerprint_seed
 from tools.correction_capture import cross_length_classes
+from tools.correction_reference import _REDUCED_CLASSES, _alignment_count, _reductions
 
 SOURCE = VECTOR_1["secret_s"]
 CONTEXT = CorrectionContext(Profile.MS, expected_length=len(SOURCE))

tools/correction_benchmark.py

@@ -15,13 +15,12 @@
 from codex32.correction import CorrectionContext
 from codex32.indel import (
     _CHARACTER_CLASSES,
-    _alignment_count,
     _required_header_substitutions,
     _search_many,
-    _variants,
 )
 from codex32.profiles import Profile
 from codex32.profiles.ms32 import TEXT_LENGTHS
+from tools.correction_reference import _alignment_count, _variants
 
 DELTAS = (-8, -4, -3, -2, -1, 0, 1, 2, 3, 4, 8)
 AUTOMATIC_48_COUNTS = (40, *range(44, 53), 56)

tools/correction_reference.py

@@ -0,0 +1,53 @@
+"""Reference-only structural helpers used by tests and correction benchmarks."""
+
+from collections.abc import Iterator
+from itertools import combinations
+
+from codex32.indel import (
+    _CLASSES,
+    _alignment_counts,
+    _StructuralClass,
+    _Variant,
+    _view_variant,
+    _views,
+)
+
+_REDUCED_CLASSES = tuple(shape for shape in _CLASSES if shape.unit == 4 or shape.distance <= 3)
+
+
+def _alignment_count(
+    shape: _StructuralClass,
+    observed_length: int,
+    target_length: int,
+    immutable_length: int,
+) -> int:
+    return sum(_alignment_counts(shape, "q" * observed_length, target_length, immutable_length).values())
+
+
+def _reductions(
+    values: tuple[int, ...],
+    characters: str,
+    count: int,
+    offset: int,
+) -> Iterator[tuple[tuple[int, ...], tuple[tuple[int, str], ...]]]:
+    for deleted in combinations(range(len(values)), count):
+        removed = frozenset(deleted)
+        kept = tuple(index for index in range(len(values)) if index not in removed)
+        retained = tuple(values[index] for index in kept)
+        position = 0
+        for kept_index in kept:
+            while values[position] != values[kept_index]:
+                position += 1
+            if position != kept_index:
+                break
+            position += 1
+        else:
+            edits = tuple((offset + index, characters[index]) for index in deleted)
+            yield retained, edits
+
+
+def _variants(
+    text: str, target: int, shape: _StructuralClass, immutable: int, prefix_length: int = 3
+) -> Iterator[_Variant]:
+    for view in _views(text, target, shape, immutable, prefix_length):
+        yield _view_variant(view, text, prefix_length)