gitgrip 2.0.0a8__tar.gz → 2.0.0a9__tar.gz

{gitgrip-2.0.0a8 → gitgrip-2.0.0a9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitgrip
-Version: 2.0.0a8
+Version: 2.0.0a9
 Summary: Workspace layer for multi-repo work: workspaces, isolated lanes, and one grouped review per slice
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -79,11 +79,14 @@ gr2 commit -m "my change" --workspace-root ~/ws --owner-unit default
 ```bash
 gr2 exec run ~/ws default --actor human:you -- pytest -q   # one command, every lane repo
 gr2 review create-project ~/ws default feat-x              # prints gr:<sha>: one object to review
+gr2 lane push ~/ws default feat-x                          # push every lane repo, each verified on its remote
 gr2 lane show ~/ws default                                 # where am I?
 gr2 lane exit ~/ws default --actor human:you
+gr2 lane list ~/ws                                         # each lane: removable, or keep and why
+gr2 lane remove ~/ws default feat-x                        # end it: its clones and record go
 ```
 
-`exec run` and `lane exit` require `--actor`. Every group and verb takes `--help`; `gr2 --help` lists them all.
+`lane remove` refuses while the lane is entered or leased, or was made by `lane bind`, while any of its repos holds uncommitted work, a stash, or a commit no remote has (on any branch or tag), or while its checkout holds anything that is not one of its repos; it names each one and removes nothing. `exec run` and `lane exit` require `--actor`. Every group and verb takes `--help`; `gr2 --help` lists them all.
 
 ## What works today, and what is not there yet
 
@@ -103,13 +106,13 @@ Not there yet:
 
 | Group | Verbs |
 |---|---|
-| `workspace` | init, init-from-topology, materialize, status, convert-clone, detect-gr1, migrate-gr1, migrate-lane-state, bootstrap-gr1, gitinclude |
+| `workspace` | init, init-from-topology, materialize, status, convert-clone, detect-gr1, migrate-gr1, retire-gr1, migrate-lane-state, bootstrap-gr1, gitinclude |
 | `spec` | show, validate |
-| `lane` | create, enter, exit, show, resolve, bind, lease |
+| `lane` | create, enter, exit, show, resolve, bind, lease, list, push, remove |
 | (top level) | branch, add, commit, push, prune, status, plan, apply |
 | `sync` | status, run |
 | `pr` | create, status, checks, merge, view |
-| `check` | run, show |
+| `check` | run, show, set |
 | `review` | open, close, checkout-pr, run, check, pin, publish, receive, verify, show, stamp, merge, repin, create-project, bind, approve, rebind |
 | `exec` | status, run |
 | `repo` | status, projection-run |
@@ -254,6 +257,12 @@ The read JSON contains `status`, `record_id` (the head's record-set blob id or
 null), `snapshot_oid`, `head`, `member_key`, `records`, and `reason`. Each
 observation retains its fields and adds a SHA-256 `observation_id`.
 
+A review over several members is checked as one set. `gr2 check set <workspace> <review> -- <command>`
+reconstructs every member at its pinned head side by side (`GR2_SET_ROOT`, `GR2_REVIEW_ID` and `GR2_SET_MEMBERS`
+name them), runs the command once, and publishes one `set` observation per member remote, carrying the review and the
+identity of the set. `gr2 review merge` requires that record on a multi-member review (`--no-set` says otherwise),
+and `check show --require set --review <id>` reads a `set` record for another review as stale.
+
 A failed command is recorded and `check run` exits 1. Publication or execution
 refusals exit 2. `check show` returns `pass`, `fail` or `absent` in its JSON;
 failed or unmeasurable reads exit 2. Conflicting pass and fail observations both

{gitgrip-2.0.0a8 → gitgrip-2.0.0a9}/README.md

@@ -63,11 +63,14 @@ gr2 commit -m "my change" --workspace-root ~/ws --owner-unit default
 ```bash
 gr2 exec run ~/ws default --actor human:you -- pytest -q   # one command, every lane repo
 gr2 review create-project ~/ws default feat-x              # prints gr:<sha>: one object to review
+gr2 lane push ~/ws default feat-x                          # push every lane repo, each verified on its remote
 gr2 lane show ~/ws default                                 # where am I?
 gr2 lane exit ~/ws default --actor human:you
+gr2 lane list ~/ws                                         # each lane: removable, or keep and why
+gr2 lane remove ~/ws default feat-x                        # end it: its clones and record go
 ```
 
-`exec run` and `lane exit` require `--actor`. Every group and verb takes `--help`; `gr2 --help` lists them all.
+`lane remove` refuses while the lane is entered or leased, or was made by `lane bind`, while any of its repos holds uncommitted work, a stash, or a commit no remote has (on any branch or tag), or while its checkout holds anything that is not one of its repos; it names each one and removes nothing. `exec run` and `lane exit` require `--actor`. Every group and verb takes `--help`; `gr2 --help` lists them all.
 
 ## What works today, and what is not there yet
 
@@ -87,13 +90,13 @@ Not there yet:
 
 | Group | Verbs |
 |---|---|
-| `workspace` | init, init-from-topology, materialize, status, convert-clone, detect-gr1, migrate-gr1, migrate-lane-state, bootstrap-gr1, gitinclude |
+| `workspace` | init, init-from-topology, materialize, status, convert-clone, detect-gr1, migrate-gr1, retire-gr1, migrate-lane-state, bootstrap-gr1, gitinclude |
 | `spec` | show, validate |
-| `lane` | create, enter, exit, show, resolve, bind, lease |
+| `lane` | create, enter, exit, show, resolve, bind, lease, list, push, remove |
 | (top level) | branch, add, commit, push, prune, status, plan, apply |
 | `sync` | status, run |
 | `pr` | create, status, checks, merge, view |
-| `check` | run, show |
+| `check` | run, show, set |
 | `review` | open, close, checkout-pr, run, check, pin, publish, receive, verify, show, stamp, merge, repin, create-project, bind, approve, rebind |
 | `exec` | status, run |
 | `repo` | status, projection-run |
@@ -238,6 +241,12 @@ The read JSON contains `status`, `record_id` (the head's record-set blob id or
 null), `snapshot_oid`, `head`, `member_key`, `records`, and `reason`. Each
 observation retains its fields and adds a SHA-256 `observation_id`.
 
+A review over several members is checked as one set. `gr2 check set <workspace> <review> -- <command>`
+reconstructs every member at its pinned head side by side (`GR2_SET_ROOT`, `GR2_REVIEW_ID` and `GR2_SET_MEMBERS`
+name them), runs the command once, and publishes one `set` observation per member remote, carrying the review and the
+identity of the set. `gr2 review merge` requires that record on a multi-member review (`--no-set` says otherwise),
+and `check show --require set --review <id>` reads a `set` record for another review as stale.
+
 A failed command is recorded and `check run` exits 1. Publication or execution
 refusals exit 2. `check show` returns `pass`, `fail` or `absent` in its JSON;
 failed or unmeasurable reads exit 2. Conflicting pass and fail observations both

{gitgrip-2.0.0a8 → gitgrip-2.0.0a9}/gitgrip.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitgrip
-Version: 2.0.0a8
+Version: 2.0.0a9
 Summary: Workspace layer for multi-repo work: workspaces, isolated lanes, and one grouped review per slice
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -79,11 +79,14 @@ gr2 commit -m "my change" --workspace-root ~/ws --owner-unit default
 ```bash
 gr2 exec run ~/ws default --actor human:you -- pytest -q   # one command, every lane repo
 gr2 review create-project ~/ws default feat-x              # prints gr:<sha>: one object to review
+gr2 lane push ~/ws default feat-x                          # push every lane repo, each verified on its remote
 gr2 lane show ~/ws default                                 # where am I?
 gr2 lane exit ~/ws default --actor human:you
+gr2 lane list ~/ws                                         # each lane: removable, or keep and why
+gr2 lane remove ~/ws default feat-x                        # end it: its clones and record go
 ```
 
-`exec run` and `lane exit` require `--actor`. Every group and verb takes `--help`; `gr2 --help` lists them all.
+`lane remove` refuses while the lane is entered or leased, or was made by `lane bind`, while any of its repos holds uncommitted work, a stash, or a commit no remote has (on any branch or tag), or while its checkout holds anything that is not one of its repos; it names each one and removes nothing. `exec run` and `lane exit` require `--actor`. Every group and verb takes `--help`; `gr2 --help` lists them all.
 
 ## What works today, and what is not there yet
 
@@ -103,13 +106,13 @@ Not there yet:
 
 | Group | Verbs |
 |---|---|
-| `workspace` | init, init-from-topology, materialize, status, convert-clone, detect-gr1, migrate-gr1, migrate-lane-state, bootstrap-gr1, gitinclude |
+| `workspace` | init, init-from-topology, materialize, status, convert-clone, detect-gr1, migrate-gr1, retire-gr1, migrate-lane-state, bootstrap-gr1, gitinclude |
 | `spec` | show, validate |
-| `lane` | create, enter, exit, show, resolve, bind, lease |
+| `lane` | create, enter, exit, show, resolve, bind, lease, list, push, remove |
 | (top level) | branch, add, commit, push, prune, status, plan, apply |
 | `sync` | status, run |
 | `pr` | create, status, checks, merge, view |
-| `check` | run, show |
+| `check` | run, show, set |
 | `review` | open, close, checkout-pr, run, check, pin, publish, receive, verify, show, stamp, merge, repin, create-project, bind, approve, rebind |
 | `exec` | status, run |
 | `repo` | status, projection-run |
@@ -254,6 +257,12 @@ The read JSON contains `status`, `record_id` (the head's record-set blob id or
 null), `snapshot_oid`, `head`, `member_key`, `records`, and `reason`. Each
 observation retains its fields and adds a SHA-256 `observation_id`.
 
+A review over several members is checked as one set. `gr2 check set <workspace> <review> -- <command>`
+reconstructs every member at its pinned head side by side (`GR2_SET_ROOT`, `GR2_REVIEW_ID` and `GR2_SET_MEMBERS`
+name them), runs the command once, and publishes one `set` observation per member remote, carrying the review and the
+identity of the set. `gr2 review merge` requires that record on a multi-member review (`--no-set` says otherwise),
+and `check show --require set --review <id>` reads a `set` record for another review as stale.
+
 A failed command is recorded and `check run` exits 1. Publication or execution
 refusals exit 2. `check show` returns `pass`, `fail` or `absent` in its JSON;
 failed or unmeasurable reads exit 2. Conflicting pass and fail observations both

{gitgrip-2.0.0a8 → gitgrip-2.0.0a9}/gitgrip.egg-info/SOURCES.txt

@@ -49,6 +49,7 @@ gr2/prototypes/repo_transport_probe.py
 gr2/python_cli/__init__.py
 gr2/python_cli/__main__.py
 gr2/python_cli/add.py
+gr2/python_cli/agent_record.py
 gr2/python_cli/app.py
 gr2/python_cli/approval_schema.py
 gr2/python_cli/approvals.py
@@ -60,6 +61,7 @@ gr2/python_cli/commit.py
 gr2/python_cli/config.py
 gr2/python_cli/consent.py
 gr2/python_cli/context.py
+gr2/python_cli/declared_sets.py
 gr2/python_cli/defaults.py
 gr2/python_cli/ecosystems_python.py
 gr2/python_cli/env_exec.py
@@ -82,9 +84,13 @@ gr2/python_cli/lane_graph.py
 gr2/python_cli/lane_plugins.py
 gr2/python_cli/launch_exec.py
 gr2/python_cli/layout.py
+gr2/python_cli/member_field_tree.py
 gr2/python_cli/merge_gate.py
+gr2/python_cli/merge_receipts.py
 gr2/python_cli/merge_verification.py
 gr2/python_cli/migration.py
+gr2/python_cli/names.py
+gr2/python_cli/next_steps.py
 gr2/python_cli/open_gr_review.py
 gr2/python_cli/platform.py
 gr2/python_cli/pr.py
@@ -102,12 +108,16 @@ gr2/python_cli/review_records.py
 gr2/python_cli/review_run.py
 gr2/python_cli/review_runners.py
 gr2/python_cli/root_option.py
+gr2/python_cli/set_check.py
+gr2/python_cli/set_hints.py
 gr2/python_cli/spec_apply.py
 gr2/python_cli/staging_cleanup.py
+gr2/python_cli/store_hooks.py
 gr2/python_cli/syncops.py
 gr2/python_cli/target.py
 gr2/python_cli/version.py
 gr2/python_cli/workspace_guidance.py
+gr2/python_cli/workspace_mode.py
 gr2/python_cli/workspace_snapshot.py
 gr2/schemas/gr2-materialization-plan-v1.schema.json
 gr2/schemas/gr2-workspace-spec-v1.schema.json
@@ -122,6 +132,9 @@ gr2/schemas/dev.synapt.grip.review.v1alpha1/review.proto
 gr2_overlay/__init__.py
 tests/test_add.py
 tests/test_agent_manifest_overlay_source.py
+tests/test_agent_record_append.py
+tests/test_agent_record_fold.py
+tests/test_agent_record_stamps.py
 tests/test_api_core_seam.py
 tests/test_api_dump.py
 tests/test_app_event_outcomes.py
@@ -139,8 +152,11 @@ tests/test_commit.py
 tests/test_config_base_path_guard.py
 tests/test_config_overlay.py
 tests/test_conftest_git_isolation.py
+tests/test_consent_key_paths.py
 tests/test_context_resolver.py
 tests/test_contribution_protocol.py
+tests/test_declared_set_pins.py
+tests/test_declared_sets.py
 tests/test_defaults_from_repo.py
 tests/test_deprecation_registry.py
 tests/test_ecosystems_python.py
@@ -151,13 +167,17 @@ tests/test_event_outcome_policy.py
 tests/test_events.py
 tests/test_events_torn_line.py
 tests/test_exec_apostrophe_and_oserror.py
+tests/test_exec_run_names_what_did_not_run.py
 tests/test_exec_single_string_and_materialize_plan.py
 tests/test_execops.py
 tests/test_failure_event_outcome.py
 tests/test_field_tree_name.py
+tests/test_field_tree_schema_reader.py
+tests/test_files_compose.py
 tests/test_first_five_minutes.py
 tests/test_foreground_launch_runtime.py
 tests/test_git_review.py
+tests/test_git_transport_allow_list.py
 tests/test_gitinclude_compiler.py
 tests/test_gitops_shared.py
 tests/test_gr1_first_run_guidance.py
@@ -170,11 +190,14 @@ tests/test_gr_shadow.py
 tests/test_grip_cli.py
 tests/test_grip_hardening.py
 tests/test_grip_snapshot.py
+tests/test_grip_toml_literals.py
 tests/test_grip_toml_schema_v1.py
 tests/test_hook_events.py
 tests/test_hook_hardening.py
 tests/test_hooks_consent.py
 tests/test_hooks_group_names.py
+tests/test_hostile_names.py
+tests/test_hostile_names_helper.py
 tests/test_jsonl_store.py
 tests/test_lane_checkout_root.py
 tests/test_lane_create_defaults.py
@@ -191,6 +214,8 @@ tests/test_lane_lifecycle_safety.py
 tests/test_lane_plugins.py
 tests/test_lane_probe.py
 tests/test_lane_probe_batch.py
+tests/test_lane_push.py
+tests/test_lane_remove.py
 tests/test_lane_repo_paths_and_all_skipped.py
 tests/test_lane_roles.py
 tests/test_lane_show_name.py
@@ -202,20 +227,25 @@ tests/test_linked_review_receipts.py
 tests/test_m2_overlay_hindsight.py
 tests/test_m2_overlay_mem0.py
 tests/test_m2_overlay_zep.py
+tests/test_malformed_remote_refusal.py
 tests/test_materialization_plan_contract.py
 tests/test_materialize_pin.py
 tests/test_member_working_root_checkout_materialize.py
 tests/test_merge_evidence.py
 tests/test_merge_parent_verification.py
 tests/test_migration.py
+tests/test_migration_desk_state.py
 tests/test_migration_overlay_compatibility.py
 tests/test_migration_unadopted_notice.py
+tests/test_names.py
 tests/test_native_store_gitinclude.py
 tests/test_native_store_review_record_probes.py
 tests/test_no_bare_python_cli_imports.py
+tests/test_np_bench_contract_scenario.py
 tests/test_null_current_lane_refusal.py
 tests/test_open_gr_enter.py
 tests/test_open_project_refusal_reason_cli.py
+tests/test_out_of_set_hint.py
 tests/test_outbox_ack_after_effect.py
 tests/test_overlay_acceptance.py
 tests/test_overlay_activate.py
@@ -239,6 +269,7 @@ tests/test_overlay_trust_model.py
 tests/test_overlay_workspace_spec.py
 tests/test_platform_adapter_changelog.py
 tests/test_platform_adapter_plugins.py
+tests/test_pr_adapter_v2_target.py
 tests/test_pr_events.py
 tests/test_pr_group_legibility.py
 tests/test_pr_merge_head_pin.py
@@ -264,6 +295,7 @@ tests/test_repo_path_read_through.py
 tests/test_repo_status_linked_worktree.py
 tests/test_repo_status_schema_version.py
 tests/test_repo_status_symlinked_git_dir.py
+tests/test_retire_gr1.py
 tests/test_review_a4.py
 tests/test_review_a4_v2.py
 tests/test_review_a4_v3.py
@@ -294,6 +326,8 @@ tests/test_review_field_tree_readers.py
 tests/test_review_install_hint.py
 tests/test_review_merge_gate.py
 tests/test_review_merge_gate_lost_ack.py
+tests/test_review_merge_receipt.py
+tests/test_review_merge_updates_tracking_ref.py
 tests/test_review_open_lane.py
 tests/test_review_pin_stamp_names.py
 tests/test_review_pr_marker_context.py
@@ -306,12 +340,15 @@ tests/test_review_ref_v1_writer.py
 tests/test_review_remote_safety.py
 tests/test_review_run.py
 tests/test_review_run_context.py
+tests/test_review_run_deleted_cwd.py
 tests/test_review_run_dependency_order.py
 tests/test_review_run_import_isolation.py
 tests/test_review_run_integrity_recheck.py
 tests/test_review_run_multi_repo.py
+tests/test_review_run_package_name.py
 tests/test_review_run_plugin_order.py
 tests/test_review_run_rerun_and_refusal_receipt.py
+tests/test_review_run_venv_and_refusal_identity.py
 tests/test_review_runners.py
 tests/test_review_subject.py
 tests/test_review_transport.py
@@ -321,24 +358,46 @@ tests/test_review_vocabulary.py
 tests/test_rmtree_or_refuse.py
 tests/test_root_option_verbs.py
 tests/test_selected_workspace_commit.py
+tests/test_set_check.py
+tests/test_set_check_remote_heads.py
 tests/test_single_repo_cwd_refusal.py
+tests/test_skill_dump.py
 tests/test_snapshot_id_prefix_resolution.py
 tests/test_spec_apply_event_outcomes.py
 tests/test_spec_declaration_ref_pin.py
+tests/test_spec_show_native_root.py
 tests/test_sprint21_sync_platform.py
 tests/test_staging_cleanup.py
 tests/test_store_break_attempts.py
 tests/test_store_checkout_atomicity.py
+tests/test_store_commit_follows_branch.py
+tests/test_store_commit_keeps_record.py
 tests/test_store_commit_noop.py
+tests/test_store_commit_refuses_rewind.py
 tests/test_store_declared_members.py
+tests/test_store_full_mode_carrier.py
+tests/test_store_full_mode_coverage.py
+tests/test_store_full_mode_layers.py
+tests/test_store_full_mode_records.py
+tests/test_store_git_hooks.py
 tests/test_store_git_native_smoke.py
+tests/test_store_gitmodules.py
+tests/test_store_gitmodules_branch.py
+tests/test_store_hook_takes_verb_coverage.py
 tests/test_store_init_branch_inference.py
+tests/test_store_init_clone.py
 tests/test_store_log_adoption_boundary.py
+tests/test_store_materialize_branch.py
+tests/test_store_materialize_fetches_new_pin.py
+tests/test_store_materialize_installs_hooks.py
 tests/test_store_member_path_hygiene.py
 tests/test_store_member_state.py
 tests/test_store_migrate_branch_inference.py
 tests/test_store_moved_workspace_guard.py
+tests/test_store_status_inspection.py
 tests/test_store_status_values.py
+tests/test_store_submodule_init.py
+tests/test_store_submodule_update_merge.py
 tests/test_store_verb_rename.py
 tests/test_store_verb_witnesses.py
 tests/test_submodule_member_predicate.py

{gitgrip-2.0.0a8 → gitgrip-2.0.0a9}/gr2/PLATFORM_ADAPTER_CHANGELOG.md

@@ -13,8 +13,38 @@ It covers what an out-of-tree adapter implements or receives: the `PlatformAdapt
 Each entry names the release that first carried it. The full release notes for every change are in the
 project's `CHANGELOG.md` and its GitHub releases.
 
-`PLATFORM_ADAPTER_API_VERSION` is the protocol's version number. It is `1`, and it changes only for a change
-an existing adapter cannot absorb.
+`PLATFORM_ADAPTER_API_VERSION` is the protocol's version number. It changes only for a change an existing
+adapter cannot absorb. Version `2` is first carried by 2.0.0a9, and later 2.0.0a releases may add to it;
+an adapter that declares version `1`, or nothing, is still accepted and called as before.
+
+## 2.0.0a9 (adapter API version 2)
+
+An adapter that declares no `platform_adapter_api_version` is a version 1 adapter and is called exactly as
+before.
+
+- **`PLATFORM_ADAPTER_API_VERSION = 2`.** gr2 accepts a declared `1` or `2` and refuses any other value.
+  `adapter_api_version(adapter)` returns the declaration, and `1` when there is none.
+- **`RemoteTarget`** is new: `raw` (the exact configured Git URL) and the adapter's reading of it, `host`,
+  `org`, `project` and `repo`, each `None` when the platform has no such part. gr2 never parses a hosting URL.
+- **`resolve_target(remote) -> RemoteTarget`** is new and is required of a version 2 adapter: it is the only
+  place a URL is parsed.
+- **`CreatePRRequest.target`** is new (default `None`): the member's `RemoteTarget`, resolved by the adapter
+  before the first PR of a group is created. A version 2 adapter always receives it; a version 1 adapter
+  receives `None`. `CreatePRRequest.remote` is unchanged and still carries the raw URL.
+- **`target` keyword on the lifecycle calls.** For a version 2 adapter gr2 passes `target=<that member's
+  RemoteTarget>` to `pr_status`, `merge_pr`, `edit_pr_body`, `pr_checks`, `pr_view` and `list_prs`, so the adapter routes by the member's own
+  target and not by a repo string. A version 1 adapter is never passed `target`.
+- **Old groups are refused by name.** A version 2 adapter given a stored group whose member has neither a
+  `target` nor a `remote` is refused as `group_lacks_routing_context`, before any adapter call; the group is
+  re-created with `gr2 pr create`. A member whose stored remote now resolves to a different target than the
+  one stored is refused as `routing_target_changed`.
+- **Review verbs.** `review open` reads the PR's base branch through the adapter's own target when the adapter
+  is version 2 (`pr_status(..., target=<origin's RemoteTarget>)`), and refuses by name when the repository has
+  no origin url; a version 1 adapter is read exactly as before. Review creation resolves each member through
+  `resolve_target` and requires the effective URL (after any `url.<base>.insteadOf` rewrite) to resolve to the
+  same `(host, org, project, repo)` as the bound one.
+- **Selection refuses a version 2 adapter without `resolve_target`** by name (`platform adapter lacks required
+  resolve_target capability`), at the same point it refuses one without `create_pr`.
 
 ## 2.0.0a8
 

{gitgrip-2.0.0a8 → gitgrip-2.0.0a9}/gr2/prototypes/repo_maintenance_prototype.py

@@ -507,7 +507,10 @@ def declared_repo_state(
     branch of record is resolved in the order the ruling names:
 
     1. ``declared_ref``, from the workspace's own ``.gitmodules`` when the
-       caller supplies it.
+       caller supplies it -- under the member's LOCAL name when its head is
+       attached to a branch configured to track origin's declared branch
+       (``branch.<local>.remote`` = origin, ``.merge`` = the declared branch),
+       since ``.gitmodules`` names a branch on origin.
     2. the branch the repo is on, when its head is attached.
     3. the remote's default from ``refs/remotes/origin/HEAD``, which git sets
        when it clones -- resolved rather than invented, and used for the
@@ -534,6 +537,17 @@ def declared_repo_state(
     ref: str | None = None
     if declared_ref:
         ref = declared_ref
+        # `.gitmodules` names a branch on the member's ORIGIN. A member attached to a local branch configured to track
+        # exactly that branch (`branch.<local>.remote` is origin and `.merge` is refs/heads/<declared>) agrees with the
+        # declaration under its own name (`mine` tracking `origin/main`, declared `main`), so the local name is the
+        # branch of record. Any other upstream, including the same name on another remote (`fork/main`), does not agree,
+        # and the declaration still outranks it. Read as configured, so a remapped fetch refspec cannot fool it.
+        if is_attached:
+            local = attached.stdout.strip().removeprefix("refs/heads/")
+            remote = run_git(path, "config", "--get", f"branch.{local}.remote")
+            merge = run_git(path, "config", "--get", f"branch.{local}.merge")
+            if remote.stdout.strip() == "origin" and merge.stdout.strip() == f"refs/heads/{declared_ref}":
+                ref = local
     elif is_attached:
         ref = attached.stdout.strip().removeprefix("refs/heads/")
     else:
@@ -805,6 +819,40 @@ def swap_in_place(staged: Path, target: Path) -> None:
     shutil.move(str(staged), str(target))
 
 
+def _restore_tracking_refs(staging_path: Path, owner_root: Path, *, keep_origin: bool) -> None:
+    """Make the staging clone's refs/remotes/origin/* what the worktree saw, not what the clone copied.
+
+    The clone's origin refs are the owner's refs/heads/*; delete them all (no-deref, so the origin/HEAD symref
+    itself goes, not its target). When the original had an origin, bring in the owner's own origin tracking refs
+    over file://, which is local, and restore its origin/HEAD symref; when it had none there is nothing to bring
+    and none are left.
+    """
+    listed = run_git(staging_path, "for-each-ref", "--format=%(refname)", "refs/remotes/origin")
+    for ref in listed.stdout.split():
+        run_git(staging_path, "update-ref", "--no-deref", "-d", ref)
+    if not keep_origin:
+        return
+    got = run_git(
+        staging_path, "fetch", "-q", f"file://{owner_root}", "+refs/remotes/origin/*:refs/remotes/origin/*"
+    )
+    if got.returncode != 0:
+        shutil.rmtree(staging_path, ignore_errors=True)
+        raise ConvertCloneError(
+            f"could not carry the owner's remote-tracking refs into the staging clone: {got.stderr.strip()}"
+        )
+    # The fetch brings origin/HEAD back as a PLAIN ref holding a sha, and the readers of the remote's default
+    # branch (`rev-parse --abbrev-ref origin/HEAD`, `symbolic-ref refs/remotes/origin/HEAD`) need the SYMREF.
+    # Put the owner's symref back, when it has one and its target is among the refs just carried; when it
+    # has none, there is none here either.
+    run_git(staging_path, "update-ref", "--no-deref", "-d", "refs/remotes/origin/HEAD")
+    owner_head = run_git(owner_root, "symbolic-ref", "-q", "refs/remotes/origin/HEAD")
+    target = owner_head.stdout.strip()
+    if owner_head.returncode == 0 and target:
+        have = run_git(staging_path, "show-ref", "--verify", "-q", target)
+        if have.returncode == 0:
+            run_git(staging_path, "symbolic-ref", "refs/remotes/origin/HEAD", target)
+
+
 def convert_worktree_to_clone(path: Path) -> dict[str, object]:
     """Convert a linked worktree into an own clone, in place.
 
@@ -933,6 +981,12 @@ def convert_worktree_to_clone(path: Path) -> dict[str, object]:
     else:
         run_git(staging_path, "remote", "remove", "origin")
 
+    # `git clone <owner path>` copied the OWNER's branches as refs/remotes/origin/*, and the real origin was just
+    # restored above, so those refs now claim the real origin holds commits that exist only in the owner. A
+    # commit the worktree knew was unpushed would read as pushed. Replace them with the refs the worktree itself
+    # was reading: the owner's own refs/remotes/origin/*, taken from the owner locally (no network).
+    _restore_tracking_refs(staging_path, canonical_repo_root, keep_origin=original_origin is not None)
+
     staging_git = staging_path / ".git"
     staging_summary = _lstat_summary(staging_git)
     if not staging_summary["is_dir"]: