Skip to content

πŸ’« Toolkit to help you get started with SDD or any other process!

fix(bundler): treat a blank active integration as indeterminate in FR-019 (#3886)

Ali jawwad197dde625344
diff --git a/src/specify_cli/bundler/services/resolver.py b/src/specify_cli/bundler/services/resolver.py
index 127fa683f..9d9c61e79 100644
--- a/src/specify_cli/bundler/services/resolver.py
+++ b/src/specify_cli/bundler/services/resolver.py
@@ -77,6 +77,16 @@ def resolve_install_plan(
# FR-019: integration-compatibility β€” a bundle that pins a different
# integration than the project's active one halts (no silent change).
+ #
+ # A blank integration arrives as ``""``, not ``None`` β€” which is not a usable
+ # integration id but satisfied NEITHER guard below (the first is a truthiness
+ # test, the second an ``is None`` test), so a pinned bundle was silently
+ # adopted: precisely the outcome this guard exists to prevent. Treat blank as
+ # indeterminate, and strip first like the writer
+ # (``integration_state.clean_integration_key``) so a padded value is not
+ # reported as clashing with itself.
+ if active_integration is not None:
+ active_integration = active_integration.strip() or None
effective_integration = active_integration
if manifest.integration is not None:
required = manifest.integration.id
diff --git a/tests/unit/test_bundler_resolver.py b/tests/unit/test_bundler_resolver.py
index 7068a4813..4045cc07a 100644
--- a/tests/unit/test_bundler_resolver.py
+++ b/tests/unit/test_bundler_resolver.py
@@ -62,6 +62,32 @@ def test_pinned_integration_with_indeterminate_active_fails():
)
[email protected]("blank", ["", " ", "\t"])
+def test_pinned_integration_with_blank_active_fails(blank):
+ """A blank active integration is indeterminate, not a match.
+
+ The clash guard is a truthiness test and the indeterminate guard is an
+ `is None` test, so `""` satisfied neither and fell through to
+ `effective_integration = required` β€” silently adopting the bundle's pinned
+ integration, the exact outcome the docstring says the guard prevents.
+ """
+ manifest = _manifest(integration={"id": "claude"})
+ with pytest.raises(BundlerError, match="could not be determined"):
+ resolve_install_plan(
+ manifest, speckit_version="0.11.2", active_integration=blank
+ )
+
+
+def test_padded_active_integration_is_not_a_clash_with_itself():
+ """A padded value must strip, like the writer's clean_integration_key,
+ rather than be reported as clashing with its own unpadded form."""
+ manifest = _manifest(integration={"id": "claude"})
+ plan = resolve_install_plan(
+ manifest, speckit_version="0.11.2", active_integration=" claude "
+ )
+ assert plan.effective_integration == "claude"
+
+
def test_pinned_integration_with_indeterminate_active_allows_explicit_override():
manifest = _manifest(integration={"id": "claude"})
plan = resolve_install_plan(