@mc-and-his-agents/loom-installer 0.1.42 → 0.1.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mc-and-his-agents/loom-installer",
-  "version": "0.1.42",
+  "version": "0.1.44",
   "description": "Node installer for Loom plugin and single-skill installation surfaces.",
   "type": "module",
   "bin": {

package/payload/manifest.json

@@ -2,9 +2,9 @@
   "schema_version": "loom-installer-payload/v1",
   "loom_version": "0.4.0",
   "source_repository": "https://github.com/MC-and-his-Agents/Loom",
-  "source_commit": "988279c09caf5bb788d70f3c9b1632b82a93c371",
+  "source_commit": "62fc9353f0821c3354965e01eb8fb77576247888",
   "source_ref": "main",
-  "built_at": "2026-04-27T18:24:47+08:00",
+  "built_at": "2026-04-27T23:17:55+08:00",
   "runtime": {
     "python_minimum": "3.10",
     "python_recommended": "3.11+"
@@ -628,18 +628,18 @@
     },
     {
       "path": "plugin/loom/skills/shared/scripts/governance_surface.py",
-      "bytes": 57136,
-      "sha256": "02e6f66afcfad5b117ea9a801c7153466f24c6d5721da1546f286aa046c548f1"
+      "bytes": 58392,
+      "sha256": "543e10c205be62f5be78704fe9bf27e808fc07ffe035382e3d4dd78ffa8c80cc"
     },
     {
       "path": "plugin/loom/skills/shared/scripts/loom_check.py",
-      "bytes": 351345,
-      "sha256": "43d96461db5e300ee40f44d0ed0cf29cf610aa8bf7343a98ff93cb7a54e36ffe"
+      "bytes": 356924,
+      "sha256": "71f0b9a7d55526b119af75b06c9787d875c27e19bbea70853ebc3df11f43eee7"
     },
     {
       "path": "plugin/loom/skills/shared/scripts/loom_flow.py",
-      "bytes": 338788,
-      "sha256": "e5f386988863d970ebf5415bfdb3a91159b120a84d3acd82ca3435be6f9af19c"
+      "bytes": 340366,
+      "sha256": "334a8df4ef8400125b6e7c311d386ac98c15f34c5be91befb9499215ee4ba0c4"
     },
     {
       "path": "plugin/loom/skills/shared/scripts/loom_init.py",
@@ -1218,18 +1218,18 @@
     },
     {
       "path": "skills/loom-adopt/.loom-runtime/shared/scripts/governance_surface.py",
-      "bytes": 57136,
-      "sha256": "02e6f66afcfad5b117ea9a801c7153466f24c6d5721da1546f286aa046c548f1"
+      "bytes": 58392,
+      "sha256": "543e10c205be62f5be78704fe9bf27e808fc07ffe035382e3d4dd78ffa8c80cc"
     },
     {
       "path": "skills/loom-adopt/.loom-runtime/shared/scripts/loom_check.py",
-      "bytes": 351345,
-      "sha256": "43d96461db5e300ee40f44d0ed0cf29cf610aa8bf7343a98ff93cb7a54e36ffe"
+      "bytes": 356924,
+      "sha256": "71f0b9a7d55526b119af75b06c9787d875c27e19bbea70853ebc3df11f43eee7"
     },
     {
       "path": "skills/loom-adopt/.loom-runtime/shared/scripts/loom_flow.py",
-      "bytes": 338788,
-      "sha256": "e5f386988863d970ebf5415bfdb3a91159b120a84d3acd82ca3435be6f9af19c"
+      "bytes": 340366,
+      "sha256": "334a8df4ef8400125b6e7c311d386ac98c15f34c5be91befb9499215ee4ba0c4"
     },
     {
       "path": "skills/loom-adopt/.loom-runtime/shared/scripts/loom_init.py",
@@ -1838,18 +1838,18 @@
     },
     {
       "path": "skills/loom-handoff/.loom-runtime/shared/scripts/governance_surface.py",
-      "bytes": 57136,
-      "sha256": "02e6f66afcfad5b117ea9a801c7153466f24c6d5721da1546f286aa046c548f1"
+      "bytes": 58392,
+      "sha256": "543e10c205be62f5be78704fe9bf27e808fc07ffe035382e3d4dd78ffa8c80cc"
     },
     {
       "path": "skills/loom-handoff/.loom-runtime/shared/scripts/loom_check.py",
-      "bytes": 351345,
-      "sha256": "43d96461db5e300ee40f44d0ed0cf29cf610aa8bf7343a98ff93cb7a54e36ffe"
+      "bytes": 356924,
+      "sha256": "71f0b9a7d55526b119af75b06c9787d875c27e19bbea70853ebc3df11f43eee7"
     },
     {
       "path": "skills/loom-handoff/.loom-runtime/shared/scripts/loom_flow.py",
-      "bytes": 338788,
-      "sha256": "e5f386988863d970ebf5415bfdb3a91159b120a84d3acd82ca3435be6f9af19c"
+      "bytes": 340366,
+      "sha256": "334a8df4ef8400125b6e7c311d386ac98c15f34c5be91befb9499215ee4ba0c4"
     },
     {
       "path": "skills/loom-handoff/.loom-runtime/shared/scripts/loom_init.py",
@@ -2458,18 +2458,18 @@
     },
     {
       "path": "skills/loom-init/.loom-runtime/shared/scripts/governance_surface.py",
-      "bytes": 57136,
-      "sha256": "02e6f66afcfad5b117ea9a801c7153466f24c6d5721da1546f286aa046c548f1"
+      "bytes": 58392,
+      "sha256": "543e10c205be62f5be78704fe9bf27e808fc07ffe035382e3d4dd78ffa8c80cc"
     },
     {
       "path": "skills/loom-init/.loom-runtime/shared/scripts/loom_check.py",
-      "bytes": 351345,
-      "sha256": "43d96461db5e300ee40f44d0ed0cf29cf610aa8bf7343a98ff93cb7a54e36ffe"
+      "bytes": 356924,
+      "sha256": "71f0b9a7d55526b119af75b06c9787d875c27e19bbea70853ebc3df11f43eee7"
     },
     {
       "path": "skills/loom-init/.loom-runtime/shared/scripts/loom_flow.py",
-      "bytes": 338788,
-      "sha256": "e5f386988863d970ebf5415bfdb3a91159b120a84d3acd82ca3435be6f9af19c"
+      "bytes": 340366,
+      "sha256": "334a8df4ef8400125b6e7c311d386ac98c15f34c5be91befb9499215ee4ba0c4"
     },
     {
       "path": "skills/loom-init/.loom-runtime/shared/scripts/loom_init.py",
@@ -3083,18 +3083,18 @@
     },
     {
       "path": "skills/loom-merge-ready/.loom-runtime/shared/scripts/governance_surface.py",
-      "bytes": 57136,
-      "sha256": "02e6f66afcfad5b117ea9a801c7153466f24c6d5721da1546f286aa046c548f1"
+      "bytes": 58392,
+      "sha256": "543e10c205be62f5be78704fe9bf27e808fc07ffe035382e3d4dd78ffa8c80cc"
     },
     {
       "path": "skills/loom-merge-ready/.loom-runtime/shared/scripts/loom_check.py",
-      "bytes": 351345,
-      "sha256": "43d96461db5e300ee40f44d0ed0cf29cf610aa8bf7343a98ff93cb7a54e36ffe"
+      "bytes": 356924,
+      "sha256": "71f0b9a7d55526b119af75b06c9787d875c27e19bbea70853ebc3df11f43eee7"
     },
     {
       "path": "skills/loom-merge-ready/.loom-runtime/shared/scripts/loom_flow.py",
-      "bytes": 338788,
-      "sha256": "e5f386988863d970ebf5415bfdb3a91159b120a84d3acd82ca3435be6f9af19c"
+      "bytes": 340366,
+      "sha256": "334a8df4ef8400125b6e7c311d386ac98c15f34c5be91befb9499215ee4ba0c4"
     },
     {
       "path": "skills/loom-merge-ready/.loom-runtime/shared/scripts/loom_init.py",
@@ -3703,18 +3703,18 @@
     },
     {
       "path": "skills/loom-pre-review/.loom-runtime/shared/scripts/governance_surface.py",
-      "bytes": 57136,
-      "sha256": "02e6f66afcfad5b117ea9a801c7153466f24c6d5721da1546f286aa046c548f1"
+      "bytes": 58392,
+      "sha256": "543e10c205be62f5be78704fe9bf27e808fc07ffe035382e3d4dd78ffa8c80cc"
     },
     {
       "path": "skills/loom-pre-review/.loom-runtime/shared/scripts/loom_check.py",
-      "bytes": 351345,
-      "sha256": "43d96461db5e300ee40f44d0ed0cf29cf610aa8bf7343a98ff93cb7a54e36ffe"
+      "bytes": 356924,
+      "sha256": "71f0b9a7d55526b119af75b06c9787d875c27e19bbea70853ebc3df11f43eee7"
     },
     {
       "path": "skills/loom-pre-review/.loom-runtime/shared/scripts/loom_flow.py",
-      "bytes": 338788,
-      "sha256": "e5f386988863d970ebf5415bfdb3a91159b120a84d3acd82ca3435be6f9af19c"
+      "bytes": 340366,
+      "sha256": "334a8df4ef8400125b6e7c311d386ac98c15f34c5be91befb9499215ee4ba0c4"
     },
     {
       "path": "skills/loom-pre-review/.loom-runtime/shared/scripts/loom_init.py",
@@ -4323,18 +4323,18 @@
     },
     {
       "path": "skills/loom-resume/.loom-runtime/shared/scripts/governance_surface.py",
-      "bytes": 57136,
-      "sha256": "02e6f66afcfad5b117ea9a801c7153466f24c6d5721da1546f286aa046c548f1"
+      "bytes": 58392,
+      "sha256": "543e10c205be62f5be78704fe9bf27e808fc07ffe035382e3d4dd78ffa8c80cc"
     },
     {
       "path": "skills/loom-resume/.loom-runtime/shared/scripts/loom_check.py",
-      "bytes": 351345,
-      "sha256": "43d96461db5e300ee40f44d0ed0cf29cf610aa8bf7343a98ff93cb7a54e36ffe"
+      "bytes": 356924,
+      "sha256": "71f0b9a7d55526b119af75b06c9787d875c27e19bbea70853ebc3df11f43eee7"
     },
     {
       "path": "skills/loom-resume/.loom-runtime/shared/scripts/loom_flow.py",
-      "bytes": 338788,
-      "sha256": "e5f386988863d970ebf5415bfdb3a91159b120a84d3acd82ca3435be6f9af19c"
+      "bytes": 340366,
+      "sha256": "334a8df4ef8400125b6e7c311d386ac98c15f34c5be91befb9499215ee4ba0c4"
     },
     {
       "path": "skills/loom-resume/.loom-runtime/shared/scripts/loom_init.py",
@@ -4943,18 +4943,18 @@
     },
     {
       "path": "skills/loom-retire/.loom-runtime/shared/scripts/governance_surface.py",
-      "bytes": 57136,
-      "sha256": "02e6f66afcfad5b117ea9a801c7153466f24c6d5721da1546f286aa046c548f1"
+      "bytes": 58392,
+      "sha256": "543e10c205be62f5be78704fe9bf27e808fc07ffe035382e3d4dd78ffa8c80cc"
     },
     {
       "path": "skills/loom-retire/.loom-runtime/shared/scripts/loom_check.py",
-      "bytes": 351345,
-      "sha256": "43d96461db5e300ee40f44d0ed0cf29cf610aa8bf7343a98ff93cb7a54e36ffe"
+      "bytes": 356924,
+      "sha256": "71f0b9a7d55526b119af75b06c9787d875c27e19bbea70853ebc3df11f43eee7"
     },
     {
       "path": "skills/loom-retire/.loom-runtime/shared/scripts/loom_flow.py",
-      "bytes": 338788,
-      "sha256": "e5f386988863d970ebf5415bfdb3a91159b120a84d3acd82ca3435be6f9af19c"
+      "bytes": 340366,
+      "sha256": "334a8df4ef8400125b6e7c311d386ac98c15f34c5be91befb9499215ee4ba0c4"
     },
     {
       "path": "skills/loom-retire/.loom-runtime/shared/scripts/loom_init.py",
@@ -5563,18 +5563,18 @@
     },
     {
       "path": "skills/loom-review/.loom-runtime/shared/scripts/governance_surface.py",
-      "bytes": 57136,
-      "sha256": "02e6f66afcfad5b117ea9a801c7153466f24c6d5721da1546f286aa046c548f1"
+      "bytes": 58392,
+      "sha256": "543e10c205be62f5be78704fe9bf27e808fc07ffe035382e3d4dd78ffa8c80cc"
     },
     {
       "path": "skills/loom-review/.loom-runtime/shared/scripts/loom_check.py",
-      "bytes": 351345,
-      "sha256": "43d96461db5e300ee40f44d0ed0cf29cf610aa8bf7343a98ff93cb7a54e36ffe"
+      "bytes": 356924,
+      "sha256": "71f0b9a7d55526b119af75b06c9787d875c27e19bbea70853ebc3df11f43eee7"
     },
     {
       "path": "skills/loom-review/.loom-runtime/shared/scripts/loom_flow.py",
-      "bytes": 338788,
-      "sha256": "e5f386988863d970ebf5415bfdb3a91159b120a84d3acd82ca3435be6f9af19c"
+      "bytes": 340366,
+      "sha256": "334a8df4ef8400125b6e7c311d386ac98c15f34c5be91befb9499215ee4ba0c4"
     },
     {
       "path": "skills/loom-review/.loom-runtime/shared/scripts/loom_init.py",
@@ -6183,18 +6183,18 @@
     },
     {
       "path": "skills/loom-spec-review/.loom-runtime/shared/scripts/governance_surface.py",
-      "bytes": 57136,
-      "sha256": "02e6f66afcfad5b117ea9a801c7153466f24c6d5721da1546f286aa046c548f1"
+      "bytes": 58392,
+      "sha256": "543e10c205be62f5be78704fe9bf27e808fc07ffe035382e3d4dd78ffa8c80cc"
     },
     {
       "path": "skills/loom-spec-review/.loom-runtime/shared/scripts/loom_check.py",
-      "bytes": 351345,
-      "sha256": "43d96461db5e300ee40f44d0ed0cf29cf610aa8bf7343a98ff93cb7a54e36ffe"
+      "bytes": 356924,
+      "sha256": "71f0b9a7d55526b119af75b06c9787d875c27e19bbea70853ebc3df11f43eee7"
     },
     {
       "path": "skills/loom-spec-review/.loom-runtime/shared/scripts/loom_flow.py",
-      "bytes": 338788,
-      "sha256": "e5f386988863d970ebf5415bfdb3a91159b120a84d3acd82ca3435be6f9af19c"
+      "bytes": 340366,
+      "sha256": "334a8df4ef8400125b6e7c311d386ac98c15f34c5be91befb9499215ee4ba0c4"
     },
     {
       "path": "skills/loom-spec-review/.loom-runtime/shared/scripts/loom_init.py",

package/payload/plugin/loom/skills/shared/scripts/governance_surface.py

@@ -1004,6 +1004,35 @@ def active_entry_points(root: Path) -> dict[str, str]:
     return active
 
 
+def bootstrap_host_binding_branch(root: Path) -> str:
+    init_result = root / ".loom/bootstrap/init-result.json"
+    try:
+        payload = json.loads(init_result.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return ""
+    if not isinstance(payload, dict):
+        return ""
+    governance_surface = payload.get("governance_surface")
+    if not isinstance(governance_surface, dict):
+        return ""
+    control_plane = governance_surface.get("governance_control_plane")
+    if not isinstance(control_plane, dict):
+        return ""
+    host_binding = control_plane.get("host_binding")
+    if not isinstance(host_binding, dict):
+        return ""
+    required_objects = host_binding.get("required_objects")
+    if not isinstance(required_objects, dict):
+        return ""
+    branch = required_objects.get("branch")
+    if not isinstance(branch, dict):
+        return ""
+    locator = branch.get("locator")
+    if isinstance(locator, str) and locator.strip() and locator != "unknown":
+        return locator.strip()
+    return ""
+
+
 def detect_carrier_summary(root: Path, *, repository_mode: str, planning_mode: bool) -> dict[str, dict[str, str]]:
     active = active_entry_points(root)
     active_item_id = active.get("current_item_id") or "INIT-0001"
@@ -1140,6 +1169,11 @@ def detect_host_binding_surface(
 ) -> dict[str, Any]:
     branch_result = run_process(["git", "branch", "--show-current"], root)
     branch = branch_result.stdout.strip() if branch_result.returncode == 0 else ""
+    branch_authority = "git"
+    if not branch:
+        branch = bootstrap_host_binding_branch(root)
+        if branch:
+            branch_authority = "bootstrap host binding"
     worktree_result = run_process(["git", "rev-parse", "--show-toplevel"], root)
     worktree = worktree_result.stdout.strip() if worktree_result.returncode == 0 else ""
     default_branch = github_control_plane.get("default_branch")
@@ -1152,7 +1186,7 @@ def detect_host_binding_surface(
         "branch": {
             "status": "present" if branch else "missing",
             "locator": branch or "unknown",
-            "authority": "git",
+            "authority": branch_authority,
         },
         "worktree": {
             "status": "present" if worktree else "missing",

package/payload/plugin/loom/skills/shared/scripts/loom_check.py

@@ -6915,6 +6915,120 @@ def check_adversarial_adoption_fixture(root: Path) -> list[Failure]:
             elif after_payload.get("refresh_needed"):
                 failures.append(Failure("adversarial-adoption", "carrier refresh --write must clear runtime provenance drift"))
 
+        outside_comment = base / "outside-comment.md"
+        outside_comment.write_text("sensitive local text\n", encoding="utf-8")
+        comment_escape_payload, error = load_command_json(
+            root,
+            [
+                "python3",
+                "tools/loom_flow.py",
+                "reconciliation",
+                "sync",
+                "--target",
+                str(baseline),
+                "--comment-file",
+                str(outside_comment),
+                "--dry-run",
+            ],
+        )
+        if error:
+            failures.append(Failure("adversarial-adoption", f"reconciliation comment-file boundary sample failed: {error}"))
+        elif comment_escape_payload.get("result") != "block":
+            failures.append(Failure("adversarial-adoption", "reconciliation --comment-file must block absolute paths outside the target root"))
+        else:
+            missing_inputs = comment_escape_payload.get("missing_inputs")
+            if not isinstance(missing_inputs, list) or not any(
+                "reconciliation comment file" in str(item) and "must be repo-relative" in str(item)
+                for item in missing_inputs
+            ):
+                failures.append(Failure("adversarial-adoption", "reconciliation --comment-file boundary block must report the comment file locator boundary error"))
+
+        original_pr_payload = loom_flow_module.github_pr_payload
+        original_issue_payload = loom_flow_module.github_issue_payload
+        original_reconciliation_audit = loom_flow_module.reconciliation_audit_payload
+        original_contains = loom_flow_module.contains_merged_commit
+        seen_target_branches: list[str] = []
+        try:
+            loom_flow_module.github_pr_payload = lambda *_args, **_kwargs: (
+                {
+                    "state": "MERGED",
+                    "baseRefName": "release/main",
+                    "mergeCommit": {"oid": "abc123"},
+                },
+                [],
+            )
+            loom_flow_module.github_issue_payload = lambda *_args, **_kwargs: (
+                {"state": "CLOSED", "id": "issue-id"},
+                [],
+            )
+            loom_flow_module.reconciliation_audit_payload = lambda **_kwargs: (
+                {
+                    "result": "pass",
+                    "findings": [],
+                    "missing_inputs": [],
+                    "fallback_to": None,
+                },
+                [],
+            )
+
+            def fake_contains(_root: Path, _merge_commit_sha: str, target_branch: str = "main") -> bool:
+                seen_target_branches.append(target_branch)
+                return target_branch == "release/main"
+
+            loom_flow_module.contains_merged_commit = fake_contains
+            closeout_target_branch_payload, closeout_errors = loom_flow_module.closeout_payload(
+                target_root=baseline,
+                phase_number=None,
+                fr_number=None,
+                issue_number=1,
+                pr_number=2,
+                project_number=None,
+                branch_name=None,
+                owner="owner",
+                repo_name="repo",
+                skip_gate=True,
+            )
+            if closeout_errors:
+                failures.append(Failure("adversarial-adoption", f"closeout target branch fixture failed: {closeout_errors}"))
+            elif closeout_target_branch_payload.get("result") != "pass":
+                failures.append(Failure("adversarial-adoption", "closeout must pass when the merge commit is contained in the PR base branch"))
+            if seen_target_branches != ["release/main"]:
+                failures.append(Failure("adversarial-adoption", "closeout must check merge commit containment against the PR base branch, including slash branches"))
+
+            seen_target_branches.clear()
+            loom_flow_module.github_pr_payload = lambda *_args, **_kwargs: (
+                {
+                    "state": "MERGED",
+                    "mergeCommit": {"oid": "abc123"},
+                },
+                [],
+            )
+            closeout_missing_base_payload, closeout_errors = loom_flow_module.closeout_payload(
+                target_root=baseline,
+                phase_number=None,
+                fr_number=None,
+                issue_number=1,
+                pr_number=2,
+                project_number=None,
+                branch_name=None,
+                owner="owner",
+                repo_name="repo",
+                skip_gate=True,
+            )
+            if closeout_errors:
+                failures.append(Failure("adversarial-adoption", f"closeout missing baseRefName fixture failed: {closeout_errors}"))
+            else:
+                missing_inputs = closeout_missing_base_payload.get("missing_inputs")
+                if closeout_missing_base_payload.get("result") != "block" or "pr baseRefName is missing" not in missing_inputs:
+                    failures.append(Failure("adversarial-adoption", "closeout must block when PR baseRefName is missing instead of falling back to main"))
+            if seen_target_branches:
+                failures.append(Failure("adversarial-adoption", "closeout must not check origin/main when PR baseRefName is missing"))
+        finally:
+            loom_flow_module.github_pr_payload = original_pr_payload
+            loom_flow_module.github_issue_payload = original_issue_payload
+            loom_flow_module.reconciliation_audit_payload = original_reconciliation_audit
+            loom_flow_module.contains_merged_commit = original_contains
+
         rollover_target = base / "active-rollover"
         shutil.copytree(baseline, rollover_target)
         payload, error = load_command_json(

package/payload/plugin/loom/skills/shared/scripts/loom_flow.py

@@ -1040,6 +1040,21 @@ def read_text_file(path_str: str) -> tuple[str | None, list[str]]:
     return text, []
 
 
+def read_repo_relative_text_file(root: Path, path_str: str, *, label: str) -> tuple[str | None, list[str]]:
+    path, errors = resolve_repo_relative_path(root, path_str, label=label)
+    if errors:
+        return None, errors
+    if path is None:
+        return None, [f"{label} is unavailable"]
+    if not path.exists() or not path.is_file():
+        return None, [f"{label} points to a missing file: {path_str}"]
+    try:
+        text = path.read_text(encoding="utf-8")
+    except OSError as exc:
+        return None, [f"failed to read {path_str}: {exc.strerror or exc}"]
+    return text, []
+
+
 def write_json_file(path: Path, payload: Any) -> None:
     path.parent.mkdir(parents=True, exist_ok=True)
     path.write_text(json.dumps(payload, ensure_ascii=False, indent=2) + "\n", encoding="utf-8")
@@ -5322,8 +5337,24 @@ def reconciliation_audit_payload(
                 if isinstance(oid, str) and oid:
                     merge_commit_sha = oid
                     base_ref = pr_payload.get("baseRefName")
-                    target_branch = base_ref if isinstance(base_ref, str) and base_ref else "main"
-                    merge_commit_in_main = contains_merged_commit(target_root, merge_commit_sha, target_branch)
+                    if isinstance(base_ref, str) and base_ref:
+                        merge_commit_in_main = contains_merged_commit(target_root, merge_commit_sha, base_ref)
+                    else:
+                        findings.append(
+                            make_reconciliation_finding(
+                                kind="merge_signal_drift",
+                                severity="block",
+                                subject=f"PR #{pr_number} merge signal",
+                                evidence={
+                                    "pr_state": pr_payload.get("state"),
+                                    "merge_commit": merge_commit_sha,
+                                    "baseRefName": base_ref,
+                                },
+                                recommended_action="re-read the PR base branch before closeout or reconciliation.",
+                                category="binding_failure",
+                                fallback_to="manual-reconciliation",
+                            )
+                        )
             if pr_payload.get("state") == "MERGED" and (not merge_commit_sha or not merge_commit_in_main):
                 findings.append(
                     make_reconciliation_finding(
@@ -6036,10 +6067,12 @@ def closeout_payload(
             if pr_payload.get("state") != "MERGED":
                 missing_inputs.append("pr is not merged")
             if merge_commit_sha:
-                run_git(target_root, ["fetch", "origin", "main"])
-                contains = run_git(target_root, ["merge-base", "--is-ancestor", merge_commit_sha, "origin/main"])
-                if contains is None or contains.returncode != 0:
-                    missing_inputs.append("origin/main does not contain the merged PR commit")
+                base_ref = pr_payload.get("baseRefName")
+                if isinstance(base_ref, str) and base_ref:
+                    if not contains_merged_commit(target_root, merge_commit_sha, base_ref):
+                        missing_inputs.append(f"origin/{base_ref} does not contain the merged PR commit")
+                else:
+                    missing_inputs.append("pr baseRefName is missing")
 
     project_payload: dict[str, Any] | None = None
     if project_number is not None:
@@ -6303,25 +6336,6 @@ def handle_reconciliation(args: argparse.Namespace) -> int:
                 summary="reconciliation is blocked because the Loom runtime state is inconsistent.",
             )
         )
-    owner = args.owner
-    repo_name = args.repo_name
-    if not owner or not repo_name:
-        detected_owner, detected_repo = detect_github_repo(target_root)
-        owner = owner or detected_owner
-        repo_name = repo_name or detected_repo
-    if not owner or not repo_name:
-        return emit(
-            {
-                "command": "reconciliation",
-                "operation": args.operation,
-                "result": "block",
-                "summary": "reconciliation could not determine the GitHub repository.",
-                "missing_inputs": ["owner/repo"],
-                "fallback_to": "manual-reconciliation",
-                "runtime_state": runtime_state,
-            }
-        )
-
     if args.comment and args.comment_file:
         return emit(
             {
@@ -6337,7 +6351,7 @@ def handle_reconciliation(args: argparse.Namespace) -> int:
 
     comment_body = args.comment
     if args.comment_file:
-        comment_body, comment_errors = read_text_file(args.comment_file)
+        comment_body, comment_errors = read_repo_relative_text_file(target_root, args.comment_file, label="reconciliation comment file")
         if comment_errors:
             return emit(
                 {
@@ -6350,6 +6364,24 @@ def handle_reconciliation(args: argparse.Namespace) -> int:
                     "runtime_state": runtime_state,
                 }
             )
+    owner = args.owner
+    repo_name = args.repo_name
+    if not owner or not repo_name:
+        detected_owner, detected_repo = detect_github_repo(target_root)
+        owner = owner or detected_owner
+        repo_name = repo_name or detected_repo
+    if not owner or not repo_name:
+        return emit(
+            {
+                "command": "reconciliation",
+                "operation": args.operation,
+                "result": "block",
+                "summary": "reconciliation could not determine the GitHub repository.",
+                "missing_inputs": ["owner/repo"],
+                "fallback_to": "manual-reconciliation",
+                "runtime_state": runtime_state,
+            }
+        )
 
     payload, errors = reconciliation_audit_payload(
         target_root=target_root,

package/payload/skills/loom-adopt/.loom-runtime/shared/scripts/governance_surface.py

@@ -1004,6 +1004,35 @@ def active_entry_points(root: Path) -> dict[str, str]:
     return active
 
 
+def bootstrap_host_binding_branch(root: Path) -> str:
+    init_result = root / ".loom/bootstrap/init-result.json"
+    try:
+        payload = json.loads(init_result.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return ""
+    if not isinstance(payload, dict):
+        return ""
+    governance_surface = payload.get("governance_surface")
+    if not isinstance(governance_surface, dict):
+        return ""
+    control_plane = governance_surface.get("governance_control_plane")
+    if not isinstance(control_plane, dict):
+        return ""
+    host_binding = control_plane.get("host_binding")
+    if not isinstance(host_binding, dict):
+        return ""
+    required_objects = host_binding.get("required_objects")
+    if not isinstance(required_objects, dict):
+        return ""
+    branch = required_objects.get("branch")
+    if not isinstance(branch, dict):
+        return ""
+    locator = branch.get("locator")
+    if isinstance(locator, str) and locator.strip() and locator != "unknown":
+        return locator.strip()
+    return ""
+
+
 def detect_carrier_summary(root: Path, *, repository_mode: str, planning_mode: bool) -> dict[str, dict[str, str]]:
     active = active_entry_points(root)
     active_item_id = active.get("current_item_id") or "INIT-0001"
@@ -1140,6 +1169,11 @@ def detect_host_binding_surface(
 ) -> dict[str, Any]:
     branch_result = run_process(["git", "branch", "--show-current"], root)
     branch = branch_result.stdout.strip() if branch_result.returncode == 0 else ""
+    branch_authority = "git"
+    if not branch:
+        branch = bootstrap_host_binding_branch(root)
+        if branch:
+            branch_authority = "bootstrap host binding"
     worktree_result = run_process(["git", "rev-parse", "--show-toplevel"], root)
     worktree = worktree_result.stdout.strip() if worktree_result.returncode == 0 else ""
     default_branch = github_control_plane.get("default_branch")
@@ -1152,7 +1186,7 @@ def detect_host_binding_surface(
         "branch": {
             "status": "present" if branch else "missing",
             "locator": branch or "unknown",
-            "authority": "git",
+            "authority": branch_authority,
         },
         "worktree": {
             "status": "present" if worktree else "missing",