sase-github 0.2.6__tar.gz → 0.2.7__tar.gz

sase_github-0.2.7/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.2.7"
+}

{sase_github-0.2.6 → sase_github-0.2.7}/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.2.7](https://github.com/sase-org/sase-github/compare/v0.2.6...v0.2.7) (2026-08-28)
+
+
+### Features
+
+* **gh-setup:** adopt the runner's numbered workspace claim ([5e8e9ea](https://github.com/sase-org/sase-github/commit/5e8e9ea6a48b5b285a65d9cb1fa087f74d52b6b0))
+
 ## [0.2.6](https://github.com/sase-org/sase-github/compare/v0.2.5...v0.2.6) (2026-08-18)
 
 

{sase_github-0.2.6 → sase_github-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sase-github
-Version: 0.2.6
+Version: 0.2.7
 Summary: GitHub VCS plugin for sase
 License-Expression: MIT
 License-File: LICENSE

{sase_github-0.2.6 → sase_github-0.2.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sase-github"
-version = "0.2.6"
+version = "0.2.7"
 description = "GitHub VCS plugin for sase"
 requires-python = ">=3.12"
 license = "MIT"

{sase_github-0.2.6 → sase_github-0.2.7}/src/sase_github/scripts/gh_setup.py

@@ -8,6 +8,7 @@ from sase.running_field import (
     WorkspaceClaim,
     claim_next_axe_workspace,
     claim_workspace,
+    find_runner_numbered_workspace,
     get_claimed_workspaces,
     release_workspace,
 )
@@ -61,14 +62,22 @@ def main(
             pinned=not release,
         )
     else:
-        workspace_num, workspace_dir = _claim_next_workspace(
+        adopted = _adopt_runner_workspace(
             project_file=project_file,
             primary_workspace_dir=resolved.primary_workspace_dir,
-            workflow_name=workflow_name,
-            pid=pid,
-            cl_name=cl_name,
-            pinned=not release,
         )
+        if adopted is not None:
+            workspace_num, workspace_dir = adopted
+            pre_allocated = True
+        else:
+            workspace_num, workspace_dir = _claim_next_workspace(
+                project_file=project_file,
+                primary_workspace_dir=resolved.primary_workspace_dir,
+                workflow_name=workflow_name,
+                pid=pid,
+                cl_name=cl_name,
+                pinned=not release,
+            )
 
     # Refuse to hand this checkout to `prepare`/`checkout` if another live
     # agent still occupies it. Runs on the pre_allocated branch too: the
@@ -129,6 +138,20 @@ def main(
     print(f"workflow_name={workflow_name}")
 
 
+def _adopt_runner_workspace(
+    *,
+    project_file: str,
+    primary_workspace_dir: str,
+) -> tuple[int, str] | None:
+    """Reuse the calling runner's numbered pool claim, if it holds one."""
+    workspace_num = find_runner_numbered_workspace(project_file)
+    if workspace_num is None:
+        return None
+    workspace_dir = ensure_workspace_checkout(primary_workspace_dir, workspace_num)
+    materialize_sdd_store(workspace_dir, workspace_num)
+    return workspace_num, workspace_dir
+
+
 def _claim_next_workspace(
     *,
     project_file: str,

{sase_github-0.2.6 → sase_github-0.2.7}/tests/test_gh_workspace_claims.py

@@ -567,6 +567,185 @@ class TestGhSetupOccupancyGuard:
         ] == [10]
 
 
+class TestGhSetupAdoptsRunnerWorkspace:
+    def test_adopts_parent_numbered_claim_without_second_claim(
+        self, tmp_path: Path, capsys: pytest.CaptureFixture[str]
+    ) -> None:
+        parent_claim = WorkspaceClaim(
+            12, "ace(run)-launcher", "feature", pid=os.getppid()
+        )
+        project_file = _write_project_file(tmp_path, running_claims=[parent_claim])
+        workspace_dir = tmp_path / "widget_12"
+        workspace_dir.mkdir()
+
+        with (
+            _isolate_ledger(tmp_path),
+            patch(
+                "sase_github.scripts.gh_setup.resolve_ref",
+                return_value=_resolved(project_file),
+            ),
+            patch.dict(os.environ, {"SASE_GH_PRE_ALLOCATED": "0"}),
+            patch(
+                "sase_github.scripts.gh_setup.ensure_workspace_checkout",
+                return_value=str(workspace_dir),
+            ),
+            patch("sase_github.scripts.gh_setup.materialize_sdd_store") as materialize,
+            patch(
+                "sase_github.scripts.gh_setup.claim_next_axe_workspace"
+            ) as claim_next,
+            patch("sase_github.scripts.gh_setup.claim_workspace") as claim,
+        ):
+            gh_setup.main(gh_ref="acme/widget", n=None, release=True)
+
+        claim_next.assert_not_called()
+        claim.assert_not_called()
+        materialize.assert_called_once_with(str(workspace_dir), 12)
+        out = capsys.readouterr().out
+        assert "workspace_num=12" in out
+        assert "should_release=false" in out
+        claims = get_claimed_workspaces(project_file)
+        assert [claim.workspace_num for claim in claims] == [12]
+        assert claims[0].pid == os.getppid()
+        assert read_occupant_record(str(workspace_dir)) is None
+
+    def test_does_not_adopt_when_parent_only_holds_placeholder(
+        self, tmp_path: Path, capsys: pytest.CaptureFixture[str]
+    ) -> None:
+        placeholder = WorkspaceClaim(
+            0, "ace(run)-launcher", "feature", pid=os.getppid()
+        )
+        project_file = _write_project_file(tmp_path, running_claims=[placeholder])
+
+        with (
+            _isolate_ledger(tmp_path),
+            patch(
+                "sase_github.scripts.gh_setup.resolve_ref",
+                return_value=_resolved(project_file),
+            ),
+            patch.dict(os.environ, {"SASE_GH_PRE_ALLOCATED": "0"}),
+            patch(
+                "sase_github.scripts.gh_setup.ensure_workspace_checkout",
+                return_value="/work/widget_10/",
+            ),
+            patch("sase_github.scripts.gh_setup.materialize_sdd_store"),
+        ):
+            gh_setup.main(gh_ref="acme/widget", n=None, release=True)
+
+        claimed_nums = {
+            claim.workspace_num for claim in get_claimed_workspaces(project_file)
+        }
+        assert claimed_nums == {0, 10}
+        out = capsys.readouterr().out
+        assert "workspace_num=10" in out
+        assert "should_release=true" in out
+
+    def test_pinned_n_does_not_adopt_parent_claim(
+        self, tmp_path: Path, capsys: pytest.CaptureFixture[str]
+    ) -> None:
+        parent_claim = WorkspaceClaim(
+            12, "ace(run)-launcher", "feature", pid=os.getppid()
+        )
+        project_file = _write_project_file(tmp_path, running_claims=[parent_claim])
+
+        with (
+            _isolate_ledger(tmp_path),
+            patch(
+                "sase_github.scripts.gh_setup.resolve_ref",
+                return_value=_resolved(project_file),
+            ),
+            patch.dict(os.environ, {"SASE_GH_PRE_ALLOCATED": "0"}),
+            patch(
+                "sase_github.scripts.gh_setup.ensure_workspace_checkout",
+                return_value="/work/widget_17/",
+            ),
+            patch("sase_github.scripts.gh_setup.materialize_sdd_store"),
+        ):
+            gh_setup.main(gh_ref="acme/widget", n=17, release=True)
+
+        claimed_nums = {
+            claim.workspace_num for claim in get_claimed_workspaces(project_file)
+        }
+        assert claimed_nums == {12, 17}
+        out = capsys.readouterr().out
+        assert "workspace_num=17" in out
+        assert "should_release=true" in out
+
+    def test_adopted_run_does_not_rewrite_occupant_record(self, tmp_path: Path) -> None:
+        parent_claim = WorkspaceClaim(
+            12, "ace(run)-launcher", "feature", pid=os.getppid()
+        )
+        project_file = _write_project_file(tmp_path, running_claims=[parent_claim])
+        workspace_dir = tmp_path / "widget_12"
+        workspace_dir.mkdir()
+        original = new_occupant_record(
+            pid=os.getppid(),
+            workflow="ace(run)-launcher",
+            project="gh_acme__widget",
+            workspace_num=12,
+            agent_name="launcher-agent",
+        )
+        write_occupant_record(str(workspace_dir), original)
+
+        with (
+            _isolate_ledger(tmp_path),
+            patch(
+                "sase_github.scripts.gh_setup.resolve_ref",
+                return_value=_resolved(project_file),
+            ),
+            patch.dict(os.environ, {"SASE_GH_PRE_ALLOCATED": "0"}),
+            patch(
+                "sase_github.scripts.gh_setup.ensure_workspace_checkout",
+                return_value=str(workspace_dir),
+            ),
+            patch("sase_github.scripts.gh_setup.materialize_sdd_store"),
+        ):
+            gh_setup.main(gh_ref="acme/widget", n=None, release=True)
+
+        record = read_occupant_record(str(workspace_dir))
+        assert record is not None
+        assert record.pid == original.pid
+        assert record.workflow == "ace(run)-launcher"
+        assert record.agent_name == "launcher-agent"
+
+    def test_adopted_guard_refusal_releases_nothing(self, tmp_path: Path) -> None:
+        parent_claim = WorkspaceClaim(
+            12, "ace(run)-launcher", "feature", pid=os.getppid()
+        )
+        project_file = _write_project_file(tmp_path, running_claims=[parent_claim])
+        workspace_dir = tmp_path / "widget_12"
+        workspace_dir.mkdir()
+        write_occupant_record(
+            str(workspace_dir),
+            new_occupant_record(
+                pid=os.getpid(),
+                workflow="ace(run)-rival",
+                project="gh_acme__widget",
+                workspace_num=12,
+                agent_name="rival-agent",
+            ),
+        )
+
+        with (
+            _isolate_ledger(tmp_path),
+            patch(
+                "sase_github.scripts.gh_setup.resolve_ref",
+                return_value=_resolved(project_file),
+            ),
+            patch.dict(os.environ, {"SASE_GH_PRE_ALLOCATED": "0"}),
+            patch(
+                "sase_github.scripts.gh_setup.ensure_workspace_checkout",
+                return_value=str(workspace_dir),
+            ),
+            patch("sase_github.scripts.gh_setup.materialize_sdd_store"),
+            pytest.raises(WorkspaceOccupiedError, match="rival-agent"),
+        ):
+            gh_setup.main(gh_ref="acme/widget", n=None, release=True)
+
+        assert [
+            claim.workspace_num for claim in get_claimed_workspaces(project_file)
+        ] == [12]
+
+
 class TestWsSubmitAtomicClaim:
     def test_submit_acquires_through_claim_next_dir_and_releases(
         self, tmp_path: Path

sase_github-0.2.6/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-  ".": "0.2.6"
-}